From 96e142ba2bfe5fe483f5364df91222c19ac13c49 Mon Sep 17 00:00:00 2001 From: Michael Anthony Knyszek Date: Wed, 3 Dec 2025 23:22:18 +0000 Subject: [PATCH] runtime: skip TestArenaCollision if we run out of hints This seems failure mode seems to have become more common on Windows. I suspect the randomized heap base address has something to do with it, but I'm not 100% sure. What's definitely certain is that we're running out of hints, since we're seeing failures that mheap_.arenaHints is nil and GetNextArenaHint doesn't actually check that. At the very least we can check that and skip. We know that in this case there's not that much we can do. Fixes #76566. Change-Id: I8ccc8994806b6c95e3157eb296b09705637564b3 Reviewed-on: https://go-review.googlesource.com/c/go/+/726527 Reviewed-by: Michael Pratt LUCI-TryBot-Result: Go LUCI --- src/runtime/export_test.go | 7 +++++-- src/runtime/malloc_test.go | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go index 26341c4300..4f6ef9a3f2 100644 --- a/src/runtime/export_test.go +++ b/src/runtime/export_test.go @@ -551,8 +551,11 @@ func MapNextArenaHint() (start, end uintptr, ok bool) { return } -func GetNextArenaHint() uintptr { - return mheap_.arenaHints.addr +func NextArenaHint() (uintptr, bool) { + if mheap_.arenaHints == nil { + return 0, false + } + return mheap_.arenaHints.addr, true } type G = g diff --git a/src/runtime/malloc_test.go b/src/runtime/malloc_test.go index 97cf0eed54..b76b0a02ac 100644 --- a/src/runtime/malloc_test.go +++ b/src/runtime/malloc_test.go @@ -664,10 +664,24 @@ func TestArenaCollision(t *testing.T) { } t.Logf("reserved [%#x, %#x)", start, end) disallowed = append(disallowed, [2]uintptr{start, end}) + + hint, ok := NextArenaHint() + if !ok { + // We're out of arena hints. There's not much we can do now except give up. + // This might happen for a number of reasons, like if there's just something + // else already mapped in the address space where we put our hints. This is + // a bit more common than it used to be thanks to heap base randomization. + t.Skip("ran out of arena hints") + } + // Allocate until the runtime tries to use the hint we // just mapped over. - hint := GetNextArenaHint() - for GetNextArenaHint() == hint { + for { + if next, ok := NextArenaHint(); !ok { + t.Skip("ran out of arena hints") + } else if next != hint { + break + } ac := new(acLink) arenaCollisionSink = append(arenaCollisionSink, ac) // The allocation must not have fallen into -- 2.43.0