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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01390C43217 for ; Mon, 29 Nov 2021 22:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236804AbhK2XBg (ORCPT ); Mon, 29 Nov 2021 18:01:36 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:59130 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236654AbhK2XAa (ORCPT ); Mon, 29 Nov 2021 18:00:30 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2DF67B81649 for ; Mon, 29 Nov 2021 22:57:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18EDFC53FC7; Mon, 29 Nov 2021 22:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1638226630; bh=wLVK6JtOb3b7FVLwtn7nQgqXklNeeDlzcWas9KZDTeA=; h=Date:From:To:Subject:From; b=1PDohNPAYdU86gtETU/hn1cA8zyTXYQ998JoWLok9vlAjIIlDGSKLRtavZNWItH89 yKZ/q4tZRPcjB2Pv0L9ep1UX2Y96f19T2NXEk8SaYBke6A0kLQPBtJ+mzVukvLBtNT xHnOR+mbuvYdBtQIvOPMweFtZsQtuCCwIiPAcGFQ= Date: Mon, 29 Nov 2021 14:57:08 -0800 From: akpm@linux-foundation.org To: andriy.shevchenko@linux.intel.com, bfields@fieldses.org, crope@iki.fi, ebiederm@xmission.com, jlayton@kernel.org, keescook@chromium.org, kernel@tuxforce.de, mcgrof@kernel.org, mchehab@kernel.org, mm-commits@vger.kernel.org, nixiaoming@huawei.com, steve@sk2.org, viro@zeniv.linux.org.uk, yzaikin@google.com Subject: + fs-move-fs-stat-sysctls-to-file_tablec.patch added to -mm tree Message-ID: <20211129225708.yq7VOxyqa%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: fs: move fs stat sysctls to file_table.c has been added to the -mm tree. Its filename is fs-move-fs-stat-sysctls-to-file_tablec.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/fs-move-fs-stat-sysctls-to-file_tablec.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/fs-move-fs-stat-sysctls-to-file_tablec.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Luis Chamberlain Subject: fs: move fs stat sysctls to file_table.c kernel/sysctl.c is a kitchen sink where everyone leaves their dirty dishes, this makes it very difficult to maintain. To help with this maintenance let's start by moving sysctls to places where they actually belong. The proc sysctl maintainers do not want to know what sysctl knobs you wish to add for your own piece of code, we just care about the core logic. We can create the sysctl dynamically on early init for fs stat to help with this clutter. This dusts off the fs stat syctls knobs and puts them into where they are declared. Link: https://lkml.kernel.org/r/20211129205548.605569-3-mcgrof@kernel.org Signed-off-by: Luis Chamberlain Cc: Al Viro Cc: Andy Shevchenko Cc: Antti Palosaari Cc: Eric Biederman Cc: Iurii Zaikin Cc: "J. Bruce Fields" Cc: Jeff Layton Cc: Kees Cook Cc: Lukas Middendorf Cc: Mauro Carvalho Chehab Cc: Stephen Kitt Cc: Xiaoming Ni Signed-off-by: Andrew Morton --- fs/file_table.c | 47 +++++++++++++++++++++++++++++++++++-------- include/linux/fs.h | 3 -- kernel/sysctl.c | 25 ---------------------- 3 files changed, 39 insertions(+), 36 deletions(-) --- a/fs/file_table.c~fs-move-fs-stat-sysctls-to-file_tablec +++ a/fs/file_table.c @@ -33,7 +33,7 @@ #include "internal.h" /* sysctl tunables... */ -struct files_stat_struct files_stat = { +static struct files_stat_struct files_stat = { .max_files = NR_FILE }; @@ -75,22 +75,53 @@ unsigned long get_max_files(void) } EXPORT_SYMBOL_GPL(get_max_files); +#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS) + /* * Handle nr_files sysctl */ -#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS) -int proc_nr_files(struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) +static int proc_nr_files(struct ctl_table *table, int write, void *buffer, + size_t *lenp, loff_t *ppos) { files_stat.nr_files = get_nr_files(); return proc_doulongvec_minmax(table, write, buffer, lenp, ppos); } -#else -int proc_nr_files(struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) + +static struct ctl_table fs_stat_sysctls[] = { + { + .procname = "file-nr", + .data = &files_stat, + .maxlen = sizeof(files_stat), + .mode = 0444, + .proc_handler = proc_nr_files, + }, + { + .procname = "file-max", + .data = &files_stat.max_files, + .maxlen = sizeof(files_stat.max_files), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + .extra1 = SYSCTL_LONG_ZERO, + .extra2 = SYSCTL_LONG_MAX, + }, + { + .procname = "nr_open", + .data = &sysctl_nr_open, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &sysctl_nr_open_min, + .extra2 = &sysctl_nr_open_max, + }, + { } +}; + +static int __init init_fs_stat_sysctls(void) { - return -ENOSYS; + register_sysctl_init("fs", fs_stat_sysctls); + return 0; } +fs_initcall(init_fs_stat_sysctls); #endif static struct file *__alloc_file(int flags, const struct cred *cred) --- a/include/linux/fs.h~fs-move-fs-stat-sysctls-to-file_tablec +++ a/include/linux/fs.h @@ -78,7 +78,6 @@ extern void __init inode_init_early(void extern void __init files_init(void); extern void __init files_maxfiles_init(void); -extern struct files_stat_struct files_stat; extern unsigned long get_max_files(void); extern unsigned int sysctl_nr_open; extern int leases_enable, lease_break_time; @@ -3591,8 +3590,6 @@ ssize_t simple_attr_write(struct file *f size_t len, loff_t *ppos); struct ctl_table; -int proc_nr_files(struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos); int proc_nr_dentry(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos); int __init list_bdev_fs_names(char *buf, size_t size); --- a/kernel/sysctl.c~fs-move-fs-stat-sysctls-to-file_tablec +++ a/kernel/sysctl.c @@ -2901,31 +2901,6 @@ static struct ctl_table vm_table[] = { static struct ctl_table fs_table[] = { { - .procname = "file-nr", - .data = &files_stat, - .maxlen = sizeof(files_stat), - .mode = 0444, - .proc_handler = proc_nr_files, - }, - { - .procname = "file-max", - .data = &files_stat.max_files, - .maxlen = sizeof(files_stat.max_files), - .mode = 0644, - .proc_handler = proc_doulongvec_minmax, - .extra1 = SYSCTL_LONG_ZERO, - .extra2 = SYSCTL_LONG_MAX, - }, - { - .procname = "nr_open", - .data = &sysctl_nr_open, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = &sysctl_nr_open_min, - .extra2 = &sysctl_nr_open_max, - }, - { .procname = "dentry-state", .data = &dentry_stat, .maxlen = 6*sizeof(long), _ Patches currently in -mm which might be from mcgrof@kernel.org are zram-use-attribute_groups.patch hpet-simplify-subdirectory-registration-with-register_sysctl.patch i915-simplify-subdirectory-registration-with-register_sysctl.patch macintosh-mac_hidc-simplify-subdirectory-registration-with-register_sysctl.patch ocfs2-simplify-subdirectory-registration-with-register_sysctl.patch test_sysctl-simplify-subdirectory-registration-with-register_sysctl.patch inotify-simplify-subdirectory-registration-with-register_sysctl-fix.patch cdrom-simplify-subdirectory-registration-with-register_sysctl.patch sysctl-add-helper-to-register-a-sysctl-mount-point.patch fs-move-binfmt_misc-sysctl-to-its-own-file.patch sysctl-share-unsigned-long-const-values.patch fs-move-inode-sysctls-to-its-own-file.patch fs-move-fs-stat-sysctls-to-file_tablec.patch fs-move-dcache-sysctls-to-its-own-file.patch sysctl-move-maxolduid-as-a-sysctl-specific-const.patch fs-move-shared-sysctls-to-fs-sysctlsc.patch fs-move-locking-sysctls-where-they-are-used.patch fs-move-namei-sysctls-to-its-own-file.patch fs-move-fs-execc-sysctls-into-its-own-file.patch fs-move-pipe-sysctls-to-is-own-file.patch sysctl-add-and-use-base-directory-declarer-and-registration-helper.patch fs-move-namespace-sysctls-and-declare-fs-base-directory.patch kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases.patch