diff options
| -rw-r--r-- | src/runtime/malloc.go | 4 | ||||
| -rw-r--r-- | src/runtime/mgc.go | 4 | ||||
| -rw-r--r-- | src/runtime/mpagealloc.go | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go index 44479cc2be2..b2026ad0dc7 100644 --- a/src/runtime/malloc.go +++ b/src/runtime/malloc.go @@ -853,6 +853,10 @@ retry: // // The heap lock must not be held over this operation, since it will briefly acquire // the heap lock. +// +// Must be called on the system stack because it acquires the heap lock. +// +//go:systemstack func (h *mheap) enableMetadataHugePages() { // Enable huge pages for page structure. h.pages.enableChunkHugePages() diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index de5ae0ae00c..a12dbfe9df2 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -1186,7 +1186,9 @@ func gcMarkTermination() { // Enable huge pages on some metadata if we cross a heap threshold. if gcController.heapGoal() > minHeapForMetadataHugePages { - mheap_.enableMetadataHugePages() + systemstack(func() { + mheap_.enableMetadataHugePages() + }) } semrelease(&worldsema) diff --git a/src/runtime/mpagealloc.go b/src/runtime/mpagealloc.go index 3e789ab85cc..2861fa93ebf 100644 --- a/src/runtime/mpagealloc.go +++ b/src/runtime/mpagealloc.go @@ -437,6 +437,10 @@ func (p *pageAlloc) grow(base, size uintptr) { // // The heap lock must not be held over this operation, since it will briefly acquire // the heap lock. +// +// Must be called on the system stack because it acquires the heap lock. +// +//go:systemstack func (p *pageAlloc) enableChunkHugePages() { // Grab the heap lock to turn on huge pages for new chunks and clone the current // heap address space ranges. |