From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 863E12BE7B6 for ; Fri, 12 Jun 2026 04:00:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236803; cv=none; b=P1buYY8HJZGIKwJoj45hJO0DraOjl1NawypJ6bIFKgmXSCqxdwB74EOQvaaO3+IW1c9QzoWu3eqvRCmMoYoU52r4vE6DAVodSNksuXFSe6nbAyloBK6Il9N9Tqhs4rHR6swdej+FhD85Njh1yrac0/3rfVnRqZ1LHu2ivKnw02Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236803; c=relaxed/simple; bh=6aPiz/bYlO+fhtJ24uJIYjSMlKfzNF5XDJAMjsDq2Es=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=THoGPCKnFldjEOX1ahiIQ28wNzwIfVFSOtiLd9+2M+a3HNSWv9aVjWQbUVZKvxvnRA+P2SOGG9jxVb6ecNGGSnHUeN8ZFri3BUeWD3gzGEarM3RC5e6ar8ETSZz95Jp/XnXn+hclyRJtPte2GhjsTwrP9r7e+eFVvuB/BVxrXiA= 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=WDpZmEty; arc=none smtp.client-ip=209.85.210.171 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="WDpZmEty" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8422871b42dso382588b3a.3 for ; Thu, 11 Jun 2026 21:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236802; x=1781841602; 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=yo9t8lKmmaXZlPvADJP1ElnBLtvvFqj3ytBwR1urti0=; b=WDpZmEtyNq77YaAo510b9wX21dlnM2jfGcYRtmt5IzvkcJDSGkjn1nnhQkbAz299nx E3oM9q1WVhCV3VCuvBZwf7KQn2NdDBlZX590s011uZ7CH4qrnPH03THVL0WuhG5oaSLu 8UWYoYPrNIG3zKVbVF7X9LWAB/uVJZKGtc7UG3DKpH/a6JvXfZJ28vY65DPUkd/58+mb BhyNJF1EmCMcxML9qafVsI9K0AmmeUIJNFTUvQrE6nrDrTI0icQWGoTjQxOEVC8fMfkz QVXWerpwlNj1M3gB0cn+AsDz2/GyrW1frDASd5/8yYssFnfVDGea1NnT6DIJ37h9htbt v3NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236802; x=1781841602; 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=yo9t8lKmmaXZlPvADJP1ElnBLtvvFqj3ytBwR1urti0=; b=jgxSSA1awhaxv7KmItn6gGKqiqLZOHRbdpd/5uS/hVVgWuHlpFcmdY9M0XBmtxt+7k +oD6LZXociip5ezC+Ghu+atfyvOv73apRxm2fn1CkiFvENEOTKlxNBtLaba86YkGV0DC M72XKZCzvhxq3bLRifVsAf5EqkWlfJ/OJe4ZOof/0mVRxJB+u9n4aqoJijKn2pBYTY4i a0FNsK4530Y3Nc6UcZcxnCqHgI0BMqd126rDqWpud3NVGbH5DiRenNgBJ/lVlt1IJWwh UO53MrKYjsj/VfvrjQdUIF7q8eGI7zh9a20mTYdlPmehHQu45YpChdKABNPAZrecDX3g vl9A== X-Forwarded-Encrypted: i=1; AFNElJ/L5KU6XdYEB6TWG6tygyWQvOlKiL0UW0bnjlUyEBWwU3xM97XgYXn5gl0STxQrCynIdcoORLpfZKguxUg=@vger.kernel.org X-Gm-Message-State: AOJu0Yws7FyKEHAK9E7SEIgDucGqmPQn7942hYSpc4rk12qJxnLy1Aw9 yWEGENeUkWO5hHSTAMMZV+cIoB6Npau8/kTXQNbZ4vEHSVWE+vPyvfGD0FLEknQl9g8= X-Gm-Gg: Acq92OHAuW/Nuhcc8ws5fUwhHGbjrbyWu0X2Rb3CSmGN/mKWDPKRrbh7OYvfJ+h6Kc0 emyMtMSaTNjneLUx6SNlTDTHd/8l3/X4lSIl1/YnGa5eVeT/4v6tf1OVeu4ge0o6RZKLQNDOaDg uuqBCZMh4Js1EiI+BTu7eRPuB08FxdvU0UM1ntDxfPoUPY8cLrIO7Wq4brW3JYsOurXblf9WaiY FsSP56b9k4CjJDckIklYZUDg26eAO43IJXvSKZ+qseyYe/RE8BHsr1zFGoeA/SusJHUGY2S7Brd SKo3VmZ0b4dUC4lUSq6fBKyYTvKD1pWJEAtYqL3Dp9vLtUJ22S1eJh06Tcl0Cf4fTqyk8FgYIM7 HwmnnUX98Ved+y9eB5DYDF3sVjjvIxFwQw9VNvYrZlf8w9LIK6enhwR5vSYck5G0IAF3NfF6MDx 8jisTSwLyCaHwCENgQrZqeMAwv5Akg7STST+YEijXXjes= X-Received: by 2002:a05:6a00:2396:b0:842:68d3:e29d with SMTP id d2e1a72fcca58-8434ce8a80dmr1047898b3a.36.1781236801769; Thu, 11 Jun 2026 21:00:01 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.99]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ad03fdcsm643352b3a.24.2026.06.11.20.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 21:00:01 -0700 (PDT) From: Muchun Song To: Oscar Salvador , David Hildenbrand , Andrew Morton , Madhavan Srinivasan , Michael Ellerman Cc: Muchun Song , Mike Rapoport , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Nicholas Piggin , Christophe Leroy , Ritesh Harjani , "Aneesh Kumar K . V" , linuxppc-dev@lists.ozlabs.org, Mike Kravetz , Muchun Song Subject: [PATCH v4 10/19] mm/mm_init: Remove set_pageblock_order() call from sparse_init() Date: Fri, 12 Jun 2026 11:58:54 +0800 Message-ID: <20260612035903.2468601-11-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612035903.2468601-1-songmuchun@bytedance.com> References: <20260612035903.2468601-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 free_area_init() already sets pageblock_order before sparse_init() runs for CONFIG_HUGETLB_PAGE_SIZE_VARIABLE, so sparse_init() does not need to call set_pageblock_order() again. With that call removed, set_pageblock_order() is only used in mm/mm_init.c. Make it static. Reviewed-by: Mike Rapoport (Microsoft) Signed-off-by: Muchun Song Reviewed-by: Oscar Salvador (SUSE) --- mm/internal.h | 1 - mm/mm_init.c | 4 ++-- mm/sparse.c | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index dccd4727de46..09efb9f4d126 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1435,7 +1435,6 @@ extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); -extern void set_pageblock_order(void); unsigned long reclaim_pages(struct list_head *folio_list); unsigned int reclaim_clean_pages_from_list(struct zone *zone, struct list_head *folio_list); diff --git a/mm/mm_init.c b/mm/mm_init.c index ccf494fa7586..a0eb61f9f55a 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1496,7 +1496,7 @@ static inline void setup_usemap(struct zone *zone) {} #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ -void __init set_pageblock_order(void) +static void __init set_pageblock_order(void) { unsigned int order = PAGE_BLOCK_MAX_ORDER; @@ -1522,7 +1522,7 @@ void __init set_pageblock_order(void) * include/linux/pageblock-flags.h for the values of pageblock_order based on * the kernel config */ -void __init set_pageblock_order(void) +static inline void __init set_pageblock_order(void) { } diff --git a/mm/sparse.c b/mm/sparse.c index 85557ef387c7..324213d8bdcb 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -343,9 +343,6 @@ void __init sparse_init(void) pnum_begin = first_present_section_nr(); nid_begin = sparse_early_nid(__nr_to_section(pnum_begin)); - /* Setup pageblock_order for HUGETLB_PAGE_SIZE_VARIABLE */ - set_pageblock_order(); - for_each_present_section_nr(pnum_begin + 1, pnum_end) { int nid = sparse_early_nid(__nr_to_section(pnum_end)); -- 2.54.0