diff options
| author | Michael Anthony Knyszek <mknyszek@google.com> | 2018-12-06 21:51:51 +0000 |
|---|---|---|
| committer | Michael Knyszek <mknyszek@google.com> | 2018-12-07 16:42:49 +0000 |
| commit | 578667f4b534974f28909dbc34bce7fe1686c5d3 (patch) | |
| tree | 9ed2526139acfc0e7f8e181c78f5ca1a79eca847 | |
| parent | f604b6ce3877bf7d612c3aaaa429a304bd2fa383 (diff) | |
| download | go-git-578667f4b534974f28909dbc34bce7fe1686c5d3.tar.gz | |
runtime: enable preemption of mark termination goroutine
A mark worker goroutine may attempt to preempt the mark termination
goroutine to scan its stack while the mark termination goroutine is
trying to preempt that worker to flush its work buffer, in rare
cases.
This change makes it so that, like a worker goroutine, the mark
termination goroutine stack is preemptible while it is on the
system stack, attempting to preempt others.
Fixes #28695.
Change-Id: I23bbb191f4fdad293e8a70befd51c9175f8a1171
Reviewed-on: https://go-review.googlesource.com/c/153077
Reviewed-by: Rick Hudson <rlh@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
| -rw-r--r-- | src/runtime/mgc.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index 7747e5409c..622750ed2e 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -1417,6 +1417,12 @@ top: // Flush all local buffers and collect flushedWork flags. gcMarkDoneFlushed = 0 systemstack(func() { + gp := getg().m.curg + // Mark the user stack as preemptible so that it may be scanned. + // Otherwise, our attempt to force all P's to a safepoint could + // result in a deadlock as we attempt to preempt a worker that's + // trying to preempt us (e.g. for a stack scan). + casgstatus(gp, _Grunning, _Gwaiting) forEachP(func(_p_ *p) { // Flush the write barrier buffer, since this may add // work to the gcWork. @@ -1449,6 +1455,7 @@ top: _p_.gcw.pauseGen = gcWorkPauseGen } }) + casgstatus(gp, _Gwaiting, _Grunning) }) if gcMarkDoneFlushed != 0 { |