languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 05:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[release-branch.go1.3] runtime: fix GC bitmap corruption

Browse source 
««« CL 103640044 / d2f256096d8d
runtime: fix GC bitmap corruption
Fixes #8299.

R=golang-codereviews
CC=golang-codereviews, khr, rsc
https://golang.org/cl/103640044
»»»

TBR=r, rsc
CC=golang-codereviews
https://golang.org/cl/125150044
This commit is contained in:
Andrew Gerrand 2014-08-13 13:20:01 +10:00
parent 1657de2d6d
commit df7a37efd7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pkg/runtime/mgc0.c
View file

@ -2760,7 +2760,7 @@ runtime·markscan(void *v)
void
runtime·markfreed(void *v)
{
uintptr *b, off, shift;
uintptr *b, off, shift, xbits;
if(0)
runtime·printf("markfreed %p\n", v);
@ -2771,7 +2771,18 @@ runtime·markfreed(void *v)
off = (uintptr*)v - (uintptr*)runtime·mheap.arena_start; // word offset
b = (uintptr*)runtime·mheap.arena_start - off/wordsPerBitmapWord - 1;
shift = off % wordsPerBitmapWord;
*b = (*b & ~(bitMask<<shift)) | (bitAllocated<<shift);
if(!g->m->gcing || work.nproc == 1) {
// During normal operation (not GC), the span bitmap is not updated concurrently,
// because either the span is cached or accesses are protected with MCentral lock.
*b = (*b & ~(bitMask<<shift)) | (bitAllocated<<shift);
} else {
// During GC other threads concurrently mark heap.
for(;;) {
xbits = *b;
if(runtime·casp((void**)b, (void*)xbits, (void*)((xbits & ~(bitMask<<shift)) | (bitAllocated<<shift))))
break;
}
}
}
// check that the block at v of size n is marked freed.