Skip to content

Commit 647037a

Browse files
dev-aaront-orgrppt
authored andcommitted
Revert "mm: Always release pages to the buddy allocator in memblock_free_late()."
This reverts commit 115d9d7. The pages being freed by memblock_free_late() have already been initialized, but if they are in the deferred init range, __free_one_page() might access nearby uninitialized pages when trying to coalesce buddies. This can, for example, trigger this BUG: BUG: unable to handle page fault for address: ffffe964c02580c8 RIP: 0010:__list_del_entry_valid+0x3f/0x70 <TASK> __free_one_page+0x139/0x410 __free_pages_ok+0x21d/0x450 memblock_free_late+0x8c/0xb9 efi_free_boot_services+0x16b/0x25c efi_enter_virtual_mode+0x403/0x446 start_kernel+0x678/0x714 secondary_startup_64_no_verify+0xd2/0xdb </TASK> A proper fix will be more involved so revert this change for the time being. Fixes: 115d9d7 ("mm: Always release pages to the buddy allocator in memblock_free_late().") Signed-off-by: Aaron Thompson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport (IBM) <[email protected]>
1 parent 4ec5183 commit 647037a

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

mm/memblock.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,13 +1640,7 @@ void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
16401640
end = PFN_DOWN(base + size);
16411641

16421642
for (; cursor < end; cursor++) {
1643-
/*
1644-
* Reserved pages are always initialized by the end of
1645-
* memblock_free_all() (by memmap_init() and, if deferred
1646-
* initialization is enabled, memmap_init_reserved_pages()), so
1647-
* these pages can be released directly to the buddy allocator.
1648-
*/
1649-
__free_pages_core(pfn_to_page(cursor), 0);
1643+
memblock_free_pages(pfn_to_page(cursor), cursor, 0);
16501644
totalram_pages_inc();
16511645
}
16521646
}

tools/testing/memblock/internal.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ bool mirrored_kernelcore = false;
1515

1616
struct page {};
1717

18-
void __free_pages_core(struct page *page, unsigned int order)
19-
{
20-
}
21-
2218
void memblock_free_pages(struct page *page, unsigned long pfn,
2319
unsigned int order)
2420
{

0 commit comments

Comments
 (0)