From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Vlastimil Babka <vbabka@suse.cz>,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 11/15] init,mm: fold late call to page_ext_init() to page_alloc_init_late()
Date: Mon, 20 Mar 2023 00:00:04 +0200 [thread overview]
Message-ID: <20230319220008.2138576-12-rppt@kernel.org> (raw)
In-Reply-To: <20230319220008.2138576-1-rppt@kernel.org>
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
When deferred initialization of struct pages is enabled, page_ext_init()
must be called after all the deferred initialization is done, but there
is no point to keep it a separate call from kernel_init_freeable() right
after page_alloc_init_late().
Fold the call to page_ext_init() into page_alloc_init_late() and
localize deferred_struct_pages variable.
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
include/linux/page_ext.h | 2 --
init/main.c | 4 ----
mm/mm_init.c | 6 +++++-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/linux/page_ext.h b/include/linux/page_ext.h
index bc2e39090a1f..67314f648aeb 100644
--- a/include/linux/page_ext.h
+++ b/include/linux/page_ext.h
@@ -29,8 +29,6 @@ struct page_ext_operations {
bool need_shared_flags;
};
-extern bool deferred_struct_pages;
-
#ifdef CONFIG_PAGE_EXTENSION
/*
diff --git a/init/main.c b/init/main.c
index 8a20b4c25f24..04113514e56a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -62,7 +62,6 @@
#include <linux/rmap.h>
#include <linux/mempolicy.h>
#include <linux/key.h>
-#include <linux/page_ext.h>
#include <linux/debug_locks.h>
#include <linux/debugobjects.h>
#include <linux/lockdep.h>
@@ -1561,9 +1560,6 @@ static noinline void __init kernel_init_freeable(void)
padata_init();
page_alloc_init_late();
- /* Initialize page ext after all struct pages are initialized. */
- if (deferred_struct_pages)
- page_ext_init();
do_basic_setup();
diff --git a/mm/mm_init.c b/mm/mm_init.c
index ae6bd26cf5a2..2d73d8b05a69 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -225,7 +225,7 @@ static unsigned long nr_kernel_pages __initdata;
static unsigned long nr_all_pages __initdata;
static unsigned long dma_reserve __initdata;
-bool deferred_struct_pages __meminitdata;
+static bool deferred_struct_pages __meminitdata;
static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);
@@ -2338,6 +2338,10 @@ void __init page_alloc_init_late(void)
for_each_populated_zone(zone)
set_zone_contiguous(zone);
+
+ /* Initialize page ext after all struct pages are initialized. */
+ if (deferred_struct_pages)
+ page_ext_init();
}
#ifndef __HAVE_ARCH_RESERVED_KERNEL_PAGES
--
2.35.1
next prev parent reply other threads:[~2023-03-19 22:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 21:59 [PATCH 00/15] mm: move core MM initialization to mm/mm_init.c Mike Rapoport
2023-03-19 21:59 ` [PATCH 01/15] mips: fix comment about pgtable_init() Mike Rapoport
2023-03-20 10:28 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 02/15] mm/cma: move init_cma_reserved_pages() to cma.c and make it static Mike Rapoport
2023-03-20 10:30 ` David Hildenbrand
2023-03-20 11:11 ` Mike Rapoport
2023-03-20 11:14 ` David Hildenbrand
2023-03-20 19:12 ` Doug Berger
2023-03-19 21:59 ` [PATCH 03/15] mm/page_alloc: add helper for checking if check_pages_enabled Mike Rapoport
2023-03-20 10:31 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 04/15] mm: move most of core MM initialization to mm/mm_init.c Mike Rapoport
2023-03-20 10:32 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 05/15] mm: handle hashdist initialization in mm/mm_init.c Mike Rapoport
2023-03-20 10:34 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 06/15] mm/page_alloc: rename page_alloc_init() to page_alloc_init_cpuhp() Mike Rapoport
2023-03-20 10:34 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 07/15] init: fold build_all_zonelists() and page_alloc_init_cpuhp() to mm_init() Mike Rapoport
2023-03-20 10:35 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 08/15] init,mm: move mm_init() to mm/mm_init.c and rename it to mm_core_init() Mike Rapoport
2023-03-20 10:36 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 09/15] mm: move pgtable_init() to mm/mm_init.c and make it static Mike Rapoport
2023-03-20 10:37 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 10/15] mm: move init_mem_debugging_and_hardening() to mm/mm_init.c Mike Rapoport
2023-03-20 10:39 ` David Hildenbrand
2023-03-20 11:17 ` Mike Rapoport
2023-03-20 11:18 ` David Hildenbrand
2023-03-19 22:00 ` Mike Rapoport [this message]
2023-03-20 10:39 ` [PATCH 11/15] init,mm: fold late call to page_ext_init() to page_alloc_init_late() David Hildenbrand
2023-03-19 22:00 ` [PATCH 12/15] mm: move mem_init_print_info() to mm_init.c Mike Rapoport
2023-03-20 10:40 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 13/15] mm: move kmem_cache_init() declaration to mm/slab.h Mike Rapoport
2023-03-20 10:40 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 14/15] mm: move vmalloc_init() declaration to mm/internal.h Mike Rapoport
2023-03-20 10:41 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 15/15] MAINTAINERS: extend memblock entry to include MM initialization Mike Rapoport
2023-03-20 10:41 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319220008.2138576-12-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).