]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: save frame pointer to the stack in signal handlers for arm64
authorNick Ripley <nick.ripley@datadoghq.com>
Mon, 3 Apr 2023 13:54:53 +0000 (09:54 -0400)
committerMichael Knyszek <mknyszek@google.com>
Wed, 5 Apr 2023 18:16:00 +0000 (18:16 +0000)
When taking over the goroutine stack in the panic or preemption signal
handlers on arm64, the frame pointer should be saved on the stack (like
the link register) so that frame-pointer unwinding from a panic stack
works properly. Otherwise, tests like TestStackWrapperStackPanic will
fail with the frame pointer check in adjustframe (enabled with
debugCheckBP) when checking the sigpanic frame.

Updates #39524, #58432

Change-Id: I8b89e6fc4877af29b1b81e55e591e6398159855c
Reviewed-on: https://go-review.googlesource.com/c/go/+/481635
Reviewed-by: Felix Geisendörfer <felix.geisendoerfer@datadoghq.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Nick Ripley <nick.ripley@datadoghq.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
src/runtime/signal_arm64.go

index c8b87817b435ab39076cc3e2838e47e0b6c0b193..4a96b3c2e70681388ac6b945dfc586b127ff9e63 100644 (file)
@@ -8,6 +8,7 @@ package runtime
 
 import (
        "internal/abi"
+       "internal/goarch"
        "runtime/internal/sys"
        "unsafe"
 )
@@ -68,6 +69,12 @@ func (c *sigctxt) preparePanic(sig uint32, gp *g) {
        sp := c.sp() - sys.StackAlign // needs only sizeof uint64, but must align the stack
        c.set_sp(sp)
        *(*uint64)(unsafe.Pointer(uintptr(sp))) = c.lr()
+       // Make sure a valid frame pointer is saved on the stack so that the
+       // frame pointer checks in adjustframe are happy, if they're enabled.
+       // Frame pointer unwinding won't visit the sigpanic frame, since
+       // sigpanic will save the same frame pointer before calling into a panic
+       // function.
+       *(*uint64)(unsafe.Pointer(uintptr(sp - goarch.PtrSize))) = c.r29()
 
        pc := gp.sigpc
 
@@ -89,6 +96,10 @@ func (c *sigctxt) pushCall(targetPC, resumePC uintptr) {
        sp := c.sp() - 16 // SP needs 16-byte alignment
        c.set_sp(sp)
        *(*uint64)(unsafe.Pointer(uintptr(sp))) = c.lr()
+       // Make sure a valid frame pointer is saved on the stack so that the
+       // frame pointer checks in adjustframe are happy, if they're enabled.
+       // This is not actually used for unwinding.
+       *(*uint64)(unsafe.Pointer(uintptr(sp - goarch.PtrSize))) = c.r29()
        // Set up PC and LR to pretend the function being signaled
        // calls targetPC at resumePC.
        c.set_lr(uint64(resumePC))