Skip to content
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

Jump to bottom

8261391: ZGC crash - SEGV in RevokeOneBias::do_thread #2571

Closed
wants to merge 4 commits into from
Closed

8261391: ZGC crash - SEGV in RevokeOneBias::do_thread #2571

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83382d2
SWS start processing on handshaker
robehn Feb 11, 2021
ff68fe0
Merge branch 'master' into 8261391-sws-handshaker
robehn Feb 17, 2021
7245e44
prepare() on self execution and a rename
robehn Feb 17, 2021
69330c1
Tiny spelling error
robehn Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/hotspot/share/runtime/handshake.cpp
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ class HandshakeOperation : public CHeapObj<mtThread> {
_target(target),
_requester(requester) {}
virtual ~HandshakeOperation() {}
void prepare(JavaThread* current_target, Thread* executioner);
void prepare(JavaThread* current_target, Thread* executing_thread);
void do_handshake(JavaThread* thread);
bool is_completed() {
int32_t val = Atomic::load(&_pending_threads);
Expand Down Expand Up @@ -280,14 +280,17 @@ class VM_HandshakeAllThreads: public VM_Handshake {
VMOp_Type type() const { return VMOp_HandshakeAllThreads; }
};

void HandshakeOperation::prepare(JavaThread* current_target, Thread* executioner) {
void HandshakeOperation::prepare(JavaThread* current_target, Thread* executing_thread) {
if (current_target->is_terminated()) {
// Will never execute any handshakes on this thread.
return;
}
StackWatermarkSet::start_processing(current_target, StackWatermarkKind::gc);
if (_requester != NULL && _requester != executioner && _requester->is_Java_thread()) {
// The handshake closure may contains oop Handles from the _requester.
if (current_target != executing_thread) {
// Only when the target is not executing the handshake it self.
robehn marked this conversation as resolved.
Show resolved Hide resolved
StackWatermarkSet::start_processing(current_target, StackWatermarkKind::gc);
}
if (_requester != NULL && _requester != executing_thread && _requester->is_Java_thread()) {
// The handshake closure may contain oop Handles from the _requester.
// We must make sure we can use them.
StackWatermarkSet::start_processing(_requester->as_Java_thread(), StackWatermarkKind::gc);
}
Expand Down Expand Up @@ -447,6 +450,7 @@ void HandshakeState::process_self_inner() {
bool async = op->is_async();
log_trace(handshake)("Proc handshake %s " INTPTR_FORMAT " on " INTPTR_FORMAT " by self",
async ? "asynchronous" : "synchronous", p2i(op), p2i(_handshakee));
op->prepare(_handshakee, _handshakee);
op->do_handshake(_handshakee);
if (async) {
log_handshake_info(((AsyncHandshakeOperation*)op)->start_time(), op->name(), 1, 0, "asynchronous");
Expand Down