From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D6D0C2D0E8 for ; Wed, 25 Mar 2020 22:42:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2B0E2076A for ; Wed, 25 Mar 2020 22:42:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="llI5fbH7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2B0E2076A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7B8AC6B0008; Wed, 25 Mar 2020 18:42:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76A096B000A; Wed, 25 Mar 2020 18:42:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 631356B000C; Wed, 25 Mar 2020 18:42:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 49C1B6B0008 for ; Wed, 25 Mar 2020 18:42:26 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 0513E8249980 for ; Wed, 25 Mar 2020 22:42:26 +0000 (UTC) X-FDA: 76635359892.17.kiss09_1532f617a254c X-HE-Tag: kiss09_1532f617a254c X-Filterd-Recvd-Size: 7513 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Mar 2020 22:42:25 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id np9so1652928pjb.4 for ; Wed, 25 Mar 2020 15:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=32blQ6BelWdyKkuvsFFmseYgkxqvrHHDfZ4Jy+npmXg=; b=llI5fbH7jaEnN2aApIM8CfavTiQ8UjVN18ZZoPEMccXPEkh2nRieYPs4beOexWuYHS UM/90F8INodTY70v8DG9jBgXhsp8jegHgt232KmKLtYTSKCdaJIFpDVGFmLdiaYpXWta qy9v83lejzlGM9+bStyyIN0L9/fJmzJ9jP1kk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=32blQ6BelWdyKkuvsFFmseYgkxqvrHHDfZ4Jy+npmXg=; b=bLGWccWiPgb36KFDWW9QlF+rA+yAI1XPm2Q1jMFzOeNUb2SSOLG2gMAH+kqh7FEOMZ xeQ2bnl33KGnmFMowyf92zaV4iIERaERLK3cP/vJ3oYGTU3HTWd++0NnOXURU9ZKsvaO cLicV3Fpom1bYrWI0fl+siCI+HJMiAFexjVdRmpqOn1e7L0UPKa6jJPhQ7ac58gtsVBW dAYvp0RBr3LLtjcLJbG6hTt5VEyrWImLGY2qDwaWfYMEXFLTmKhK2RMHq1Jbe8MRiGCr WBTQ8uPYt/88nYfbhsYHbqVrEtRFvSH/tQewS4npF7GETQFp4NZcHfakp4OcExUi4OBJ bAMw== X-Gm-Message-State: ANhLgQ2USnfoT3x6Uq0Oc3tU7TjmdOu/Poohr8wDpzpMfiVbRBuiqcNh 1jLWLTAZN/hPIHgHKzIrufAk4w== X-Google-Smtp-Source: ADFU+vvicQ+leUWBf0Njne8GoiluUkBvqVW1zfb4wNajEaoMEv2V6R3u/c0lURO6sdKariva9/uKVw== X-Received: by 2002:a17:90a:aa83:: with SMTP id l3mr6089435pjq.5.1585176144350; Wed, 25 Mar 2020 15:42:24 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id h15sm158986pfq.10.2020.03.25.15.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 15:42:23 -0700 (PDT) Date: Wed, 25 Mar 2020 15:42:22 -0700 From: Kees Cook To: Vlastimil Babka Cc: Luis Chamberlain , Iurii Zaikin , linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-mm@kvack.org, Ivan Teterevkov , Michal Hocko , David Rientjes , Matthew Wilcox , "Eric W . Biederman" , "Guilherme G . Piccoli" Subject: Re: [RFC v2 2/2] kernel/sysctl: support handling command line aliases Message-ID: <202003251423.9138B8C8A9@keescook> References: <20200325120345.12946-1-vbabka@suse.cz> <20200325120345.12946-2-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200325120345.12946-2-vbabka@suse.cz> 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: On Wed, Mar 25, 2020 at 01:03:45PM +0100, Vlastimil Babka wrote: > We can now handle sysctl parameters on kernel command line, but historically > some parameters introduced their own command line equivalent, which we don't > want to remove for compatibility reasons. We can however convert them to the > generic infrastructure with a table translating the legacy command line > parameters to their sysctl names, and removing the one-off param handlers. > > This patch adds the support and makes the first conversion to demonstrate it, > on the (deprecated) numa_zonelist_order parameter. > > Signed-off-by: Vlastimil Babka > --- > kernel/sysctl.c | 39 +++++++++++++++++++++++++++++++++++---- > mm/page_alloc.c | 9 --------- > 2 files changed, 35 insertions(+), 13 deletions(-) > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index 18c7f5606d55..fd72853396f9 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -1971,6 +1971,22 @@ static struct ctl_table dev_table[] = { > { } > }; > > +struct sysctl_alias { > + char *kernel_param; const char ... > + char *sysctl_param; > +}; > + > +/* > + * Historically some settings had both sysctl and a command line parameter. > + * With the generic sysctl. parameter support, we can handle them at a single > + * place and only keep the historical name for compatibility. This is not meant > + * to add brand new aliases. > + */ > +static struct sysctl_alias sysctl_aliases[] = { static const ... > + {"numa_zonelist_order", "vm.numa_zonelist_order" }, > + { } > +}; > + > int __init sysctl_init(void) > { > struct ctl_table_header *hdr; > @@ -1980,6 +1996,18 @@ int __init sysctl_init(void) > return 0; > } > > +char *sysctl_find_alias(char *param) > +{ > + struct sysctl_alias *alias; > + > + for (alias = &sysctl_aliases[0]; alias->kernel_param != NULL; alias++) { > + if (strcmp(alias->kernel_param, param) == 0) > + return alias->sysctl_param; > + } > + > + return NULL; > +} > + > /* Set sysctl value passed on kernel command line. */ > int process_sysctl_arg(char *param, char *val, > const char *unused, void *arg) > @@ -1990,10 +2018,13 @@ int process_sysctl_arg(char *param, char *val, > loff_t ppos = 0; > struct ctl_table *ctl, *found = NULL; > > - if (strncmp(param, "sysctl.", sizeof("sysctl.") - 1)) > - return 0; > - > - param += sizeof("sysctl.") - 1; > + if (strncmp(param, "sysctl.", sizeof("sysctl.") - 1) == 0) { > + param += sizeof("sysctl.") - 1; > + } else { > + param = sysctl_find_alias(param); > + if (!param) > + return 0; > + } > > remaining = param; > ctl = &sysctl_base_table[0]; > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 3c4eb750a199..de7a134b1b8a 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -5460,15 +5460,6 @@ static int __parse_numa_zonelist_order(char *s) > return 0; > } > > -static __init int setup_numa_zonelist_order(char *s) > -{ > - if (!s) > - return 0; > - > - return __parse_numa_zonelist_order(s); > -} > -early_param("numa_zonelist_order", setup_numa_zonelist_order); > - > char numa_zonelist_order[] = "Node"; Nice. :) Effectively: -9 lines +1 line for the using aliasing. I think it would be worth identifying the specific requirements for a sysctl alias to be safe to use, and likely in a comment before the alias table: - boot param parsing must be identical to the sysctl parsing - temporal changes must be tolerable: i.e. early_param() runs earlier than when the sysctl-in-boot-param runs -- must the variable be set before the code's other __init functions run? - must be for a non-module code (since we don't have the dynamic support yet) As it turns out, "numa_zonelist_order" has literally no effect on anything -- it's a parsed but ignored setting: static int __parse_numa_zonelist_order(char *s) { /* * We used to support different zonlists modes but they turned * out to be just not useful. Let's keep the warning in place * if somebody still use the cmd line parameter so that we do * not fail it silently */ if (!(*s == 'd' || *s == 'D' || *s == 'n' || *s == 'N')) { pr_warn("Ignoring unsupported numa_zonelist_order value: %s\n", s); return -EINVAL; } return 0; } But anyway, do you have a way to generate a list of potential candidates? -- Kees Cook