From patchwork Thu Sep 22 01:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 12984364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73A9EC32771 for ; Thu, 22 Sep 2022 01:13:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B03FC80012; Wed, 21 Sep 2022 21:13:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9ED6680011; Wed, 21 Sep 2022 21:13:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7820680014; Wed, 21 Sep 2022 21:13:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5B27E80012 for ; Wed, 21 Sep 2022 21:13:05 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2A75A141340 for ; Thu, 22 Sep 2022 01:13:05 +0000 (UTC) X-FDA: 79937947530.30.21E5E0C Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by imf28.hostedemail.com (Postfix) with ESMTP id D3534C000C for ; Thu, 22 Sep 2022 01:13:04 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 7D5F75C0183; Wed, 21 Sep 2022 21:13:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 21 Sep 2022 21:13:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to :reply-to:sender:subject:subject:to:to; s=fm2; t=1663809184; x= 1663895584; bh=n1NV+B8lEl76VhNv8qB8eN5BjUrGYH/BezDur0ycako=; b=b UP0mNGn2ZplCVwYt69z9QrLForMHyZpc08pTqLg2Aw6guz+8obxUA/EoERGA1RQC hjwuZieh+8jI9wuWkEtiCJCkWzQzRTB+Yp+pVatRY+AjVC+pyr3SywxBKWyvfdEj 1EzU1T4sEpt3i5OeVVH11HenwHZBJo+f/9b06LxRxxcKdN3ugFf+qWzdj5OT6Z8W hGKvlyShRc14mOM/UuZFFAi2op3tFKMPjCWxDlLF6cS4Qh94pQyYxJy47F1Q0BtB VTyPuvBwiVgWww9HUilg+a3v35ypl/JgOIsevwTkzyJXLxCFgMEYXOqFP5TOyZ4t JlRkadme+j05RDQb6C96Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1663809184; x=1663895584; bh=n 1NV+B8lEl76VhNv8qB8eN5BjUrGYH/BezDur0ycako=; b=sjGJ6lLShwHUT0Bt9 FAsdJ8gWTNntTkulo2MynpeCmp+QJzBKnbg56mjUBrHnhMg8dUTnpcgWqTayB+vo 88B8jaybDlKcFQr1is4tLGveHxMyhNNA9RNtO3/aE6YFSqF18axXlvAnKBZ47xHl MECAfaBLyDtrNawWUyQrpG+tPFq0n69rLaVlc+jq7Aowo5PSZOULACNogRhbFzHI DP+nTCfF6jexxgj2xp7RX5I5RW+4cMpA3gP7mCJTV8aLwTSukKoB+fbR41W/HdWR L5ZSDbZqcFckigantdBHBhk261CKkwJojDe8oYKNfrJbCIMA57gcr2dhMzOFZksq IqXBw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefvddggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrggfgsedtqhertdertddtnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeegge ehudfgudduvdelheehteegledtteeiveeuhfffveekhfevueefieeijeegvdenucevlhhu shhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 21 Sep 2022 21:13:03 -0400 (EDT) From: Zi Yan To: linux-mm@kvack.org Cc: Zi Yan , David Hildenbrand , Matthew Wilcox , Vlastimil Babka , "Kirill A . Shutemov" , Mike Kravetz , John Hubbard , Yang Shi , David Rientjes , James Houghton , Mike Rapoport , Muchun Song , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH v1 12/12] mm: make MAX_ORDER a kernel boot time parameter. Date: Wed, 21 Sep 2022 21:12:52 -0400 Message-Id: <20220922011252.2266780-13-zi.yan@sent.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220922011252.2266780-1-zi.yan@sent.com> References: <20220922011252.2266780-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663809184; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=n1NV+B8lEl76VhNv8qB8eN5BjUrGYH/BezDur0ycako=; b=0k/Uy3pSbwGv/Ta2weQFhv0Ecl0oMKK+xZo7wF5Fxx8Z3btHqRovDtLNFwAtMQhR8pnCIj oJKxS6geumD9mFDVu+OQUFrxUCwbuEbxg5REfcVmwfQHnQvA/bnhJrOR6eBA5h5+XUvkei LqiG7OU1xM3EcsrVLqvYrBzT8ZFA85k= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b="b UP0mNG"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=sjGJ6lLS; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf28.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.26 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663809184; a=rsa-sha256; cv=none; b=nzSolZTwKaALVMdWp35g+w3Br1dNQWT/+HaMAC40Ch9lxFqQplqXHP9AW5VmYjEXircYiv gxeH2w9NSWDjH/9zOWyD/WHfeYfTyFpOseujecEXBRYtYqSm5/OraKU5Ze8kmW+L+N6uCl 9ezis7Eqe3K1+ZUISKsM3eH+1126m5M= X-Rspam-User: X-Stat-Signature: ysqdu9xms8nzjd63i4fhdbrj39rmwjx6 X-Rspamd-Queue-Id: D3534C000C Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b="b UP0mNG"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=sjGJ6lLS; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf28.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.26 as permitted sender) smtp.mailfrom=zi.yan@sent.com X-Rspamd-Server: rspam08 X-HE-Tag: 1663809184-555645 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Zi Yan With the new buddy_alloc_max_order, users can specify larger MAX_ORDER than set in CONFIG_ARCH_MAX_ORDER or CONFIG_SET_MAX_ORDER. It can be set any value >= CONFIG_ARCH_MAX_ORDER or CONFIG_SET_MAX_ORDER, but < 256 (limited by vmscan scan_control and per-cpu free page list). Signed-off-by: Zi Yan Cc: Jonathan Corbet Cc: "Paul E. McKenney" Cc: Randy Dunlap Cc: Thomas Gleixner Cc: Vlastimil Babka Cc: linux-doc@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- .../admin-guide/kernel-parameters.txt | 5 +++ include/linux/mmzone.h | 10 +++++- mm/Kconfig | 13 ++++++++ mm/page_alloc.c | 31 +++++++++++++++++++ mm/vmscan.c | 1 - 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 5f633844daac..eb0dd8a78205 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -494,6 +494,11 @@ bttv.pll= See Documentation/admin-guide/media/bttv.rst bttv.tuner= + buddy_alloc_max_order= [KNL] This parameter adjusts the size of largest + pages that can be allocated from kernel buddy allocator. The largest + page size is 2^buddy_alloc_max_order * PAGE_SIZE. + Format: integer + bulk_remove=off [PPC] This parameter disables the use of the pSeries firmware feature for flushing multiple hpte entries at a time. diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 19fca391f635..5669191d15dc 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -35,6 +35,14 @@ #define MIN_MAX_ORDER MAX_ORDER #endif +/* remap MAX_ORDER to buddy_alloc_max_order for boot time adjustment */ +#ifdef CONFIG_BOOT_TIME_MAX_ORDER +/* Defined in mm/page_alloc.c */ +extern int buddy_alloc_max_order; +#undef MAX_ORDER +#define MAX_ORDER buddy_alloc_max_order +#endif /* CONFIG_BOOT_TIME_MAX_ORDER */ + #define MAX_ORDER_NR_PAGES (1 << MAX_ORDER) /* @@ -1600,7 +1608,7 @@ static inline bool movable_only_nodes(nodemask_t *nodes) * contiguous, thus > section size pages can be allocated and manipulated * without worrying about non-contiguous struct page. */ -#ifndef CONFIG_SET_MAX_ORDER +#if !defined(CONFIG_SET_MAX_ORDER) && !defined(CONFIG_BOOT_TIME_MAX_ORDER) #if (MAX_ORDER + PAGE_SHIFT) > SECTION_SIZE_BITS #error Allocator MAX_ORDER exceeds SECTION_SIZE #endif diff --git a/mm/Kconfig b/mm/Kconfig index 9c7280acd528..3e6b61ba9fec 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -449,6 +449,19 @@ config SET_MAX_ORDER increase this value. A value of 10 means that the largest free memory block is 2^10 pages. +config BOOT_TIME_MAX_ORDER + bool "Set maximum order of buddy allocator at boot time" + depends on SPARSEMEM_VMEMMAP && (ARCH_FORCE_MAX_ORDER != 0 || SET_MAX_ORDER != 0) + help + It enables users to set the maximum order of buddy allocator at system + boot time instead of a static MACRO set at compilation time. Systems with + a lot of memory might want to allocate large pages whereas it is much + less feasible and desirable for systems with less memory. This option + allows different systems to control the largest page they want to + allocate. By default, MAX_ORDER will be set to ARCH_FORCE_MAX_ORDER or + SET_MAX_ORDER, whichever is non-zero, when the boot time parameter is not + set. The maximum of MAX_ORDER is currently limited at 256. + config HAVE_MEMBLOCK_PHYS_MAP bool diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ba7c284ba3d3..9eacdf3a37c4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -9720,3 +9720,34 @@ bool has_managed_dma(void) return false; } #endif /* CONFIG_ZONE_DMA */ + +#ifdef CONFIG_BOOT_TIME_MAX_ORDER +int buddy_alloc_max_order = MIN_MAX_ORDER; +EXPORT_SYMBOL(buddy_alloc_max_order); + +static int __init buddy_alloc_set(char *val) +{ + int ret; + unsigned long max_order; + + ret = kstrtoul(val, 10, &max_order); + + if (ret < 0) + return -EINVAL; + + /* + * max_order is also limited at below locations: + * 1. scan_control in mm/vmscan.c uses s8 field for order, max_order cannot + * be bigger than S8_MAX before the field is changed. + * 2. free_pcppages_bulk has max_order upper limit. + */ + if (max_order > MIN_MAX_ORDER && max_order <= S8_MAX) + buddy_alloc_max_order = max_order; + else + buddy_alloc_max_order = MIN_MAX_ORDER; + + return 0; +} + +early_param("buddy_alloc_max_order", buddy_alloc_set); +#endif /* CONFIG_BOOT_TIME_MAX_ORDER */ diff --git a/mm/vmscan.c b/mm/vmscan.c index a8fd6300fa7e..009632243398 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6623,7 +6623,6 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order, * scan_control uses s8 fields for order, priority, and reclaim_idx. * Confirm they are large enough for max values. */ - BUILD_BUG_ON(MAX_ORDER > S8_MAX); BUILD_BUG_ON(DEF_PRIORITY > S8_MAX); BUILD_BUG_ON(MAX_NR_ZONES > S8_MAX);