From 2d99109cfcaef22b6872dc2e07e4582586c032a2 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 13 Feb 2023 16:20:54 -0500 Subject: runtime: replace all callback uses of gentraceback with unwinder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a really nice simplification for all of these call sites. It also achieves a nice performance improvement for stack copying: goos: linux goarch: amd64 pkg: runtime cpu: Intel(R) Xeon(R) CPU E5-2690 v3 @ 2.60GHz │ before │ after │ │ sec/op │ sec/op vs base │ StackCopyPtr-48 89.25m ± 1% 79.78m ± 1% -10.62% (p=0.000 n=20) StackCopy-48 83.48m ± 2% 71.88m ± 1% -13.90% (p=0.000 n=20) StackCopyNoCache-48 2.504m ± 2% 2.195m ± 1% -12.32% (p=0.000 n=20) StackCopyWithStkobj-48 21.66m ± 1% 21.02m ± 2% -2.95% (p=0.000 n=20) geomean 25.21m 22.68m -10.04% Updates #54466. Change-Id: I31715b7b6efd65726940041d3052bb1c0a1186f3 Reviewed-on: https://go-review.googlesource.com/c/go/+/468297 Run-TryBot: Austin Clements TryBot-Result: Gopher Robot Reviewed-by: Michael Pratt --- src/runtime/stack.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/runtime/stack.go') diff --git a/src/runtime/stack.go b/src/runtime/stack.go index d5e587a209..14e1a75ccd 100644 --- a/src/runtime/stack.go +++ b/src/runtime/stack.go @@ -649,11 +649,10 @@ func adjustpointers(scanp unsafe.Pointer, bv *bitvector, adjinfo *adjustinfo, f } // Note: the argument/return area is adjusted by the callee. -func adjustframe(frame *stkframe, arg unsafe.Pointer) bool { - adjinfo := (*adjustinfo)(arg) +func adjustframe(frame *stkframe, adjinfo *adjustinfo) { if frame.continpc == 0 { // Frame is dead. - return true + return } f := frame.fn if stackDebug >= 2 { @@ -663,7 +662,7 @@ func adjustframe(frame *stkframe, arg unsafe.Pointer) bool { // A special routine at the bottom of stack of a goroutine that does a systemstack call. // We will allow it to be copied even though we don't // have full GC info for it (because it is written in asm). - return true + return } locals, args, objs := frame.getStackMap(&adjinfo.cache, true) @@ -736,8 +735,6 @@ func adjustframe(frame *stkframe, arg unsafe.Pointer) bool { } } } - - return true } func adjustctxt(gp *g, adjinfo *adjustinfo) { @@ -931,7 +928,10 @@ func copystack(gp *g, newsize uintptr) { gp.stktopsp += adjinfo.delta // Adjust pointers in the new stack. - gentraceback(^uintptr(0), ^uintptr(0), 0, gp, 0, nil, 0x7fffffff, adjustframe, noescape(unsafe.Pointer(&adjinfo)), 0) + var u unwinder + for u.init(gp, 0); u.valid(); u.next() { + adjustframe(&u.frame, &adjinfo) + } // free old stack if stackPoisonCopy != 0 { -- cgit v1.3