From patchwork Wed Mar 25 12:03:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 11457597 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D7DE61392 for ; Wed, 25 Mar 2020 12:04:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A193D2078A for ; Wed, 25 Mar 2020 12:04:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A193D2078A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8D69D6B000D; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 885CE6B000E; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7744C6B0010; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0237.hostedemail.com [216.40.44.237]) by kanga.kvack.org (Postfix) with ESMTP id 60A036B000E for ; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 36F4D4FE6 for ; Wed, 25 Mar 2020 12:03:57 +0000 (UTC) X-FDA: 76633750914.07.burn84_79bcdc75bfe4e X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,vbabka@suse.cz,,RULES_HIT:30029:30034:30036:30054:30056:30070,0,RBL:195.135.220.15:@suse.cz:.lbl8.mailshell.net-62.2.6.2 64.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: burn84_79bcdc75bfe4e X-Filterd-Recvd-Size: 7883 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Mar 2020 12:03:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 55705AC1D; Wed, 25 Mar 2020 12:03:54 +0000 (UTC) From: Vlastimil Babka To: Luis Chamberlain , Kees Cook , Iurii Zaikin Cc: 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" , Vlastimil Babka Subject: [RFC v2 1/2] kernel/sysctl: support setting sysctl parameters from kernel command line Date: Wed, 25 Mar 2020 13:03:44 +0100 Message-Id: <20200325120345.12946-1-vbabka@suse.cz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: A recently proposed patch to add vm_swappiness command line parameter in addition to existing sysctl [1] made me wonder why we don't have a general support for passing sysctl parameters via command line. Googling found only somebody else wondering the same [2], but I haven't found any prior discussion with reasons why not to do this. Settings the vm_swappiness issue aside (the underlying issue might be solved in a different way), quick search of kernel-parameters.txt shows there are already some that exist as both sysctl and kernel parameter - hung_task_panic, nmi_watchdog, numa_zonelist_order, traceoff_on_warning. A general mechanism would remove the need to add more of those one-offs and might be handy in situations where configuration by e.g. /etc/sysctl.d/ is impractical. Also after 61a47c1ad3a4 ("sysctl: Remove the sysctl system call") the only way to set sysctl is via procfs, so this would eventually allow small systems to be built without CONFIG_PROC_SYSCTL and still be able to change sysctl parameters. Hence, this patch adds a new parse_args() pass that looks for parameters prefixed by 'sysctl.' and searches for them in the sysctl ctl_tables. When found, the respective proc handler is invoked. The search is just a naive linear one, to avoid using the whole procfs layer. It should be acceptable, as the cost depends on number of sysctl. parameters passed. The main limitation of avoiding the procfs layer is however that sysctls dynamically registered by register_sysctl_table() or register_sysctl_paths() cannot currently be set by this method. The processing is hooked right before the init process is loaded, as some handlers might be more complicated than simple setters and might need some subsystems to be initialized. At the moment the init process can be started and eventually execute a process writing to /proc/sys/ then it should be also fine to do that from the kernel. [1] https://lore.kernel.org/linux-doc/BL0PR02MB560167492CA4094C91589930E9FC0@BL0PR02MB5601.namprd02.prod.outlook.com/ [2] https://unix.stackexchange.com/questions/558802/how-to-set-sysctl-using-kernel-command-line-parameter Signed-off-by: Vlastimil Babka --- v2: - handle any nesting level of parameter name - add Documentation/admin-guide/kernel-parameters.txt blurb - alias support for legacy one-off parameters, with first conversion (patch 2) - still no support for dynamically registed sysctls .../admin-guide/kernel-parameters.txt | 9 +++ include/linux/sysctl.h | 1 + init/main.c | 21 +++++++ kernel/sysctl.c | 62 +++++++++++++++++++ 4 files changed, 93 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index c07815d230bc..5076e288f93f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4793,6 +4793,15 @@ switches= [HW,M68k] + sysctl.*= [KNL] + Set a sysctl parameter right before loading the init + process, as if the value was written to the respective + /proc/sys/... file. Currently a subset of sysctl + parameters is supported that is not registered + dynamically. Unrecognized parameters and invalid values + are reported in the kernel log. + Example: sysctl.vm.swappiness=40 + sysfs.deprecated=0|1 [KNL] Enable/disable old style sysfs layout for old udev on older distributions. When this option is enabled diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 02fa84493f23..62ae963a5c0c 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -206,6 +206,7 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, void unregister_sysctl_table(struct ctl_table_header * table); extern int sysctl_init(void); +int process_sysctl_arg(char *param, char *val, const char *unused, void *arg); extern struct ctl_table sysctl_mount_point[]; diff --git a/init/main.c b/init/main.c index ee4947af823f..74a094c6b8b9 100644 --- a/init/main.c +++ b/init/main.c @@ -1345,6 +1345,25 @@ void __weak free_initmem(void) free_initmem_default(POISON_FREE_INITMEM); } +static void do_sysctl_args(void) +{ +#ifdef CONFIG_SYSCTL + size_t len = strlen(saved_command_line) + 1; + char *command_line; + + command_line = kzalloc(len, GFP_KERNEL); + if (!command_line) + panic("%s: Failed to allocate %zu bytes\n", __func__, len); + + strcpy(command_line, saved_command_line); + + parse_args("Setting sysctl args", command_line, + NULL, 0, -1, -1, NULL, process_sysctl_arg); + + kfree(command_line); +#endif +} + static int __ref kernel_init(void *unused) { int ret; @@ -1367,6 +1386,8 @@ static int __ref kernel_init(void *unused) rcu_end_inkernel_boot(); + do_sysctl_args(); + if (ramdisk_execute_command) { ret = run_init_process(ramdisk_execute_command); if (!ret) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ad5b88a53c5a..18c7f5606d55 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1980,6 +1980,68 @@ int __init sysctl_init(void) return 0; } +/* Set sysctl value passed on kernel command line. */ +int process_sysctl_arg(char *param, char *val, + const char *unused, void *arg) +{ + size_t count; + char *remaining; + int err; + loff_t ppos = 0; + struct ctl_table *ctl, *found = NULL; + + if (strncmp(param, "sysctl.", sizeof("sysctl.") - 1)) + return 0; + + param += sizeof("sysctl.") - 1; + + remaining = param; + ctl = &sysctl_base_table[0]; + + while(ctl->procname != 0) { + int len = strlen(ctl->procname); + if (strncmp(remaining, ctl->procname, len)) { + ctl++; + continue; + } + if (ctl->child) { + if (remaining[len] == '.') { + remaining += len + 1; + ctl = ctl->child; + continue; + } + } else { + if (remaining[len] == '\0') { + found = ctl; + break; + } + } + ctl++; + } + + if (!found) { + pr_warn("Unknown sysctl param '%s' on command line", param); + return 0; + } + + if (!(found->mode & 0200)) { + pr_warn("Cannot set sysctl '%s=%s' from command line - not writable", + param, val); + return 0; + } + + count = strlen(val); + err = found->proc_handler(found, 1, val, &count, &ppos); + + if (err) + pr_warn("Error %d setting sysctl '%s=%s' from command line", + err, param, val); + + pr_debug("Set sysctl '%s=%s' from command line", param, val); + + return 0; +} + #endif /* CONFIG_SYSCTL */ /* From patchwork Wed Mar 25 12:03:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 11457595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 48E71913 for ; Wed, 25 Mar 2020 12:03:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 16DD120775 for ; Wed, 25 Mar 2020 12:03:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16DD120775 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 441AC6B000C; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3F1926B000D; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32E666B000E; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0165.hostedemail.com [216.40.44.165]) by kanga.kvack.org (Postfix) with ESMTP id 185B16B000C for ; Wed, 25 Mar 2020 08:03:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D3B8A180AD80F for ; Wed, 25 Mar 2020 12:03:56 +0000 (UTC) X-FDA: 76633750872.14.pear48_79b5aea28a229 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,vbabka@suse.cz,,RULES_HIT:30029:30030:30054,0,RBL:195.135.220.15:@suse.cz:.lbl8.mailshell.net-64.201.201.201 62.14.6.2,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: pear48_79b5aea28a229 X-Filterd-Recvd-Size: 4231 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Mar 2020 12:03:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 55912AC37; Wed, 25 Mar 2020 12:03:54 +0000 (UTC) From: Vlastimil Babka To: Luis Chamberlain , Kees Cook , Iurii Zaikin Cc: 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" , Vlastimil Babka Subject: [RFC v2 2/2] kernel/sysctl: support handling command line aliases Date: Wed, 25 Mar 2020 13:03:45 +0100 Message-Id: <20200325120345.12946-2-vbabka@suse.cz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200325120345.12946-1-vbabka@suse.cz> References: <20200325120345.12946-1-vbabka@suse.cz> MIME-Version: 1.0 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: 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; + 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[] = { + {"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"; /*