diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go index 857b7001ea7858..c2cab7c813bf55 100644 --- a/src/runtime/crash_test.go +++ b/src/runtime/crash_test.go @@ -144,6 +144,7 @@ func buildTestProg(t *testing.T, binary string, flags ...string) (string, error) } func TestVDSO(t *testing.T) { + t.Parallel() output := runTestProg(t, "testprog", "SignalInVDSO") want := "success\n" if output != want { diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go index 436c18c1261f54..ba90815a656dd8 100644 --- a/src/runtime/signal_unix.go +++ b/src/runtime/signal_unix.go @@ -274,6 +274,20 @@ func sigpipe() { dieFromSignal(_SIGPIPE) } +// G may be clobbered in VDSO context in some architectures. +// See #32912. +// +//go:nosplit +func sigFetchG(c *sigctxt) *g { + switch GOARCH { + case "arm", "arm64", "ppc64", "ppc64le": + if inVDSOPage(c.sigpc()) { + return nil + } + } + return getg() +} + // sigtrampgo is called from the signal handler function, sigtramp, // written in assembly code. // This is called by the signal handler, and the world may be stopped. @@ -289,9 +303,9 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) { if sigfwdgo(sig, info, ctx) { return } - g := getg() + c := &sigctxt{info, ctx} + g := sigFetchG(c) if g == nil { - c := &sigctxt{info, ctx} if sig == _SIGPROF { sigprofNonGoPC(c.sigpc()) return @@ -347,7 +361,6 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) { signalDuringFork(sig) } - c := &sigctxt{info, ctx} c.fixsigcode(sig) sighandler(sig, info, ctx, g) setg(g) @@ -657,9 +670,10 @@ func sigfwdgo(sig uint32, info *siginfo, ctx unsafe.Pointer) bool { return false } // Determine if the signal occurred inside Go code. We test that: - // (1) we were in a goroutine (i.e., m.curg != nil), and - // (2) we weren't in CGO. - g := getg() + // (1) we weren't in VDSO page, + // (2) we were in a goroutine (i.e., m.curg != nil), and + // (3) we weren't in CGO. + g := sigFetchG(c) if g != nil && g.m != nil && g.m.curg != nil && !g.m.incgo { return false } diff --git a/src/runtime/testdata/testprog/vdso.go b/src/runtime/testdata/testprog/vdso.go index c952a08d487247..6036f45bc83c1e 100644 --- a/src/runtime/testdata/testprog/vdso.go +++ b/src/runtime/testdata/testprog/vdso.go @@ -33,8 +33,8 @@ func signalInVDSO() { t0 := time.Now() t1 := t0 // We should get a profiling signal 100 times a second, - // so running for 10 seconds should be sufficient. - for t1.Sub(t0) < 10*time.Second { + // so running for 1 second should be sufficient. + for t1.Sub(t0) < time.Second { t1 = time.Now() } diff --git a/src/runtime/vdso_linux.go b/src/runtime/vdso_linux.go index 71ba4ce4161b66..8518276867e394 100644 --- a/src/runtime/vdso_linux.go +++ b/src/runtime/vdso_linux.go @@ -281,6 +281,7 @@ func vdsoauxv(tag, val uintptr) { } // vdsoMarker reports whether PC is on the VDSO page. +//go:nosplit func inVDSOPage(pc uintptr) bool { for _, k := range vdsoSymbolKeys { if *k.ptr != 0 {