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

pmm: Fix change-memmap-in-use bug

Browse Source
This commit is contained in:
mintsuki 2023-06-15 12:54:36 +02:00
parent 910a0d84a0
commit cb14f44eb3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/mm/pmm.s2.c
View File

@ -286,6 +286,8 @@ void init_memmap(void) {
#endif
#if defined (UEFI)
static struct memmap_entry *recl;
extern symbol __image_base;
extern symbol __image_end;
@ -428,6 +430,15 @@ void init_memmap(void) {
sanitise_entries(memmap, &memmap_entries, false);
size_t recl_count = 0;
for (size_t i = 0; i < memmap_entries; i++) {
if (memmap[i].type == MEMMAP_EFI_RECLAIMABLE) {
recl_count++;
}
}
recl = ext_mem_alloc(recl_count * sizeof(struct memmap_entry));
return;
fail:
@ -441,15 +452,7 @@ static void pmm_reclaim_uefi_mem(struct memmap_entry *m, size_t *_count) {
for (size_t i = 0; i < count; i++) {
if (m[i].type == MEMMAP_EFI_RECLAIMABLE) {
recl_i++;
}
}
struct memmap_entry *recl = ext_mem_alloc(recl_i * sizeof(struct memmap_entry));
for (size_t i = 0, j = 0; i < count; i++) {
if (m[i].type == MEMMAP_EFI_RECLAIMABLE) {
recl[j++] = m[i];
recl[recl_i++] = m[i];
}
}