Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pmm: Limit bump allocator to 0x70000 on UEFI as well

This commit is contained in:
mintsuki 2021-03-17 07:51:32 +01:00
parent fd66a94334
commit f7dc2e7b8e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stage23/mm/pmm.s2.c
View File

@ -14,15 +14,18 @@
#define MEMMAP_BASE ((size_t)0x100000) #define MEMMAP_BASE ((size_t)0x100000)
#define MEMMAP_MAX_ENTRIES 256 #define MEMMAP_MAX_ENTRIES 256
#define BUMP_ALLOC_LIMIT_HIGH 0x70000
#define BUMP_ALLOC_LIMIT_LOW 0x1000
#if defined (bios) #if defined (bios)
extern symbol bss_end; extern symbol bss_end;
static size_t bump_allocator_base = (size_t)bss_end; static size_t bump_allocator_base = (size_t)bss_end;
static size_t bump_allocator_limit = 0x70000; static size_t bump_allocator_limit = BUMP_ALLOC_LIMIT_HIGH;
#endif #endif
#if defined (uefi) #if defined (uefi)
static size_t bump_allocator_base = 0x100000; static size_t bump_allocator_base = BUMP_ALLOC_LIMIT_HIGH;
static size_t bump_allocator_limit = 0x100000; static size_t bump_allocator_limit = BUMP_ALLOC_LIMIT_HIGH;
#endif #endif
void *conv_mem_alloc(size_t count) { void *conv_mem_alloc(size_t count) {
@ -291,18 +294,18 @@ void init_memmap(void) {
memmap_entries++; memmap_entries++;
if (our_type != MEMMAP_USABLE || entry->PhysicalStart >= 0x100000)
continue;
static size_t bump_alloc_pool_size = 0; static size_t bump_alloc_pool_size = 0;
if (our_type != MEMMAP_USABLE || entry->PhysicalStart >= BUMP_ALLOC_LIMIT_HIGH)
continue;
size_t entry_pool_limit = entry->PhysicalStart + entry->NumberOfPages * 4096; size_t entry_pool_limit = entry->PhysicalStart + entry->NumberOfPages * 4096;
if (entry_pool_limit > 0x100000) if (entry_pool_limit > BUMP_ALLOC_LIMIT_HIGH)
entry_pool_limit = 0x100000; entry_pool_limit = BUMP_ALLOC_LIMIT_HIGH;
size_t entry_pool_start = entry->PhysicalStart; size_t entry_pool_start = entry->PhysicalStart;
if (entry_pool_start < 0x1000) if (entry_pool_start < BUMP_ALLOC_LIMIT_LOW)
entry_pool_start = 0x1000; entry_pool_start = BUMP_ALLOC_LIMIT_LOW;
if (entry_pool_start > entry_pool_limit) if (entry_pool_start > entry_pool_limit)
continue; continue;