Skip to contentSkip to conversation

mm-mm_initc-print-mem_init-info-after-defer_init-is-done.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 25, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/mm_init.c: print mem_init info after defer_init is done
has been removed from the -mm tree. Its filename was
mm-mm_initc-print-mem_init-info-after-defer_init-is-done.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: mm/mm_init.c: print mem_init info after defer_init is done
Date: Tue, 11 Jun 2024 14:52:23 +0000

Current call flow looks like this:

start_kernel
mm_core_init
mem_init
mem_init_print_info
rest_init
kernel_init
kernel_init_freeable
page_alloc_init_late
deferred_init_memmap

If CONFIG_DEFERRED_STRUCT_PAGE_INIT, the time mem_init_print_info() calls, pages are not totally initialized and freed to buddy.

This has one issue

* nr_free_pages() just contains partial free pages in the system, which is not we expect.

Let's print the mem info after defer_init is done.

Also this would help changing totalram_pages accounting, since we plan to move the accounting into __free_pages_core().

---

 mm/mm_init.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/mm_init.c renamed from mm/mm_init.c~mm-mm_initc-print-mem_init-info-after-defer_init-is-done +3 -1
@@ -2321,6 +2321,7 @@ void set_zone_contiguous(struct zone *zo
 	zone->contiguous = true;
 }
 
+static void __init mem_init_print_info(void);
 void __init page_alloc_init_late(void)
 {
 	struct zone *zone;
@@ -2347,6 +2348,8 @@ void __init page_alloc_init_late(void)
 	files_maxfiles_init();
 #endif
 
+	/* Accounting of total+free memory is stable at this point. */
+	mem_init_print_info();
 	buffer_init();
 
 	/* Discard memblock private memory */
@@ -2707,7 +2710,6 @@ void __init mm_core_init(void)
 	kmsan_init_shadow();
 	stack_depot_early_init();
 	mem_init();
-	mem_init_print_info();
 	kmem_cache_init();
 	/*
 	 * page_owner must be initialized after buddy is ready, and also after

_

Patches currently in -mm which might be from [email protected] are

mm-sparse-nr_pages-wont-be-0.patch mm-mm_initc-move-build-check-on-max_zonelists-out-of-ifdef.patch mm-page_alloc-fix-a-typo-in-comment-about-gfp-flag.patch mm-page_alloc-reword-the-comment-of-buddy_merge_likely.patch