From: Austin Clements Date: Thu, 11 May 2017 19:28:39 +0000 (-0400) Subject: [release-branch.go1.8] runtime: doubly fix "double wakeup" panic X-Git-Tag: go1.8.3~12 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=18a13d373a0554a28835c58d1ddfb69b387f41bf;p=gostls13.git [release-branch.go1.8] runtime: doubly fix "double wakeup" panic Cherry-pick of CL 43311. runtime.gchelper depends on the non-atomic load of work.ndone happening strictly before the atomic add of work.nwait. Until very recently (commit 978af9c2db, fixing #20334), the compiler reordered these operations. This created a race since work.ndone can change as soon as work.nwait is equal to work.ndone. If that happened, more than one gchelper could attempt to wake up the work.alldone note, causing a "double wakeup" panic. This was fixed in the compiler, but to make this code less subtle, make the load of work.ndone atomic. This clearly forces the order of these operations, ensuring the race doesn't happen. Fixes #19305 (though really 978af9c2db fixed it). Change-Id: Ieb1a84e1e5044c33ac612c8a5ab6297e7db4c57d Reviewed-on: https://go-review.googlesource.com/43412 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index cd57720917..8f424926cb 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -1918,7 +1918,7 @@ func gchelper() { traceGCScanDone() } - nproc := work.nproc // work.nproc can change right after we increment work.ndone + nproc := atomic.Load(&work.nproc) // work.nproc can change right after we increment work.ndone if atomic.Xadd(&work.ndone, +1) == nproc-1 { notewakeup(&work.alldone) }