diff options
| author | Damien Neil <dneil@google.com> | 2025-05-22 11:14:53 -0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-05-29 12:49:36 -0700 |
| commit | 21b7e60c6b64dd3221ab5b95d164fb42492029e8 (patch) | |
| tree | 97881264d6ec2f6c7f793b69dc7d215e0517b953 /src/runtime | |
| parent | 555d425d177db7fa7123779d253aee42980cb8a3 (diff) | |
| download | go-21b7e60c6b64dd3221ab5b95d164fb42492029e8.tar.xz | |
runtime, testing/synctest: breaking bubble isolation with Cond is fatal
sync.Cond.Wait is durably blocking. Waking a goroutine out of Cond.Wait
from outside its bubble panics.
Make this panic a fatal panic, since it leaves the notifyList in an
inconsistent state. We could do some work to make this a recoverable
panic, but the complexity doesn't seem worth the outcome.
For #67434
Change-Id: I88874c1519c2e5c0063175297a9b120cedabcd07
Reviewed-on: https://go-review.googlesource.com/c/go/+/675617
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/crash_test.go | 17 | ||||
| -rw-r--r-- | src/runtime/sema.go | 4 | ||||
| -rw-r--r-- | src/runtime/testdata/testprog/synctest.go | 58 |
3 files changed, 77 insertions, 2 deletions
diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go index 221a9a95cc..8696672065 100644 --- a/src/runtime/crash_test.go +++ b/src/runtime/crash_test.go @@ -1228,3 +1228,20 @@ func TestFinalizerOrCleanupDeadlock(t *testing.T) { }) } } + +func TestSynctestCondSignalFromNoBubble(t *testing.T) { + for _, test := range []string{ + "SynctestCond/signal/no_bubble", + "SynctestCond/broadcast/no_bubble", + "SynctestCond/signal/other_bubble", + "SynctestCond/broadcast/other_bubble", + } { + t.Run(test, func(t *testing.T) { + output := runTestProg(t, "testprog", test) + want := "fatal error: semaphore wake of synctest goroutine from outside bubble" + if !strings.Contains(output, want) { + t.Fatalf("output:\n%s\n\nwant output containing: %s", output, want) + } + }) + } +} diff --git a/src/runtime/sema.go b/src/runtime/sema.go index 7d6fc6d57d..0f029f604f 100644 --- a/src/runtime/sema.go +++ b/src/runtime/sema.go @@ -635,7 +635,7 @@ func notifyListNotifyAll(l *notifyList) { s.next = nil if s.g.bubble != nil && getg().bubble != s.g.bubble { println("semaphore wake of synctest goroutine", s.g.goid, "from outside bubble") - panic("semaphore wake of synctest goroutine from outside bubble") + fatal("semaphore wake of synctest goroutine from outside bubble") } readyWithTime(s, 4) s = next @@ -692,7 +692,7 @@ func notifyListNotifyOne(l *notifyList) { s.next = nil if s.g.bubble != nil && getg().bubble != s.g.bubble { println("semaphore wake of synctest goroutine", s.g.goid, "from outside bubble") - panic("semaphore wake of synctest goroutine from outside bubble") + fatal("semaphore wake of synctest goroutine from outside bubble") } readyWithTime(s, 4) return diff --git a/src/runtime/testdata/testprog/synctest.go b/src/runtime/testdata/testprog/synctest.go new file mode 100644 index 0000000000..dd3a6df8a0 --- /dev/null +++ b/src/runtime/testdata/testprog/synctest.go @@ -0,0 +1,58 @@ +// Copyright 2025 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +import ( + "internal/synctest" + "sync" +) + +func init() { + register("SynctestCond/signal/no_bubble", func() { + synctestCond(func(cond *sync.Cond) { + cond.Signal() + }) + }) + register("SynctestCond/broadcast/no_bubble", func() { + synctestCond(func(cond *sync.Cond) { + cond.Broadcast() + }) + }) + register("SynctestCond/signal/other_bubble", func() { + synctestCond(func(cond *sync.Cond) { + synctest.Run(cond.Signal) + }) + }) + register("SynctestCond/broadcast/other_bubble", func() { + synctestCond(func(cond *sync.Cond) { + synctest.Run(cond.Broadcast) + }) + }) +} + +func synctestCond(f func(*sync.Cond)) { + var ( + mu sync.Mutex + cond = sync.NewCond(&mu) + readyc = make(chan struct{}) + wg sync.WaitGroup + ) + defer wg.Wait() + wg.Go(func() { + synctest.Run(func() { + go func() { + mu.Lock() + defer mu.Unlock() + cond.Wait() + }() + synctest.Wait() + <-readyc // #1: signal that cond.Wait is waiting + <-readyc // #2: wait to continue + cond.Signal() + }) + }) + readyc <- struct{}{} + f(cond) +} |
