mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: prepare for 8K pages 

Ensure than heap is PageSize aligned.

LGTM=iant
R=iant, dave, gobot
CC=golang-codereviews
https://golang.org/cl/56630043
This commit is contained in:
Dmitriy Vyukov 2014-01-29 18:18:46 +04:00
parent ff29be14c4
commit 327e431057
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkg/runtime/malloc.goc
View File

@ -427,7 +427,6 @@ runtime·mallocinit(void)
byte *p;
uintptr arena_size, bitmap_size, spans_size;
extern byte end[];
byte *want;
uintptr limit;
uint64 i;
@ -486,7 +485,7 @@ runtime·mallocinit(void)
spans_size = ROUND(spans_size, PageSize);
for(i = 0; i <= 0x7f; i++) {
p = (void*)(i<<40 | 0x00c0ULL<<32);
p = runtime·SysReserve(p, bitmap_size + spans_size + arena_size);
p = runtime·SysReserve(p, bitmap_size + spans_size + arena_size + PageSize);
if(p != nil)
break;
}
@ -528,16 +527,16 @@ runtime·mallocinit(void)
// So adjust it upward a little bit ourselves: 1/4 MB to get
// away from the running binary image and then round up
// to a MB boundary.
want = (byte*)ROUND((uintptr)end + (1<<18), 1<<20);
p = runtime·SysReserve(want, bitmap_size + spans_size + arena_size);
p = (byte*)ROUND((uintptr)end + (1<<18), 1<<20);
p = runtime·SysReserve(p, bitmap_size + spans_size + arena_size + PageSize);
if(p == nil)
runtime·throw("runtime: cannot reserve arena virtual address space");
if((uintptr)p & (((uintptr)1<<PageShift)-1))
runtime·printf("runtime: SysReserve returned unaligned address %p; asked for %p", p,
bitmap_size+spans_size+arena_size);
}
if((uintptr)p & (((uintptr)1<<PageShift)-1))
runtime·throw("runtime: SysReserve returned unaligned address");
// PageSize can be larger than OS definition of page size,
// so SysReserve can give us a PageSize-unaligned pointer.
// To overcome this we ask for PageSize more and round up the pointer.
p = (byte*)ROUND((uintptr)p, PageSize);
runtime·mheap.spans = (MSpan**)p;
runtime·mheap.bitmap = p + spans_size;