From patchwork Fri Dec 15 03:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongwei Song X-Patchwork-Id: 13493986 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 233ADC4332F for ; Fri, 15 Dec 2023 03:43:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E6198D010B; Thu, 14 Dec 2023 22:43:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 749DE8D0103; Thu, 14 Dec 2023 22:43:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 574AB8D010B; Thu, 14 Dec 2023 22:43:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 38DA58D0103 for ; Thu, 14 Dec 2023 22:43:28 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 04092A0447 for ; Fri, 15 Dec 2023 03:43:27 +0000 (UTC) X-FDA: 81567657696.05.5F5A93F Received: from pv50p00im-ztdg10021901.me.com (pv50p00im-ztdg10021901.me.com [17.58.6.55]) by imf21.hostedemail.com (Postfix) with ESMTP id 22FDD1C0012 for ; Fri, 15 Dec 2023 03:43:25 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=Tm4gEt2e; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf21.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.55 as permitted sender) smtp.mailfrom=sxwjean@me.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702611806; h=from:from:sender: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=bODnJlG+KG/EKv36cxETUCIM/X+NGX+FI+DxIHyVCJg=; b=Ea0kn0Blimq7G6T6OaJ86usx60xkYohg7avYoi9282D3LJ1dalz0jCnxofUDXuXTb0iulT j4SMJYYPYWqTT/xDAfgW4XsPF4NOIaTROgiE/bWPvW9wdr0X1usf4luSXDzAxRvUnedyxn gEopTwi6YeRY3WXoP6F8cNmsW5e+W6c= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=me.com header.s=1a1hai header.b=Tm4gEt2e; dmarc=pass (policy=quarantine) header.from=me.com; spf=pass (imf21.hostedemail.com: domain of sxwjean@me.com designates 17.58.6.55 as permitted sender) smtp.mailfrom=sxwjean@me.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702611806; a=rsa-sha256; cv=none; b=VtSlCFSBa6UdsumtjyV+sxdkYckS9aToWds5pXa/kES8dgS85QiCpRKKRAR0lGeecblQWk NoA7MLQr7NtJC38ReX/cXXz9TQeHxpiybVeh53qKIGD+Upq2/iYNiJpp552zz3VVfAO5VV Yz4ztu0iChnRUbHGZViWFzsar1rMFN4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1702611804; bh=bODnJlG+KG/EKv36cxETUCIM/X+NGX+FI+DxIHyVCJg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Tm4gEt2epNLFRKmu4dJdJWK4EaWsxTyz7iD8+xIaF3Gbt0jw/GH2WIZfHBqbpqWMF 9kaWSqKVqEEhTPzyAAdoklWOFX5NLIsybV7JM8UfW0y4z0PZ5l6zVPpRTF+q74QnyX px8SumtjYW6GyCTl4MfQioCGfG/yQxmS0ePs34JJISqOGrH3zE4bWnVfEpEot5Ih/w 2v/WWKizvhhvVayAdRyttxlDazD77N3j3SF8Nn9/VXFzdinq7jwzGeC6IizO8GB+q7 4naOrCvtOGV90tEtPQ1oOg2+/vcW2lxPYk5cOLWaYGmMj5wf3iQ0Owda583ogRTSjr zeWkgzXSurFHA== Received: from xiongwei.. (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-ztdg10021901.me.com (Postfix) with ESMTPSA id B4ACB814DA; Fri, 15 Dec 2023 03:42:58 +0000 (UTC) From: sxwjean@me.com To: vbabka@suse.cz, 42.hyeyoo@gmail.com, cl@linux.com, linux-mm@kvack.org Cc: penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, roman.gushchin@linux.dev, corbet@lwn.net, keescook@chromium.org, arnd@arndb.de, akpm@linux-foundation.org, gregkh@linuxfoundation.org, quic_jjohnson@quicinc.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Xiongwei Song Subject: [PATCH v4 2/4] mm/slub: unify all sl[au]b parameters with "slab_$param" Date: Fri, 15 Dec 2023 11:41:48 +0800 Message-Id: <20231215034150.108783-3-sxwjean@me.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231215034150.108783-1-sxwjean@me.com> References: <20231215034150.108783-1-sxwjean@me.com> MIME-Version: 1.0 X-Proofpoint-GUID: VflpYgzwl0eQjRpp7fpmWdTvV29PQhUV X-Proofpoint-ORIG-GUID: VflpYgzwl0eQjRpp7fpmWdTvV29PQhUV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-14_17,2023-12-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 spamscore=0 mlxscore=0 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2312150026 X-Rspamd-Queue-Id: 22FDD1C0012 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: xas4dkqo3g9tstdidfet9sujjwgctzam X-HE-Tag: 1702611805-96336 X-HE-Meta: U2FsdGVkX1/kk5+RNEGaZcF8rwvdIf2OMogQtGtMnnO00RFAPqtHHpuNNtiH7ykxHT35p/rR8SC4HiZmy97w1hFX0EekbJ/Nsc8rnnwG6KpTaAr9x8MHQwVPZOmxGxAtko9tFrhTaldnUzN5u0Nr9q9zrW6/H+Jdkgw24x7tNFIFTrN4O6ny2kQwqIolV/qC01qEzC7of2NDcqUMaOeqrNNHnJWELCfpiBol3H9M3xhgc2LPtS2jJ2usqUuiAKZlc6Zf7gvoUFc0xMCks/X0DRRN95EUvpPobKt8k3cL/7KeIzuikZaA0UsFR+DFfEZwpF4TP6VylyIkv7b4K7Ub2FZ3NCOyBxiKWjsRuscTEHYGjvjNd2+k8RRMLc0GoegAkh6AuNFlLTZ14UGUi1vcnLoe9ltMhOkj9rn7msy35BZkDYLfFNdX0X+kFkNgoAPBkP3RO8/4T06KZqwyeVVvTVo3Umy0D5cG7wLx6q8YxCSn7iOf9J35OS3ZQa0PQhOafipbIx4nNUK8hD3Ii/p9+o15+GilVc3lcJV1QJr5DWlSU22dWuK5eaMDr/nra8HmskkN3wJf7y4M1C5Sughy5T+GaAfv/g35WUt298Tfs3M8CJwrEmIn/QzWripk6VUy23+NJ4gYF6T+tKVPWSGzGCWdnI3Ft9cWfzkYettmdQY55p52CJvZiLXasdkuMPuvsA1H1LnXRyPZdyHHx8lt6HGLqZzZweHKZRlBOsBXC9wfht3S5NiUUFial70GVG4h9H18GQjI/fb+pCpPsv21COPDt6/bcEzE230twI9sS1qNd2kwtOkI5FiknBRJpK9zilbIN3X+/xHLDFdae75TQj/4s6Bjgm/SehoIGCIr9BdevwfzcxYwv+RLJJQciScRiflj5lBGdSBFSe40KKV28XuP9ICJsmHlBIaXwBE6R8VrGDrk09tAGE0l6hiT79Q9KXHw+t6Mx1jcey6BSGe 5/p1f7Qz dqGUP8C3/yMvkP0rtZbKVmrqfy0e2b1F8CUVO9wUnCKgjs6+d4b0/63UTtvK5wsFL2eMVS7RPc/M3KA/ov9P/fAcIbysb4igr5iL0hunJ8VNpfZBe9EDUn+5kJbKDE0uN/84eLXiPstOgXU+ErqeGC2RzT19EK3hOJz+p7etvr/JZ3XZt4HdCiA6OgFeV0baxzfzwSqqENL3Hizf5eqibDiSBy17MmpibQO3TfTwSa4++tcE7Y4U0OwXljSx9yU49gkG3cd8og/Kh4ZLXR1yxY+I3tNqKEWQPc82cCiXF/nm6GQR+Tpq8uHEJGXnS7J8YZQCKU9nSsEQMCp+Tm+HY9cPG0tmAJj7CsCbYYFY0GbIgnhPTDoL7i+m53E5szmW3wsMLRWYaz2iKZ0YXxZ67K4X0ywXy5wGW2dX3c00f9lu+QgVcuPu4PqJdmnIBVoQzuEvHudEr57z9Bs2Ad55OR6ECwfVq2KYqkL4B4QxuJDbd1Yk= 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: List-Subscribe: List-Unsubscribe: From: Xiongwei Song Since the SLAB allocator has been removed, so we can clean up the sl[au]b_$params. With only one slab allocator left, it's better to use the generic "slab" term instead of "slub" which is an implementation detail, which is pointed out by Vlastimil Babka. For more information please see [1]. Hence, we are going to use "slab_$param" as the primary prefix. This patch is changing the following slab parameters - slub_max_order - slub_min_order - slub_min_objects - slub_debug to - slab_max_order - slab_min_order - slab_min_objects - slab_debug as the primary slab parameters for all references of them in docs and comments. But this patch won't change variables and functions inside slub as we will have wider slub/slab change. Meanwhile, "slub_$params" can also be passed by command line, which is to keep backward compatibility. Also mark all "slub_$params" as legacy. Remove the separate descriptions for slub_[no]merge, append legacy tip for them at the end of descriptions of slab_[no]merge. [1] https://lore.kernel.org/linux-mm/7512b350-4317-21a0-fab3-4101bc4d8f7a@suse.cz/ Signed-off-by: Xiongwei Song Reviewed-by: Vlastimil Babka --- .../admin-guide/kernel-parameters.txt | 71 +++++++++---------- drivers/misc/lkdtm/heap.c | 2 +- mm/Kconfig.debug | 6 +- mm/slab.h | 2 +- mm/slab_common.c | 4 +- mm/slub.c | 41 ++++++----- 6 files changed, 62 insertions(+), 64 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 9f94baeb2f82..abfc0838feb9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5864,65 +5864,58 @@ simeth= [IA-64] simscsi= - slram= [HW,MTD] - - slab_merge [MM] - Enable merging of slabs with similar size when the - kernel is built without CONFIG_SLAB_MERGE_DEFAULT. - - slab_nomerge [MM] - Disable merging of slabs with similar size. May be - necessary if there is some reason to distinguish - allocs to different slabs, especially in hardened - environments where the risk of heap overflows and - layout control by attackers can usually be - frustrated by disabling merging. This will reduce - most of the exposure of a heap attack to a single - cache (risks via metadata attacks are mostly - unchanged). Debug options disable merging on their - own. - For more information see Documentation/mm/slub.rst. - - slab_max_order= [MM, SLAB] - Determines the maximum allowed order for slabs. - A high setting may cause OOMs due to memory - fragmentation. Defaults to 1 for systems with - more than 32MB of RAM, 0 otherwise. - - slub_debug[=options[,slabs][;[options[,slabs]]...] [MM, SLUB] - Enabling slub_debug allows one to determine the + slab_debug[=options[,slabs][;[options[,slabs]]...] [MM] + Enabling slab_debug allows one to determine the culprit if slab objects become corrupted. Enabling - slub_debug can create guard zones around objects and + slab_debug can create guard zones around objects and may poison objects when not in use. Also tracks the last alloc / free. For more information see Documentation/mm/slub.rst. + (slub_debug legacy name also accepted for now) - slub_max_order= [MM, SLUB] + slab_max_order= [MM] Determines the maximum allowed order for slabs. A high setting may cause OOMs due to memory fragmentation. For more information see Documentation/mm/slub.rst. + (slub_max_order legacy name also accepted for now) + + slab_merge [MM] + Enable merging of slabs with similar size when the + kernel is built without CONFIG_SLAB_MERGE_DEFAULT. + (slub_merge legacy name also accepted for now) - slub_min_objects= [MM, SLUB] + slab_min_objects= [MM] The minimum number of objects per slab. SLUB will - increase the slab order up to slub_max_order to + increase the slab order up to slab_max_order to generate a sufficiently large slab able to contain the number of objects indicated. The higher the number of objects the smaller the overhead of tracking slabs and the less frequently locks need to be acquired. For more information see Documentation/mm/slub.rst. + (slub_min_objects legacy name also accepted for now) - slub_min_order= [MM, SLUB] + slab_min_order= [MM] Determines the minimum page order for slabs. Must be - lower than slub_max_order. - For more information see Documentation/mm/slub.rst. + lower or equal to slab_max_order. For more information see + Documentation/mm/slub.rst. + (slub_min_order legacy name also accepted for now) - slub_merge [MM, SLUB] - Same with slab_merge. + slab_nomerge [MM] + Disable merging of slabs with similar size. May be + necessary if there is some reason to distinguish + allocs to different slabs, especially in hardened + environments where the risk of heap overflows and + layout control by attackers can usually be + frustrated by disabling merging. This will reduce + most of the exposure of a heap attack to a single + cache (risks via metadata attacks are mostly + unchanged). Debug options disable merging on their + own. + For more information see Documentation/mm/slub.rst. + (slub_nomerge legacy name also accepted for now) - slub_nomerge [MM, SLUB] - Same with slab_nomerge. This is supported for legacy. - See slab_nomerge for more information. + slram= [HW,MTD] smart2= [HW] Format: [,[,...,]] diff --git a/drivers/misc/lkdtm/heap.c b/drivers/misc/lkdtm/heap.c index 0ce4cbf6abda..076ca9b225de 100644 --- a/drivers/misc/lkdtm/heap.c +++ b/drivers/misc/lkdtm/heap.c @@ -47,7 +47,7 @@ static void lkdtm_VMALLOC_LINEAR_OVERFLOW(void) * correctly. * * This should get caught by either memory tagging, KASan, or by using - * CONFIG_SLUB_DEBUG=y and slub_debug=ZF (or CONFIG_SLUB_DEBUG_ON=y). + * CONFIG_SLUB_DEBUG=y and slab_debug=ZF (or CONFIG_SLUB_DEBUG_ON=y). */ static void lkdtm_SLAB_LINEAR_OVERFLOW(void) { diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index 321ab379994f..afc72fde0f03 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug @@ -64,11 +64,11 @@ config SLUB_DEBUG_ON help Boot with debugging on by default. SLUB boots by default with the runtime debug capabilities switched off. Enabling this is - equivalent to specifying the "slub_debug" parameter on boot. + equivalent to specifying the "slab_debug" parameter on boot. There is no support for more fine grained debug control like - possible with slub_debug=xxx. SLUB debugging may be switched + possible with slab_debug=xxx. SLUB debugging may be switched off in a kernel built with CONFIG_SLUB_DEBUG_ON by specifying - "slub_debug=-". + "slab_debug=-". config PAGE_OWNER bool "Track page owner" diff --git a/mm/slab.h b/mm/slab.h index 54deeb0428c6..f7df6d701c5b 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -528,7 +528,7 @@ static inline bool __slub_debug_enabled(void) #endif /* - * Returns true if any of the specified slub_debug flags is enabled for the + * Returns true if any of the specified slab_debug flags is enabled for the * cache. Use only for flags parsed by setup_slub_debug() as it also enables * the static key. */ diff --git a/mm/slab_common.c b/mm/slab_common.c index 238293b1dbe1..230ef7cc3467 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -282,7 +282,7 @@ kmem_cache_create_usercopy(const char *name, #ifdef CONFIG_SLUB_DEBUG /* - * If no slub_debug was enabled globally, the static key is not yet + * If no slab_debug was enabled globally, the static key is not yet * enabled by setup_slub_debug(). Enable it if the cache is being * created with any of the debugging flags passed explicitly. * It's also possible that this is the first cache created with @@ -766,7 +766,7 @@ EXPORT_SYMBOL(kmalloc_size_roundup); } /* - * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. + * kmalloc_info[] is to make slab_debug=,kmalloc-xx option work at boot time. * kmalloc_index() supports up to 2^21=2MB, so the final entry of the table is * kmalloc-2M. */ diff --git a/mm/slub.c b/mm/slub.c index 02d5299810df..842379a17709 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -295,7 +295,7 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s) /* * Debugging flags that require metadata to be stored in the slab. These get - * disabled when slub_debug=O is used and a cache's min order increases with + * disabled when slab_debug=O is used and a cache's min order increases with * metadata. */ #define DEBUG_METADATA_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER) @@ -1605,7 +1605,7 @@ static inline int free_consistency_checks(struct kmem_cache *s, } /* - * Parse a block of slub_debug options. Blocks are delimited by ';' + * Parse a block of slab_debug options. Blocks are delimited by ';' * * @str: start of block * @flags: returns parsed flags, or DEBUG_DEFAULT_FLAGS if none specified @@ -1666,7 +1666,7 @@ parse_slub_debug_flags(char *str, slab_flags_t *flags, char **slabs, bool init) break; default: if (init) - pr_err("slub_debug option '%c' unknown. skipped\n", *str); + pr_err("slab_debug option '%c' unknown. skipped\n", *str); } } check_slabs: @@ -1725,7 +1725,7 @@ static int __init setup_slub_debug(char *str) /* * For backwards compatibility, a single list of flags with list of * slabs means debugging is only changed for those slabs, so the global - * slub_debug should be unchanged (0 or DEBUG_DEFAULT_FLAGS, depending + * slab_debug should be unchanged (0 or DEBUG_DEFAULT_FLAGS, depending * on CONFIG_SLUB_DEBUG_ON). We can extended that to multiple lists as * long as there is no option specifying flags without a slab list. */ @@ -1749,7 +1749,8 @@ static int __init setup_slub_debug(char *str) return 1; } -__setup("slub_debug", setup_slub_debug); +__setup("slab_debug", setup_slub_debug); +__setup_param("slub_debug", slub_debug, setup_slub_debug, 0); /* * kmem_cache_flags - apply debugging options to the cache @@ -1759,7 +1760,7 @@ __setup("slub_debug", setup_slub_debug); * * Debug option(s) are applied to @flags. In addition to the debug * option(s), if a slab name (or multiple) is specified i.e. - * slub_debug=,, ... + * slab_debug=,, ... * then only the select slabs will receive the debug option(s). */ slab_flags_t kmem_cache_flags(unsigned int object_size, @@ -3256,7 +3257,7 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid) oo_order(s->min)); if (oo_order(s->min) > get_order(s->object_size)) - pr_warn(" %s debugging increased min order, use slub_debug=O to disable.\n", + pr_warn(" %s debugging increased min order, use slab_debug=O to disable.\n", s->name); for_each_kmem_cache_node(s, node, n) { @@ -3785,11 +3786,11 @@ void slab_post_alloc_hook(struct kmem_cache *s, struct obj_cgroup *objcg, zero_size = orig_size; /* - * When slub_debug is enabled, avoid memory initialization integrated + * When slab_debug is enabled, avoid memory initialization integrated * into KASAN and instead zero out the memory via the memset below with * the proper size. Otherwise, KASAN might overwrite SLUB redzones and * cause false-positive reports. This does not lead to a performance - * penalty on production builds, as slub_debug is not intended to be + * penalty on production builds, as slab_debug is not intended to be * enabled there. */ if (__slub_debug_enabled()) @@ -4695,8 +4696,8 @@ static unsigned int slub_min_objects; * activity on the partial lists which requires taking the list_lock. This is * less a concern for large slabs though which are rarely used. * - * slub_max_order specifies the order where we begin to stop considering the - * number of objects in a slab as critical. If we reach slub_max_order then + * slab_max_order specifies the order where we begin to stop considering the + * number of objects in a slab as critical. If we reach slab_max_order then * we try to keep the page order as low as possible. So we accept more waste * of space in favor of a small page order. * @@ -4763,14 +4764,14 @@ static inline int calculate_order(unsigned int size) * and backing off gradually. * * We start with accepting at most 1/16 waste and try to find the - * smallest order from min_objects-derived/slub_min_order up to - * slub_max_order that will satisfy the constraint. Note that increasing + * smallest order from min_objects-derived/slab_min_order up to + * slab_max_order that will satisfy the constraint. Note that increasing * the order can only result in same or less fractional waste, not more. * * If that fails, we increase the acceptable fraction of waste and try * again. The last iteration with fraction of 1/2 would effectively * accept any waste and give us the order determined by min_objects, as - * long as at least single object fits within slub_max_order. + * long as at least single object fits within slab_max_order. */ for (unsigned int fraction = 16; fraction > 1; fraction /= 2) { order = calc_slab_order(size, min_order, slub_max_order, @@ -4780,7 +4781,7 @@ static inline int calculate_order(unsigned int size) } /* - * Doh this slab cannot be placed using slub_max_order. + * Doh this slab cannot be placed using slab_max_order. */ order = get_order(size); if (order <= MAX_ORDER) @@ -5306,7 +5307,9 @@ static int __init setup_slub_min_order(char *str) return 1; } -__setup("slub_min_order=", setup_slub_min_order); +__setup("slab_min_order=", setup_slub_min_order); +__setup_param("slub_min_order=", slub_min_order, setup_slub_min_order, 0); + static int __init setup_slub_max_order(char *str) { @@ -5319,7 +5322,8 @@ static int __init setup_slub_max_order(char *str) return 1; } -__setup("slub_max_order=", setup_slub_max_order); +__setup("slab_max_order=", setup_slub_max_order); +__setup_param("slub_max_order=", slub_max_order, setup_slub_max_order, 0); static int __init setup_slub_min_objects(char *str) { @@ -5328,7 +5332,8 @@ static int __init setup_slub_min_objects(char *str) return 1; } -__setup("slub_min_objects=", setup_slub_min_objects); +__setup("slab_min_objects=", setup_slub_min_objects); +__setup_param("slub_min_objects=", slub_min_objects, setup_slub_min_objects, 0); #ifdef CONFIG_HARDENED_USERCOPY /*