Skip to content

8350106: [PPC] Avoid ticks_unknown_not_Java AsyncGetCallTrace() if JavaFrameAnchor::_last_Java_pc not set #3957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+31 −10
Open

8350106: [PPC] Avoid ticks_unknown_not_Java AsyncGetCallTrace() if JavaFrameAnchor::_last_Java_pc not set #3957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3efbbf8
Backport d5908231ebc16f443b3fc9b2ebf03cc4deb67373
reinrich Jul 22, 2025
4bbbe10
Order includes in thread_aix_ppc.cpp
reinrich Sep 19, 2025
53461d2
Rename frame::common_abi to frame::abi_minframe
reinrich Sep 22, 2025
fcdc188
Use frame constructur that inits pc from the lr slot
reinrich Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2025 SAP SE. All rights reserved.
* Copyright (c) 2022, IBM Corp.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand All @@ -27,6 +27,7 @@
#include "precompiled.hpp"
#include "memory/metaspace.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/os.inline.hpp"
#include "runtime/thread.hpp"

frame JavaThread::pd_last_frame() {
Expand Down Expand Up @@ -54,9 +55,19 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
if (has_last_Java_frame() && frame_anchor()->walkable()) {
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
// pc can be seen as null because not all writers use store pc + release store sp.
// Simply discard the sample in this very rare case.
if (pc == nullptr) return false;
if (pc == nullptr) {
// This is not uncommon. Many c1/c2 runtime stubs do not set the pc in the anchor.
intptr_t* top_sp = os::Aix::ucontext_get_sp((const ucontext_t*)ucontext);
if ((uint64_t)sp <= ((frame::abi_minframe*)top_sp)->callers_sp) {
// The interrupt occurred either in the last java frame or in its direct callee.
// We cannot be sure that the link register LR was already saved to the
// java frame. Therefore we discard this sample.
return false;
}
// The last java pc will be found in the abi part of the last java frame.
*fr_addr = frame(sp);
return true;
}
*fr_addr = frame(sp, pc);
return true;
}
Expand Down
20 changes: 15 additions & 5 deletions src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2022 SAP SE. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2025 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -53,9 +53,19 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
if (has_last_Java_frame() && frame_anchor()->walkable()) {
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
// pc can be seen as null because not all writers use store pc + release store sp.
// Simply discard the sample in this very rare case.
if (pc == nullptr) return false;
if (pc == nullptr) {
// This is not uncommon. Many c1/c2 runtime stubs do not set the pc in the anchor.
intptr_t* top_sp = os::Linux::ucontext_get_sp((const ucontext_t*)ucontext);
if ((uint64_t)sp <= ((frame::abi_minframe*)top_sp)->callers_sp) {
// The interrupt occurred either in the last java frame or in its direct callee.
// We cannot be sure that the link register LR was already saved to the
// java frame. Therefore we discard this sample.
return false;
}
// The last java pc will be found in the abi part of the last java frame.
*fr_addr = frame(sp);
return true;
}
*fr_addr = frame(sp, pc);
return true;
}
Expand Down