Message ID | 20230920074413.1361547-1-feng.tang@intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3960447vqi; Wed, 20 Sep 2023 01:09:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZqV6bqiVxqr9Wy4+SOk5msAnBTdPreDJI8iiybvNSUomTtPpQQe8XAjJ0/6TFwRiv5SKh X-Received: by 2002:a05:6358:341a:b0:134:de8b:17f0 with SMTP id h26-20020a056358341a00b00134de8b17f0mr2436427rwd.19.1695197386512; Wed, 20 Sep 2023 01:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695197386; cv=none; d=google.com; s=arc-20160816; b=pX9ggGtIei98uXqTse6VQUBZPwqnGj8dFK1sPBcEu9askO4B68fj04IZDb+Fd3cV30 clHutKFQPwSlEQOl1TnLBW9E0MloWGLOcQDfc4/bXsjqCPbu4S38ek3Zj6rvi955AHSh /pp1RqiJPSbzxUE2N6m4UIS0Atmz3KSPT1hSnCf/UnBkv5B5GM9lmYh+LMvjbl2jgTo0 9Tjo+E7urFEtBDolWVisj+gwb4KT9tZuEBdDbb+7ETLkcfFHG/t1UEOcAlMRIDfE1tug 7Gn48ReGe18Ppqm5D9v/3AltF800M1X7KZQEucCNkpT7jhzF0shP0leboR9IR3HsU2ci 2aog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=aA+zJ22iLK4jP4Csdf14X3X/z4LJBxroN15n6AMYPqA=; fh=OlsaixR8Ac3gCiL1ibyiDDTBAqeWLx503wD4olNmYFE=; b=KYorQqPh7dySjptCjJI7tcYjASO70Fck3YwWWq/7iX3iS3R19DG5pkYC/5kH95Ca6p oSfVtyEeYJnzQ+TbslpsMnhtBGgRkqfhQ4cZqk5xmlw1i5tHV1WnX1WRP/19JS9M2U/o XHcZmTKg2ti1+/MEKU1mCt2L2uzHXS6Vezg8T2n//ZxG91r01VI/Yi2XOj6jOnVA4MJl 3o29LNYwltSF4CMA66VrGQI8x2BCRJZGhidJESNX1HnpIMf1HZPJ0gIXYTDJzZhypAQd 3t/QtATzVTpICiEx1Ve490J5FzUuzIBRYb4zUf4WmRNOFDe9y95hTWznkD2xs4kcQE+p dzYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WeSB6Qq4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id w71-20020a63824a000000b00578b499200esi2717365pgd.84.2023.09.20.01.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 01:09:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WeSB6Qq4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D129283174BA; Wed, 20 Sep 2023 00:53:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233163AbjITHxp (ORCPT <rfc822;toshivichauhan@gmail.com> + 26 others); Wed, 20 Sep 2023 03:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232073AbjITHxk (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 20 Sep 2023 03:53:40 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1E809D for <linux-kernel@vger.kernel.org>; Wed, 20 Sep 2023 00:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695196414; x=1726732414; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cyF9k8+wKohW4Ip51mWA8jLGwLnjOpNLUoQ7IQBCewg=; b=WeSB6Qq4KgBz0TYf0O0IBx7sHB9rqLyYnkFvUM5ecMzkC5xdTsrk0aWZ kJK5Ed/0Le65mS7HN/pOE7aOs7OpDNN/dv0rYsk0UZ0+ucgnBHAKuWPCV xZjWye8iD8zbf8bMjLgU9Lwz9qlXT8ybslmezfgIFFeHrgLCEc0kqQA0l MM0XWmtg+/oe8VmEOnZywdeCGxhde4hMl8zQZ1agbw0dqb5TSlZgLeyrk 9e2tVmZzvQk5o/7vryPE1n7WMjeoaTGpPRjraAh3yKd0Z4nzdTN3FGgGv FZj+exyHWEd+rr5xju/gX+icGZKQ2tKI6oRnVHJMYtYssWQKj37bgCv7X w==; X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="411095222" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="411095222" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 00:53:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="870272968" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="870272968" Received: from feng-clx.sh.intel.com ([10.238.200.228]) by orsmga004.jf.intel.com with ESMTP; 20 Sep 2023 00:53:31 -0700 From: Feng Tang <feng.tang@intel.com> To: Vlastimil Babka <vbabka@suse.cz>, Christoph Lameter <cl@linux.com>, Andrew Morton <akpm@linux-foundation.org>, Pekka Enberg <penberg@kernel.org>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Roman Gushchin <roman.gushchin@linux.dev>, Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Feng Tang <feng.tang@intel.com> Subject: [PATCH] mm/slub: add sanity check for slub_min/max_order cmdline setup Date: Wed, 20 Sep 2023 15:44:13 +0800 Message-Id: <20230920074413.1361547-1-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 20 Sep 2023 00:53:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777543294576522667 X-GMAIL-MSGID: 1777543294576522667 |
Series |
mm/slub: add sanity check for slub_min/max_order cmdline setup
|
|
Commit Message
Feng Tang
Sept. 20, 2023, 7:44 a.m. UTC
Currently there are 2 parameters could be setup from kernel cmdline:
slub_min_order and slub_max_order. It's possible that the user
configured slub_min_order is bigger than the default slub_max_order
[1], which can still take effect, as calculate_oder() will use MAX_ORDER
as a fallback to check against, but has some downsides:
* the kernel message about SLUB will be strange in showing min/max
orders:
SLUB: HWalign=64, Order=9-3, MinObjects=0, CPUs=16, Nodes=1
* in calculate_order() called by each slab, the 2 loops of
calc_slab_order() will all be meaningless due to slub_min_order
is bigger than slub_max_order
* prevent future code cleanup like in [2].
Fix it by adding some sanity check to enforce the min/max semantics.
[1]. https://lore.kernel.org/lkml/21a0ba8b-bf05-0799-7c78-2a35f8c8d52a@os.amperecomputing.com/
[2]. https://lore.kernel.org/lkml/20230908145302.30320-7-vbabka@suse.cz/
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
mm/slub.c | 6 ++++++
1 file changed, 6 insertions(+)
Comments
On 9/20/23 09:44, Feng Tang wrote: > Currently there are 2 parameters could be setup from kernel cmdline: > slub_min_order and slub_max_order. It's possible that the user > configured slub_min_order is bigger than the default slub_max_order > [1], which can still take effect, as calculate_oder() will use MAX_ORDER > as a fallback to check against, but has some downsides: > > * the kernel message about SLUB will be strange in showing min/max > orders: > > SLUB: HWalign=64, Order=9-3, MinObjects=0, CPUs=16, Nodes=1 > > * in calculate_order() called by each slab, the 2 loops of > calc_slab_order() will all be meaningless due to slub_min_order > is bigger than slub_max_order > > * prevent future code cleanup like in [2]. > > Fix it by adding some sanity check to enforce the min/max semantics. > > [1]. https://lore.kernel.org/lkml/21a0ba8b-bf05-0799-7c78-2a35f8c8d52a@os.amperecomputing.com/ > [2]. https://lore.kernel.org/lkml/20230908145302.30320-7-vbabka@suse.cz/ > Signed-off-by: Feng Tang <feng.tang@intel.com> Thanks, applied! > --- > mm/slub.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/mm/slub.c b/mm/slub.c > index f7940048138c..b36e5eb0ccb7 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4711,6 +4711,9 @@ static int __init setup_slub_min_order(char *str) > { > get_option(&str, (int *)&slub_min_order); > > + if (slub_min_order > slub_max_order) > + slub_max_order = slub_min_order; > + > return 1; > } > > @@ -4721,6 +4724,9 @@ static int __init setup_slub_max_order(char *str) > get_option(&str, (int *)&slub_max_order); > slub_max_order = min_t(unsigned int, slub_max_order, MAX_ORDER); > > + if (slub_min_order > slub_max_order) > + slub_min_order = slub_max_order; > + > return 1; > } >
diff --git a/mm/slub.c b/mm/slub.c index f7940048138c..b36e5eb0ccb7 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -4711,6 +4711,9 @@ static int __init setup_slub_min_order(char *str) { get_option(&str, (int *)&slub_min_order); + if (slub_min_order > slub_max_order) + slub_max_order = slub_min_order; + return 1; } @@ -4721,6 +4724,9 @@ static int __init setup_slub_max_order(char *str) get_option(&str, (int *)&slub_max_order); slub_max_order = min_t(unsigned int, slub_max_order, MAX_ORDER); + if (slub_min_order > slub_max_order) + slub_min_order = slub_max_order; + return 1; }