Skip to content

Commit 6455afb

Browse files
committed
runtime: dropg after emitting trace event in preemptPark
Because we dropg before emitting a trace event in preemptPark, we end up failing to emit a status for the goroutine if this happens to be the first event for it in the generation. We only really see this with multiple subscribers in TestSubscribers. This is for two reasons: 1. If we are missing a status event for a non-initial generation then the trace parser won't validate that (an oversight, but we can only enforce that for new traces because of this bug), and 2. If we're starting the tracer fresh, then we have a STW which effectively guarantees that the first event for a goroutine cannot come from preemptPark. Therefore, we cannot observe this situation unless the first generation manifests the bug, but prior to having flight recording and/or multiple subscribers being able to "cut" the trace data at any point, this was impossible. The fix is simple: dropg only after emitting the trace event. This is also safe, because the tracer doesn't care. The tracer will also start taking a stack trace of the goroutine in this circumstance, but that is also safe, since we are able to generally unwind the stack of asynchronously preempted goroutines, and here we're at the very, very end of asynchronous preemption where all the state to do so is already set up. Fixes #75665. Change-Id: I7ee1142697d0a53b62d4c5647aa53775d2f6976a Reviewed-on: https://go-review.googlesource.com/c/go/+/729400 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Cherry Mui <[email protected]>
1 parent 8f45611 commit 6455afb

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/runtime/proc.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4385,7 +4385,6 @@ func preemptPark(gp *g) {
43854385
// up. Hence, we set the scan bit to lock down further
43864386
// transitions until we can dropg.
43874387
casGToPreemptScan(gp, _Grunning, _Gscan|_Gpreempted)
4388-
dropg()
43894388

43904389
// Be careful about ownership as we trace this next event.
43914390
//
@@ -4411,10 +4410,19 @@ func preemptPark(gp *g) {
44114410
if trace.ok() {
44124411
trace.GoPark(traceBlockPreempted, 0)
44134412
}
4413+
4414+
// Drop the goroutine from the M. Only do this after the tracer has
4415+
// emitted an event, because it needs the association for GoPark to
4416+
// work correctly.
4417+
dropg()
4418+
4419+
// Drop the scan bit and release the trace locker if necessary.
44144420
casfrom_Gscanstatus(gp, _Gscan|_Gpreempted, _Gpreempted)
44154421
if trace.ok() {
44164422
traceRelease(trace)
44174423
}
4424+
4425+
// All done.
44184426
schedule()
44194427
}
44204428

src/runtime/trace/subscribe_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import (
1717

1818
func TestSubscribers(t *testing.T) {
1919
validate := func(t *testing.T, source string, tr []byte) {
20+
t.Log("validating", source)
2021
defer func() {
2122
if t.Failed() {
22-
testtrace.Dump(t, "trace", tr, *dumpTraces)
23+
testtrace.Dump(t, "TestSubscribers."+source, tr, *dumpTraces)
2324
}
2425
}()
2526

0 commit comments

Comments
 (0)