From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16B87C74A5B for ; Tue, 21 Mar 2023 17:06:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A707E900003; Tue, 21 Mar 2023 13:05:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FA00900002; Tue, 21 Mar 2023 13:05:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C1A9900003; Tue, 21 Mar 2023 13:05:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7DCA9900002 for ; Tue, 21 Mar 2023 13:05:59 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 247BE1C2620 for ; Tue, 21 Mar 2023 17:05:59 +0000 (UTC) X-FDA: 80593532838.27.9AA73A3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 2287714002A for ; Tue, 21 Mar 2023 17:05:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="cbrXwF/k"; spf=pass (imf09.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679418357; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o5qc1bAR4hgCQZF01Zq3zFVRJWBLrRy6VgyJZRWiCeQ=; b=Fyw1dvyRxGxy4T6GTo1kBcteQ/6tsGsSo2F999deSca44KgWHGh1Vxkur1wsNmgG4EUb9u OU3GvWfXPTU+8Rom447Ywo8aqeN3Cl3a42iKXAofrA9leYf9JZftr02Z5JaL4lzKWb6Ji8 SqAFyZ5qc8ivdbPYI0bBmXVZxjd3AZM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="cbrXwF/k"; spf=pass (imf09.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679418357; a=rsa-sha256; cv=none; b=3/kZj0m3UdfJ2KBslx7ZIV65fHUYksYiFPMQ+Z27IXLlrC/yZlV0zLYrLpyfa+QaRTEXMZ dxXilE362lyxfZmTzgORSFU9YLKilJQ6sYZV6jkToTubmpbmZTJriDVSiEP/YHwHxSTF1B 1wm3HL2ugRQqB0jhgSOsOR/i0MdkAPQ= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 34D1061D57; Tue, 21 Mar 2023 17:05:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D557C433A0; Tue, 21 Mar 2023 17:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679418356; bh=UNeFcb5PNOhwqohZU+Jc2J8lUuh4fggG90Bd0WQdoSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cbrXwF/kWX943Eora0PJmXJuxATEdUYCAPvoSgcIKCZJN2+aVQ3+4FbdbyaX7bFPu /UCIEShcsyTs0b349/pkEgxG0v9MvQUm10kAiG25e8SlRbLmuVE0keHHqMtyb02mjT 37yRRmT8heaLbWNDw5y8ztkpYs0qagpbvs7cAdTDffAtzNFBzqRb5zizcPx63j8e+d fs62HRzsup8cLdnMthq6A5r2MnkK2VKvxGdOpN4yBqsraDyazwIDsZVNUCDTePcmqQ 58NrKKA65LXKm2NwaoHuT4qdRwk2ck2hjd6d1/hCqXqCDff/5DYT/SRynEpt+hqFIj 0N//T5rQMIV2w== From: Mike Rapoport To: Andrew Morton Cc: David Hildenbrand , Doug Berger , Matthew Wilcox , Mel Gorman , Michal Hocko , Mike Rapoport , Thomas Bogendoerfer , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 07/14] init,mm: move mm_init() to mm/mm_init.c and rename it to mm_core_init() Date: Tue, 21 Mar 2023 19:05:06 +0200 Message-Id: <20230321170513.2401534-8-rppt@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230321170513.2401534-1-rppt@kernel.org> References: <20230321170513.2401534-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2287714002A X-Stat-Signature: gu5iifxjfnk6wug3eic6x37s7qb6gez6 X-HE-Tag: 1679418356-407011 X-HE-Meta: U2FsdGVkX1+48IebZVRe/xv3RlkYcwbTLSp6lE2vjKPmcbo3C0JjiJfI3f8wB5eP72IqRuYNK3KX/K3f71/rmRYeOIWQ4jG/kuwaYLc9/1jPHtwcOXiVbt86C+NLjPZXQor5tRu7ChdGUt2sKfdXmtXIjvIPVQPZcu1+7iTQlhGu5hizDrhozuZ3+3YdTHXOuIJJTPIiFP/7e2ZwHOBaFeUjKDfyYCoep/30z8H/snNC0laLzG3Y4RYdSl8VSVaVIeFvVucqhH0VRsVz0+eAcJ39EsXm2j4x1G0yxZJLm/xk53dG3o1WrNKMiJtZZDFvHCKSJOTmio2TH3p/wv4+/0NvtAHGczRoHS7zwSTf/GqYl26BlDcxsBPbKyT5pjLttZXIXJV88a/0KPE6N3YeiARMvYBMfCNFQvIhMM0Nio2C9b6Ya4KthAssdSGRZDBuDz2D901iVEEe2kSE+6WjHIKTVeFNY85oAZm8B+wAEeIX5SeMv5jFPphr7kso3haj5u+wnnSZPkLX+Ib1U1qAV1H4jfFHwAu/RKMfD6yOGUEz5KvCJluboP5QRto2IhAeevWfho2EOnE7Az5MRY4PprNYludlddnNISh9KxYEWzz+U5GoFCT+Qf9IcuJd/3icojDRm7rgh2PcWYV8NMY35k+4FN1Bonw/cQTAKjcvTbLiyjVJpjXmB/g+TO1wHWl5NZZtp919AUAem26FLHsdVX+qYoJariHZgvJSU24z2yaYUSmZtrX2ZFmR35vO2Tkh92zACO0XnKX8rg3uuZRmj0HNLpXyirk076qJpHoirxHptlP39XDB5YEVmGR1izff0/F+qfWgRsHdzhV18buih/I6zMhVpxC0HIm3x1Jb4LUK54daxVa6Vawb/i9vVIZDwLvfF78x9UZZY/1n7aKU8CJhoo9GWj9DLvxZntr4ylRqkuuvmd5qbKTy9ER+LT9q7txw1huJCHTZw0Zf+2b 7dpLLnir xCbXa+TureLU0yVkoIx0qbdUtCemEtdnfmdc741kA3MElFVcealKusazAm/D6WDjWJrf0aEPBzT1z7U/cJnzaiRn/6rATNw2ZSY7mih+SmH9boH5nlmZcMSuvgBqgEIxU2OUZNUAxH/ihu7q1oXUOsVhxPYyaF0oqJH9Q54qp43WW4GuBhs4a15jTGEpMFeHAKi3arOHYJdL2lTLg2fUhMW59eZ/hds4a9p+DiBG5qrxax4vjTc5AwMduXVYv2DTDVYA2qKAm+TomRiEBHHhvnd/dJDguHm5XX9ObkmSqja4bGW1A7KqjQhelSJNqFyaWeZrFG1JlCKxDlbZYc7ci9MyK/FB2luF6FcZ4BTgTO53pEN62om+NX7e+buB8somy7oNo6ilmJHUzqbToF9TmI9xVTWSmr04gdzlX1C4Z+uOnATE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Mike Rapoport (IBM)" Make mm_init() a part of mm/ codebase. mm_core_init() better describes what the function does and does not clash with mm_init() in kernel/fork.c Signed-off-by: Mike Rapoport (IBM) Acked-by: David Hildenbrand --- include/linux/mm.h | 1 + init/main.c | 71 ++------------------------------------------ mm/mm_init.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 69 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index ee755bb4e1c1..2d7f095136fc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -39,6 +39,7 @@ struct pt_regs; extern int sysctl_page_lock_unfairness; +void mm_core_init(void); void init_mm_internals(void); #ifndef CONFIG_NUMA /* Don't use mapnrs, do it properly */ diff --git a/init/main.c b/init/main.c index 4423906177c1..8a20b4c25f24 100644 --- a/init/main.c +++ b/init/main.c @@ -803,73 +803,6 @@ static inline void initcall_debug_enable(void) } #endif -/* Report memory auto-initialization states for this boot. */ -static void __init report_meminit(void) -{ - const char *stack; - - if (IS_ENABLED(CONFIG_INIT_STACK_ALL_PATTERN)) - stack = "all(pattern)"; - else if (IS_ENABLED(CONFIG_INIT_STACK_ALL_ZERO)) - stack = "all(zero)"; - else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)) - stack = "byref_all(zero)"; - else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF)) - stack = "byref(zero)"; - else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_USER)) - stack = "__user(zero)"; - else - stack = "off"; - - pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n", - stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off", - want_init_on_free() ? "on" : "off"); - if (want_init_on_free()) - pr_info("mem auto-init: clearing system memory may take some time...\n"); -} - -/* - * Set up kernel memory allocators - */ -static void __init mm_init(void) -{ - /* Initializations relying on SMP setup */ - build_all_zonelists(NULL); - page_alloc_init_cpuhp(); - - /* - * page_ext requires contiguous pages, - * bigger than MAX_ORDER unless SPARSEMEM. - */ - page_ext_init_flatmem(); - init_mem_debugging_and_hardening(); - kfence_alloc_pool(); - report_meminit(); - 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 - * slab is ready so that stack_depot_init() works properly - */ - page_ext_init_flatmem_late(); - kmemleak_init(); - pgtable_init(); - debug_objects_mem_init(); - vmalloc_init(); - /* If no deferred init page_ext now, as vmap is fully initialized */ - if (!deferred_struct_pages) - page_ext_init(); - /* Should be run before the first non-init thread is created */ - init_espfix_bsp(); - /* Should be run after espfix64 is set up. */ - pti_init(); - kmsan_init_runtime(); - mm_cache_init(); -} - #ifdef CONFIG_RANDOMIZE_KSTACK_OFFSET DEFINE_STATIC_KEY_MAYBE_RO(CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT, randomize_kstack_offset); @@ -993,13 +926,13 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) /* * These use large bootmem allocations and must precede - * kmem_cache_init() + * initalization of page allocator */ setup_log_buf(0); vfs_caches_init_early(); sort_main_extable(); trap_init(); - mm_init(); + mm_core_init(); poking_init(); ftrace_init(); diff --git a/mm/mm_init.c b/mm/mm_init.c index 2e60c7186132..bba73f1fb277 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -20,9 +20,15 @@ #include #include #include +#include +#include +#include +#include #include "internal.h" #include "shuffle.h" +#include + #ifdef CONFIG_DEBUG_MEMORY_INIT int __meminitdata mminit_loglevel; @@ -2524,3 +2530,70 @@ void __init memblock_free_pages(struct page *page, unsigned long pfn, } __free_pages_core(page, order); } + +/* Report memory auto-initialization states for this boot. */ +static void __init report_meminit(void) +{ + const char *stack; + + if (IS_ENABLED(CONFIG_INIT_STACK_ALL_PATTERN)) + stack = "all(pattern)"; + else if (IS_ENABLED(CONFIG_INIT_STACK_ALL_ZERO)) + stack = "all(zero)"; + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)) + stack = "byref_all(zero)"; + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF)) + stack = "byref(zero)"; + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_USER)) + stack = "__user(zero)"; + else + stack = "off"; + + pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n", + stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off", + want_init_on_free() ? "on" : "off"); + if (want_init_on_free()) + pr_info("mem auto-init: clearing system memory may take some time...\n"); +} + +/* + * Set up kernel memory allocators + */ +void __init mm_core_init(void) +{ + /* Initializations relying on SMP setup */ + build_all_zonelists(NULL); + page_alloc_init_cpuhp(); + + /* + * page_ext requires contiguous pages, + * bigger than MAX_ORDER unless SPARSEMEM. + */ + page_ext_init_flatmem(); + init_mem_debugging_and_hardening(); + kfence_alloc_pool(); + report_meminit(); + 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 + * slab is ready so that stack_depot_init() works properly + */ + page_ext_init_flatmem_late(); + kmemleak_init(); + pgtable_init(); + debug_objects_mem_init(); + vmalloc_init(); + /* If no deferred init page_ext now, as vmap is fully initialized */ + if (!deferred_struct_pages) + page_ext_init(); + /* Should be run before the first non-init thread is created */ + init_espfix_bsp(); + /* Should be run after espfix64 is set up. */ + pti_init(); + kmsan_init_runtime(); + mm_cache_init(); +} -- 2.35.1