From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C6AF42EED9 for ; Wed, 13 May 2026 13:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677826; cv=none; b=moFHw1d/2MZ6HMsm2lWeZiFvOfSYWBIbwshoLtlCy59ro1aRH90kJhJVEdSjzRnMgcCS/nMTfLFDD2peWBKTGz8NsH11ZDZ89OfD471usfnN0JdZNzpJx5F1i+hqaEgqDd6ts72v5FxzHuRWUuC9RlvIZCcNxpqLIJoWLS1015g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677826; c=relaxed/simple; bh=gZTnDE1rAQGEqxni0j+ozEqVTX5yzi4y3svvSLySLeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ScXdLesx13Rr1r3Pd3wkAIkUflHLLrYh4Qzct3m4s2CemTUrf/LB4+Wu8LEbdS8gmDJCeN8UgCvDT3Q6opf/q8tERS7jQU0ON2JylUg+FLyuF/7J/OEdQimzviUxKS+ycYh+E4pzXHnIWpc2DCu2y5zg3LB/J4u/LF2V96qHGhY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=Rtl4dW91; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="Rtl4dW91" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c8021c8c42fso2843208a12.3 for ; Wed, 13 May 2026 06:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677824; x=1779282624; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MIg/xuUWJQhpBPpGQxQRETv9f5LqZHFddPqDq17HTHk=; b=Rtl4dW91SJBbJNi4psuPpg8mnXkfG8kyQ7HPG6EmHhNxDvSCyCIdUHb8FTf1mRIl2C A3DVlOYRCgMChNrFV6DYKfjyKzJ7CI9H4lnhAjK1U9DJIxmbJfTAG9XpBu8bxpXA0KD3 yoix0dN+QFdgHVnic+DgNegDWNQDIa23oQx2vs4T48KUo3DttFDXKLkQwbMgjthCvgPT 2KfECdHYMOaHQy2xbkgRyKh6R5BV7JPXOFDvAlIlnREGSiHzrt+BhXNMvz05S0vRRHSw yng0a/mWv6bycNFwreUEmoQ3A9xoD6lQVrWUpZLY0r5AkUwmTrvTvnOUwZQmuRZNEWmE pXuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677824; x=1779282624; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MIg/xuUWJQhpBPpGQxQRETv9f5LqZHFddPqDq17HTHk=; b=tLwRRtrWkBvnpVXltvDEnqQmuo/P5ktzQyqB2mZ0bnzc57eq7x74m2sMH0DqCcu8Ep HvrR5/tkUiIT0nuMMnZ2+83BZYELIUr16iKf6P40xeSleSq/6sGxx9QKtAkGufsCrURc 7cAAGsfAyr+Ye/n1L+HJpR+/Dt5+Tj9rizCF+CBhfSk2DycU8jxWn9Z9bwDkcfEAaq3c DOkA00qSPZGL4Fb0H7EzXEVyK/NkPB1lJ/UinkUQiMa6o9k+/qmuQA4B/oEIKPu+oJXQ X4NCRcmDQdySqDMWUS0OWKh6oK5cZlYIDfJkGSy3CGv5JLEHb5y/7R57zg2gCY/Wjeg1 jLAw== X-Forwarded-Encrypted: i=1; AFNElJ9RgXVkiT9nA+4TD4tolbx1ida/vZRHtkPKevFO+S6SuDUZM94J3U57xSFFc+CbW/4eS39LPHmvuI9CgCw=@vger.kernel.org X-Gm-Message-State: AOJu0YyJkeGWJ2WgYrxFjPAvzwTxllGOAlE2EnMEWxDZipSMTTz4Q3PU AGlrGXCLl5iDkSxozvwxRXVIm8kGlqekbPn0lPZgEIJ9G3XxiX5Pm2NsMsQOkDK56FE= X-Gm-Gg: Acq92OGKP4eaiWt6/1CI3rHH0M00jdzblUirDzmApepOv4ZZL2mViLwimg+EqnzrXNA l1WAYZbwUNbbIoq+AU/Xzukxp2llnrTRGrbHCCcRYImfjHe87JWuGMk4NZhZCDJwIH2FjkvhFte 53yKSmSHY5d86gJ5nyMusPcPNIsndXRk2p2IOznHU4QaBHy25Nr76621Nf7IARl1rrnvCwXiBG3 VPP4WKro8SFGFWFSRKZgfShzcHMjjchQfy6edYLZs6cj23pYqfTiRu+XIOY5gKMg1owMi82LDCB IZN1ZEyt6TQzEXoW0Csd4rpTv80F2x2amn+9upJKDhKIyUHZOo254yxbvGqnJZwq5DVEkbekPGt wZiZbFyiOjRzHXvWjD2nwLfV1vV8O/mLfbu3uuEWNLpkBg6VZTOA4IV0UltBjQntaJZMUPcZFet BTYvP4fcEseZ/YGPYgOiobKQPvAb0AWq1YLFOrjGKSbvFWnKOcMDSH4PHcQpE= X-Received: by 2002:a17:903:bc2:b0:2b0:c45a:bc2 with SMTP id d9443c01a7336-2bd27139901mr29366285ad.16.1778677824098; Wed, 13 May 2026 06:10:24 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e90854sm166641925ad.66.2026.05.13.06.10.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:10:23 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Muchun Song , Oscar Salvador , Michael Ellerman , Madhavan Srinivasan Cc: Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nicholas Piggin , Christophe Leroy , Ackerley Tng , Frank van der Linden , aneesh.kumar@linux.ibm.com, joao.m.martins@oracle.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH v2 31/69] mm/sparse: Remove section_map_size() Date: Wed, 13 May 2026 21:04:59 +0800 Message-ID: <20260513130542.35604-32-songmuchun@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260513130542.35604-1-songmuchun@bytedance.com> References: <20260513130542.35604-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit section_map_size() no longer provides any shared logic. After the sparse-vmemmap changes, its only remaining user is the !CONFIG_SPARSEMEM_VMEMMAP path in __populate_section_memmap(), which can compute the size inline with PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION). Remove section_map_size() and inline the remaining calculation. Signed-off-by: Muchun Song --- include/linux/mm.h | 1 - mm/sparse.c | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index f39f6fca6551..fef39be8acd2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4845,7 +4845,6 @@ static inline void print_vma_addr(char *prefix, unsigned long rip) } #endif -unsigned long section_map_size(void); struct page * __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); diff --git a/mm/sparse.c b/mm/sparse.c index 33e89bf1ec0c..47349f6f463f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -222,23 +222,12 @@ size_t mem_section_usage_size(void) return sizeof(struct mem_section_usage) + usemap_size(); } -#ifdef CONFIG_SPARSEMEM_VMEMMAP -unsigned long __init section_map_size(void) -{ - return ALIGN(sizeof(struct page) * PAGES_PER_SECTION, PMD_SIZE); -} - -#else -unsigned long __init section_map_size(void) -{ - return PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); -} - +#ifndef CONFIG_SPARSEMEM_VMEMMAP struct page __init *__populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { - unsigned long size = section_map_size(); + unsigned long size = PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), nid, false); } -- 2.54.0