From: Austin Clements Date: Tue, 20 Feb 2018 23:16:56 +0000 (-0500) Subject: runtime: ensure sysStat for mheap_.arenas is aligned X-Git-Tag: go1.11beta1~1520 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c823155828e5e6f4f7aa5683edb6f9e5dfd31d28;p=gostls13.git runtime: ensure sysStat for mheap_.arenas is aligned We don't want to account the memory for mheap_.arenas because most of it is never touched, so currently we pass the address of a uint64 on the heap. However, at least on mips, it's possible for this uint64 to be unaligned, which causes the atomic add in mSysStatInc to crash. Fix this by instead passing a nil stat pointer. Fixes #23946. Change-Id: I091587df1b3066c330b6bb4d834e4596c407910f Reviewed-on: https://go-review.googlesource.com/95695 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang --- diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go index ecbae721dd..e9150fdbb6 100644 --- a/src/runtime/malloc.go +++ b/src/runtime/malloc.go @@ -302,8 +302,7 @@ func mallocinit() { // Map the arena index. Most of this will never be written to, // so we don't account it. - var untracked uint64 - mheap_.arenas = (*[memLimit / heapArenaBytes]*heapArena)(persistentalloc(unsafe.Sizeof(*mheap_.arenas), sys.PtrSize, &untracked)) + mheap_.arenas = (*[memLimit / heapArenaBytes]*heapArena)(persistentalloc(unsafe.Sizeof(*mheap_.arenas), sys.PtrSize, nil)) if mheap_.arenas == nil { throw("failed to allocate arena index") }