Commit 230809c1 authored Feb 11, 2023 by Linus Torvalds

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()."

parents 420b2d43 647037ad

mm/memblock.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1640,13 +1640,7 @@ void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
		end = PFN_DOWN(base + size);

		for (; cursor < end; cursor++) {
		/*
		* Reserved pages are always initialized by the end of
		* memblock_free_all() (by memmap_init() and, if deferred
		* initialization is enabled, memmap_init_reserved_pages()), so
		* these pages can be released directly to the buddy allocator.
		*/
		__free_pages_core(pfn_to_page(cursor), 0);
		memblock_free_pages(pfn_to_page(cursor), cursor, 0);
		totalram_pages_inc();
		}
		}

tools/testing/memblock/internal.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -15,10 +15,6 @@ bool mirrored_kernelcore = false;

		struct page {};

		void __free_pages_core(struct page *page, unsigned int order)
		{
		}

		void memblock_free_pages(struct page *page, unsigned long pfn,
		unsigned int order)
		{