sysctl: 4th set of kernel/sysctl cleanups
Subsystems (5)
cover sysctl: 4th set of kernel/sysctl cleanups
This is the 4th set of kernel/sysctl.c cleanups. These are being pushed out for review for the first time. This is trying to move all filesystem sysctl knobs out from kernel/sysctl.c to where they are actually being used.
This is slimming down the fs uses of kernel/sysctl.c to the point that the next step is to just get rid of the fs base directory for it and move that elsehwere, so that next patch series starts dealing with that to demo how we can end up cleaning up a full base directory from kernel/sysctl.c, one at a time.
Luis Chamberlain (9):
fs: move inode sysctls to its own file
fs: move fs stat sysctls to file_table.c
fs: move dcache sysctls to its own file
sysctl: move maxolduid as a sysctl specific const
fs: move shared sysctls to fs/sysctls.c
fs: move locking sysctls where they are used
fs: move namei sysctls to its own file
fs: move fs/exec.c sysctls into its own file
fs: move pipe sysctls to is own file
fs/Makefile | 1 + fs/dcache.c | 32 ++++- fs/exec.c | 90 ++++++++++++++ fs/file_table.c | 47 +++++-- fs/inode.c | 31 ++++- fs/locks.c | 34 ++++- fs/namei.c | 58 ++++++++- fs/pipe.c | 64 +++++++++- fs/proc/proc_sysctl.c | 2 +- fs/sysctls.c | 38 ++++++ include/linux/dcache.h | 10 -- include/linux/fs.h | 13 -- include/linux/pipe_fs_i.h | 4 - include/linux/sysctl.h | 9 ++ kernel/sysctl.c | 255 ++------------------------------------ 15 files changed, 390 insertions(+), 298 deletions(-) create mode 100644 fs/sysctls.c
Signature · 1 line
2.33.0
PATCH 1/9 fs: move inode sysctls to its own file
The 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.
So move the inode sysctls to its own file. Since we are no longer using this outside of fs/ remove the extern declaration of its respective proc helper.
We use early_initcall() as it is the earliest we can use.
--- fs/inode.c | 31 ++++++++++++++++++++++++++++--- include/linux/fs.h | 3 --- kernel/sysctl.c | 14 -------------- 3 files changed, 28 insertions(+), 20 deletions(-)
fs/inode.c +28 -3
@@ -70,7 +70,7 @@ EXPORT_SYMBOL(empty_aops);/* * Statistics gathering.. */ -struct inodes_stat_t inodes_stat; +static struct inodes_stat_t inodes_stat; static DEFINE_PER_CPU(unsigned long, nr_inodes); static DEFINE_PER_CPU(unsigned long, nr_unused);
@@ -106,13 +106,38 @@ long get_nr_dirty_inodes(void)* Handle nr_inode sysctl */ #ifdef CONFIG_SYSCTL -int proc_nr_inodes (struct ctl_table *table,int write, -void *buffer,size_t *lenp,loff_t *ppos) +static int proc_nr_inodes (struct ctl_table *table,int write,void *buffer, +size_t *lenp,loff_t *ppos) { inodes_stat.nr_inodes =get_nr_inodes (); inodes_stat.nr_unused =get_nr_inodes_unused ();return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); } + +static struct ctl_table inodes_sysctls[] = { + { + .procname ="inode-nr" , + .data = &inodes_stat, + .maxlen =2 *sizeof (long ), + .mode =0444 , + .proc_handler = proc_nr_inodes, + }, + { + .procname ="inode-state" , + .data = &inodes_stat, + .maxlen =7 *sizeof (long ), + .mode =0444 , + .proc_handler = proc_nr_inodes, + }, + { } +}; + +static int __init init_fs_inode_sysctls (void ) +{ +register_sysctl_init ("fs" , inodes_sysctls); +return 0 ; +} +early_initcall (init_fs_inode_sysctls);#endif static int no_open (struct inode *inode,struct file *file)
include/linux/fs.h +0 -3
@@ -81,7 +81,6 @@ 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 struct inodes_stat_t inodes_stat;extern int leases_enable, lease_break_time;extern int sysctl_protected_symlinks;extern int sysctl_protected_hardlinks;
@@ -3596,8 +3595,6 @@ 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 proc_nr_inodes (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);#define __FMODE_EXEC ((__force int) FMODE_EXEC)
kernel/sysctl.c +0 -14
@@ -2900,20 +2900,6 @@ static struct ctl_table vm_table[] = { };static struct ctl_table fs_table[] = { - { - .procname ="inode-nr" , - .data = &inodes_stat, - .maxlen =2 *sizeof (long ), - .mode =0444 , - .proc_handler = proc_nr_inodes, - }, - { - .procname ="inode-state" , - .data = &inodes_stat, - .maxlen =7 *sizeof (long ), - .mode =0444 , - .proc_handler = proc_nr_inodes, - }, { .procname ="file-nr" , .data = &files_stat,
Signature · 1 line
2.33.0
PATCH 2/9 fs: move fs stat sysctls to file_table.c
In reply to Luis ChamberlainThe 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.
--- fs/file_table.c | 47 ++++++++++++++++++++++++++++++++++++++-------- include/linux/fs.h | 3 --- kernel/sysctl.c | 25 ------------------------ 3 files changed, 39 insertions(+), 36 deletions(-)
fs/file_table.c +39 -8
@@ -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)
include/linux/fs.h +0 -3
@@ -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 *file, const char __user *buf, 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);
kernel/sysctl.c +0 -25
@@ -2900,31 +2900,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,
Signature · 1 line
2.33.0
PATCH 3/9 fs: move dcache sysctls to its own file
In reply to Luis ChamberlainThe 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.
So move the dcache sysctl clutter out of kernel/sysctl.c. This is a small one-off entry, perhaps later we can simplify this representation, but for now we use the helpers we have. We won't know how we can simplify this further untl we're fully done with the cleanup.
--- fs/dcache.c | 32 +++++++++++++++++++++++++++++--- include/linux/dcache.h | 10 ---------- include/linux/fs.h | 2 -- kernel/sysctl.c | 7 ------- 4 files changed, 29 insertions(+), 22 deletions(-)
fs/dcache.c +29 -3
@@ -115,9 +115,17 @@ static inline struct hlist_bl_head *in_lookup_hash(const struct dentry *parent,return in_lookup_hashtable +hash_32 (hash,IN_LOOKUP_SHIFT ); } +struct dentry_stat_t { +long nr_dentry; +long nr_unused; +long age_limit;/* age in seconds */ +long want_pages;/* pages requested by system */ +long nr_negative;/* # of unused negative dentries */ +long dummy;/* Reserved for future use */ +};/* Statistics gathering. */ -struct dentry_stat_t dentry_stat = { +static struct dentry_stat_t dentry_stat = { .age_limit =45 , };
@@ -167,14 +175,32 @@ static long get_nr_dentry_negative(void)return sum <0 ?0 : sum; } -int proc_nr_dentry (struct ctl_table *table,int write,void *buffer, -size_t *lenp,loff_t *ppos) +static int proc_nr_dentry (struct ctl_table *table,int write,void *buffer, +size_t *lenp,loff_t *ppos) { dentry_stat.nr_dentry =get_nr_dentry (); dentry_stat.nr_unused =get_nr_dentry_unused (); dentry_stat.nr_negative =get_nr_dentry_negative ();return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); } + +static struct ctl_table fs_dcache_sysctls[] = { + { + .procname ="dentry-state" , + .data = &dentry_stat, + .maxlen =6 *sizeof (long ), + .mode =0444 , + .proc_handler = proc_nr_dentry, + }, + { } +}; + +static int __init init_fs_dcache_sysctls (void ) +{ +register_sysctl_init ("fs" , fs_dcache_sysctls); +return 0 ; +} +fs_initcall (init_fs_dcache_sysctls);#endif /*
include/linux/dcache.h +0 -10
@@ -61,16 +61,6 @@ extern const struct qstr empty_name;extern const struct qstr slash_name;extern const struct qstr dotdot_name; -struct dentry_stat_t { -long nr_dentry; -long nr_unused; -long age_limit;/* age in seconds */ -long want_pages;/* pages requested by system */ -long nr_negative;/* # of unused negative dentries */ -long dummy;/* Reserved for future use */ -}; -extern struct dentry_stat_t dentry_stat; -/* * Try to keep struct dentry aligned on 64 byte cachelines (this will * give reasonable cacheline footprint with larger lines without the
include/linux/fs.h +0 -2
@@ -3590,8 +3590,6 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos);struct ctl_table ; -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);#define __FMODE_EXEC ((__force int) FMODE_EXEC)
kernel/sysctl.c +0 -7
@@ -2900,13 +2900,6 @@ static struct ctl_table vm_table[] = { };static struct ctl_table fs_table[] = { - { - .procname ="dentry-state" , - .data = &dentry_stat, - .maxlen =6 *sizeof (long ), - .mode =0444 , - .proc_handler = proc_nr_dentry, - }, { .procname ="overflowuid" , .data = &fs_overflowuid,
Signature · 1 line
2.33.0
PATCH 4/9 sysctl: move maxolduid as a sysctl specific const
In reply to Luis ChamberlainThe maxolduid value is only shared for sysctl purposes for use on a max range. Just stuff this into our shared const array.
--- fs/proc/proc_sysctl.c | 2 +- include/linux/sysctl.h | 3 +++ kernel/sysctl.c | 12 ++++-------- 3 files changed, 8 insertions(+), 9 deletions(-)
fs/proc/proc_sysctl.c +1 -1
@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;static const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX };EXPORT_SYMBOL (sysctl_vals);const unsigned long sysctl_long_vals[] = {0 ,1 ,LONG_MAX };
include/linux/sysctl.h +3 -0
@@ -49,6 +49,9 @@ struct ctl_dir;#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8])#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9]) +/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ +#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10]) +extern const int sysctl_vals[];#define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0])
kernel/sysctl.c +4 -8
@@ -109,10 +109,6 @@ static const int six_hundred_forty_kb = 640 * 1024;/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ static const unsigned long dirty_bytes_min =2 *PAGE_SIZE ; -/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ -static const int maxolduid =65535 ; -/* minolduid is SYSCTL_ZERO */ -static const int ngroups_max =NGROUPS_MAX ;static const int cap_last_cap =CAP_LAST_CAP ;
@@ -2126,7 +2122,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid",
@@ -2135,7 +2131,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, },#ifdef CONFIG_S390 {
@@ -2907,7 +2903,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid",
@@ -2916,7 +2912,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, },#ifdef CONFIG_FILE_LOCKING {
Signature · 1 line
2.33.0
Re: [PATCH 4/9] sysctl: move maxolduid as a sysctl specific const
This patch introduces a bug in -next:
Quoted 16 lines · Luis Chamberlain
The maxolduid value is only shared for sysctl purposes for use on a max range. Just stuff this into our shared const array.
Signed-off-by Luis Chamberlain <[email protected]>--- fs/proc/proc_sysctl.c | 2 +- include/linux/sysctl.h | 3 +++ kernel/sysctl.c | 12 ++++-------- 3 files changed, 8 insertions(+), 9 deletions(-)fs/proc/proc_sysctl.c +0
-0
fs/proc/proc_sysctl.c static const struct file_operations proc_sys_dir_file_operations; · line 29
Quoted 5 lines
fs/proc/proc_sysctl.c +1
-1@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;static const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX };
The new SYSCTL_MAXOLDUID uses the index 10 of sysctl_vals[] but the same commit replaces index 8 (SYSCTL_THREE_THOUSAND used by vm.watermark_scale_factor) instead of adding a new entry.
It should be:
+const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 };
Quoted 69 lines
fs/proc/proc_sysctl.c +0
-0EXPORT_SYMBOL (sysctl_vals);const unsigned long sysctl_long_vals[] = {0 ,1 ,LONG_MAX };include/linux/sysctl.h +3
-0@@ -49,6 +49,9 @@ struct ctl_dir;#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8])#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9]) +/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ +#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10]) +extern const int sysctl_vals[];#define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0])kernel/sysctl.c +4
-8@@ -109,10 +109,6 @@ static const int six_hundred_forty_kb = 640 * 1024;/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ static const unsigned long dirty_bytes_min =2 *PAGE_SIZE ; -/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ -static const int maxolduid =65535 ; -/* minolduid is SYSCTL_ZERO */ -static const int ngroups_max =NGROUPS_MAX ;static const int cap_last_cap =CAP_LAST_CAP ;@@ -2126,7 +2122,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid",@@ -2135,7 +2131,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, },#ifdef CONFIG_S390 {@@ -2907,7 +2903,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, }, { .procname = "overflowgid",@@ -2916,7 +2912,7 @@ static struct ctl_table fs_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&maxolduid, + .extra2 = SYSCTL_MAXOLDUID, },#ifdef CONFIG_FILE_LOCKING {
Re: [PATCH 4/9] sysctl: move maxolduid as a sysctl specific const
Quoted 14 lines · Mickaël Salaün
fs/proc/proc_sysctl.c static const struct file_operations proc_sys_dir_file_operations; · line 28
Quoted 9 lines
fs/proc/proc_sysctl.c +1
-1@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;static const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX };The new
SYSCTL_MAXOLDUIDuses the index 10 of sysctl_vals[] but the same commit replaces index 8 (SYSCTL_THREE_THOUSANDused by vm.watermark_scale_factor) instead of adding a new entry.
Quoted 3 lines
It should be:
+const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000,INT_MAX, 65535 };
Can you send a proper patch which properly fixes this and identifies the commit name with a Fixes tag. Since thi sis on Andrew's tree no commit ID is required given that they are ephemeral.
Luis
Re: [PATCH 4/9] sysctl: move maxolduid as a sysctl specific const
Quoted 15 lines · On Mon, 20 Dec 2021 11:25:41 -0800 Luis Chamberlain <[email protected]> wrote:
Quoted 14 lines · Mickaël Salaün
fs/proc/proc_sysctl.c static const struct file_operations proc_sys_dir_file_operations; · line 28
Quoted 9 lines
fs/proc/proc_sysctl.c +1
-1@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;static const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX };The new
SYSCTL_MAXOLDUIDuses the index 10 of sysctl_vals[] but the same commit replaces index 8 (SYSCTL_THREE_THOUSANDused by vm.watermark_scale_factor) instead of adding a new entry.
Quoted 7 lines
Quoted 3 lines
It should be:
+const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000,INT_MAX, 65535 };Can you send a proper patch which properly fixes this and identifies the commit name with a Fixes tag. Since thi sis on Andrew's tree no commit ID is required given that they are ephemeral.
I did this:
From: Andrew Morton <[email protected]>
Subject: sysctl-move-maxolduid-as-a-sysctl-specific-const-fix
fix sysctl_vals[], per Mickaël.
---
fs/proc/proc_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~sysctl-move-maxolduid-as-a-sysctl-specific-const-fix +1 -1
@@ -26,7 +26,7 @@ static const struct file_operations procstatic const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX ,65535 };EXPORT_SYMBOL (sysctl_vals);const unsigned long sysctl_long_vals[] = {0 ,1 ,LONG_MAX };
_
Re: [PATCH 4/9] sysctl: move maxolduid as a sysctl specific const
Quoted 25 lines · Andrew Morton
Quoted 15 lines · On Mon, 20 Dec 2021 11:25:41 -0800 Luis Chamberlain <[email protected]> wrote:
Quoted 14 lines · Mickaël Salaün
fs/proc/proc_sysctl.c static const struct file_operations proc_sys_dir_file_operations; · line 28
Quoted 9 lines
fs/proc/proc_sysctl.c +1
-1@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;static const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX };The new
SYSCTL_MAXOLDUIDuses the index 10 of sysctl_vals[] but the same commit replaces index 8 (SYSCTL_THREE_THOUSANDused by vm.watermark_scale_factor) instead of adding a new entry.Quoted 7 lines
Quoted 3 lines
It should be:
+const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000,INT_MAX, 65535 };Can you send a proper patch which properly fixes this and identifies the commit name with a Fixes tag. Since thi sis on Andrew's tree no commit ID is required given that they are ephemeral.
Quoted 8 lines
I did this:
From: Andrew Morton <[email protected]>
Subject: sysctl-move-maxolduid-as-a-sysctl-specific-const-fixfix sysctl_vals[], per Mickaël.
Cc Mickaël Salaün <mic@digikonet>
Except a typo in my email
Thanks!
Quoted 31 lines
Cc Al Viro <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Antti Palosaari <[email protected]>Cc Eric Biederman <[email protected]>Cc Iurii Zaikin <[email protected]>Cc "J. Bruce Fields" <[email protected]>Cc Jeff Layton <[email protected]>Cc Kees Cook <[email protected]>Cc Luis Chamberlain <[email protected]>Cc Lukas Middendorf <[email protected]>Cc Stephen Kitt <[email protected]>Cc Xiaoming Ni <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
fs/proc/proc_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~sysctl-move-maxolduid-as-a-sysctl-specific-const-fix +1
-1@@ -26,7 +26,7 @@ static const struct file_operations procstatic const struct inode_operations proc_sys_dir_operations;/* shared constants to be used in various sysctls */ -const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,65535 ,INT_MAX }; +const int sysctl_vals[] = {-1 ,0 ,1 ,2 ,4 ,100 ,200 ,1000 ,3000 ,INT_MAX ,65535 };EXPORT_SYMBOL (sysctl_vals);const unsigned long sysctl_long_vals[] = {0 ,1 ,LONG_MAX };_
PATCH 5/9 fs: move shared sysctls to fs/sysctls.c
In reply to Luis ChamberlainTo 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.
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.
So move sysctls which are shared between filesystems into a common file outside of kernel/sysctl.c.
--- fs/Makefile | 1 + fs/sysctls.c | 38 ++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 18 ------------------ 3 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 fs/sysctls.c
fs/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-y += notify/ obj-$(CONFIG_EPOLL) += eventpoll.o obj-y += anon_inodes.o obj-$(CONFIG_SIGNALFD) += signalfd.o +obj-$(CONFIG_SYSCTL) += sysctls.o obj-$(CONFIG_TIMERFD) += timerfd.o obj-$(CONFIG_EVENTFD) += eventfd.o obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
fs/sysctls.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* /proc/sys/fs shared sysctls +* +* These sysctls are shared between different filesystems. +*/ +#include <linux/init.h> +#include <linux/sysctl.h> + +static struct ctl_table fs_shared_sysctls[] = { + { + .procname ="overflowuid" , + .data = &fs_overflowuid, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_MAXOLDUID , + }, + { + .procname ="overflowgid" , + .data = &fs_overflowgid, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_MAXOLDUID , + }, + { } +}; + +static int __init init_fs_shared_sysctls (void ) +{ +register_sysctl_init ("fs" , fs_shared_sysctls); +return 0 ; +} + +early_initcall (init_fs_shared_sysctls);
kernel/sysctl.c +0 -18
@@ -2896,24 +2896,6 @@ static struct ctl_table vm_table[] = { }; static struct ctl_table fs_table[] = { - { - .procname ="overflowuid" , - .data = &fs_overflowuid, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_MAXOLDUID , - }, - { - .procname ="overflowgid" , - .data = &fs_overflowgid, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_MAXOLDUID , - }, #ifdef CONFIG_FILE_LOCKING { .procname = "leases-enable",
Signature · 1 line
2.33.0
PATCH 6/9 fs: move locking sysctls where they are used
In reply to Luis ChamberlainThe 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.
The locking fs sysctls are only used on fs/locks.c, so move them there.
--- fs/locks.c | 34 ++++++++++++++++++++++++++++++++-- include/linux/fs.h | 4 ---- kernel/sysctl.c | 20 -------------------- 3 files changed, 32 insertions(+), 26 deletions(-)
fs/locks.c +32 -2
@@ -62,6 +62,7 @@#include <linux/pid_namespace.h> #include <linux/hashtable.h> #include <linux/percpu.h> +#include <linux/sysctl.h> #define CREATE_TRACE_POINTS #include <trace/events/filelock.h>
@@ -88,8 +89,37 @@ static int target_leasetype(struct file_lock *fl)return fl->fl_type; } -int leases_enable =1 ; -int lease_break_time =45 ; +static int leases_enable =1 ; +static int lease_break_time =45 ; + +#ifdef CONFIG_SYSCTL +static struct ctl_table locks_sysctls[] = { + { + .procname ="leases-enable" , + .data = &leases_enable, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec, + }, +#ifdef CONFIG_MMU + { + .procname ="lease-break-time" , + .data = &lease_break_time, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec, + }, +#endif /* CONFIG_MMU */ + {} +}; + +static int __init init_fs_locks_sysctls (void ) +{ +register_sysctl_init ("fs" , locks_sysctls); +return 0 ; +} +early_initcall (init_fs_locks_sysctls); +#endif /* CONFIG_SYSCTL */ /* * The global file_lock_list is only used for displaying /proc/locks, so we
include/linux/fs.h +0 -4
@@ -81,10 +81,6 @@ extern void __init files_maxfiles_init(void);extern unsigned long get_max_files (void );extern unsigned int sysctl_nr_open;extern int leases_enable, lease_break_time; -extern int sysctl_protected_symlinks; -extern int sysctl_protected_hardlinks; -extern int sysctl_protected_fifos; -extern int sysctl_protected_regular;typedef __kernel_rwf_t rwf_t ;
kernel/sysctl.c +0 -20
@@ -2896,26 +2896,6 @@ static struct ctl_table vm_table[] = { };static struct ctl_table fs_table[] = { -#ifdef CONFIG_FILE_LOCKING - { - .procname = "leases-enable", - .data = &leases_enable, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif -#ifdef CONFIG_MMU -#ifdef CONFIG_FILE_LOCKING - { - .procname = "lease-break-time", - .data = &lease_break_time, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif -#endif { .procname ="protected_symlinks" , .data = &sysctl_protected_symlinks,
Signature · 1 line
2.33.0
PATCH 7/9 fs: move namei sysctls to its own file
In reply to Luis ChamberlainThe 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.
So move namei's own sysctl knobs to its own file.
Other than the move we also avoid initializing two static variables to 0 as this is not needed:
* sysctl_protected_symlinks
* sysctl_protected_hardlinks
--- fs/namei.c | 58 ++++++++++++++++++++++++++++++++++++++++++---- include/linux/fs.h | 1 - kernel/sysctl.c | 36 ---------------------------- 3 files changed, 54 insertions(+), 41 deletions(-)
fs/namei.c +54 -4
@@ -1020,10 +1020,60 @@ static inline void put_link(struct nameidata *nd)path_put (&last->link); } -int sysctl_protected_symlinks__read_mostly =0 ; -int sysctl_protected_hardlinks__read_mostly =0 ; -int sysctl_protected_fifos__read_mostly ; -int sysctl_protected_regular__read_mostly ; +static int sysctl_protected_symlinks__read_mostly ; +static int sysctl_protected_hardlinks__read_mostly ; +static int sysctl_protected_fifos__read_mostly ; +static int sysctl_protected_regular__read_mostly ; + +#ifdef CONFIG_SYSCTL +static struct ctl_table namei_sysctls[] = { + { + .procname ="protected_symlinks" , + .data = &sysctl_protected_symlinks, + .maxlen =sizeof (int ), + .mode =0600 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + { + .procname ="protected_hardlinks" , + .data = &sysctl_protected_hardlinks, + .maxlen =sizeof (int ), + .mode =0600 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + { + .procname ="protected_fifos" , + .data = &sysctl_protected_fifos, + .maxlen =sizeof (int ), + .mode =0600 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_TWO , + }, + { + .procname ="protected_regular" , + .data = &sysctl_protected_regular, + .maxlen =sizeof (int ), + .mode =0600 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_TWO , + }, + { } +}; + +static int __init init_fs_namei_sysctls (void ) +{ +register_sysctl_init ("fs" , namei_sysctls); +return 0 ; +} +fs_initcall (init_fs_namei_sysctls); + +#endif /* CONFIG_SYSCTL */ /** * may_follow_link - Check symlink following for unsafe situations
include/linux/fs.h +0 -1
@@ -80,7 +80,6 @@ extern void __init files_maxfiles_init(void);extern unsigned long get_max_files (void );extern unsigned int sysctl_nr_open; -extern int leases_enable, lease_break_time;typedef __kernel_rwf_t rwf_t ;
kernel/sysctl.c +0 -36
@@ -2896,42 +2896,6 @@ static struct ctl_table vm_table[] = { };static struct ctl_table fs_table[] = { - { - .procname ="protected_symlinks" , - .data = &sysctl_protected_symlinks, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_ONE , - }, - { - .procname ="protected_hardlinks" , - .data = &sysctl_protected_hardlinks, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_ONE , - }, - { - .procname ="protected_fifos" , - .data = &sysctl_protected_fifos, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_TWO , - }, - { - .procname ="protected_regular" , - .data = &sysctl_protected_regular, - .maxlen =sizeof (int ), - .mode =0644 , - .proc_handler = proc_dointvec_minmax, - .extra1 =SYSCTL_ZERO , - .extra2 =SYSCTL_TWO , - }, { .procname ="suid_dumpable" , .data = &suid_dumpable,
Signature · 1 line
2.33.0
PATCH 8/9 fs: move fs/exec.c sysctls into its own file
In reply to Luis ChamberlainThe 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.
So move the fs/exec.c respective sysctls to its own file.
Since checkpatch complains about style issues with the old code, this move also fixes a few of those minor style issues:
* Use pr_warn() instead of prink(WARNING
* New empty lines are wanted at the beginning of routines
--- fs/exec.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 66 ------------------------------------ 2 files changed, 90 insertions(+), 66 deletions(-)
fs/exec.c +90 -0
@@ -65,6 +65,7 @@#include <linux/vmalloc.h> #include <linux/io_uring.h> #include <linux/syscall_user_dispatch.h> +#include <linux/coredump.h> #include <linux/uaccess.h> #include <asm/mmu_context.h>
@@ -2097,3 +2098,92 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd, argv, envp, flags); }#endif + +#ifdef CONFIG_SYSCTL + +static void validate_coredump_safety (void ) +{ +#ifdef CONFIG_COREDUMP +if (suid_dumpable ==SUID_DUMP_ROOT && + core_pattern[0 ] !='/' && core_pattern[0 ] !='|' ) { +pr_warn ( +"Unsafe core_pattern used with fs.suid_dumpable=2.\n" +"Pipe handler or fully qualified core dump path required.\n" +"Set kernel.core_pattern before fs.suid_dumpable.\n" + ); + } +#endif +} + +static int proc_dointvec_minmax_coredump (struct ctl_table *table,int write, +void *buffer,size_t *lenp,loff_t *ppos) +{ +int error =proc_dointvec_minmax (table, write, buffer, lenp, ppos); + +if (!error) +validate_coredump_safety (); +return error; +} + +static struct ctl_table fs_exec_sysctls[] = { + { + .procname ="suid_dumpable" , + .data = &suid_dumpable, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax_coredump, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_TWO , + }, + { } +}; + +#ifdef CONFIG_COREDUMP + +static int proc_dostring_coredump (struct ctl_table *table,int write, +void *buffer,size_t *lenp,loff_t *ppos) +{ +int error =proc_dostring (table, write, buffer, lenp, ppos); + +if (!error) +validate_coredump_safety (); +return error; +} + +static struct ctl_table kernel_exec_sysctls[] = { + { + .procname ="core_uses_pid" , + .data = &core_uses_pid, + .maxlen =sizeof (int ), + .mode =0644 , + .proc_handler = proc_dointvec, + }, + { + .procname ="core_pattern" , + .data = core_pattern, + .maxlen =CORENAME_MAX_SIZE , + .mode =0644 , + .proc_handler = proc_dostring_coredump, + }, + { + .procname ="core_pipe_limit" , + .data = &core_pipe_limit, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = proc_dointvec, + }, + { } +}; +#endif + +static int __init init_fs_exec_sysctls (void ) +{ +register_sysctl_init ("fs" , fs_exec_sysctls); +#ifdef CONFIG_COREDUMP +register_sysctl_init ("kernel" , kernel_exec_sysctls); +#endif +return 0 ; +} + +fs_initcall (init_fs_exec_sysctls); +#endif /* CONFIG_SYSCTL */
kernel/sysctl.c +0 -66
84 lines not on this page · raw message
Signature · 1 line
2.33.0
PATCH 9/9 fs: move pipe sysctls to is own file
In reply to Luis ChamberlainThe 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.
So move the pipe sysctls to its own file.
--- fs/pipe.c | 64 +++++++++++++++++++++++++++++++++++++-- include/linux/pipe_fs_i.h | 4 --- include/linux/sysctl.h | 6 ++++ kernel/sysctl.c | 61 ++++--------------------------------- 4 files changed, 73 insertions(+), 62 deletions(-)
fs/pipe.c +61 -3
@@ -25,6 +25,7 @@#include <linux/fcntl.h> #include <linux/memcontrol.h> #include <linux/watch_queue.h> +#include <linux/sysctl.h> #include <linux/uaccess.h> #include <asm/ioctls.h>
@@ -50,13 +51,13 @@* The max size that a non-root user is allowed to grow the pipe. Can * be set by root in /proc/sys/fs/pipe-max-size */ -unsigned int pipe_max_size =1048576 ; +static unsigned int pipe_max_size =1048576 ;/* Maximum allocatable pages per user. Hard limit is unset by default, soft * matches default values. */ -unsigned long pipe_user_pages_hard; -unsigned long pipe_user_pages_soft =PIPE_DEF_BUFFERS *INR_OPEN_CUR ; +static unsigned long pipe_user_pages_hard; +static unsigned long pipe_user_pages_soft =PIPE_DEF_BUFFERS *INR_OPEN_CUR ;/* * We use head and tail indices that aren't masked off, except at the point of
@@ -1428,6 +1429,60 @@ static struct file_system_type pipe_fs_type = { .kill_sb = kill_anon_super, }; +#ifdef CONFIG_SYSCTL +static int do_proc_dopipe_max_size_conv (unsigned long *lvalp, +unsigned int *valp, +int write,void *data) +{ +if (write) { +unsigned int val; + + val =round_pipe_size (*lvalp); +if (val ==0 ) +return -EINVAL ; + + *valp = val; + }else { +unsigned int val = *valp; + *lvalp = (unsigned long ) val; + } + +return 0 ; +} + +static int proc_dopipe_max_size (struct ctl_table *table,int write, +void *buffer,size_t *lenp,loff_t *ppos) +{ +return do_proc_douintvec (table, write, buffer, lenp, ppos, + do_proc_dopipe_max_size_conv,NULL ); +} + +static struct ctl_table fs_pipe_sysctls[] = { + { + .procname ="pipe-max-size" , + .data = &pipe_max_size, + .maxlen =sizeof (pipe_max_size), + .mode =0644 , + .proc_handler = proc_dopipe_max_size, + }, + { + .procname ="pipe-user-pages-hard" , + .data = &pipe_user_pages_hard, + .maxlen =sizeof (pipe_user_pages_hard), + .mode =0644 , + .proc_handler = proc_doulongvec_minmax, + }, + { + .procname ="pipe-user-pages-soft" , + .data = &pipe_user_pages_soft, + .maxlen =sizeof (pipe_user_pages_soft), + .mode =0644 , + .proc_handler = proc_doulongvec_minmax, + }, + { } +}; +#endif +static int __init init_pipe_fs (void ) {int err =register_filesystem (&pipe_fs_type);
@@ -1439,6 +1494,9 @@ static int __init init_pipe_fs(void)unregister_filesystem (&pipe_fs_type); } } +#ifdef CONFIG_SYSCTL +register_sysctl_init ("fs" , fs_pipe_sysctls); +#endif return err; }
include/linux/pipe_fs_i.h +0 -4
@@ -238,10 +238,6 @@ void pipe_lock(struct pipe_inode_info *);void pipe_unlock (struct pipe_inode_info *);void pipe_double_lock (struct pipe_inode_info *,struct pipe_inode_info *); -extern unsigned int pipe_max_size; -extern unsigned long pipe_user_pages_hard; -extern unsigned long pipe_user_pages_soft; -/* Wait for a pipe to be readable/writable while dropping the pipe lock */ void pipe_wait_readable (struct pipe_inode_info *);void pipe_wait_writable (struct pipe_inode_info *);
include/linux/sysctl.h +6 -0
@@ -221,6 +221,12 @@ extern void __register_sysctl_init(const char *path, struct ctl_table *table,extern struct ctl_table_header *register_sysctl_mount_point (const char *path);void do_sysctl_args (void ); +int do_proc_douintvec (struct ctl_table *table,int write, +void *buffer,size_t *lenp,loff_t *ppos, +int (*conv)(unsigned long *lvalp, +unsigned int *valp, +int write,void *data), +void *data);extern int pwrsw_enabled;extern int unaligned_enabled;
kernel/sysctl.c +6 -55
85 lines not on this page · raw message
Signature · 1 line
2.33.0