From 4e3d58009a1ba08e41dd1ec33691120a76a06af9 Mon Sep 17 00:00:00 2001 From: Michael Anthony Knyszek Date: Tue, 26 Nov 2019 21:16:43 +0000 Subject: [PATCH] runtime: reset scavenge address in scavengeAll Currently scavengeAll (which is called by debug.FreeOSMemory) doesn't reset the scavenge address before scavenging, meaning it could miss large portions of the heap. Fix this by reseting the address before scavenging, which will ensure it is able to walk over the entire heap. Fixes #35858. Change-Id: I4a7408050b8e134318ff94428f98cb96a1795aa9 Reviewed-on: https://go-review.googlesource.com/c/go/+/208960 Reviewed-by: Cherry Zhang Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot --- src/runtime/mheap.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go index 3f3e36728b..114c97b874 100644 --- a/src/runtime/mheap.go +++ b/src/runtime/mheap.go @@ -1424,6 +1424,8 @@ func (h *mheap) scavengeAll() { gp := getg() gp.m.mallocing++ lock(&h.lock) + // Reset the scavenger address so we have access to the whole heap. + h.pages.resetScavengeAddr() released := h.pages.scavenge(^uintptr(0), true) unlock(&h.lock) gp.m.mallocing-- -- 2.50.0