Skip to content

Commit 230809c

Browse files
committed
Merge tag 'fixes-2023-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock revert from Mike Rapoport: "Revert 'mm: Always release pages to the buddy allocator in memblock_free_late()' 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, which will cause a crash. A proper fix will be more involved so revert this change for the time being" * tag 'fixes-2023-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: Revert "mm: Always release pages to the buddy allocator in memblock_free_late()."
2 parents 420b2d4 + 647037a commit 230809c

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)