Skip to content

Pal zero bug alignment #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2019
Merged

Pal zero bug alignment #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9a525
Added zero test at threshold.
mjp41 Feb 14, 2019
adeecfb
Added bug fix to alignment of using.
mjp41 Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/mem/largealloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,15 @@ namespace snmalloc
memory_provider.template zero<true>(p, OS_PAGE_SIZE);

memory_provider.template notify_using<zero_mem>(
(void*)((size_t)p + OS_PAGE_SIZE), size - OS_PAGE_SIZE);
(void*)((size_t)p + OS_PAGE_SIZE),
bits::align_up(size, OS_PAGE_SIZE) - OS_PAGE_SIZE);
}
else
{
// This is a superslab that has not been decommitted.
if (zero_mem == YesZero)
memory_provider.template zero<true>(p, size);
memory_provider.template zero<true>(
p, bits::align_up(size, OS_PAGE_SIZE));
}
}

Expand Down
12 changes: 12 additions & 0 deletions src/test/func/memory/memory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,17 @@ void test_alloc_16M()
alloc->dealloc(p1);
}

void test_calloc_16M()
{
auto* alloc = ThreadAlloc::get();
// sizes >= 16M use large_alloc
const size_t size = 16'000'000;

void* p1 = alloc->alloc<YesZero>(size);
assert(Alloc::alloc_size(Alloc::external_pointer(p1)) >= size);
alloc->dealloc(p1);
}

int main(int argc, char** argv)
{
#ifdef USE_SYSTEMATIC_TESTING
Expand All @@ -296,6 +307,7 @@ int main(int argc, char** argv)
test_double_alloc();
test_external_pointer();
test_alloc_16M();
test_calloc_16M();

return 0;
}