diff options
| author | Cherry Mui <cherryyz@google.com> | 2022-09-30 19:01:09 -0400 |
|---|---|---|
| committer | Michael Knyszek <mknyszek@google.com> | 2022-11-09 18:44:56 +0000 |
| commit | ec6510887c2ce7571c78ae497ccf9ad334fa3145 (patch) | |
| tree | ecc8ae0619a37c6b3d5566f460eb50427a4a7282 | |
| parent | 9e0b6c11115ce187f6c526858904204c3efa2ce2 (diff) | |
| download | go-git-ec6510887c2ce7571c78ae497ccf9ad334fa3145.tar.gz | |
[release-branch.go1.19] runtime: don't jump stack if at entry of systemstack
The traceback code has special "jump stack" logic, to trace back
stack switches through systemstack. If we're at the entry of
systemstack, the stack switch hasn't happened, so don't jump to
user stack.
The jump stack logic is only used if we're on the g0 stack. It can
happen that we're at the entry of a recursive systemstack call on
the g0 stack. In we jump stack here, there will be two problems:
1. There are frames between entering the g0 stack and this
recursive systemstack call. Those frames will be lost.
2. Worse, we switched frame.sp but frame.fp calculation will use
the entry SP delta (0), which will be wrong, which in turn
leads wrong frame.lr and things will go off.
For now, don't jump stack if we're at entry of systemstack (SP
delta is 0).
Using a per-PC SPWRITE marker may be a better fix. If we haven't
written the SP, we haven't switched the stack so we can just
unwind like a normal function.
Updates #55851.
Fixes #56636.
Change-Id: I2b624c8c086b235b34d9c7d3cebd4a37264f00f8
Reviewed-on: https://go-review.googlesource.com/c/go/+/437299
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Cherry Mui <cherryyz@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
(cherry picked from commit 500bc6b8056ee2eaf7640610a48ffa00bdd896a5)
Reviewed-on: https://go-review.googlesource.com/c/go/+/448516
| -rw-r--r-- | src/runtime/traceback.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go index 49147ff838..23d108dc6b 100644 --- a/src/runtime/traceback.go +++ b/src/runtime/traceback.go @@ -182,6 +182,17 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in case funcID_systemstack: // systemstack returns normally, so just follow the // stack transition. + if usesLR && funcspdelta(f, frame.pc, &cache) == 0 { + // We're at the function prologue and the stack + // switch hasn't happened, or epilogue where we're + // about to return. Just unwind normally. + // Do this only on LR machines because on x86 + // systemstack doesn't have an SP delta (the CALL + // instruction opens the frame), therefore no way + // to check. + flag &^= funcFlag_SPWRITE + break + } frame.sp = gp.m.curg.sched.sp stack = gp.m.curg.stack cgoCtxt = gp.m.curg.cgoCtxt |