archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 02:24:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8231949: [PPC64, s390]: Make async profiling more reliable

Browse source 
Better checks if method from interpreter frame is valid.

Reviewed-by: rrich, ghaug, goetz
This commit is contained in:
Martin Doerr 2019-10-24 16:28:51 +02:00
parent aba2880e2e
commit a5fab79984
2 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
View file

@ -65,14 +65,15 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
} }
if (ret_frame.is_interpreted_frame()) { if (ret_frame.is_interpreted_frame()) {
frame::ijava_state* istate = ret_frame.get_ijava_state(); frame::ijava_state *istate = ret_frame.get_ijava_state();
if (MetaspaceObj::is_valid((Method*)(istate->method)) == false) { const Method *m = (const Method*)(istate->method);
return false; if (!Method::is_valid_method(m)) return false;
} if (!Metaspace::contains(m->constMethod())) return false;
uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
uint64_t istate_bcp = istate->bcp; uint64_t istate_bcp = istate->bcp;
uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base()); uint64_t code_start = (uint64_t)(m->code_base());
uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size()); uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
if (istate_bcp >= code_start && istate_bcp < code_end) { if (istate_bcp >= code_start && istate_bcp < code_end) {
// we have a valid bcp, don't touch it, do nothing // we have a valid bcp, don't touch it, do nothing
} else if (reg_bcp >= code_start && reg_bcp < code_end) { } else if (reg_bcp >= code_start && reg_bcp < code_end) {

11
src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp
View file

@ -63,14 +63,17 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
if (ret_frame.is_interpreted_frame()) { if (ret_frame.is_interpreted_frame()) {
frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked(); frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked();
if ((stack_base() >= (address)istate && (address)istate > stack_end()) || if (stack_base() >= (address)istate && (address)istate > stack_end()) {
MetaspaceObj::is_valid((Method*)(istate->method)) == false) {
return false; return false;
} }
const Method *m = (const Method*)(istate->method);
if (!Method::is_valid_method(m)) return false;
if (!Metaspace::contains(m->constMethod())) return false;
uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/]; uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/];
uint64_t istate_bcp = istate->bcp; uint64_t istate_bcp = istate->bcp;
uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base()); uint64_t code_start = (uint64_t)(m->code_base());
uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size()); uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
if (istate_bcp >= code_start && istate_bcp < code_end) { if (istate_bcp >= code_start && istate_bcp < code_end) {
// we have a valid bcp, don't touch it, do nothing // we have a valid bcp, don't touch it, do nothing
} else if (reg_bcp >= code_start && reg_bcp < code_end) { } else if (reg_bcp >= code_start && reg_bcp < code_end) {