Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "runtime: drop stack-allocated pcvalueCaches"

Browse source 
This reverts CL 515277

Change-Id: Ie10378eed4993cb69f4a9b43a38af32b9d743155
Reviewed-on: https://go-review.googlesource.com/c/go/+/516855
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Austin Clements <austin@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
Austin Clements 2023-08-07 18:11:17 -04:00 • committed by Gopher Robot
parent 008ab9adb8
commit 5f674f64e4
14 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/runtime/debugcall.go
View file

@ -83,7 +83,7 @@ func debugCallCheck(pc uintptr) string {
if pc != f.entry() { if pc != f.entry() {
pc-- pc--
} }
up := pcdatavalue(f, abi.PCDATA_UnsafePoint, pc) up := pcdatavalue(f, abi.PCDATA_UnsafePoint, pc, nil)
if up != abi.UnsafePointSafe { if up != abi.UnsafePointSafe {
// Not at a safe point. // Not at a safe point.
ret = debugCallUnsafePoint ret = debugCallUnsafePoint

2
src/runtime/heapdump.go
View file

@ -259,7 +259,7 @@ func dumpframe(s *stkframe, child *childInfo) {
pcdata := int32(-1) // Use the entry map at function entry pcdata := int32(-1) // Use the entry map at function entry
if pc != f.entry() { if pc != f.entry() {
pc-- pc--
pcdata = pcdatavalue(f, abi.PCDATA_StackMapIndex, pc) pcdata = pcdatavalue(f, abi.PCDATA_StackMapIndex, pc, nil)
} }
if pcdata == -1 { if pcdata == -1 {
// We do not have a valid pcdata value but there might be a // We do not have a valid pcdata value but there might be a

2
src/runtime/mbitmap.go
View file

@ -1479,7 +1479,7 @@ func getgcmask(ep any) (mask []byte) {
} }
} }
if found { if found {
locals, _, _ := u.frame.getStackMap(false) locals, _, _ := u.frame.getStackMap(nil, false)
if locals.n == 0 { if locals.n == 0 {
return return
} }

2
src/runtime/mgcmark.go
View file

@ -964,7 +964,7 @@ func scanframeworker(frame *stkframe, state *stackScanState, gcw *gcWork) {
return return
} }
locals, args, objs := frame.getStackMap(false) locals, args, objs := frame.getStackMap(&state.cache, false)
// Scan local variables if stack frame has been allocated. // Scan local variables if stack frame has been allocated.
if locals.n > 0 { if locals.n > 0 {

2
src/runtime/mgcstack.go
View file

@ -166,6 +166,8 @@ func (obj *stackObject) setRecord(r *stackObjectRecord) {
// A stackScanState keeps track of the state used during the GC walk // A stackScanState keeps track of the state used during the GC walk
// of a goroutine. // of a goroutine.
type stackScanState struct { type stackScanState struct {
cache pcvalueCache
// stack limits // stack limits
stack stack stack stack

4
src/runtime/preempt.go
View file

@ -385,7 +385,7 @@ func isAsyncSafePoint(gp *g, pc, sp, lr uintptr) (bool, uintptr) {
// Not Go code. // Not Go code.
return false, 0 return false, 0
} }
if (GOARCH == "mips" || GOARCH == "mipsle" || GOARCH == "mips64" || GOARCH == "mips64le") && lr == pc+8 && funcspdelta(f, pc) == 0 { if (GOARCH == "mips" || GOARCH == "mipsle" || GOARCH == "mips64" || GOARCH == "mips64le") && lr == pc+8 && funcspdelta(f, pc, nil) == 0 {
// We probably stopped at a half-executed CALL instruction, // We probably stopped at a half-executed CALL instruction,
// where the LR is updated but the PC has not. If we preempt // where the LR is updated but the PC has not. If we preempt
// here we'll see a seemingly self-recursive call, which is in // here we'll see a seemingly self-recursive call, which is in
@ -414,7 +414,7 @@ func isAsyncSafePoint(gp *g, pc, sp, lr uintptr) (bool, uintptr) {
return false, 0 return false, 0
} }
// Check the inner-most name // Check the inner-most name
u, uf := newInlineUnwinder(f, pc) u, uf := newInlineUnwinder(f, pc, nil)
name := u.srcFunc(uf).name() name := u.srcFunc(uf).name()
if hasPrefix(name, "runtime.") || if hasPrefix(name, "runtime.") ||
hasPrefix(name, "runtime/internal/") || hasPrefix(name, "runtime/internal/") ||

2
src/runtime/race.go
View file

@ -172,7 +172,7 @@ func raceSymbolizeCode(ctx *symbolizeCodeContext) {
pc := ctx.pc pc := ctx.pc
fi := findfunc(pc) fi := findfunc(pc)
if fi.valid() { if fi.valid() {
u, uf := newInlineUnwinder(fi, pc) u, uf := newInlineUnwinder(fi, pc, nil)
for ; uf.valid(); uf = u.next(uf) { for ; uf.valid(); uf = u.next(uf) {
sf := u.srcFunc(uf) sf := u.srcFunc(uf)
if sf.funcID == abi.FuncIDWrapper && u.isInlined(uf) { if sf.funcID == abi.FuncIDWrapper && u.isInlined(uf) {

3
src/runtime/stack.go
View file

@ -555,6 +555,7 @@ var ptrnames = []string{
type adjustinfo struct { type adjustinfo struct {
old stack old stack
delta uintptr // ptr distance from old to new stack (newbase - oldbase) delta uintptr // ptr distance from old to new stack (newbase - oldbase)
cache pcvalueCache
// sghi is the highest sudog.elem on the stack. // sghi is the highest sudog.elem on the stack.
sghi uintptr sghi uintptr
@ -675,7 +676,7 @@ func adjustframe(frame *stkframe, adjinfo *adjustinfo) {
adjustpointer(adjinfo, unsafe.Pointer(frame.varp)) adjustpointer(adjinfo, unsafe.Pointer(frame.varp))
} }
locals, args, objs := frame.getStackMap(true) locals, args, objs := frame.getStackMap(&adjinfo.cache, true)
// Adjust local variables if stack frame has been allocated. // Adjust local variables if stack frame has been allocated.
if locals.n > 0 { if locals.n > 0 {

4
src/runtime/stkframe.go
View file

@ -154,7 +154,7 @@ func (frame *stkframe) argMapInternal() (argMap bitvector, hasReflectStackObj bo
// getStackMap returns the locals and arguments live pointer maps, and // getStackMap returns the locals and arguments live pointer maps, and
// stack object list for frame. // stack object list for frame.
func (frame *stkframe) getStackMap(debug bool) (locals, args bitvector, objs []stackObjectRecord) { func (frame *stkframe) getStackMap(cache *pcvalueCache, debug bool) (locals, args bitvector, objs []stackObjectRecord) {
targetpc := frame.continpc targetpc := frame.continpc
if targetpc == 0 { if targetpc == 0 {
// Frame is dead. Return empty bitvectors. // Frame is dead. Return empty bitvectors.
@ -169,7 +169,7 @@ func (frame *stkframe) getStackMap(debug bool) (locals, args bitvector, objs []s
// the first instruction of the function changes the // the first instruction of the function changes the
// stack map. // stack map.
targetpc-- targetpc--
pcdata = pcdatavalue(f, abi.PCDATA_StackMapIndex, targetpc) pcdata = pcdatavalue(f, abi.PCDATA_StackMapIndex, targetpc, cache)
} }
if pcdata == -1 { if pcdata == -1 {
// We do not have a valid pcdata value but there might be a // We do not have a valid pcdata value but there might be a

30
src/runtime/symtab.go
View file

@ -119,7 +119,7 @@ func (ci *Frames) Next() (frame Frame, more bool) {
} }
// It's important that interpret pc non-strictly as cgoTraceback may // It's important that interpret pc non-strictly as cgoTraceback may
// have added bogus PCs with a valid funcInfo but invalid PCDATA. // have added bogus PCs with a valid funcInfo but invalid PCDATA.
u, uf := newInlineUnwinder(funcInfo, pc) u, uf := newInlineUnwinder(funcInfo, pc, nil)
sf := u.srcFunc(uf) sf := u.srcFunc(uf)
if u.isInlined(uf) { if u.isInlined(uf) {
// Note: entry is not modified. It always refers to a real frame, not an inlined one. // Note: entry is not modified. It always refers to a real frame, not an inlined one.
@ -180,7 +180,7 @@ func runtime_FrameSymbolName(f *Frame) string {
if !f.funcInfo.valid() { if !f.funcInfo.valid() {
return f.Function return f.Function
} }
u, uf := newInlineUnwinder(f.funcInfo, f.PC) u, uf := newInlineUnwinder(f.funcInfo, f.PC, nil)
sf := u.srcFunc(uf) sf := u.srcFunc(uf)
return sf.name() return sf.name()
} }
@ -204,7 +204,8 @@ func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr {
return stk return stk
} }
u, uf := newInlineUnwinder(f, tracepc) var cache pcvalueCache
u, uf := newInlineUnwinder(f, tracepc, &cache)
if !u.isInlined(uf) { if !u.isInlined(uf) {
// Nothing inline at tracepc. // Nothing inline at tracepc.
return stk return stk
@ -657,7 +658,7 @@ func FuncForPC(pc uintptr) *Func {
// We just report the preceding function in that situation. See issue 29735. // We just report the preceding function in that situation. See issue 29735.
// TODO: Perhaps we should report no function at all in that case. // TODO: Perhaps we should report no function at all in that case.
// The runtime currently doesn't have function end info, alas. // The runtime currently doesn't have function end info, alas.
u, uf := newInlineUnwinder(f, pc) u, uf := newInlineUnwinder(f, pc, nil)
if !u.isInlined(uf) { if !u.isInlined(uf) {
return f._Func() return f._Func()
} }
@ -842,7 +843,7 @@ func pcvalueCacheKey(targetpc uintptr) uintptr {
} }
// Returns the PCData value, and the PC where this value starts. // Returns the PCData value, and the PC where this value starts.
func pcvalue(f funcInfo, off uint32, targetpc uintptr, strict bool) (int32, uintptr) { func pcvalue(f funcInfo, off uint32, targetpc uintptr, _ *pcvalueCache, strict bool) (int32, uintptr) {
if off == 0 { if off == 0 {
return -1, 0 return -1, 0
} }
@ -978,8 +979,8 @@ func funcline1(f funcInfo, targetpc uintptr, strict bool) (file string, line int
if !f.valid() { if !f.valid() {
return "?", 0 return "?", 0
} }
fileno, _ := pcvalue(f, f.pcfile, targetpc, strict) fileno, _ := pcvalue(f, f.pcfile, targetpc, nil, strict)
line, _ = pcvalue(f, f.pcln, targetpc, strict) line, _ = pcvalue(f, f.pcln, targetpc, nil, strict)
if fileno == -1 || line == -1 || int(fileno) >= len(datap.filetab) { if fileno == -1 || line == -1 || int(fileno) >= len(datap.filetab) {
// print("looking for ", hex(targetpc), " in ", funcname(f), " got file=", fileno, " line=", lineno, "\n") // print("looking for ", hex(targetpc), " in ", funcname(f), " got file=", fileno, " line=", lineno, "\n")
return "?", 0 return "?", 0
@ -992,8 +993,8 @@ func funcline(f funcInfo, targetpc uintptr) (file string, line int32) {
return funcline1(f, targetpc, true) return funcline1(f, targetpc, true)
} }
func funcspdelta(f funcInfo, targetpc uintptr) int32 { func funcspdelta(f funcInfo, targetpc uintptr, cache *pcvalueCache) int32 {
x, _ := pcvalue(f, f.pcsp, targetpc, true) x, _ := pcvalue(f, f.pcsp, targetpc, cache, true)
if debugPcln && x&(goarch.PtrSize-1) != 0 { if debugPcln && x&(goarch.PtrSize-1) != 0 {
print("invalid spdelta ", funcname(f), " ", hex(f.entry()), " ", hex(targetpc), " ", hex(f.pcsp), " ", x, "\n") print("invalid spdelta ", funcname(f), " ", hex(f.entry()), " ", hex(targetpc), " ", hex(f.pcsp), " ", x, "\n")
throw("bad spdelta") throw("bad spdelta")
@ -1024,28 +1025,29 @@ func pcdatastart(f funcInfo, table uint32) uint32 {
return *(*uint32)(add(unsafe.Pointer(&f.nfuncdata), unsafe.Sizeof(f.nfuncdata)+uintptr(table)*4)) return *(*uint32)(add(unsafe.Pointer(&f.nfuncdata), unsafe.Sizeof(f.nfuncdata)+uintptr(table)*4))
} }
func pcdatavalue(f funcInfo, table uint32, targetpc uintptr) int32 { func pcdatavalue(f funcInfo, table uint32, targetpc uintptr, cache *pcvalueCache) int32 {
if table >= f.npcdata { if table >= f.npcdata {
return -1 return -1
} }
r, _ := pcvalue(f, pcdatastart(f, table), targetpc, true) r, _ := pcvalue(f, pcdatastart(f, table), targetpc, cache, true)
return r return r
} }
func pcdatavalue1(f funcInfo, table uint32, targetpc uintptr, strict bool) int32 { func pcdatavalue1(f funcInfo, table uint32, targetpc uintptr, cache *pcvalueCache, strict bool) int32 {
if table >= f.npcdata { if table >= f.npcdata {
return -1 return -1
} }
r, _ := pcvalue(f, pcdatastart(f, table), targetpc, strict) r, _ := pcvalue(f, pcdatastart(f, table), targetpc, cache, strict)
return r return r
} }
// Like pcdatavalue, but also return the start PC of this PCData value. // Like pcdatavalue, but also return the start PC of this PCData value.
// It doesn't take a cache.
func pcdatavalue2(f funcInfo, table uint32, targetpc uintptr) (int32, uintptr) { func pcdatavalue2(f funcInfo, table uint32, targetpc uintptr) (int32, uintptr) {
if table >= f.npcdata { if table >= f.npcdata {
return -1, 0 return -1, 0
} }
return pcvalue(f, pcdatastart(f, table), targetpc, true) return pcvalue(f, pcdatastart(f, table), targetpc, nil, true)
} }
// funcdata returns a pointer to the ith funcdata for f. // funcdata returns a pointer to the ith funcdata for f.

7
src/runtime/symtabinl.go
View file

@ -30,6 +30,7 @@ type inlinedCall struct {
// code. // code.
type inlineUnwinder struct { type inlineUnwinder struct {
f funcInfo f funcInfo
cache *pcvalueCache
inlTree *[1 << 20]inlinedCall inlTree *[1 << 20]inlinedCall
} }
@ -51,13 +52,13 @@ type inlineFrame struct {
// This unwinder uses non-strict handling of PC because it's assumed this is // This unwinder uses non-strict handling of PC because it's assumed this is
// only ever used for symbolic debugging. If things go really wrong, it'll just // only ever used for symbolic debugging. If things go really wrong, it'll just
// fall back to the outermost frame. // fall back to the outermost frame.
func newInlineUnwinder(f funcInfo, pc uintptr) (inlineUnwinder, inlineFrame) { func newInlineUnwinder(f funcInfo, pc uintptr, cache *pcvalueCache) (inlineUnwinder, inlineFrame) {
inldata := funcdata(f, abi.FUNCDATA_InlTree) inldata := funcdata(f, abi.FUNCDATA_InlTree)
if inldata == nil { if inldata == nil {
return inlineUnwinder{f: f}, inlineFrame{pc: pc, index: -1} return inlineUnwinder{f: f}, inlineFrame{pc: pc, index: -1}
} }
inlTree := (*[1 << 20]inlinedCall)(inldata) inlTree := (*[1 << 20]inlinedCall)(inldata)
u := inlineUnwinder{f: f, inlTree: inlTree} u := inlineUnwinder{f: f, cache: cache, inlTree: inlTree}
return u, u.resolveInternal(pc) return u, u.resolveInternal(pc)
} }
@ -66,7 +67,7 @@ func (u *inlineUnwinder) resolveInternal(pc uintptr) inlineFrame {
pc: pc, pc: pc,
// Conveniently, this returns -1 if there's an error, which is the same // Conveniently, this returns -1 if there's an error, which is the same
// value we use for the outermost frame. // value we use for the outermost frame.
index: pcdatavalue1(u.f, abi.PCDATA_InlTreeIndex, pc, false), index: pcdatavalue1(u.f, abi.PCDATA_InlTreeIndex, pc, u.cache, false),
} }
} }

3
src/runtime/symtabinl_test.go
View file

@ -34,9 +34,10 @@ func XTestInlineUnwinder(t TestingT) {
// Iterate over the PCs in tiuTest and walk the inline stack for each. // Iterate over the PCs in tiuTest and walk the inline stack for each.
prevStack := "x" prevStack := "x"
var cache pcvalueCache
for pc := pc1; pc < pc1+1024 && findfunc(pc) == f; pc += sys.PCQuantum { for pc := pc1; pc < pc1+1024 && findfunc(pc) == f; pc += sys.PCQuantum {
stack := "" stack := ""
u, uf := newInlineUnwinder(f, pc) u, uf := newInlineUnwinder(f, pc, &cache)
if file, _ := u.fileLine(uf); file == "?" { if file, _ := u.fileLine(uf); file == "?" {
// We're probably in the trailing function padding, where findfunc // We're probably in the trailing function padding, where findfunc
// still returns f but there's no symbolic information. Just keep // still returns f but there's no symbolic information. Just keep

3
src/runtime/trace.go
View file

@ -1345,6 +1345,7 @@ func fpunwindExpand(pcBuf []uintptr) []uintptr {
} }
var ( var (
cache pcvalueCache
lastFuncID = abi.FuncIDNormal lastFuncID = abi.FuncIDNormal
newPCBuf = make([]uintptr, 0, traceStackSize) newPCBuf = make([]uintptr, 0, traceStackSize)
skip = pcBuf[0] skip = pcBuf[0]
@ -1373,7 +1374,7 @@ outer:
continue continue
} }
u, uf := newInlineUnwinder(fi, callPC) u, uf := newInlineUnwinder(fi, callPC, &cache)
for ; uf.valid(); uf = u.next(uf) { for ; uf.valid(); uf = u.next(uf) {
sf := u.srcFunc(uf) sf := u.srcFunc(uf)
if sf.funcID == abi.FuncIDWrapper && elideWrapperCalling(lastFuncID) { if sf.funcID == abi.FuncIDWrapper && elideWrapperCalling(lastFuncID) {

17
src/runtime/traceback.go
View file

@ -112,6 +112,9 @@ type unwinder struct {
// flags are the flags to this unwind. Some of these are updated as we // flags are the flags to this unwind. Some of these are updated as we
// unwind (see the flags documentation). // unwind (see the flags documentation).
flags unwindFlags flags unwindFlags
// cache is used to cache pcvalue lookups.
cache pcvalueCache
} }
// init initializes u to start unwinding gp's stack and positions the // init initializes u to start unwinding gp's stack and positions the
@ -304,7 +307,7 @@ func (u *unwinder) resolveInternal(innermost, isSyscall bool) {
case abi.FuncID_systemstack: case abi.FuncID_systemstack:
// systemstack returns normally, so just follow the // systemstack returns normally, so just follow the
// stack transition. // stack transition.
if usesLR && funcspdelta(f, frame.pc) == 0 { if usesLR && funcspdelta(f, frame.pc, &u.cache) == 0 {
// We're at the function prologue and the stack // We're at the function prologue and the stack
// switch hasn't happened, or epilogue where we're // switch hasn't happened, or epilogue where we're
// about to return. Just unwind normally. // about to return. Just unwind normally.
@ -322,7 +325,7 @@ func (u *unwinder) resolveInternal(innermost, isSyscall bool) {
flag &^= abi.FuncFlagSPWrite flag &^= abi.FuncFlagSPWrite
} }
} }
frame.fp = frame.sp + uintptr(funcspdelta(f, frame.pc)) frame.fp = frame.sp + uintptr(funcspdelta(f, frame.pc, &u.cache))
if !usesLR { if !usesLR {
// On x86, call instruction pushes return PC before entering new function. // On x86, call instruction pushes return PC before entering new function.
frame.fp += goarch.PtrSize frame.fp += goarch.PtrSize
@ -497,7 +500,7 @@ func (u *unwinder) next() {
frame.fn = f frame.fn = f
if !f.valid() { if !f.valid() {
frame.pc = x frame.pc = x
} else if funcspdelta(f, frame.pc) == 0 { } else if funcspdelta(f, frame.pc, &u.cache) == 0 {
frame.lr = x frame.lr = x
} }
} }
@ -617,7 +620,7 @@ func tracebackPCs(u *unwinder, skip int, pcBuf []uintptr) int {
cgoN := u.cgoCallers(cgoBuf[:]) cgoN := u.cgoCallers(cgoBuf[:])
// TODO: Why does &u.cache cause u to escape? (Same in traceback2) // TODO: Why does &u.cache cause u to escape? (Same in traceback2)
for iu, uf := newInlineUnwinder(f, u.symPC()); n < len(pcBuf) && uf.valid(); uf = iu.next(uf) { for iu, uf := newInlineUnwinder(f, u.symPC(), noEscapePtr(&u.cache)); n < len(pcBuf) && uf.valid(); uf = iu.next(uf) {
sf := iu.srcFunc(uf) sf := iu.srcFunc(uf)
if sf.funcID == abi.FuncIDWrapper && elideWrapperCalling(u.calleeFuncID) { if sf.funcID == abi.FuncIDWrapper && elideWrapperCalling(u.calleeFuncID) {
// ignore wrappers // ignore wrappers
@ -667,7 +670,7 @@ func printArgs(f funcInfo, argp unsafe.Pointer, pc uintptr) {
} }
liveInfo := funcdata(f, abi.FUNCDATA_ArgLiveInfo) liveInfo := funcdata(f, abi.FUNCDATA_ArgLiveInfo)
liveIdx := pcdatavalue(f, abi.PCDATA_ArgLiveIndex, pc) liveIdx := pcdatavalue(f, abi.PCDATA_ArgLiveIndex, pc, nil)
startOffset := uint8(0xff) // smallest offset that needs liveness info (slots with a lower offset is always live) startOffset := uint8(0xff) // smallest offset that needs liveness info (slots with a lower offset is always live)
if liveInfo != nil { if liveInfo != nil {
startOffset = *(*uint8)(liveInfo) startOffset = *(*uint8)(liveInfo)
@ -974,7 +977,7 @@ func traceback2(u *unwinder, showRuntime bool, skip, max int) (n, lastN int) {
for ; u.valid(); u.next() { for ; u.valid(); u.next() {
lastN = 0 lastN = 0
f := u.frame.fn f := u.frame.fn
for iu, uf := newInlineUnwinder(f, u.symPC()); uf.valid(); uf = iu.next(uf) { for iu, uf := newInlineUnwinder(f, u.symPC(), noEscapePtr(&u.cache)); uf.valid(); uf = iu.next(uf) {
sf := iu.srcFunc(uf) sf := iu.srcFunc(uf)
callee := u.calleeFuncID callee := u.calleeFuncID
u.calleeFuncID = sf.funcID u.calleeFuncID = sf.funcID
@ -1075,7 +1078,7 @@ func printAncestorTraceback(ancestor ancestorInfo) {
// due to only have access to the pcs at the time of the caller // due to only have access to the pcs at the time of the caller
// goroutine being created. // goroutine being created.
func printAncestorTracebackFuncInfo(f funcInfo, pc uintptr) { func printAncestorTracebackFuncInfo(f funcInfo, pc uintptr) {
u, uf := newInlineUnwinder(f, pc) u, uf := newInlineUnwinder(f, pc, nil)
file, line := u.fileLine(uf) file, line := u.fileLine(uf)
printFuncName(u.srcFunc(uf).name()) printFuncName(u.srcFunc(uf).name())
print("(...)\n") print("(...)\n")