3party/mimalloc
0
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2024-12-27 13:33:18 +08:00
Code Issues Projects Releases Wiki Activity

fix huge page aligned allocation size in secure mode

Browse Source
This commit is contained in:
daan 2022-11-07 10:51:15 -08:00
parent 1632dd73c9
commit 96f1574faf
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/vs2022/mimalloc.vcxproj
View File

@ -116,7 +116,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MI_DEBUG=4;%(PreprocessorDefinitions);</PreprocessorDefinitions> <PreprocessorDefinitions>MI_DEBUG=4;MI_SECURE=0;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<CompileAs>CompileAsCpp</CompileAs> <CompileAs>CompileAsCpp</CompileAs>
<SupportJustMyCode>false</SupportJustMyCode> <SupportJustMyCode>false</SupportJustMyCode>
<LanguageStandard>stdcpp20</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>

20
src/segment.c
View File

@ -340,8 +340,10 @@ static size_t mi_segment_calculate_slices(size_t required, size_t* pre_size, siz
if (MI_SECURE>0) { if (MI_SECURE>0) {
// in secure mode, we set up a protected page in between the segment info // in secure mode, we set up a protected page in between the segment info
// and the page data (and one at the end of the segment) // and the page data (and one at the end of the segment)
guardsize = page_size; guardsize = page_size;
required = _mi_align_up(required, page_size); if (required > 0) {
required = _mi_align_up(required, MI_SEGMENT_SLICE_SIZE) + page_size;
}
} }
if (pre_size != NULL) *pre_size = isize; if (pre_size != NULL) *pre_size = isize;
@ -802,7 +804,6 @@ static mi_segment_t* mi_segment_init(mi_segment_t* segment, size_t required, siz
size_t memid = 0; size_t memid = 0;
size_t align_offset = 0; size_t align_offset = 0;
size_t alignment = MI_SEGMENT_SIZE; size_t alignment = MI_SEGMENT_SIZE;
size_t segment_size = segment_slices * MI_SEGMENT_SLICE_SIZE;
if (page_alignment > 0) { if (page_alignment > 0) {
mi_assert_internal(huge_page != NULL); mi_assert_internal(huge_page != NULL);
@ -810,13 +811,20 @@ static mi_segment_t* mi_segment_init(mi_segment_t* segment, size_t required, siz
alignment = page_alignment; alignment = page_alignment;
const size_t info_size = info_slices * MI_SEGMENT_SLICE_SIZE; const size_t info_size = info_slices * MI_SEGMENT_SLICE_SIZE;
align_offset = _mi_align_up( info_size, MI_SEGMENT_ALIGN ); align_offset = _mi_align_up( info_size, MI_SEGMENT_ALIGN );
segment_size += _mi_align_up(align_offset - info_size, MI_SEGMENT_SLICE_SIZE); const size_t extra = align_offset - info_size;
segment_slices = segment_size / MI_SEGMENT_SLICE_SIZE; // recalculate due to potential guard pages
segment_slices = mi_segment_calculate_slices(required + extra, &pre_size, &info_slices);
//segment_size += _mi_align_up(align_offset - info_size, MI_SEGMENT_SLICE_SIZE);
//segment_slices = segment_size / MI_SEGMENT_SLICE_SIZE;
} }
else { const size_t segment_size = segment_slices * MI_SEGMENT_SLICE_SIZE;
// get from cache
if (page_alignment == 0) {
segment = (mi_segment_t*)_mi_segment_cache_pop(segment_size, &commit_mask, &decommit_mask, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld); segment = (mi_segment_t*)_mi_segment_cache_pop(segment_size, &commit_mask, &decommit_mask, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld);
} }
// get from OS
if (segment==NULL) { if (segment==NULL) {
segment = (mi_segment_t*)_mi_arena_alloc_aligned(segment_size, alignment, align_offset, &commit, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld); segment = (mi_segment_t*)_mi_arena_alloc_aligned(segment_size, alignment, align_offset, &commit, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld);
if (segment == NULL) return NULL; // failed to allocate if (segment == NULL) return NULL; // failed to allocate

2
test/test-api.c
View File

@ -149,7 +149,7 @@ int main(void) {
for (size_t align = 1; align <= MI_ALIGNMENT_MAX && ok; align *= 2) { for (size_t align = 1; align <= MI_ALIGNMENT_MAX && ok; align *= 2) {
void* ps[8]; void* ps[8];
for (int i = 0; i < 8 && ok; i++) { for (int i = 0; i < 8 && ok; i++) {
ps[i] = mi_malloc_aligned(align*13 /*size*/, align); ps[i] = mi_malloc_aligned(align*5 /*size*/, align);
if (ps[i] == NULL || (uintptr_t)(ps[i]) % align != 0) { if (ps[i] == NULL || (uintptr_t)(ps[i]) % align != 0) {
ok = false; ok = false;
} }