From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 26EA540759A for ; Wed, 13 May 2026 13:09:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677777; cv=none; b=hps3iBsIcjk5++omFA9j+xOelb+qrtWfppUtgqqqqc3oAUmwtK7TeJrsPih3jhHJDAQOVf9PJ4wKR8xjI4DZ9LtO5VA33aqNzcvEHnC506+E0tclTCpU2ug5ZhOI7wGfM2xjKu4Mj5iws2vx4Dgdu3AWc7gtnBZNMznrfNCml6Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677777; c=relaxed/simple; bh=E3ttm4/WU/ZcCJVVc758AnvYRwcbmk7QE3IuObO3kwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EIupmOIdSeVtBDqxUY+tNcScHlRSGsU1qkR5CHQoCOUr1x4qGgwUxcmq4WoRtoQSEjbODFXODxLh66J+1l6W87xa+1t9oxRCjsFKsIVn15NYKd3HMn+0V3BDItbPaFcSEswL1WKPZX/omnlFpzdtZNa1guZMh6kJPvmmG3yd3LY= 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=TM/g0hi9; arc=none smtp.client-ip=209.85.214.182 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="TM/g0hi9" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2b9ec9443c2so41136625ad.1 for ; Wed, 13 May 2026 06:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677775; x=1779282575; 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=T0ssBedciqiVv0raptLCn49uzFGNVgYKzMgS4u/pGVs=; b=TM/g0hi9/ahEBeTKFOmQCu0Wo1agDs4x3oslTUhyDAkeK2MRg862xqWSrY3NkMM9ci tMsHFuGML0FEPqYZob0nomUqKxWmW54qTHAzVZ74tFrpu8BDp3aGfcJtTChxq+AG8PUh oDfqXw9LXJ8xGMcr/rg2crggszkGFROYkv0ZKVXNEN5bixTrolJ/EAb5UKeTp/WcGoJq vOCapqUjjhYopqpMAaMUJMJtr6LfTcv+it78YUuvKjlyGizSq2E1a88bT0gCnOdjM8Ab 7/n5rxmy0srYTZ3gel2lrRboNZUienbbB86/yvtjbwaezBa1/5aNWIj2d6eIYjDq3fQI SHPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677775; x=1779282575; 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=T0ssBedciqiVv0raptLCn49uzFGNVgYKzMgS4u/pGVs=; b=mUIUbF3T98PUTTTMLpjogeOb1zdNSfSa12RNGIzSbkRhQsv+kKG9Ljf2a/MLRsvyiP jJnU6DPlyxCm8t9v7Pt5Zm1DjSWZR+FLcTOq+2WXFexrefplluvV2TLihsmorl2+ox/H mFH9B/K2/OgIF7uENFs62vLsdjVjcD8LGAECMc2sPhtrVFfmZNY4EP7HpXacYDI7kcMZ Trz8inbMQbbPSzmd/TA115Dm8AgZ4lh8LCPCGof1fCJziXsdJ9wt3FYCM35AYkba667F VvZL+Vs24jTEvkhkyvKPVaeIdC4GB46hKjHKyqdPGayUJ9RhsB21V0WWHxMPUku04ywt ferg== X-Forwarded-Encrypted: i=1; AFNElJ8SVESfOpM7/w7diFkP/1gfh2QYPYteZtVXYpCcEpFm/X77AmXzIitiL5DUmuSRpPKnY+MSVCAsxhGYPvQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxaLb4S4jmKYs/w+1IXMr+30ZDfAZTBgXdjpwBaK0fE0aULimCF NWlAixADhkifK/hXsnGFtsstPMSMOaRfpZ4KT63LtYFtRbbolwzlK+IA1xpD9JPN9nk= X-Gm-Gg: Acq92OHZ/IgUznWILFlxbYdlMIxMG8pRX4zNeOFhIDDBUsmsOw1hp6MfOyzRKo+yKRh VHdIEn1F79Axlle/MMZfVMuVnAvRDS1gOvzvPJhk3plkmRwVBg0MNAUKX9GayQxOv3rIH7W3dZz lL4pEoSldzETNfecx90S3XFW1ipo7SQtD0ADCDo8xGlqAnom4pHBsqT553mvij2Ak/4N/5J+ZIf tiG1zhjCgTPOvZ7IQ9JlUaEKmXQPX92BNpuNFENptDK1iEXPwymv5Qu49/oL2DfCDDWipkzwNsj ph7ax76Dfa2K9bHAHmk1CRVy2i1wZ/SUSwAZHYbE7aRtU9ZP0XoUqI+azvOPRaPGmwlf2RSpAC/ DzlOF/lbQiwW5zbMgtcCgZ0+vd0V7r0d4PSGAlkWeblqUFtCly0ChWBFmi6/hGofM43u8iaOuzJ 1ZFI6RGaBTrsHaHNn5WW2vfCOfDXjrS8sCePWyJRX75D1iZgIvqq8nglYD/hM= X-Received: by 2002:a17:903:320d:b0:2b2:5070:8b with SMTP id d9443c01a7336-2bd270fa021mr26473735ad.1.1778677774883; Wed, 13 May 2026 06:09:34 -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.09.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:09:34 -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 22/69] mm/sparse: Drop power-of-2 size requirement for struct mem_section Date: Wed, 13 May 2026 21:04:50 +0800 Message-ID: <20260513130542.35604-23-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 struct mem_section is currently forced to a power-of-2 size so the section-to-root lookup can use a mask instead of a modulo. That requirement adds configuration-dependent padding, especially with CONFIG_PAGE_EXTENSION, just to preserve the lookup scheme. Drop the constraint and use a plain modulo for the lookup instead. The divisor is constant, so the generated code remains cheap while avoiding the extra padding. It also removes an unnecessary layout constraint from the type. Signed-off-by: Muchun Song --- include/linux/mmzone.h | 8 +------- mm/sparse.c | 2 -- scripts/gdb/linux/mm.py | 6 ++---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 40b1cea98b82..ae0271eaec05 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -2027,12 +2027,7 @@ struct mem_section { * section. (see page_ext.h about this.) */ struct page_ext *page_ext; - unsigned long pad; #endif - /* - * WARNING: mem_section must be a power-of-2 in size for the - * calculation and use of SECTION_ROOT_MASK to make sense. - */ }; #ifdef CONFIG_SPARSEMEM_EXTREME @@ -2043,7 +2038,6 @@ struct mem_section { #define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT) #define NR_SECTION_ROOTS DIV_ROUND_UP(NR_MEM_SECTIONS, SECTIONS_PER_ROOT) -#define SECTION_ROOT_MASK (SECTIONS_PER_ROOT - 1) #ifdef CONFIG_SPARSEMEM_EXTREME extern struct mem_section **mem_section; @@ -2067,7 +2061,7 @@ static inline struct mem_section *__nr_to_section(unsigned long nr) if (!mem_section || !mem_section[root]) return NULL; #endif - return &mem_section[root][nr & SECTION_ROOT_MASK]; + return &mem_section[root][nr % SECTIONS_PER_ROOT]; } extern size_t mem_section_usage_size(void); diff --git a/mm/sparse.c b/mm/sparse.c index 324213d8bdcb..9457a4d6a6fc 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -331,8 +331,6 @@ void __init sparse_init(void) unsigned long pnum_end, pnum_begin, map_count = 1; int nid_begin; - /* see include/linux/mmzone.h 'struct mem_section' definition */ - BUILD_BUG_ON(!is_power_of_2(sizeof(struct mem_section))); memblocks_present(); if (compound_info_has_mask()) { diff --git a/scripts/gdb/linux/mm.py b/scripts/gdb/linux/mm.py index dffadccbb01d..da4e8e9655a6 100644 --- a/scripts/gdb/linux/mm.py +++ b/scripts/gdb/linux/mm.py @@ -70,7 +70,6 @@ class x86_page_ops(): self.SECTIONS_PER_ROOT = 1 self.NR_SECTION_ROOTS = DIV_ROUND_UP(self.NR_MEM_SECTIONS, self.SECTIONS_PER_ROOT) - self.SECTION_ROOT_MASK = self.SECTIONS_PER_ROOT - 1 try: self.SECTION_HAS_MEM_MAP = 1 << int(gdb.parse_and_eval('SECTION_HAS_MEM_MAP_BIT')) @@ -100,7 +99,7 @@ class x86_page_ops(): def __nr_to_section(self, nr): root = self.SECTION_NR_TO_ROOT(nr) mem_section = gdb.parse_and_eval("mem_section") - return mem_section[root][nr & self.SECTION_ROOT_MASK] + return mem_section[root][nr % self.SECTIONS_PER_ROOT] def pfn_to_section_nr(self, pfn): return pfn >> self.PFN_SECTION_SHIFT @@ -249,7 +248,6 @@ class aarch64_page_ops(): self.SECTIONS_PER_ROOT = 1 self.NR_SECTION_ROOTS = DIV_ROUND_UP(self.NR_MEM_SECTIONS, self.SECTIONS_PER_ROOT) - self.SECTION_ROOT_MASK = self.SECTIONS_PER_ROOT - 1 self.SUBSECTION_SHIFT = 21 self.SEBSECTION_SIZE = 1 << self.SUBSECTION_SHIFT self.PFN_SUBSECTION_SHIFT = self.SUBSECTION_SHIFT - self.PAGE_SHIFT @@ -304,7 +302,7 @@ class aarch64_page_ops(): def __nr_to_section(self, nr): root = self.SECTION_NR_TO_ROOT(nr) mem_section = gdb.parse_and_eval("mem_section") - return mem_section[root][nr & self.SECTION_ROOT_MASK] + return mem_section[root][nr % self.SECTIONS_PER_ROOT] def pfn_to_section_nr(self, pfn): return pfn >> self.PFN_SECTION_SHIFT -- 2.54.0