Skip to content

Commit 52eaed6

Browse files
L3n41cgopherbot
L3n41c
authored and
gopherbot
committed
runtime: decorate anonymous memory mappings
Leverage the prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ...) API to name the anonymous memory areas. This API has been introduced in Linux 5.17 to decorate the anonymous memory areas shown in /proc/<pid>/maps. This is already used by glibc. See: * https://sourceware.org/git/?p=glibc.git;a=blob;f=malloc/malloc.c;h=27dfd1eb907f4615b70c70237c42c552bb4f26a8;hb=HEAD#l2434 * https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/setvmaname.c;h=ea93a5ffbebc9e5a7e32a297138f465724b4725f;hb=HEAD#l63 This can be useful when investigating the memory consumption of a multi-language program. On a 100% Go program, pprof profiler can be used to profile the memory consumption of the program. But pprof is only aware of what happens within the Go world. On a multi-language program, there could be a doubt about whether the suspicious extra-memory consumption comes from the Go part or the native part. With this change, the following Go program: package main import ( "fmt" "log" "os" ) /* #include <stdlib.h> void f(void) { (void)malloc(1024*1024*1024); } */ import "C" func main() { C.f() data, err := os.ReadFile("/proc/self/maps") if err != nil { log.Fatal(err) } fmt.Println(string(data)) } produces this output: $ GLIBC_TUNABLES=glibc.mem.decorate_maps=1 ~/doc/devel/open-source/go/bin/go run . 00400000-00402000 r--p 00000000 00:21 28451768 /home/lenaic/.cache/go-build/9f/9f25a17baed5a80d03eb080a2ce2a5ff49c17f9a56e28330f0474a2bb74a30a0-d/test_vma_name 00402000-004a4000 r-xp 00002000 00:21 28451768 /home/lenaic/.cache/go-build/9f/9f25a17baed5a80d03eb080a2ce2a5ff49c17f9a56e28330f0474a2bb74a30a0-d/test_vma_name 004a4000-00574000 r--p 000a4000 00:21 28451768 /home/lenaic/.cache/go-build/9f/9f25a17baed5a80d03eb080a2ce2a5ff49c17f9a56e28330f0474a2bb74a30a0-d/test_vma_name 00574000-00575000 r--p 0017300 00:21 28451768 /home/lenaic/.cache/go-build/9f/9f25a17baed5a80d03eb080a2ce2a5ff49c17f9a56e28330f0474a2bb74a30a0-d/test_vma_name 00575000-00580000 rw-p 00174000 00:21 28451768 /home/lenaic/.cache/go-build/9f/9f25a17baed5a80d03eb080a2ce2a5ff49c17f9a56e28330f0474a2bb74a30a0-d/test_vma_name 00580000-005a4000 rw-p 00000000 00:00 0 2e075000-2e096000 rw-p 00000000 00:00 0 [heap] c000000000-c000400000 rw-p 00000000 00:00 0 [anon: Go: heap] c000400000-c004000000 ---p 00000000 00:00 0 [anon: Go: heap reservation] 777f40000000-777f40021000 rw-p 00000000 00:00 0 [anon: glibc: malloc arena] 777f40021000-777f44000000 ---p 00000000 00:00 0 777f44000000-777f44021000 rw-p 00000000 00:00 0 [anon: glibc: malloc arena] 777f44021000-777f48000000 ---p 00000000 00:00 0 777f48000000-777f48021000 rw-p 00000000 00:00 0 [anon: glibc: malloc arena] 777f48021000-777f4c000000 ---p 00000000 00:00 0 777f4c000000-777f4c021000 rw-p 00000000 00:00 0 [anon: glibc: malloc arena] 777f4c021000-777f50000000 ---p 00000000 00:00 0 777f50000000-777f50021000 rw-p 00000000 00:00 0 [anon: glibc: malloc arena] 777f50021000-777f54000000 ---p 00000000 00:00 0 777f55afb000-777f55afc000 ---p 00000000 00:00 0 777f55afc000-777f562fc000 rw-p 00000000 00:00 0 [anon: glibc: pthread stack: 216378] 777f562fc000-777f562fd000 ---p 00000000 00:00 0 777f562fd000-777f56afd000 rw-p 00000000 00:00 0 [anon: glibc: pthread stack: 216377] 777f56afd000-777f56afe000 ---p 00000000 00:00 0 777f56afe000-777f572fe000 rw-p 00000000 00:00 0 [anon: glibc: pthread stack: 216376] 777f572fe000-777f572ff000 ---p 00000000 00:00 0 777f572ff000-777f57aff000 rw-p 00000000 00:00 0 [anon: glibc: pthread stack: 216375] 777f57aff000-777f57b00000 ---p 00000000 00:00 0 777f57b00000-777f58300000 rw-p 00000000 00:00 0 [anon: glibc: pthread stack: 216374] 777f58300000-777f58400000 rw-p 00000000 00:00 0 [anon: Go: page alloc index] 777f58400000-777f5a400000 rw-p 00000000 00:00 0 [anon: Go: heap index] 777f5a400000-777f6a580000 ---p 00000000 00:00 0 [anon: Go: scavenge index] 777f6a580000-777f6a581000 rw-p 00000000 00:00 0 [anon: Go: scavenge index] 777f6a581000-777f7a400000 ---p 00000000 00:00 0 [anon: Go: scavenge index] 777f7a400000-777f8a580000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f8a580000-777f8a581000 rw-p 00000000 00:00 0 [anon: Go: page alloc] 777f8a581000-777f9c430000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f9c430000-777f9c431000 rw-p 00000000 00:00 0 [anon: Go: page alloc] 777f9c431000-777f9e806000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f9e806000-777f9e807000 rw-p 00000000 00:00 0 [anon: Go: page alloc] 777f9e807000-777f9ec00000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f9ec36000-777f9ecb6000 rw-p 00000000 00:00 0 [anon: Go: immortal metadata] 777f9ecb6000-777f9ecc6000 rw-p 00000000 00:00 0 [anon: Go: gc bits] 777f9ecc6000-777f9ecd6000 rw-p 00000000 00:00 0 [anon: Go: allspans array] 777f9ecd6000-777f9ece7000 rw-p 00000000 00:00 0 [anon: Go: immortal metadata] 777f9ece7000-777f9ed67000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f9ed67000-777f9ed68000 rw-p 00000000 00:00 0 [anon: Go: page alloc] 777f9ed68000-777f9ede7000 ---p 00000000 00:00 0 [anon: Go: page summary] 777f9ede7000-777f9ee07000 rw-p 00000000 00:00 0 [anon: Go: page alloc] 777f9ee07000-777f9ee0a000 rw-p 00000000 00:00 0 [anon: glibc: loader malloc] 777f9ee0a000-777f9ee2e000 r--p 00000000 00:21 48158213 /usr/lib/libc.so.6 777f9ee2e000-777f9ef9f000 r-xp 00024000 00:21 48158213 /usr/lib/libc.so.6 777f9ef9f000-777f9efee000 r--p 00195000 00:21 48158213 /usr/lib/libc.so.6 777f9efee000-777f9eff2000 r--p 001e3000 00:21 48158213 /usr/lib/libc.so.6 777f9eff2000-777f9eff4000 rw-p 001e7000 00:21 48158213 /usr/lib/libc.so.6 777f9eff4000-777f9effc000 rw-p 00000000 00:00 0 777f9effc000-777f9effe000 rw-p 00000000 00:00 0 [anon: glibc: loader malloc] 777f9f00a000-777f9f04a000 rw-p 00000000 00:00 0 [anon: Go: immortal metadata] 777f9f04a000-777f9f04c000 r--p 00000000 00:00 0 [vvar] 777f9f04c000-777f9f04e000 r--p 00000000 00:00 0 [vvar_vclock] 777f9f04e000-777f9f050000 r-xp 00000000 00:00 0 [vdso] 777f9f050000-777f9f051000 r--p 00000000 00:21 48158204 /usr/lib/ld-linux-x86-64.so.2 777f9f051000-777f9f07a000 r-xp 00001000 00:21 48158204 /usr/lib/ld-linux-x86-64.so.2 777f9f07a000-777f9f085000 r--p 0002a000 00:21 48158204 /usr/lib/ld-linux-x86-64.so.2 777f9f085000-777f9f087000 r--p 00034000 00:21 48158204 /usr/lib/ld-linux-x86-64.so.2 777f9f087000-777f9f088000 rw-p 00036000 00:21 48158204 /usr/lib/ld-linux-x86-64.so.2 777f9f088000-777f9f089000 rw-p 00000000 00:00 0 7ffc7bfa7000-7ffc7bfc8000 rw-p 00000000 00:00 0 [stack] ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0 [vsyscall] The anonymous memory areas are now labelled so that we can see which ones have been allocated by the Go runtime versus which ones have been allocated by the glibc. Fixes #71546 Change-Id: I304e8b4dd7f2477a6da794fd44e9a7a5354e4bf4 Reviewed-on: https://go-review.googlesource.com/c/go/+/646095 Auto-Submit: Alan Donovan <[email protected]> Commit-Queue: Alan Donovan <[email protected]> Reviewed-by: Felix Geisendörfer <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Knyszek <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent f95941d commit 52eaed6

36 files changed

+130
-62
lines changed

‎src/internal/runtime/syscall/defs_linux.go

+3
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@ const (
1616
EPOLL_CTL_DEL = 0x2
1717
EPOLL_CTL_MOD = 0x3
1818
EFD_CLOEXEC = 0x80000
19+
20+
PR_SET_VMA = 0x53564d41
21+
PR_SET_VMA_ANON_NAME = 0
1922
)

‎src/internal/runtime/syscall/defs_linux_386.go

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package syscall
77
const (
88
SYS_FCNTL = 55
99
SYS_MPROTECT = 125
10+
SYS_PRCTL = 172
1011
SYS_EPOLL_CTL = 255
1112
SYS_EPOLL_PWAIT = 319
1213
SYS_EPOLL_CREATE1 = 329

‎src/internal/runtime/syscall/defs_linux_amd64.go

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package syscall
77
const (
88
SYS_MPROTECT = 10
99
SYS_FCNTL = 72
10+
SYS_PRCTL = 157
1011
SYS_EPOLL_CTL = 233
1112
SYS_EPOLL_PWAIT = 281
1213
SYS_EPOLL_CREATE1 = 291

‎src/internal/runtime/syscall/defs_linux_arm.go

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package syscall
77
const (
88
SYS_FCNTL = 55
99
SYS_MPROTECT = 125
10+
SYS_PRCTL = 172
1011
SYS_EPOLL_CTL = 251
1112
SYS_EPOLL_PWAIT = 346
1213
SYS_EPOLL_CREATE1 = 357

‎src/internal/runtime/syscall/defs_linux_arm64.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
SYS_EPOLL_CTL = 21
1010
SYS_EPOLL_PWAIT = 22
1111
SYS_FCNTL = 25
12+
SYS_PRCTL = 167
1213
SYS_MPROTECT = 226
1314
SYS_EPOLL_PWAIT2 = 441
1415
SYS_EVENTFD2 = 19

‎src/internal/runtime/syscall/defs_linux_loong64.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
SYS_EPOLL_CTL = 21
1010
SYS_EPOLL_PWAIT = 22
1111
SYS_FCNTL = 25
12+
SYS_PRCTL = 167
1213
SYS_MPROTECT = 226
1314
SYS_EPOLL_PWAIT2 = 441
1415
SYS_EVENTFD2 = 19

‎src/internal/runtime/syscall/defs_linux_mips64x.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package syscall
99
const (
1010
SYS_MPROTECT = 5010
1111
SYS_FCNTL = 5070
12+
SYS_PRCTL = 5153
1213
SYS_EPOLL_CTL = 5208
1314
SYS_EPOLL_PWAIT = 5272
1415
SYS_EPOLL_CREATE1 = 5285

‎src/internal/runtime/syscall/defs_linux_mipsx.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package syscall
99
const (
1010
SYS_FCNTL = 4055
1111
SYS_MPROTECT = 4125
12+
SYS_PRCTL = 4192
1213
SYS_EPOLL_CTL = 4249
1314
SYS_EPOLL_PWAIT = 4313
1415
SYS_EPOLL_CREATE1 = 4326

‎src/internal/runtime/syscall/defs_linux_ppc64x.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package syscall
99
const (
1010
SYS_FCNTL = 55
1111
SYS_MPROTECT = 125
12+
SYS_PRCTL = 171
1213
SYS_EPOLL_CTL = 237
1314
SYS_EPOLL_PWAIT = 303
1415
SYS_EPOLL_CREATE1 = 315

‎src/internal/runtime/syscall/defs_linux_riscv64.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
SYS_EPOLL_CTL = 21
1010
SYS_EPOLL_PWAIT = 22
1111
SYS_FCNTL = 25
12+
SYS_PRCTL = 167
1213
SYS_MPROTECT = 226
1314
SYS_EPOLL_PWAIT2 = 441
1415
SYS_EVENTFD2 = 19

‎src/internal/runtime/syscall/defs_linux_s390x.go

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package syscall
77
const (
88
SYS_FCNTL = 55
99
SYS_MPROTECT = 125
10+
SYS_PRCTL = 172
1011
SYS_EPOLL_CTL = 250
1112
SYS_EPOLL_PWAIT = 312
1213
SYS_EPOLL_CREATE1 = 327

‎src/runtime/arena.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ func (h *mheap) allocUserArenaChunk() *mspan {
10411041
//
10421042
// Unlike (*mheap).grow, just map in everything that we
10431043
// asked for. We're likely going to use it all.
1044-
sysMap(unsafe.Pointer(base), userArenaChunkBytes, &gcController.heapReleased)
1044+
sysMap(unsafe.Pointer(base), userArenaChunkBytes, &gcController.heapReleased, "user arena chunk")
10451045
sysUsed(unsafe.Pointer(base), userArenaChunkBytes, userArenaChunkBytes)
10461046

10471047
// Model the user arena as a heap span for a large object.

‎src/runtime/debuglog.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func dlogImpl() *dloggerImpl {
9595
if l == nil {
9696
// Use sysAllocOS instead of sysAlloc because we want to interfere
9797
// with the runtime as little as possible, and sysAlloc updates accounting.
98-
l = (*dloggerImpl)(sysAllocOS(unsafe.Sizeof(dloggerImpl{})))
98+
l = (*dloggerImpl)(sysAllocOS(unsafe.Sizeof(dloggerImpl{}), "debug log"))
9999
if l == nil {
100100
throw("failed to allocate debug log")
101101
}
@@ -774,7 +774,7 @@ func printDebugLogImpl() {
774774
}
775775
// Use sysAllocOS instead of sysAlloc because we want to interfere
776776
// with the runtime as little as possible, and sysAlloc updates accounting.
777-
state1 := sysAllocOS(unsafe.Sizeof(readState{}) * uintptr(n))
777+
state1 := sysAllocOS(unsafe.Sizeof(readState{})*uintptr(n), "debug log")
778778
if state1 == nil {
779779
println("failed to allocate read state for", n, "logs")
780780
printunlock()

‎src/runtime/export_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ func MapNextArenaHint() (start, end uintptr, ok bool) {
536536
} else {
537537
start, end = addr, addr+heapArenaBytes
538538
}
539-
got := sysReserve(unsafe.Pointer(addr), physPageSize)
539+
got := sysReserve(unsafe.Pointer(addr), physPageSize, "")
540540
ok = (addr == uintptr(got))
541541
if !ok {
542542
// We were unable to get the requested reservation.

‎src/runtime/heapdump.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ func makeheapobjbv(p uintptr, size uintptr) bitvector {
727727
sysFree(unsafe.Pointer(&tmpbuf[0]), uintptr(len(tmpbuf)), &memstats.other_sys)
728728
}
729729
n := nptr/8 + 1
730-
p := sysAlloc(n, &memstats.other_sys)
730+
p := sysAlloc(n, &memstats.other_sys, "heapdump")
731731
if p == nil {
732732
throw("heapdump: out of memory")
733733
}

‎src/runtime/malloc.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ func mallocinit() {
570570
// heap reservation.
571571

572572
const arenaMetaSize = (1 << arenaBits) * unsafe.Sizeof(heapArena{})
573-
meta := uintptr(sysReserve(nil, arenaMetaSize))
573+
meta := uintptr(sysReserve(nil, arenaMetaSize, "heap reservation"))
574574
if meta != 0 {
575575
mheap_.heapArenaAlloc.init(meta, arenaMetaSize, true)
576576
}
@@ -607,7 +607,7 @@ func mallocinit() {
607607
128 << 20,
608608
}
609609
for _, arenaSize := range arenaSizes {
610-
a, size := sysReserveAligned(unsafe.Pointer(p), arenaSize, heapArenaBytes)
610+
a, size := sysReserveAligned(unsafe.Pointer(p), arenaSize, heapArenaBytes, "heap reservation")
611611
if a != nil {
612612
mheap_.arena.init(uintptr(a), size, false)
613613
p = mheap_.arena.end // For hint below
@@ -657,7 +657,7 @@ func (h *mheap) sysAlloc(n uintptr, hintList **arenaHint, arenaList *[]arenaIdx)
657657
//
658658
// Only do this if we're using the regular heap arena hints.
659659
// This behavior is only for the heap.
660-
v = h.arena.alloc(n, heapArenaBytes, &gcController.heapReleased)
660+
v = h.arena.alloc(n, heapArenaBytes, &gcController.heapReleased, "heap")
661661
if v != nil {
662662
size = n
663663
goto mapped
@@ -678,7 +678,7 @@ func (h *mheap) sysAlloc(n uintptr, hintList **arenaHint, arenaList *[]arenaIdx)
678678
// Outside addressable heap. Can't use.
679679
v = nil
680680
} else {
681-
v = sysReserve(unsafe.Pointer(p), n)
681+
v = sysReserve(unsafe.Pointer(p), n, "heap reservation")
682682
}
683683
if p == uintptr(v) {
684684
// Success. Update the hint.
@@ -714,7 +714,7 @@ func (h *mheap) sysAlloc(n uintptr, hintList **arenaHint, arenaList *[]arenaIdx)
714714
// All of the hints failed, so we'll take any
715715
// (sufficiently aligned) address the kernel will give
716716
// us.
717-
v, size = sysReserveAligned(nil, n, heapArenaBytes)
717+
v, size = sysReserveAligned(nil, n, heapArenaBytes, "heap")
718718
if v == nil {
719719
return nil, 0
720720
}
@@ -764,7 +764,7 @@ mapped:
764764
// is paged in is too expensive. Trying to account for the whole region means
765765
// that it will appear like an enormous memory overhead in statistics, even though
766766
// it is not.
767-
l2 = (*[1 << arenaL2Bits]*heapArena)(sysAllocOS(unsafe.Sizeof(*l2)))
767+
l2 = (*[1 << arenaL2Bits]*heapArena)(sysAllocOS(unsafe.Sizeof(*l2), "heap index"))
768768
if l2 == nil {
769769
throw("out of memory allocating heap arena map")
770770
}
@@ -780,7 +780,7 @@ mapped:
780780
throw("arena already initialized")
781781
}
782782
var r *heapArena
783-
r = (*heapArena)(h.heapArenaAlloc.alloc(unsafe.Sizeof(*r), goarch.PtrSize, &memstats.gcMiscSys))
783+
r = (*heapArena)(h.heapArenaAlloc.alloc(unsafe.Sizeof(*r), goarch.PtrSize, &memstats.gcMiscSys, "heap metadata"))
784784
if r == nil {
785785
r = (*heapArena)(persistentalloc(unsafe.Sizeof(*r), goarch.PtrSize, &memstats.gcMiscSys))
786786
if r == nil {
@@ -827,7 +827,7 @@ mapped:
827827
// sysReserveAligned is like sysReserve, but the returned pointer is
828828
// aligned to align bytes. It may reserve either n or n+align bytes,
829829
// so it returns the size that was reserved.
830-
func sysReserveAligned(v unsafe.Pointer, size, align uintptr) (unsafe.Pointer, uintptr) {
830+
func sysReserveAligned(v unsafe.Pointer, size, align uintptr, vmaName string) (unsafe.Pointer, uintptr) {
831831
if isSbrkPlatform {
832832
if v != nil {
833833
throw("unexpected heap arena hint on sbrk platform")
@@ -839,7 +839,7 @@ func sysReserveAligned(v unsafe.Pointer, size, align uintptr) (unsafe.Pointer, u
839839
// for a larger region and remove the parts we don't need.
840840
retries := 0
841841
retry:
842-
p := uintptr(sysReserve(v, size+align))
842+
p := uintptr(sysReserve(v, size+align, vmaName))
843843
switch {
844844
case p == 0:
845845
return nil, 0
@@ -852,7 +852,7 @@ retry:
852852
// so we may have to try again.
853853
sysFreeOS(unsafe.Pointer(p), size+align)
854854
p = alignUp(p, align)
855-
p2 := sysReserve(unsafe.Pointer(p), size)
855+
p2 := sysReserve(unsafe.Pointer(p), size, vmaName)
856856
if p != uintptr(p2) {
857857
// Must have raced. Try again.
858858
sysFreeOS(p2, size)
@@ -1933,7 +1933,7 @@ func persistentalloc1(size, align uintptr, sysStat *sysMemStat) *notInHeap {
19331933
}
19341934

19351935
if size >= maxBlock {
1936-
return (*notInHeap)(sysAlloc(size, sysStat))
1936+
return (*notInHeap)(sysAlloc(size, sysStat, "immortal metadata"))
19371937
}
19381938

19391939
mp := acquirem()
@@ -1946,7 +1946,7 @@ func persistentalloc1(size, align uintptr, sysStat *sysMemStat) *notInHeap {
19461946
}
19471947
persistent.off = alignUp(persistent.off, align)
19481948
if persistent.off+size > persistentChunkSize || persistent.base == nil {
1949-
persistent.base = (*notInHeap)(sysAlloc(persistentChunkSize, &memstats.other_sys))
1949+
persistent.base = (*notInHeap)(sysAlloc(persistentChunkSize, &memstats.other_sys, "immortal metadata"))
19501950
if persistent.base == nil {
19511951
if persistent == &globalAlloc.persistentAlloc {
19521952
unlock(&globalAlloc.mutex)
@@ -2020,7 +2020,7 @@ func (l *linearAlloc) init(base, size uintptr, mapMemory bool) {
20202020
l.mapMemory = mapMemory
20212021
}
20222022

2023-
func (l *linearAlloc) alloc(size, align uintptr, sysStat *sysMemStat) unsafe.Pointer {
2023+
func (l *linearAlloc) alloc(size, align uintptr, sysStat *sysMemStat, vmaName string) unsafe.Pointer {
20242024
p := alignUp(l.next, align)
20252025
if p+size > l.end {
20262026
return nil
@@ -2030,7 +2030,7 @@ func (l *linearAlloc) alloc(size, align uintptr, sysStat *sysMemStat) unsafe.Poi
20302030
if l.mapMemory {
20312031
// Transition from Reserved to Prepared to Ready.
20322032
n := pEnd - l.mapped
2033-
sysMap(unsafe.Pointer(l.mapped), n, sysStat)
2033+
sysMap(unsafe.Pointer(l.mapped), n, sysStat, vmaName)
20342034
sysUsed(unsafe.Pointer(l.mapped), n, n)
20352035
}
20362036
l.mapped = pEnd

‎src/runtime/mem.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ import "unsafe"
4646
// which prevents us from allocating more stack.
4747
//
4848
//go:nosplit
49-
func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
49+
func sysAlloc(n uintptr, sysStat *sysMemStat, vmaName string) unsafe.Pointer {
5050
sysStat.add(int64(n))
5151
gcController.mappedReady.Add(int64(n))
52-
return sysAllocOS(n)
52+
return sysAllocOS(n, vmaName)
5353
}
5454

5555
// sysUnused transitions a memory region from Ready to Prepared. It notifies the
@@ -142,15 +142,15 @@ func sysFault(v unsafe.Pointer, n uintptr) {
142142
// NOTE: sysReserve returns OS-aligned memory, but the heap allocator
143143
// may use larger alignment, so the caller must be careful to realign the
144144
// memory obtained by sysReserve.
145-
func sysReserve(v unsafe.Pointer, n uintptr) unsafe.Pointer {
146-
return sysReserveOS(v, n)
145+
func sysReserve(v unsafe.Pointer, n uintptr, vmaName string) unsafe.Pointer {
146+
return sysReserveOS(v, n, vmaName)
147147
}
148148

149149
// sysMap transitions a memory region from Reserved to Prepared. It ensures the
150150
// memory region can be efficiently transitioned to Ready.
151151
//
152152
// sysStat must be non-nil.
153-
func sysMap(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
153+
func sysMap(v unsafe.Pointer, n uintptr, sysStat *sysMemStat, vmaName string) {
154154
sysStat.add(int64(n))
155-
sysMapOS(v, n)
155+
sysMapOS(v, n, vmaName)
156156
}

‎src/runtime/mem_aix.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// prevents us from allocating more stack.
1313
//
1414
//go:nosplit
15-
func sysAllocOS(n uintptr) unsafe.Pointer {
15+
func sysAllocOS(n uintptr, _ string) unsafe.Pointer {
1616
p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, -1, 0)
1717
if err != 0 {
1818
if err == _EACCES {
@@ -56,15 +56,15 @@ func sysFaultOS(v unsafe.Pointer, n uintptr) {
5656
mmap(v, n, _PROT_NONE, _MAP_ANON|_MAP_PRIVATE|_MAP_FIXED, -1, 0)
5757
}
5858

59-
func sysReserveOS(v unsafe.Pointer, n uintptr) unsafe.Pointer {
59+
func sysReserveOS(v unsafe.Pointer, n uintptr, _ string) unsafe.Pointer {
6060
p, err := mmap(v, n, _PROT_NONE, _MAP_ANON|_MAP_PRIVATE, -1, 0)
6161
if err != 0 {
6262
return nil
6363
}
6464
return p
6565
}
6666

67-
func sysMapOS(v unsafe.Pointer, n uintptr) {
67+
func sysMapOS(v unsafe.Pointer, n uintptr, _ string) {
6868
// AIX does not allow mapping a range that is already mapped.
6969
// So, call mprotect to change permissions.
7070
// Note that sysMap is always called with a non-nil pointer

‎src/runtime/mem_bsd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// which prevents us from allocating more stack.
1515
//
1616
//go:nosplit
17-
func sysAllocOS(n uintptr) unsafe.Pointer {
17+
func sysAllocOS(n uintptr, _ string) unsafe.Pointer {
1818
v, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, -1, 0)
1919
if err != 0 {
2020
return nil
@@ -57,7 +57,7 @@ func sysFaultOS(v unsafe.Pointer, n uintptr) {
5757
// Indicates not to reserve swap space for the mapping.
5858
const _sunosMAP_NORESERVE = 0x40
5959

60-
func sysReserveOS(v unsafe.Pointer, n uintptr) unsafe.Pointer {
60+
func sysReserveOS(v unsafe.Pointer, n uintptr, _ string) unsafe.Pointer {
6161
flags := int32(_MAP_ANON | _MAP_PRIVATE)
6262
if GOOS == "solaris" || GOOS == "illumos" {
6363
// Be explicit that we don't want to reserve swap space
@@ -75,7 +75,7 @@ func sysReserveOS(v unsafe.Pointer, n uintptr) unsafe.Pointer {
7575
const _sunosEAGAIN = 11
7676
const _ENOMEM = 12
7777

78-
func sysMapOS(v unsafe.Pointer, n uintptr) {
78+
func sysMapOS(v unsafe.Pointer, n uintptr, _ string) {
7979
p, err := mmap(v, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_FIXED|_MAP_PRIVATE, -1, 0)
8080
if err == _ENOMEM || ((GOOS == "solaris" || GOOS == "illumos") && err == _sunosEAGAIN) {
8181
throw("runtime: out of memory")

‎src/runtime/mem_darwin.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// which prevents us from allocating more stack.
1313
//
1414
//go:nosplit
15-
func sysAllocOS(n uintptr) unsafe.Pointer {
15+
func sysAllocOS(n uintptr, _ string) unsafe.Pointer {
1616
v, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, -1, 0)
1717
if err != 0 {
1818
return nil
@@ -54,7 +54,7 @@ func sysFaultOS(v unsafe.Pointer, n uintptr) {
5454
mmap(v, n, _PROT_NONE, _MAP_ANON|_MAP_PRIVATE|_MAP_FIXED, -1, 0)
5555
}
5656

57-
func sysReserveOS(v unsafe.Pointer, n uintptr) unsafe.Pointer {
57+
func sysReserveOS(v unsafe.Pointer, n uintptr, _ string) unsafe.Pointer {
5858
p, err := mmap(v, n, _PROT_NONE, _MAP_ANON|_MAP_PRIVATE, -1, 0)
5959
if err != 0 {
6060
return nil
@@ -64,7 +64,7 @@ func sysReserveOS(v unsafe.Pointer, n uintptr) unsafe.Pointer {
6464

6565
const _ENOMEM = 12
6666

67-
func sysMapOS(v unsafe.Pointer, n uintptr) {
67+
func sysMapOS(v unsafe.Pointer, n uintptr, _ string) {
6868
p, err := mmap(v, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_FIXED|_MAP_PRIVATE, -1, 0)
6969
if err == _ENOMEM {
7070
throw("runtime: out of memory")

0 commit comments

Comments
 (0)