From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A47C3BA42 for ; Wed, 4 Jun 2025 21:27:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749072468; cv=none; b=ayJ7JZyAsOf+vLb+6Gt2Tm7MsmUh0DXw33Ntzqs5jBUpbNr0dwZCwj69n2bqXfpS1DoZBJ2c0ETFT4boBcgp0ecSxc5xw31GPGIC9LRhKJNA/dVmAOE8esxVCLVTsfEFmQbOHiHoOmxocl41ro/f7W0siviu5DZP1MZvxHQZZkc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749072468; c=relaxed/simple; bh=AgmYbI8WbcNApCDq+CNDw1Esmdj7ArK3g8GLJTuAVWM=; h=Date:To:From:Subject:Message-Id; b=frubFLLi/cFLEckQcU6IkAOoWsW/6YT7Iiw/RTI0hWfySjQCyK/3bhhqovI5J+p47fG3XDeOiRVZFZ/LAuwjQKfxogwyL2u/QC5fRNsCcEt/qXVmUCkcTAv0wfRFEJp+V05ZbqQQXks/DABCKVl5nrZg3X3CBRU8yy1qLic+Xgw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=Ii5FZ9Yu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="Ii5FZ9Yu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB337C4CEE4; Wed, 4 Jun 2025 21:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1749072467; bh=AgmYbI8WbcNApCDq+CNDw1Esmdj7ArK3g8GLJTuAVWM=; h=Date:To:From:Subject:From; b=Ii5FZ9YuQBNgrl42fWZUp4CMvbhcfGX1+zihcQ2kXP80bAKAsQIr2uBqP6xX1xYFu wEfJ7zYYVN1xpCdrcdK/fSIYwv9q+kHqMiJGmFVS7BW+9pXy8Pt+gd/kJaQo45E+Md IYp/gCPoSSA0ApYZZSyR6ZISxieVx8p6kurC/OL0= Date: Wed, 04 Jun 2025 14:27:47 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,tjmercier@google.com,surenb@google.com,rppt@kernel.org,osalvador@suse.de,minchan@kernel.org,mhocko@suse.com,masahiroy@kernel.org,lorenzo.stoakes@oracle.com,liam.howlett@oracle.com,kaleshsingh@google.com,jyescas@google.com,isaacmanjarres@google.com,david@redhat.com,anshuman.khandual@arm.com,ziy@nvidia.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-rename-config_page_block_order-to-config_page_block_order_ceil.patch removed from -mm tree Message-Id: <20250604212747.DB337C4CEE4@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm: rename CONFIG_PAGE_BLOCK_ORDER to CONFIG_PAGE_BLOCK_ORDER_CEIL has been removed from the -mm tree. Its filename was mm-rename-config_page_block_order-to-config_page_block_order_ceil.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Zi Yan Subject: mm: rename CONFIG_PAGE_BLOCK_ORDER to CONFIG_PAGE_BLOCK_ORDER_CEIL Date: Tue, 3 Jun 2025 11:48:43 -0400 The config is in fact an additional upper limit of pageblock_order, so rename it to avoid confusion. [ziy@nvidia.com: set_pageblock_order(): use PAGE_BLOCK_ORDER_CEIL] Link: https://lkml.kernel.org/r/EF1B1979-4D72-472D-8655-6B21AD26AA58@nvidia.com Link: https://lkml.kernel.org/r/20250603154843.1565239-1-ziy@nvidia.com Fixes: e13e7922d034 ("mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order") Signed-off-by: Zi Yan Acked-by: David Hildenbrand Acked-by: Juan Yescas Cc: Anshuman Khandual Reviewed-by: Oscar Salvador Cc: "Isaac J. Manjarres" Cc: Kalesh Singh Cc: Liam Howlett Cc: Lorenzo Stoakes Cc: Masahiro Yamada Cc: Michal Hocko Cc: Mike Rapoport Cc: Minchan Kim Cc: Suren Baghdasaryan Cc: T.J. Mercier Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 14 +++++++------- include/linux/pageblock-flags.h | 8 ++++---- mm/Kconfig | 15 ++++++++------- mm/mm_init.c | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) --- a/include/linux/mmzone.h~mm-rename-config_page_block_order-to-config_page_block_order_ceil +++ a/include/linux/mmzone.h @@ -38,19 +38,19 @@ #define NR_PAGE_ORDERS (MAX_PAGE_ORDER + 1) /* Defines the order for the number of pages that have a migrate type. */ -#ifndef CONFIG_PAGE_BLOCK_ORDER -#define PAGE_BLOCK_ORDER MAX_PAGE_ORDER +#ifndef CONFIG_PAGE_BLOCK_ORDER_CEIL +#define PAGE_BLOCK_ORDER_CEIL MAX_PAGE_ORDER #else -#define PAGE_BLOCK_ORDER CONFIG_PAGE_BLOCK_ORDER -#endif /* CONFIG_PAGE_BLOCK_ORDER */ +#define PAGE_BLOCK_ORDER_CEIL CONFIG_PAGE_BLOCK_ORDER_CEIL +#endif /* CONFIG_PAGE_BLOCK_ORDER_CEIL */ /* * The MAX_PAGE_ORDER, which defines the max order of pages to be allocated - * by the buddy allocator, has to be larger or equal to the PAGE_BLOCK_ORDER, + * by the buddy allocator, has to be larger or equal to the PAGE_BLOCK_ORDER_CEIL, * which defines the order for the number of pages that can have a migrate type */ -#if (PAGE_BLOCK_ORDER > MAX_PAGE_ORDER) -#error MAX_PAGE_ORDER must be >= PAGE_BLOCK_ORDER +#if (PAGE_BLOCK_ORDER_CEIL > MAX_PAGE_ORDER) +#error MAX_PAGE_ORDER must be >= PAGE_BLOCK_ORDER_CEIL #endif /* --- a/include/linux/pageblock-flags.h~mm-rename-config_page_block_order-to-config_page_block_order_ceil +++ a/include/linux/pageblock-flags.h @@ -41,18 +41,18 @@ extern unsigned int pageblock_order; * Huge pages are a constant size, but don't exceed the maximum allocation * granularity. */ -#define pageblock_order MIN_T(unsigned int, HUGETLB_PAGE_ORDER, PAGE_BLOCK_ORDER) +#define pageblock_order MIN_T(unsigned int, HUGETLB_PAGE_ORDER, PAGE_BLOCK_ORDER_CEIL) #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */ #elif defined(CONFIG_TRANSPARENT_HUGEPAGE) -#define pageblock_order MIN_T(unsigned int, HPAGE_PMD_ORDER, PAGE_BLOCK_ORDER) +#define pageblock_order MIN_T(unsigned int, HPAGE_PMD_ORDER, PAGE_BLOCK_ORDER_CEIL) #else /* CONFIG_TRANSPARENT_HUGEPAGE */ -/* If huge pages are not used, group by PAGE_BLOCK_ORDER */ -#define pageblock_order PAGE_BLOCK_ORDER +/* If huge pages are not used, group by PAGE_BLOCK_ORDER_CEIL */ +#define pageblock_order PAGE_BLOCK_ORDER_CEIL #endif /* CONFIG_HUGETLB_PAGE */ --- a/mm/Kconfig~mm-rename-config_page_block_order-to-config_page_block_order_ceil +++ a/mm/Kconfig @@ -1005,8 +1005,8 @@ config ARCH_FORCE_MAX_ORDER # the default page block order is MAX_PAGE_ORDER (10) as per # include/linux/mmzone.h. # -config PAGE_BLOCK_ORDER - int "Page Block Order" +config PAGE_BLOCK_ORDER_CEIL + int "Page Block Order Upper Limit" range 1 10 if ARCH_FORCE_MAX_ORDER = 0 default 10 if ARCH_FORCE_MAX_ORDER = 0 range 1 ARCH_FORCE_MAX_ORDER if ARCH_FORCE_MAX_ORDER != 0 @@ -1014,12 +1014,13 @@ config PAGE_BLOCK_ORDER help The page block order refers to the power of two number of pages that are physically contiguous and can have a migrate type associated to - them. The maximum size of the page block order is limited by - ARCH_FORCE_MAX_ORDER. + them. The maximum size of the page block order is at least limited by + ARCH_FORCE_MAX_ORDER/MAX_PAGE_ORDER. - This config allows overriding the default page block order when the - page block order is required to be smaller than ARCH_FORCE_MAX_ORDER - or MAX_PAGE_ORDER. + This config adds a new upper limit of default page block + order when the page block order is required to be smaller than + ARCH_FORCE_MAX_ORDER/MAX_PAGE_ORDER or other limits + (see include/linux/pageblock-flags.h for details). Reducing pageblock order can negatively impact THP generation success rate. If your workloads uses THP heavily, please use this --- a/mm/mm_init.c~mm-rename-config_page_block_order-to-config_page_block_order_ceil +++ a/mm/mm_init.c @@ -1509,7 +1509,7 @@ static inline void setup_usemap(struct z /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ void __init set_pageblock_order(void) { - unsigned int order = PAGE_BLOCK_ORDER; + unsigned int order = PAGE_BLOCK_ORDER_CEIL; /* Check that pageblock_nr_pages has not already been setup */ if (pageblock_order) _ Patches currently in -mm which might be from ziy@nvidia.com are