From: Austin Clements <austin@google.com>
Date: Tue, 12 Jul 2022 20:35:26 +0000 (-0400)
Subject: runtime: switch gp when jumping stacks during traceback
X-Git-Tag: go1.20rc1~1244
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=511cd9b8af10de9cad86be38a22e5eb2e5d4cd8d;p=gostls13.git

runtime: switch gp when jumping stacks during traceback

Currently, when traceback jumps from the system stack to a user stack
(e.g., during profiling tracebacks), it leaves gp pointing at the g0.
This is currently harmless since it's only used during profiling, so
the code paths in gentraceback that care about gp aren't used, but
it's really confusing and would certainly break if _TraceJumpStack
were ever used in a context other than profiling.

Fix this by updating gp to point to the user g when we switch stacks.

For #54466.

Change-Id: I1541e004667a52e37671803ce45c91d8c5308830
Reviewed-on: https://go-review.googlesource.com/c/go/+/424257
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Auto-Submit: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
---

diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go
index ed64343470..8ecddc8935 100644
--- a/src/runtime/traceback.go
+++ b/src/runtime/traceback.go
@@ -167,20 +167,22 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
 					// This keeps morestack() from showing up in the backtrace,
 					// but that makes some sense since it'll never be returned
 					// to.
-					frame.pc = gp.m.curg.sched.pc
+					gp = gp.m.curg
+					frame.pc = gp.sched.pc
 					frame.fn = findfunc(frame.pc)
 					f = frame.fn
 					flag = f.flag
-					frame.lr = gp.m.curg.sched.lr
-					frame.sp = gp.m.curg.sched.sp
-					stack = gp.m.curg.stack
-					cgoCtxt = gp.m.curg.cgoCtxt
+					frame.lr = gp.sched.lr
+					frame.sp = gp.sched.sp
+					stack = gp.stack
+					cgoCtxt = gp.cgoCtxt
 				case funcID_systemstack:
 					// systemstack returns normally, so just follow the
 					// stack transition.
-					frame.sp = gp.m.curg.sched.sp
-					stack = gp.m.curg.stack
-					cgoCtxt = gp.m.curg.cgoCtxt
+					gp = gp.m.curg
+					frame.sp = gp.sched.sp
+					stack = gp.stack
+					cgoCtxt = gp.cgoCtxt
 					flag &^= funcFlag_SPWRITE
 				}
 			}