Skip to content

Commit 21713f4

Browse files
committed
runtime: make sure BP is saved in nanotime1/walltime1, else frame pointer may not be preserved
nanotime1 and walltime1 do not preserve BP on linux amd64. Previously, this did not cause a problem, because nanotime/walltime do preserve the BP. But now with mid-stack inlining, nanotime/walltime are usually inlined, so BP is not preserved. So, the BP is now wrong in any function after a call to nanotime()/walltime() on amd64. That means the frame pointer on the stack can be wrong for any further function call made after the nanotime() call (notably runtime.main and various GC functions). [386 doesn't use framepointer.] Fix is to set a frame size of 8 for nanotime1 and walltime1, which means the standard prolog/epilog that saves/restore BP in the stack frame is added. I noticed this while investigating issue 16638 (use frame pointers for runtime.Callers). This change would needed for progress on that issue (which doesn't have a high priority). Verified that this fix works/is useful for issue 16638. Change-Id: I19e19ef2c1a517d737a34928baae034f2eb0b2c2 Reviewed-on: https://go-review.googlesource.com/c/go/+/212079 Run-TryBot: Dan Scales <[email protected]> Reviewed-by: Keith Randall <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 3f51350 commit 21713f4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/runtime/sys_linux_amd64.s

+5-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-28
205205
RET
206206

207207
// func walltime1() (sec int64, nsec int32)
208-
TEXT runtime·walltime1(SB),NOSPLIT,$0-12
208+
// non-zero frame-size means bp is saved and restored
209+
TEXT runtime·walltime1(SB),NOSPLIT,$8-12
209210
// We don't know how much stack space the VDSO code will need,
210211
// so switch to g0.
211212
// In particular, a kernel configured with CONFIG_OPTIMIZE_INLINING=n
@@ -262,7 +263,9 @@ fallback:
262263
MOVL DX, nsec+8(FP)
263264
RET
264265

265-
TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
266+
// func nanotime1() int64
267+
// non-zero frame-size means bp is saved and restored
268+
TEXT runtime·nanotime1(SB),NOSPLIT,$8-8
266269
// Switch to g0 stack. See comment above in runtime·walltime.
267270

268271
MOVQ SP, BP // Save old SP; BP unchanged by C code.

0 commit comments

Comments
 (0)