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=-7.0 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 0BA06C2D0E5 for ; Mon, 30 Mar 2020 17:41:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B8BA32073B for ; Mon, 30 Mar 2020 17:41:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="c588ptYq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8BA32073B 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 583BE8E0005; Mon, 30 Mar 2020 13:41:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50ECD8E0001; Mon, 30 Mar 2020 13:41:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D6CA8E0005; Mon, 30 Mar 2020 13:41:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id 1D9D28E0001 for ; Mon, 30 Mar 2020 13:41:15 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C2555181AD0A8 for ; Mon, 30 Mar 2020 17:41:14 +0000 (UTC) X-FDA: 76652744868.10.lamp06_ad2d76e7b13e X-HE-Tag: lamp06_ad2d76e7b13e X-Filterd-Recvd-Size: 6858 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Mon, 30 Mar 2020 17:41:14 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id t24so8995999pgj.7 for ; Mon, 30 Mar 2020 10:41:14 -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=9A9BFDWaBKeFJEhXv569Hcf1cU3lWJT2qzpJ99N8MCk=; b=c588ptYqwCmsWEonO588jIjpypgAAMTUL58QUCwA/bBLmIORgJNEOXJxHmUoCvXzNS qdwHBXTKTzAdmAMY7lWdJG4D14txV1wst9CUI7g7DNIHQb4vdQiWZpRkHcyxl4Wx8ifz fwzua6wxK/EOmnxeRkV1nUTb+4EQjsgGp6C9U= 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=9A9BFDWaBKeFJEhXv569Hcf1cU3lWJT2qzpJ99N8MCk=; b=Xy5KGQYM2u1lkMGS6BXFwXKeQ5+sk3fKjlnny3qAb/51urNiKD8Y855J94IX4XuXb7 M+7Fs5RxXW790IVjUup+jDD5vgT20qeKGsIR1z+0WIetRbJk1/EPdqwlKb7zFXPDUna/ IflVb04yPmTGeMdChHQRdRJFIQsHlpoO4XxuPUslDl+fn3QoHbvtccSOXY8/Yz0ydfW2 yU24uj5JgtwHNMumRIY+5woAhKLftr0/HZxm3WTVMHoHTqsfcW5Cv2l1N3xu+Hgi8JB5 kqHXsVEnvBJZrm1BacPOWR/E3JzclY1HKobzxVPLAd7vILZ617m/+jEZrLnbQIcVKu8o ND4Q== X-Gm-Message-State: ANhLgQ3w1hpaZAx44ZMFvlk9Bq51crZ6lfafT9uR0MsfR0VFTNJGoaA2 OQaHVlj1An5ra49bPPWXcZOkoQ== X-Google-Smtp-Source: ADFU+vuP1FGs+E8bbM6cuPnbi2RGCCdWSTAmb5Pnlf37InzDZNSuZ3SNT/PxgA7MaMnVZYPI0R1hRQ== X-Received: by 2002:a63:6d02:: with SMTP id i2mr13505140pgc.267.1585590073404; Mon, 30 Mar 2020 10:41:13 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id x75sm10741891pfc.161.2020.03.30.10.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 10:41:12 -0700 (PDT) Date: Mon, 30 Mar 2020 10:41:11 -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" , Alexey Dobriyan , Thomas Gleixner , Greg Kroah-Hartman , Christian Brauner Subject: Re: [PATCH 2/3] kernel/sysctl: support handling command line aliases Message-ID: <202003301041.86E6C7EB@keescook> References: <20200330115535.3215-1-vbabka@suse.cz> <20200330115535.3215-3-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200330115535.3215-3-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 Mon, Mar 30, 2020 at 01:55:34PM +0200, 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 Acked-by: Kees Cook -Kees > --- > fs/proc/proc_sysctl.c | 48 ++++++++++++++++++++++++++++++++++++------- > mm/page_alloc.c | 9 -------- > 2 files changed, 41 insertions(+), 16 deletions(-) > > diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c > index 653188c9c4c9..97eb0b552bf8 100644 > --- a/fs/proc/proc_sysctl.c > +++ b/fs/proc/proc_sysctl.c > @@ -1727,6 +1727,37 @@ int __init proc_sys_init(void) > return sysctl_init(); > } > > +struct sysctl_alias { > + const char *kernel_param; > + const 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. When adding existing aliases, consider whether > + * the possibly different moment of changing the value (e.g. from early_param > + * to the moment do_sysctl_args() is called) is an issue for the specific > + * parameter. > + */ > +static const struct sysctl_alias sysctl_aliases[] = { > + {"numa_zonelist_order", "vm.numa_zonelist_order" }, > + { } > +}; > + > +static const char *sysctl_find_alias(char *param) > +{ > + const 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. */ > static int process_sysctl_arg(char *param, char *val, > const char *unused, void *arg) > @@ -1740,15 +1771,18 @@ static int process_sysctl_arg(char *param, char *val, > loff_t pos = 0; > ssize_t wret; > > - 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; > > - if (param[0] != '/' && param[0] != '.') > - return 0; > + if (param[0] != '/' && param[0] != '.') > + return 0; > > - param++; > + param++; > + } else { > + param = (char *) sysctl_find_alias(param); > + if (!param) > + return 0; > + } > > if (!proc_mnt) { > proc_fs_type = get_fs_type("proc"); > 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"; > > /* > -- > 2.25.1 > -- Kees Cook