From patchwork Sun Mar 19 22:00:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13180637 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 F3D9BC76195 for ; Sun, 19 Mar 2023 22:00:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FD4190000B; Sun, 19 Mar 2023 18:00:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AE59900002; Sun, 19 Mar 2023 18:00:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74EC490000B; Sun, 19 Mar 2023 18:00:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6827C900002 for ; Sun, 19 Mar 2023 18:00:55 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1D1E01C5D9E for ; Sun, 19 Mar 2023 22:00:55 +0000 (UTC) X-FDA: 80587018470.24.1F2BFF2 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 26EDFA001B for ; Sun, 19 Mar 2023 22:00:52 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="CQj36/c5"; spf=pass (imf25.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=1679263253; 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=QlBbim3xnh0fjP4Sc4K6+MacYz8bYA1jMrCNMhhDe04=; b=fzLca9dbQtuOv9mc6EsmhpH59O1DvftNvKp3xR2Bk5tdQJCNO+ZMAnpu8Tepu9s71N5kyp pjZiwWEjhVq6XleJ1atYbrCXpzC40RdmEdeRtk8bx/lXh1Df6zqwFac7CpoeU5Q18e1AyA 1/KQqK3VKWvqYxbJKjqM5c66CJKAioI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="CQj36/c5"; spf=pass (imf25.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=1679263253; a=rsa-sha256; cv=none; b=4TR0VxZgciiFZatuGkyAhXty2ROpp3n+X9dK0DZBDkrnf1KqiOWKNjYRGY/kHD9hnQ+4uw zqgsoqTtW07UJEygm8zRtgJ/ppziTSnxvba0NIMMn5gpYaXEkTYsaHok2SNjYlaBIFRplv htrFTS68gIbRn7CL3firLCRYakMNP5o= 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 41D38611D2; Sun, 19 Mar 2023 22:00:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A29E8C433A4; Sun, 19 Mar 2023 22:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679263251; bh=uV4gJFJoIVTV9htd8RCrOaAU9KLl8DLHB7MDbKZkC0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CQj36/c5qv8IcPiOqJ0xZNbpyBo/SK2XmaGkWi+IO6y2dPZ2tG4ua/h6o0SS/c+iF 0scf0+O+3sWRH8CDsPGEWYBh0quOjdP03gCVFOwKETutJR55v2nNmNqpEHFpR5zChI 1oUfHaGThm+jLhVeBkiV9A1P7wUoSIpSKGDiKp0ke6ltYYwZr5j00FKAoLikFoEcU1 wnkOmpjfpc0dCyEUH9/+HUtbM6Yo7gNsfxaQaZ2QWOT9/HoSzsa2m9O+gLhzRdh2a5 xckfYrHXcat9vF3ZRBqqDW3w9roV5Vk7ifLGQNVxGpAr/7YgP5GHwymALkop8292BD 3SB+xrnbB62mw== From: Mike Rapoport To: Andrew Morton Cc: David Hildenbrand , 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 08/15] init,mm: move mm_init() to mm/mm_init.c and rename it to mm_core_init() Date: Mon, 20 Mar 2023 00:00:01 +0200 Message-Id: <20230319220008.2138576-9-rppt@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230319220008.2138576-1-rppt@kernel.org> References: <20230319220008.2138576-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 26EDFA001B X-Stat-Signature: c7gt6f516mmfzbdjz1zp8oyqy1zc4j8s X-Rspam-User: X-HE-Tag: 1679263252-933086 X-HE-Meta: U2FsdGVkX1/WJxmU+UTHGRglozmZIo2ekdu+0/GEQLo0jtE2amQUmbng0yiFTkM3ouHk2Uwap9ayYPykhYJxgLVrk2+XtR69hX32uoK14WU68Pz63QpdLpkdaHKurGM/Dmp9X/9ARc/o4AdoZl5ZKlJlw3po4/zUbE9kbfHMf+Q1uyQjVgJs6ZzSthmY5DNtU+CL8WlGJRwHz2uhmOtL9RTP4i0hmIC6ObIHCBsrfAGpM351hVmgPwOAAeDXnwHNd4hgwKNm2F0sH1a+GOawd0u777vo2j1bsPbNVNWX/MIln0giWjjOwVyL+hnyu4XYXw0vRzw0rtwGVFHau7MIkh6Wr+zhqeS4ZabofUzXHbtzFYeJr1oqdUqoVJkkOFwy+AdpgOAbNto2LmsBrjkCn37Id+YKIcFwGfV6chzkJFdSYbj+cUBXdVDWYTKjxsY/1VcDG6GpwZJsv++jZYMikCC5goTMDNgJG9urp5piavZE9VHa5IhXrAUT8NmTY7jEX+Rc0duzEyfmrNnREnnZ5NoGqobcLNix2LQFr8K6ZjTMf7k9YVPr7Jsw/LhEX/WpognymQDX5NxXbCFoe5YaOIHk1vzfoP5HMz5KUqlAu6VlaTmNKbv9yppu+97wvZAUvAWJfmJdekvS5leqaNhXqCTNi4UWXswGE6611yYsSpljMCB6r3w8d5piJWpjVZViQgiW3Vap+loo86dpz6RlPDsBiEsjBb2jyUs4yBETDFPR7BqVbkAOcZ+d2kGZHEoIc418CPblxwdUjPJJIVcS+hO8lAtfOOMjepM9jsnFGkW4eYp9iXwaK+PnnQ5CorfG8PW/RXJIlNUdZFUNUuUH7rjElX2yghQS4L5Z44aAFN7y9p9hrCZRszd1ki6j97kN8Ys8Vz8a8x4S6l8uHQEuXXcxKJeniANmVrSCJ6ak+cQBsMvfRPvbh3Kor0pOjsoPHz2GBgrq8CWu5KxhD+h WOhEa9KJ FHixkCjIAEwtRNP6yZtQa8D7BtWAQMG+LAayIluOnY1bxXc8/NslRHvyhRyp4Y9NvrEf/DSOZbl4fsEg10f81AzLgGVB7fG5lUzsVfuF/JeAJX7ySnjlsDDV3+hLU8HDab4qXTOtHHraf9NmQ59Ac91IRQgEGxrmiAPdutw51VGPd3PEpPRSEvKIugYDJQpjZKfAaeUmLOIvavZZkBtk5ukG0JOe6I6jMlaF9cCOy9g2X1671SvoRXKM8uNeMNQ96mnrr95Vm+aqjUIYkbJK7G7ky6pGGVnC5dHnG8kSDI7mDwkE7KeTv64hHnlXMPHREZEqzknsr4NDKB/Gzh+BKGEJCQAJLdvKujMmXZ702Z6DbMEYc0B17w1nndUivrMgElXfbpIn9J9EgoVHVleVWcMgxNw== 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 8aaaddd13a20..1da48762e4a2 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; @@ -2504,3 +2510,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(); +}