From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C7048408607; Thu, 9 Jul 2026 10:00:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591230; cv=none; b=DGbMXk/uq97U+VeubloH3bMpfzO3MmZ45j0iqdfkjvhOe4g/w9dWhiLR5oV6nqaHXmOmtBwMFy9DPnY6TQTFfAzCOClc1ebPs16gRoRc0PKmnPNDs5U3Se9DvY3EEF2NV3w5sUcwGPIqvoIqoN5js9ybMNcOBMtg9sDvP7OOHZs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591230; c=relaxed/simple; bh=SAFzIrENilPVbgQpOa5TuSFOe31YfO68AewfbkubMMk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mdphDXmXf1h7kEi8cjANMezKdg/dlsXyAvnYI0HDWsNaKf2LIkexaXxtsPauOSCEySo1hCu19lAlDxucOCBOTojzSudBJBSuDmPWWONcI/dF0orBEyqbSFSV6Mrp2VMlvt/80GI52hbX7Pgrp5DiBORH+xySAnV/MRUo0YtiMxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=StbkFvHz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="StbkFvHz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDE771F000E9; Thu, 9 Jul 2026 10:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783591225; bh=TrELcVwRYyz8Jzkrxkj7A9TvS/0MDDsv0mFX1UjuUEg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=StbkFvHzawMhF0L4yrlgXoQknDDCvW45GVgyVKeSATD3sS6xlFsVQp7trQfrDH5P7 04NV94a2lyluspknNz3Ow/hXxTzu1AZG5xcF+7x8NiHfTl3hGVbXMlDFGbQpUjBJWK VqKp9WEudr61e0Lf1pkXWy/00IKakbMp1yjPoEESVsLJGJWAHWzgOy6r4VEihNUBCi WzwuugtweWvwWEfScgbUOvL33bhVQstQb2CWC74iWnlkFPG8BhNmaeaqEeSIDrTmqM jiTcOnrjI/YYKDAZkBw9ylWcyZSmDd6LTWZY0zDczecZXYpxuMs9rhvTe+FdzpZgbP kFURq7j8z28Bw== From: "Mike Rapoport (Microsoft)" Date: Thu, 09 Jul 2026 13:00:04 +0300 Subject: [PATCH v2 2/3] mm: split out sparse declarations from internal.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260709-internal-h-v2-2-695631425968@kernel.org> References: <20260709-internal-h-v2-0-695631425968@kernel.org> In-Reply-To: <20260709-internal-h-v2-0-695631425968@kernel.org> To: Andrew Morton , David Hildenbrand Cc: Alexander Graf , Alexander Potapenko , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , Johannes Weiner , "Liam R. Howlett" , Lorenzo Stoakes , Marco Elver , Michal Hocko , Mike Rapoport , Muchun Song , Oscar Salvador , Pasha Tatashin , Pratyush Yadav , Suren Baghdasaryan , Tejun Heo , Uladzislau Rezki , Vlastimil Babka , Zi Yan , kasan-dev@googlegroups.com, kexec@lists.infradead.org, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org X-Mailer: b4 0.16-dev mm/internal.h becomes more and more bloated. Move declarations related to SPARSE and SPARSE_VMEMMAP memory models to a new mm/sparse.h header. No functional changes. Signed-off-by: Mike Rapoport (Microsoft) Acked-by: Muchun Song --- MAINTAINERS | 1 + mm/internal.h | 52 ------------------------------------------- mm/mm_init.c | 1 + mm/sparse-vmemmap.c | 1 + mm/sparse.c | 1 + mm/sparse.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 67 insertions(+), 52 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 33cef4d8e1ee..5c1aed067656 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16999,6 +16999,7 @@ F: mm/pgtable-generic.c F: mm/ptdump.c F: mm/sparse-vmemmap.c F: mm/sparse.c +F: mm/sparse.h F: mm/util.c F: mm/vmpressure.c F: mm/vmstat.c diff --git a/mm/internal.h b/mm/internal.h index 59adb140fc7a..a29a7dab2e6c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -807,58 +807,6 @@ static inline void init_compound_tail(struct page *tail, prep_compound_tail(tail, head, order); } -/* - * mm/sparse.c - */ -#ifdef CONFIG_SPARSEMEM -void sparse_init(void); -int sparse_index_init(unsigned long section_nr, int nid); - -static inline void sparse_init_one_section(struct mem_section *ms, - unsigned long pnum, struct page *mem_map, - struct mem_section_usage *usage, unsigned long flags) -{ - unsigned long coded_mem_map; - - BUILD_BUG_ON(SECTION_MAP_LAST_BIT > PFN_SECTION_SHIFT); - - /* - * We encode the start PFN of the section into the mem_map such that - * page_to_pfn() on !CONFIG_SPARSEMEM_VMEMMAP can simply subtract it - * from the page pointer to obtain the PFN. - */ - coded_mem_map = (unsigned long)(mem_map - section_nr_to_pfn(pnum)); - VM_WARN_ON_ONCE(coded_mem_map & ~SECTION_MAP_MASK); - - ms->section_mem_map &= ~SECTION_MAP_MASK; - ms->section_mem_map |= coded_mem_map; - ms->section_mem_map |= flags | SECTION_HAS_MEM_MAP; - ms->usage = usage; -} - -static inline void __section_mark_present(struct mem_section *ms, - unsigned long section_nr) -{ - if (section_nr > __highest_present_section_nr) - __highest_present_section_nr = section_nr; - - ms->section_mem_map |= SECTION_MARKED_PRESENT; -} -#else -static inline void sparse_init(void) {} -#endif /* CONFIG_SPARSEMEM */ - -/* - * mm/sparse-vmemmap.c - */ -#ifdef CONFIG_SPARSEMEM_VMEMMAP -void sparse_init_subsection_map(void); -#else -static inline void sparse_init_subsection_map(void) -{ -} -#endif /* CONFIG_SPARSEMEM_VMEMMAP */ - #if defined CONFIG_COMPACTION || defined CONFIG_CMA /* diff --git a/mm/mm_init.c b/mm/mm_init.c index 39583c028e34..b557e5fe35f3 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -35,6 +35,7 @@ #include "internal.h" #include "mm_init.h" #include "page_alloc.h" +#include "sparse.h" #include "slab.h" #include "shuffle.h" diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 10dd4a9b591b..458b0b9570ff 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -42,6 +42,7 @@ #include "internal.h" #include "mm_init.h" +#include "sparse.h" /* * Allocate a block of memory to be used to back the virtual memory map diff --git a/mm/sparse.c b/mm/sparse.c index d54e30f58b93..704a9dec2b9a 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -16,6 +16,7 @@ #include #include "internal.h" #include "mm_init.h" +#include "sparse.h" #include /* diff --git a/mm/sparse.h b/mm/sparse.h new file mode 100644 index 000000000000..95aa031213f2 --- /dev/null +++ b/mm/sparse.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * sparse.h: + * + * mm/ internal sparse and sparse-vmemmap declarations + */ + +#ifndef __MM_SPARSE_H +#define __MM_SPARSE_H + +#include + +/* + * mm/sparse.c + */ +#ifdef CONFIG_SPARSEMEM +void sparse_init(void); +int sparse_index_init(unsigned long section_nr, int nid); + +static inline void sparse_init_one_section(struct mem_section *ms, + unsigned long pnum, struct page *mem_map, + struct mem_section_usage *usage, unsigned long flags) +{ + unsigned long coded_mem_map; + + BUILD_BUG_ON(SECTION_MAP_LAST_BIT > PFN_SECTION_SHIFT); + + /* + * We encode the start PFN of the section into the mem_map such that + * page_to_pfn() on !CONFIG_SPARSEMEM_VMEMMAP can simply subtract it + * from the page pointer to obtain the PFN. + */ + coded_mem_map = (unsigned long)(mem_map - section_nr_to_pfn(pnum)); + VM_WARN_ON_ONCE(coded_mem_map & ~SECTION_MAP_MASK); + + ms->section_mem_map &= ~SECTION_MAP_MASK; + ms->section_mem_map |= coded_mem_map; + ms->section_mem_map |= flags | SECTION_HAS_MEM_MAP; + ms->usage = usage; +} + +static inline void __section_mark_present(struct mem_section *ms, + unsigned long section_nr) +{ + if (section_nr > __highest_present_section_nr) + __highest_present_section_nr = section_nr; + + ms->section_mem_map |= SECTION_MARKED_PRESENT; +} +#else +static inline void sparse_init(void) {} +#endif /* CONFIG_SPARSEMEM */ + +/* + * mm/sparse-vmemmap.c + */ +#ifdef CONFIG_SPARSEMEM_VMEMMAP +void sparse_init_subsection_map(void); +#else +static inline void sparse_init_subsection_map(void) {} +#endif /* CONFIG_SPARSEMEM_VMEMMAP */ + +#endif /* __MM_SPARSE_H */ -- 2.53.0