internal/gocore: support Go 1.22 allocation headers
This change supports Go 1.22 allocation headers by identifying all the
heap pointers when enumerating spans. When looking over each span, we
check to see where the pointer data for each value lives, and then
enumerate all the pointers as needed.
This gets the goroot test passing again, which is a low bar... but it's
something.
While we're here, let's also get rid of a branch that only applied to an
unreleased version of Go 1.22.
Fixes #63359.
Change-Id: Id936a0e3b44d0fb0ec300fe957ac8218212de939
Reviewed-on: https://go-review.googlesource.com/c/debug/+/608475
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Auto-Submit: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
diff --git a/internal/gocore/gocore_test.go b/internal/gocore/gocore_test.go
index 7db04a6..c599db3 100644
--- a/internal/gocore/gocore_test.go
+++ b/internal/gocore/gocore_test.go
@@ -421,7 +421,6 @@
}
t.Run("goroot", func(t *testing.T) {
- t.Skip("doesn't work with Go 1.22 allocation headers yet")
loadExampleGenerated(t)
})
}
diff --git a/internal/gocore/object.go b/internal/gocore/object.go
index 88ea63c..481a04d 100644
--- a/internal/gocore/object.go
+++ b/internal/gocore/object.go
@@ -54,6 +54,12 @@
// Instead we use exactly what the runtime uses.
// Goroutine roots
+ //
+ // BUG: If the process dumps core with a thread in mallocgc at the point
+ // where an object is reachable from the stack but it hasn't been zeroed
+ // yet, it's possible for us to observe stale pointers here and follow them.
+ // Not a huge deal given that we'll just ignore outright bad pointers, but
+ // we may accidentally mark some objects as live erroneously.
for _, g := range p.goroutines {
for _, f := range g.frames {
for a := range f.Live {
diff --git a/internal/gocore/process.go b/internal/gocore/process.go
index bbedd02..73e7b99 100644
--- a/internal/gocore/process.go
+++ b/internal/gocore/process.go
@@ -107,9 +107,17 @@
}
func (p *Process) findType(name string) *Type {
+ typ := p.tryFindType(name)
+ if typ == nil {
+ panic("can't find type " + name)
+ }
+ return typ
+}
+
+func (p *Process) tryFindType(name string) *Type {
s := p.runtimeNameMap[name]
if len(s) == 0 {
- panic("can't find type " + name)
+ return nil
}
return s[0]
}
@@ -284,21 +292,18 @@
func (p *Process) readArena(a region, min, max core.Address) arena {
ptrSize := p.proc.PtrSize()
+ // Bitmap reading handled in readSpans.
+ // Read in all the pointer locations from the arenas, where they lived before Go 1.22.
+ // After Go 1.22, the pointer locations are scattered among more locations; they're
+ // processed during readSpans instead.
var bitmap region
- if a.HasField("bitmap") { // Before go 1.22
+ if a.HasField("bitmap") {
bitmap = a.Field("bitmap")
if oneBitBitmap := a.HasField("noMorePtrs"); oneBitBitmap { // Starting in go 1.20
p.readOneBitBitmap(bitmap, min)
} else {
p.readMultiBitBitmap(bitmap, min)
}
- } else if a.HasField("heapArenaPtrScalar") && a.Field("heapArenaPtrScalar").HasField("bitmap") { // go 1.22 without allocation headers
- // TODO: This configuration only existed between CL 537978 and CL
- // 538217 and was never released. Prune support.
- bitmap = a.Field("heapArenaPtrScalar").Field("bitmap")
- p.readOneBitBitmap(bitmap, min)
- } else { // go 1.22 with allocation headers
- panic("unimplemented")
}
spans := a.Field("spans")
@@ -353,6 +358,7 @@
}
func (p *Process) readSpans(mheap region, arenas []arena) {
+ ptrSize := p.proc.PtrSize()
var all int64
var text int64
var readOnly int64
@@ -415,6 +421,13 @@
spanDead := uint8(p.rtConstants["_MSpanDead"])
spanFree := uint8(p.rtConstants["_MSpanFree"])
+ // Malloc header constants (go 1.22+)
+ minSizeForMallocHeader := int64(p.rtConstants["minSizeForMallocHeader"])
+ mallocHeaderSize := int64(p.rtConstants["mallocHeaderSize"])
+ maxSmallSize := int64(p.rtConstants["maxSmallSize"])
+
+ abiType := p.tryFindType("abi.Type") // Non-nil expected for Go 1.22+.
+
// Process spans.
if pageSize%heapInfoSize != 0 {
panic(fmt.Sprintf("page size not a multiple of %d", heapInfoSize))
@@ -518,6 +531,77 @@
// the corresponding finalizer data, so we punt on that thorny
// issue for now.
}
+ // Check if we're in Go 1.22+. If not, then we're done. Otherwise,
+ // we need to discover all the heap pointers in the span here.
+ if !s.HasField("largeType") || !s.HasField("spanclass") {
+ continue
+ }
+ if noscan := s.Field("spanclass").Uint8()&1 != 0; noscan {
+ // No pointers.
+ continue
+ }
+ if elemSize <= minSizeForMallocHeader {
+ // Heap bits in span.
+ bitmapSize := spanSize / ptrSize / 8
+ bitmapAddr := min.Add(spanSize - bitmapSize)
+ for i := int64(0); i < bitmapSize; i++ {
+ bits := p.proc.ReadUint8(bitmapAddr.Add(int64(i)))
+ for j := int64(0); j < 8; j++ {
+ if bits&(uint8(1)<<j) != 0 {
+ p.setHeapPtr(min.Add(ptrSize * (i*8 + j)))
+ }
+ }
+ }
+ } else if elemSize <= maxSmallSize-mallocHeaderSize {
+ // Allocation headers.
+ //
+ // These will always point to real abi.Type values that, once allocated,
+ // are never freed, so it's safe to observe them even if the object is
+ // dead. We may note down pointers that are invalid if the object is not
+ // allocated (or live) but that's no different from reading stale bits
+ // out of the bitmap in older Go versions.
+ for e, off := 0, int64(0); int64(e) < n; e, off = e+1, off+elemSize {
+ // We need to be careful to only check space that's actually marked
+ // allocated, otherwise it can contain junk, including an invalid
+ // header.
+ if !alloc[e] {
+ continue
+ }
+ typeAddr := p.proc.ReadPtr(min.Add(off))
+ if typeAddr == 0 {
+ continue
+ }
+ typ := region{p: p, a: typeAddr, typ: abiType}
+ nptrs := int64(typ.Field("PtrBytes").Uintptr()) / ptrSize
+ if typ.Field("Kind_").Uint8()&uint8(p.rtConstants["kindGCProg"]) != 0 {
+ panic("unexpected GC prog on small allocation")
+ }
+ gcdata := typ.Field("GCData").Address()
+ for i := int64(0); i < nptrs; i++ {
+ if p.proc.ReadUint8(gcdata.Add(i/8))>>uint(i%8)&1 != 0 {
+ p.setHeapPtr(min.Add(off + mallocHeaderSize + i*ptrSize))
+ }
+ }
+ }
+ } else {
+ // Large object (header in span).
+ //
+ // These will either point to a real type or a "dummy" type whose storage
+ // is not valid if the object is dead. However, because large objects are
+ // 1:1 with spans, we can be certain largeType is valid as long as the span
+ // is in use.
+ typ := s.Field("largeType")
+ nptrs := int64(typ.Field("PtrBytes").Uintptr()) / ptrSize
+ if typ.Field("Kind_").Uint8()&uint8(p.rtConstants["kindGCProg"]) != 0 {
+ panic("large object's GCProg was not unrolled")
+ }
+ gcdata := typ.Field("GCData").Address()
+ for i := int64(0); i < nptrs; i++ {
+ if p.proc.ReadUint8(gcdata.Add(i/8))>>uint(i%8)&1 != 0 {
+ p.setHeapPtr(min.Add(i * ptrSize))
+ }
+ }
+ }
case spanFree:
freeSpanSize += spanSize
if s.HasField("npreleased") { // go 1.11 and earlier
