RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-29 11:45:11 +00:00
Code Issues Activity Actions

Kernel: Make kmalloc expansions scale to incoming allocation request

Browse source 
This allows kmalloc() to satisfy arbitrary allocation requests instead
of being limited to a static subheap expansion size.
This commit is contained in:
Andreas Kling 2021-12-26 10:40:28 +01:00
parent f49649645c
commit 1c99f99e99
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Heap/kmalloc.cpp
View file

@ -48,6 +48,8 @@ struct KmallocSubheap {
}; };
struct KmallocGlobalData { struct KmallocGlobalData {
static constexpr size_t minimum_subheap_size = 1 * MiB;
KmallocGlobalData(u8* initial_heap, size_t initial_heap_size) KmallocGlobalData(u8* initial_heap, size_t initial_heap_size)
{ {
add_subheap(initial_heap, initial_heap_size); add_subheap(initial_heap, initial_heap_size);
@ -69,7 +71,7 @@ struct KmallocGlobalData {
return ptr; return ptr;
} }
if (!try_expand()) { if (!try_expand(size)) {
PANIC("OOM when trying to expand kmalloc heap."); PANIC("OOM when trying to expand kmalloc heap.");
} }
@ -106,13 +108,21 @@ struct KmallocGlobalData {
return total; return total;
} }
bool try_expand() bool try_expand(size_t allocation_request)
{ {
VERIFY(!expansion_in_progress); VERIFY(!expansion_in_progress);
TemporaryChange change(expansion_in_progress, true); TemporaryChange change(expansion_in_progress, true);
auto new_subheap_base = expansion_data->next_virtual_address; auto new_subheap_base = expansion_data->next_virtual_address;
size_t new_subheap_size = 1 * MiB; Checked<size_t> padded_allocation_request = allocation_request;
padded_allocation_request *= 2;
padded_allocation_request += PAGE_SIZE;
if (padded_allocation_request.has_overflow()) {
PANIC("Integer overflow during kmalloc heap expansion");
}
size_t new_subheap_size = max(minimum_subheap_size, Memory::page_round_up(padded_allocation_request.value()));
dbgln("Unable to allocate {}, expanding kmalloc heap", allocation_request);
if (!expansion_data->virtual_range.contains(new_subheap_base, new_subheap_size)) { if (!expansion_data->virtual_range.contains(new_subheap_base, new_subheap_size)) {
// FIXME: Dare to return false and allow kmalloc() to fail! // FIXME: Dare to return false and allow kmalloc() to fail!