suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid traversal of full page table when restoring mprotects

Browse Source 
Overlooked this traversal at 50df879e79.
This commit is contained in:
Matthew Flatt 2015-09-19 15:16:30 -06:00
parent 584920b3a6
commit 7ff1cf3619
2 changed files with 78 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
racket/src/racket/gc2/newgc.c
View File

@ -61,14 +61,17 @@ enum {
PAGE_ARRAY = 2, PAGE_ARRAY = 2,
PAGE_PAIR = 3, PAGE_PAIR = 3,
PAGE_BIG = 4, PAGE_BIG = 4,
/* the number of page types: */ /* the number of page types in then gen1 array: */
PAGE_TYPES = 5 PAGE_TYPES = 5,
/* medium page types: */
PAGE_MED_ATOMIC = 6,
PAGE_MED_NONATOMIC = 7
}; };
enum { enum {
MED_PAGE_NONATOMIC = 0, MED_PAGE_NONATOMIC_INDEX = 0,
MED_PAGE_ATOMIC = 1, MED_PAGE_ATOMIC_INDEX = 1,
/* the number of medium-page types: */ /* the number of medium-page types in the array: */
MED_PAGE_TYPES = 2 MED_PAGE_TYPES = 2
}; };
@ -1083,10 +1086,10 @@ inline static mpage *create_new_medium_page(NewGC *gc, const int sz, const int p
int n, ty; int n, ty;
void *src_block, *addr; void *src_block, *addr;
ty = ((type == PAGE_ATOMIC) ? MED_PAGE_ATOMIC : MED_PAGE_NONATOMIC); ty = ((type == PAGE_ATOMIC) ? MED_PAGE_ATOMIC_INDEX : MED_PAGE_NONATOMIC_INDEX);
addr = malloc_pages_maybe_fail(gc, APAGE_SIZE, APAGE_SIZE, MMU_ZEROED, MMU_BIG_MED, addr = malloc_pages_maybe_fail(gc, APAGE_SIZE, APAGE_SIZE, MMU_ZEROED, MMU_BIG_MED,
(type == MED_PAGE_NONATOMIC) ? MMU_PROTECTABLE : MMU_NON_PROTECTABLE, (ty == MED_PAGE_NONATOMIC_INDEX) ? MMU_PROTECTABLE : MMU_NON_PROTECTABLE,
&src_block, sz); &src_block, sz);
page = malloc_mpage(); page = malloc_mpage();
@ -1094,7 +1097,7 @@ inline static mpage *create_new_medium_page(NewGC *gc, const int sz, const int p
page->mmu_src_block = src_block; page->mmu_src_block = src_block;
page->obj_size = sz; page->obj_size = sz;
page->size_class = SIZE_CLASS_MED_PAGE; page->size_class = SIZE_CLASS_MED_PAGE;
page->page_type = PAGE_BIG; page->page_type = ((type == PAGE_ATOMIC) ? PAGE_MED_ATOMIC : PAGE_MED_NONATOMIC);
page->med_search_start = PREFIX_SIZE; page->med_search_start = PREFIX_SIZE;
page->live_size = sz; page->live_size = sz;
GCVERBOSEPAGE(gc, "NEW MED PAGE", page); GCVERBOSEPAGE(gc, "NEW MED PAGE", page);
@ -1129,7 +1132,7 @@ inline static void *medium_page_realloc_dead_slot(NewGC *gc, const int sz, const
int n, ty; int n, ty;
mpage *page; mpage *page;
ty = ((type == PAGE_ATOMIC) ? MED_PAGE_ATOMIC : MED_PAGE_NONATOMIC); ty = ((type == PAGE_ATOMIC) ? MED_PAGE_ATOMIC_INDEX : MED_PAGE_NONATOMIC_INDEX);
for (page = gc->med_freelist_pages[ty][pos]; page; page = gc->med_freelist_pages[ty][pos] = page->prev) { for (page = gc->med_freelist_pages[ty][pos]; page; page = gc->med_freelist_pages[ty][pos] = page->prev) {
for (n = page->med_search_start; ((n + sz) <= APAGE_SIZE); n += sz) { for (n = page->med_search_start; ((n + sz) <= APAGE_SIZE); n += sz) {
@ -2756,7 +2759,9 @@ inline static int page_mmu_type(mpage *page) {
} }
inline static int page_mmu_protectable(mpage *page) { inline static int page_mmu_protectable(mpage *page) {
return (page->page_type == PAGE_ATOMIC) ? MMU_NON_PROTECTABLE : MMU_PROTECTABLE; return (((page->page_type == PAGE_ATOMIC) || (page->page_type == PAGE_MED_ATOMIC))
? MMU_NON_PROTECTABLE
: MMU_PROTECTABLE);
} }
static void set_has_back_pointers(NewGC *gc, mpage *page) static void set_has_back_pointers(NewGC *gc, mpage *page)
@ -4037,7 +4042,7 @@ void GC_dump_with_traces(int flags,
} }
for (ty = 0; ty < MED_PAGE_TYPES; ty++) { for (ty = 0; ty < MED_PAGE_TYPES; ty++) {
GCWARN((GCOUTF, "Generation 1 [medium%s]:", (ty == MED_PAGE_ATOMIC) ? " atomic" : "")); GCWARN((GCOUTF, "Generation 1 [medium%s]:", (ty == MED_PAGE_ATOMIC_INDEX) ? " atomic" : ""));
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) { for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
if (gc->med_pages[ty][i]) { if (gc->med_pages[ty][i]) {
intptr_t count = 0, page_count = 0; intptr_t count = 0, page_count = 0;
@ -4150,7 +4155,7 @@ static void reset_gen1_pages_live_and_scan_boundaries(NewGC *gc)
} }
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) { for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
for (work = gc->med_pages[MED_PAGE_NONATOMIC][i]; work; work = work->next) { for (work = gc->med_pages[MED_PAGE_NONATOMIC_INDEX][i]; work; work = work->next) {
if (work->generation > AGE_GEN_0) { if (work->generation > AGE_GEN_0) {
if (work->mprotected) { if (work->mprotected) {
work->mprotected = 0; work->mprotected = 0;
@ -4189,6 +4194,7 @@ static void mark_backpointers(NewGC *gc)
work->mprotected = 0; work->mprotected = 0;
mmu_write_unprotect_page(gc->mmu, work->addr, real_page_size(work), page_mmu_type(work), &work->mmu_src_block); mmu_write_unprotect_page(gc->mmu, work->addr, real_page_size(work), page_mmu_type(work), &work->mmu_src_block);
} }
work->marked_from = 1; work->marked_from = 1;
if (work->size_class == SIZE_CLASS_BIG_PAGE) { if (work->size_class == SIZE_CLASS_BIG_PAGE) {
@ -4534,6 +4540,8 @@ static void repair_heap(NewGC *gc)
page = gc->modified_next; page = gc->modified_next;
gc->modified_next = NULL; gc->modified_next = NULL;
gc->reprotect_next = NULL;
memory_in_use = gc->memory_in_use; memory_in_use = gc->memory_in_use;
need_fixup = gc->need_fixup; need_fixup = gc->need_fixup;
@ -4656,7 +4664,7 @@ static void repair_heap(NewGC *gc)
memory_in_use += page->live_size; memory_in_use += page->live_size;
page->med_search_start = PREFIX_SIZE; /* start next block search at the beginning */ page->med_search_start = PREFIX_SIZE; /* start next block search at the beginning */
if (page->generation == AGE_GEN_0) { if (page->generation == AGE_GEN_0) {
/* Tell the clean-up phase to keep this one (even for a minor GC): */ /* Tell the clean-up phase to keep this one (needed even for a minor GC): */
page->marked_on = 1; page->marked_on = 1;
GC_ASSERT(non_dead); /* otherwise, wouldn't have marked_on */ GC_ASSERT(non_dead); /* otherwise, wouldn't have marked_on */
} }
@ -4668,6 +4676,11 @@ static void repair_heap(NewGC *gc)
set_has_back_pointers(gc, page); set_has_back_pointers(gc, page);
else else
page->back_pointers = 0; page->back_pointers = 0;
if ((page->page_type != PAGE_ATOMIC) && (page->page_type != PAGE_MED_ATOMIC)) {
page->reprotect_next = gc->reprotect_next;
gc->reprotect_next = page;
}
} }
} }
@ -4835,7 +4848,7 @@ static void unprotect_old_pages(NewGC *gc)
} }
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) { for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
for (page = gc->med_pages[MED_PAGE_NONATOMIC][i]; page; page = page->next) { for (page = gc->med_pages[MED_PAGE_NONATOMIC_INDEX][i]; page; page = page->next) {
if (page->mprotected) { if (page->mprotected) {
page->mprotected = 0; page->mprotected = 0;
mmu_queue_write_unprotect_range(mmu, page->addr, real_page_size(page), page_mmu_type(page), &page->mmu_src_block); mmu_queue_write_unprotect_range(mmu, page->addr, real_page_size(page), page_mmu_type(page), &page->mmu_src_block);
@ -4851,29 +4864,56 @@ static void protect_old_pages(NewGC *gc)
{ {
MMU *mmu = gc->mmu; MMU *mmu = gc->mmu;
mpage *page; mpage *page;
int i;
for (i = 0; i < PAGE_TYPES; i++) { #if 0
if (i != PAGE_ATOMIC) { /* Check that `reprotect_next` chain is correct: */
for (page = gc->gen1_pages[i]; page; page = page->next) { {
if (page->page_type != PAGE_ATOMIC) { int i;
if (!page->mprotected && !page->back_pointers) { int count = 0;
page->mprotected = 1;
mmu_queue_write_protect_range(mmu, page->addr, real_page_size(page), page_mmu_type(page), &page->mmu_src_block); for (i = 0; i < PAGE_TYPES; i++) {
} else if (QUEUED_MPROTECT_INFECTS_SMALL) if (i != PAGE_ATOMIC) {
page->mprotected = 1; for (page = gc->gen1_pages[i]; page; page = page->next) {
GC_ASSERT(page->generation != AGE_VACATED);
if (page->page_type != PAGE_ATOMIC) {
if (!page->mprotected)
count++;
}
} }
} }
} }
}
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) { for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
for (page = gc->med_pages[MED_PAGE_NONATOMIC][i]; page; page = page->next) { for (page = gc->med_pages[MED_PAGE_NONATOMIC_INDEX][i]; page; page = page->next) {
if (!page->mprotected && !page->back_pointers) { if (!page->mprotected)
page->mprotected = 1; count++;
mmu_queue_write_protect_range(mmu, page->addr, APAGE_SIZE, page_mmu_type(page), &page->mmu_src_block); }
} else if (QUEUED_MPROTECT_INFECTS_MED) }
page->mprotected = 1;
for (page = gc->reprotect_next; page; page = page->reprotect_next) {
count--;
}
GC_ASSERT(!count);
}
#endif
for (page = gc->reprotect_next; page; page = page->reprotect_next) {
GC_ASSERT(!page->mprotected);
GC_ASSERT(page->page_type != PAGE_ATOMIC);
GC_ASSERT(page->page_type != PAGE_MED_ATOMIC);
GC_ASSERT(page->generation != AGE_VACATED);
if (!page->back_pointers) {
page->mprotected = 1;
mmu_queue_write_protect_range(mmu, page->addr, real_page_size(page), page_mmu_type(page), &page->mmu_src_block);
} else {
if (page->size_class == SIZE_CLASS_SMALL_PAGE) {
if (QUEUED_MPROTECT_INFECTS_SMALL)
page->mprotected = 1;
} else if (page->size_class == SIZE_CLASS_MED_PAGE) {
if (QUEUED_MPROTECT_INFECTS_MED)
page->mprotected = 1;
}
} }
} }
@ -5334,7 +5374,7 @@ static void free_gc(NewGC *gc)
} }
} }
for (i = 0; i < NUM_MED_PAGE_SIZES; i++) { for (i = 0; i < NUM_MED_PAGE_SIZES; i++) {
for (work = gc->med_pages[MED_PAGE_NONATOMIC][i]; work; work = work->next) { for (work = gc->med_pages[MED_PAGE_NONATOMIC_INDEX][i]; work; work = work->next) {
if (work->mprotected) if (work->mprotected)
mmu_write_unprotect_page(gc->mmu, work->addr, real_page_size(work), page_mmu_type(work), &work->mmu_src_block); mmu_write_unprotect_page(gc->mmu, work->addr, real_page_size(work), page_mmu_type(work), &work->mmu_src_block);
} }

6
racket/src/racket/gc2/newgc.h
View File

@ -14,6 +14,8 @@ typedef struct mpage {
struct mpage *prev; struct mpage *prev;
void *addr; void *addr;
void *mmu_src_block; void *mmu_src_block;
struct mpage *modified_next; /* next in chain of pages for backpointers, marks, etc. */
struct mpage *reprotect_next; /* next in a chain of pages that need to be re-protected */
#ifdef MZ_GC_BACKTRACE #ifdef MZ_GC_BACKTRACE
void **backtrace; void **backtrace;
void *backtrace_page_src; void *backtrace_page_src;
@ -36,7 +38,6 @@ typedef struct mpage {
left alone and that that will be scanned & fixed up; objects before left alone and that that will be scanned & fixed up; objects before
have cleared "mark" bits, while objects after (may) have "mark" bits sets */ have cleared "mark" bits, while objects after (may) have "mark" bits sets */
}; };
struct mpage *modified_next; /* next in chain of pages for backpointers, marks, etc. */
unsigned short live_size; /* except for big pages, total size of live objects on the page */ unsigned short live_size; /* except for big pages, total size of live objects on the page */
unsigned char generation :2; unsigned char generation :2;
unsigned char back_pointers :1; unsigned char back_pointers :1;
@ -157,6 +158,9 @@ typedef struct NewGC {
/* linked list of pages with back pointers to be traversed in a /* linked list of pages with back pointers to be traversed in a
minor collection, etc.: */ minor collection, etc.: */
struct mpage *modified_next; struct mpage *modified_next;
/* linked list of pages that need to be given write protection at
the end of the GC cycle: */
struct mpage *reprotect_next;
MarkSegment *mark_stack; MarkSegment *mark_stack;