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 05/15] mm: handle hashdist initialization in mm/mm_init.c
Date: Sun, 19 Mar 2023 23:59:58 +0200 [thread overview]
Message-ID: <20230319220008.2138576-6-rppt@kernel.org> (raw)
In-Reply-To: <20230319220008.2138576-1-rppt@kernel.org>
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
The hashdist variable must be initialized before the first call to
alloc_large_system_hash() and free_area_init() looks like a better place
for it than page_alloc_init().
Move hashdist handling to mm/mm_init.c
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
mm/mm_init.c | 22 ++++++++++++++++++++++
mm/page_alloc.c | 18 ------------------
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 63aa7b6b2880..8aaaddd13a20 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -607,6 +607,25 @@ int __meminit early_pfn_to_nid(unsigned long pfn)
return nid;
}
+
+int hashdist = HASHDIST_DEFAULT;
+
+static int __init set_hashdist(char *str)
+{
+ if (!str)
+ return 0;
+ hashdist = simple_strtoul(str, &str, 0);
+ return 1;
+}
+__setup("hashdist=", set_hashdist);
+
+static inline void fixup_hashdist(void)
+{
+ if (num_node_state(N_MEMORY) == 1)
+ hashdist = 0;
+}
+#else
+static inline void fixup_hashdist(void) {}
#endif /* CONFIG_NUMA */
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
@@ -1855,6 +1874,9 @@ void __init free_area_init(unsigned long *max_zone_pfn)
}
memmap_init();
+
+ /* disable hash distribution for systems with a single node */
+ fixup_hashdist();
}
/**
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c56c147bdf27..ff6a2fff2880 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6383,28 +6383,10 @@ static int page_alloc_cpu_online(unsigned int cpu)
return 0;
}
-#ifdef CONFIG_NUMA
-int hashdist = HASHDIST_DEFAULT;
-
-static int __init set_hashdist(char *str)
-{
- if (!str)
- return 0;
- hashdist = simple_strtoul(str, &str, 0);
- return 1;
-}
-__setup("hashdist=", set_hashdist);
-#endif
-
void __init page_alloc_init(void)
{
int ret;
-#ifdef CONFIG_NUMA
- if (num_node_state(N_MEMORY) == 1)
- hashdist = 0;
-#endif
-
ret = cpuhp_setup_state_nocalls(CPUHP_PAGE_ALLOC,
"mm/page_alloc:pcp",
page_alloc_cpu_online,
--
2.35.1
next prev parent reply other threads:[~2023-03-19 22:00 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 ` Mike Rapoport [this message]
2023-03-20 10:34 ` [PATCH 05/15] mm: handle hashdist initialization in mm/mm_init.c 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 ` [PATCH 11/15] init,mm: fold late call to page_ext_init() to page_alloc_init_late() Mike Rapoport
2023-03-20 10:39 ` 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-6-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