kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-15 11:39:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

potential fix for low address allocations, issue #1087

Browse source
This commit is contained in:
daanx 2025-05-13 14:41:40 -07:00
parent a92f86dc73
commit ad0764272a
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/page-map.c
View file

@ -218,10 +218,14 @@ bool _mi_page_map_init(void) {
if (!mi_page_map_memid.initially_committed) { if (!mi_page_map_memid.initially_committed) {
_mi_os_commit(&_mi_page_map[0], os_page_size, NULL); // commit first part of the map _mi_os_commit(&_mi_page_map[0], os_page_size, NULL); // commit first part of the map
} }
_mi_page_map[0] = (mi_page_t**)((uint8_t*)_mi_page_map + page_map_size); // we reserved 2 sub maps at the end already _mi_page_map[0] = (mi_page_t**)((uint8_t*)_mi_page_map + page_map_size); // we reserved a submap part at the end already
if (!mi_page_map_memid.initially_committed) { if (!mi_page_map_memid.initially_committed) {
_mi_os_commit(_mi_page_map[0], os_page_size, NULL); // only first OS page _mi_os_commit(_mi_page_map[0], os_page_size, NULL); // only first OS page
} }
if (!mi_page_map_memid.initially_zero) { // initialize first addresses with NULL
_mi_memzero_aligned(_mi_page_map[0], os_page_size);
}
mi_assert_internal(_mi_ptr_page(NULL)==NULL); mi_assert_internal(_mi_ptr_page(NULL)==NULL);
return true; return true;
} }
@ -271,19 +275,24 @@ static mi_page_t** mi_page_map_ensure_committed(size_t idx) {
static mi_page_t** mi_page_map_ensure_at(size_t idx) { static mi_page_t** mi_page_map_ensure_at(size_t idx) {
mi_page_t** sub = mi_page_map_ensure_committed(idx); mi_page_t** sub = mi_page_map_ensure_committed(idx);
if mi_unlikely(sub == NULL) { if mi_unlikely(sub == NULL || idx == 0 /* low addresses */) {
// sub map not yet allocated, alloc now // sub map not yet allocated, alloc now
mi_memid_t memid; mi_memid_t memid;
sub = (mi_page_t**)_mi_os_alloc(MI_PAGE_MAP_SUB_COUNT * sizeof(mi_page_t*), &memid); mi_page_t** expect = sub;
mi_page_t** expect = NULL; const size_t submap_size = MI_PAGE_MAP_SUB_COUNT * sizeof(mi_page_t*);
if (!mi_atomic_cas_ptr_strong_acq_rel(mi_page_t*, ((_Atomic(mi_page_t**)*)&_mi_page_map[idx]), &expect, sub)) { sub = (mi_page_t**)_mi_os_alloc(submap_size, &memid);
// another thread already allocated it.. free and continue
_mi_os_free(sub, MI_PAGE_MAP_SUB_COUNT * sizeof(mi_page_t*), memid);
sub = expect;
mi_assert_internal(sub!=NULL);
}
if (sub == NULL) { if (sub == NULL) {
_mi_error_message(EFAULT, "internal error: unable to extend the page map\n"); _mi_error_message(EFAULT, "internal error: unable to extend the page map\n");
return NULL;
}
if (!memid.initially_zero) {
_mi_memzero_aligned(sub, submap_size);
}
if (!mi_atomic_cas_ptr_strong_acq_rel(mi_page_t*, ((_Atomic(mi_page_t**)*)&_mi_page_map[idx]), &expect, sub)) {
// another thread already allocated it.. free and continue
_mi_os_free(sub, submap_size, memid);
sub = expect;
mi_assert_internal(sub!=NULL);
} }
} }
return sub; return sub;