Skip to content

Commit 592329e

Browse files
torvaldstorvalds
committed
Merge tag 'sysctl-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl updates from Joel Granados: - Move vm_table members out of kernel/sysctl.c All vm_table array members have moved to their respective subsystems leading to the removal of vm_table from kernel/sysctl.c. This increases modularity by placing the ctl_tables closer to where they are actually used and at the same time reducing the chances of merge conflicts in kernel/sysctl.c. - ctl_table range fixes Replace the proc_handler function that checks variable ranges in coredump_sysctls and vdso_table with the one that actually uses the extra{1,2} pointers as min/max values. This tightens the range of the values that users can pass into the kernel effectively preventing {under,over}flows. - Misc fixes Correct grammar errors and typos in test messages. Update sysctl files in MAINTAINERS. Constified and removed array size in declaration for alignment_tbl * tag 'sysctl-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl: (22 commits) selftests/sysctl: fix wording of help messages selftests: fix spelling/grammar errors in sysctl/sysctl.sh MAINTAINERS: Update sysctl file list in MAINTAINERS sysctl: Fix underflow value setting risk in vm_table coredump: Fixes core_pipe_limit sysctl proc_handler sysctl: remove unneeded include sysctl: remove the vm_table sh: vdso: move the sysctl to arch/sh/kernel/vsyscall/vsyscall.c x86: vdso: move the sysctl to arch/x86/entry/vdso/vdso32-setup.c fs: dcache: move the sysctl to fs/dcache.c sunrpc: simplify rpcauth_cache_shrink_count() fs: drop_caches: move sysctl to fs/drop_caches.c fs: fs-writeback: move sysctl to fs/fs-writeback.c mm: nommu: move sysctl to mm/nommu.c security: min_addr: move sysctl to security/min_addr.c mm: mmap: move sysctl to mm/mmap.c mm: util: move sysctls to mm/util.c mm: vmscan: move vmscan sysctls to mm/vmscan.c mm: swap: move sysctl to mm/swap.c mm: filemap: move sysctl to mm/filemap.c ...
2 parents 336b4da + 29fa7d7 commit 592329e

File tree

27 files changed

+350
-322
lines changed

27 files changed

+350
-322
lines changed

‎MAINTAINERS

+4-3
Original file line numberDiff line numberDiff line change
@@ -19081,9 +19081,10 @@ S: Maintained
1908119081
T: git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl-next
1908219082
F: fs/proc/proc_sysctl.c
1908319083
F: include/linux/sysctl.h
19084-
F: kernel/sysctl-test.c
19085-
F: kernel/sysctl.c
19086-
F: tools/testing/selftests/sysctl/
19084+
F: kernel/sysctl*
19085+
F: tools/testing/selftests/sysctl/*
19086+
F: lib/test_sysctl.c
19087+
F: scripts/check-sysctl-docs
1908719088

1908819089
PS3 NETWORK SUPPORT
1908919090
M: Geoff Levand <[email protected]>

‎arch/csky/abiv1/alignment.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ void csky_alignment(struct pt_regs *regs)
300300
force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
301301
}
302302

303-
static struct ctl_table alignment_tbl[5] = {
303+
static const struct ctl_table alignment_tbl[] = {
304304
{
305305
.procname = "kernel_enable",
306306
.data = &align_kern_enable,

‎arch/sh/kernel/vsyscall/vsyscall.c

+21
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/module.h>
1515
#include <linux/elf.h>
1616
#include <linux/sched.h>
17+
#include <linux/sysctl.h>
1718
#include <linux/err.h>
1819

1920
/*
@@ -30,6 +31,18 @@ static int __init vdso_setup(char *s)
3031
}
3132
__setup("vdso=", vdso_setup);
3233

34+
static const struct ctl_table vdso_table[] = {
35+
{
36+
.procname = "vdso_enabled",
37+
.data = &vdso_enabled,
38+
.maxlen = sizeof(vdso_enabled),
39+
.mode = 0644,
40+
.proc_handler = proc_dointvec_minmax,
41+
.extra1 = SYSCTL_ZERO,
42+
.extra2 = SYSCTL_ONE,
43+
},
44+
};
45+
3346
/*
3447
* These symbols are defined by vsyscall.o to mark the bounds
3548
* of the ELF DSO images included therein.
@@ -58,6 +71,14 @@ int __init vsyscall_init(void)
5871
return 0;
5972
}
6073

74+
static int __init vm_sysctl_init(void)
75+
{
76+
register_sysctl_init("vm", vdso_table);
77+
return 0;
78+
}
79+
80+
fs_initcall(vm_sysctl_init);
81+
6182
/* Setup a VMA at program startup for the vsyscall page */
6283
int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
6384
{

‎arch/x86/entry/vdso/vdso32-setup.c

+11-5
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,17 @@ __setup("vdso32=", vdso32_setup);
5151
__setup_param("vdso=", vdso_setup, vdso32_setup, 0);
5252
#endif
5353

54-
#ifdef CONFIG_X86_64
5554

5655
#ifdef CONFIG_SYSCTL
57-
/* Register vsyscall32 into the ABI table */
5856
#include <linux/sysctl.h>
5957

60-
static const struct ctl_table abi_table2[] = {
58+
static const struct ctl_table vdso_table[] = {
6159
{
60+
#ifdef CONFIG_X86_64
6261
.procname = "vsyscall32",
62+
#else
63+
.procname = "vdso_enabled",
64+
#endif
6365
.data = &vdso32_enabled,
6466
.maxlen = sizeof(int),
6567
.mode = 0644,
@@ -71,10 +73,14 @@ static const struct ctl_table abi_table2[] = {
7173

7274
static __init int ia32_binfmt_init(void)
7375
{
74-
register_sysctl("abi", abi_table2);
76+
#ifdef CONFIG_X86_64
77+
/* Register vsyscall32 into the ABI table */
78+
register_sysctl("abi", vdso_table);
79+
#else
80+
register_sysctl_init("vm", vdso_table);
81+
#endif
7582
return 0;
7683
}
7784
__initcall(ia32_binfmt_init);
7885
#endif /* CONFIG_SYSCTL */
7986

80-
#endif /* CONFIG_X86_64 */

‎fs/coredump.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,9 @@ static const struct ctl_table coredump_sysctls[] = {
10421042
.data = &core_pipe_limit,
10431043
.maxlen = sizeof(unsigned int),
10441044
.mode = 0644,
1045-
.proc_handler = proc_dointvec,
1045+
.proc_handler = proc_dointvec_minmax,
1046+
.extra1 = SYSCTL_ZERO,
1047+
.extra2 = SYSCTL_INT_MAX,
10461048
},
10471049
{
10481050
.procname = "core_file_note_size_limit",

‎fs/dcache.c

+19-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,13 @@
7373
* If no ancestor relationship:
7474
* arbitrary, since it's serialized on rename_lock
7575
*/
76-
int sysctl_vfs_cache_pressure __read_mostly = 100;
77-
EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
76+
static int sysctl_vfs_cache_pressure __read_mostly = 100;
77+
78+
unsigned long vfs_pressure_ratio(unsigned long val)
79+
{
80+
return mult_frac(val, sysctl_vfs_cache_pressure, 100);
81+
}
82+
EXPORT_SYMBOL_GPL(vfs_pressure_ratio);
7883

7984
__cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);
8085

@@ -211,8 +216,20 @@ static const struct ctl_table fs_dcache_sysctls[] = {
211216
},
212217
};
213218

219+
static const struct ctl_table vm_dcache_sysctls[] = {
220+
{
221+
.procname = "vfs_cache_pressure",
222+
.data = &sysctl_vfs_cache_pressure,
223+
.maxlen = sizeof(sysctl_vfs_cache_pressure),
224+
.mode = 0644,
225+
.proc_handler = proc_dointvec_minmax,
226+
.extra1 = SYSCTL_ZERO,
227+
},
228+
};
229+
214230
static int __init init_fs_dcache_sysctls(void)
215231
{
232+
register_sysctl_init("vm", vm_dcache_sysctls);
216233
register_sysctl_init("fs", fs_dcache_sysctls);
217234
return 0;
218235
}

‎fs/drop_caches.c

+21-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "internal.h"
1515

1616
/* A global variable is a bit ugly, but it keeps the code simple */
17-
int sysctl_drop_caches;
17+
static int sysctl_drop_caches;
1818

1919
static void drop_pagecache_sb(struct super_block *sb, void *unused)
2020
{
@@ -48,7 +48,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused)
4848
iput(toput_inode);
4949
}
5050

51-
int drop_caches_sysctl_handler(const struct ctl_table *table, int write,
51+
static int drop_caches_sysctl_handler(const struct ctl_table *table, int write,
5252
void *buffer, size_t *length, loff_t *ppos)
5353
{
5454
int ret;
@@ -77,3 +77,22 @@ int drop_caches_sysctl_handler(const struct ctl_table *table, int write,
7777
}
7878
return 0;
7979
}
80+
81+
static const struct ctl_table drop_caches_table[] = {
82+
{
83+
.procname = "drop_caches",
84+
.data = &sysctl_drop_caches,
85+
.maxlen = sizeof(int),
86+
.mode = 0200,
87+
.proc_handler = drop_caches_sysctl_handler,
88+
.extra1 = SYSCTL_ONE,
89+
.extra2 = SYSCTL_FOUR,
90+
},
91+
};
92+
93+
static int __init init_vm_drop_caches_sysctls(void)
94+
{
95+
register_sysctl_init("vm", drop_caches_table);
96+
return 0;
97+
}
98+
fs_initcall(init_vm_drop_caches_sysctls);

‎fs/fs-writeback.c

+21-9
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct wb_writeback_work {
6565
* timestamps written to disk after 12 hours, but in the worst case a
6666
* few inodes might not their timestamps updated for 24 hours.
6767
*/
68-
unsigned int dirtytime_expire_interval = 12 * 60 * 60;
68+
static unsigned int dirtytime_expire_interval = 12 * 60 * 60;
6969

7070
static inline struct inode *wb_inode(struct list_head *head)
7171
{
@@ -2435,14 +2435,7 @@ static void wakeup_dirtytime_writeback(struct work_struct *w)
24352435
schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);
24362436
}
24372437

2438-
static int __init start_dirtytime_writeback(void)
2439-
{
2440-
schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);
2441-
return 0;
2442-
}
2443-
__initcall(start_dirtytime_writeback);
2444-
2445-
int dirtytime_interval_handler(const struct ctl_table *table, int write,
2438+
static int dirtytime_interval_handler(const struct ctl_table *table, int write,
24462439
void *buffer, size_t *lenp, loff_t *ppos)
24472440
{
24482441
int ret;
@@ -2453,6 +2446,25 @@ int dirtytime_interval_handler(const struct ctl_table *table, int write,
24532446
return ret;
24542447
}
24552448

2449+
static const struct ctl_table vm_fs_writeback_table[] = {
2450+
{
2451+
.procname = "dirtytime_expire_seconds",
2452+
.data = &dirtytime_expire_interval,
2453+
.maxlen = sizeof(dirtytime_expire_interval),
2454+
.mode = 0644,
2455+
.proc_handler = dirtytime_interval_handler,
2456+
.extra1 = SYSCTL_ZERO,
2457+
},
2458+
};
2459+
2460+
static int __init start_dirtytime_writeback(void)
2461+
{
2462+
schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);
2463+
register_sysctl_init("vm", vm_fs_writeback_table);
2464+
return 0;
2465+
}
2466+
__initcall(start_dirtytime_writeback);
2467+
24562468
/**
24572469
* __mark_inode_dirty - internal function to mark an inode dirty
24582470
*

‎include/linux/dcache.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,7 @@ static inline int simple_positive(const struct dentry *dentry)
519519
return d_really_is_positive(dentry) && !d_unhashed(dentry);
520520
}
521521

522-
extern int sysctl_vfs_cache_pressure;
523-
524-
static inline unsigned long vfs_pressure_ratio(unsigned long val)
525-
{
526-
return mult_frac(val, sysctl_vfs_cache_pressure, 100);
527-
}
522+
unsigned long vfs_pressure_ratio(unsigned long val);
528523

529524
/**
530525
* d_inode - Get the actual inode of this dentry

‎include/linux/mm.h

-23
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ struct user_struct;
4040
struct pt_regs;
4141
struct folio_batch;
4242

43-
extern int sysctl_page_lock_unfairness;
44-
4543
void mm_core_init(void);
4644
void init_mm_internals(void);
4745

@@ -78,8 +76,6 @@ static inline void totalram_pages_add(long count)
7876
}
7977

8078
extern void * high_memory;
81-
extern int page_cluster;
82-
extern const int page_cluster_max;
8379

8480
#ifdef CONFIG_SYSCTL
8581
extern int sysctl_legacy_va_layout;
@@ -209,17 +205,6 @@ extern int sysctl_max_map_count;
209205
extern unsigned long sysctl_user_reserve_kbytes;
210206
extern unsigned long sysctl_admin_reserve_kbytes;
211207

212-
extern int sysctl_overcommit_memory;
213-
extern int sysctl_overcommit_ratio;
214-
extern unsigned long sysctl_overcommit_kbytes;
215-
216-
int overcommit_ratio_handler(const struct ctl_table *, int, void *, size_t *,
217-
loff_t *);
218-
int overcommit_kbytes_handler(const struct ctl_table *, int, void *, size_t *,
219-
loff_t *);
220-
int overcommit_policy_handler(const struct ctl_table *, int, void *, size_t *,
221-
loff_t *);
222-
223208
#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP)
224209
#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
225210
#define folio_page_idx(folio, p) (page_to_pfn(p) - folio_pfn(folio))
@@ -3809,12 +3794,6 @@ static inline int in_gate_area(struct mm_struct *mm, unsigned long addr)
38093794

38103795
extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);
38113796

3812-
#ifdef CONFIG_SYSCTL
3813-
extern int sysctl_drop_caches;
3814-
int drop_caches_sysctl_handler(const struct ctl_table *, int, void *, size_t *,
3815-
loff_t *);
3816-
#endif
3817-
38183797
void drop_slab(void);
38193798

38203799
#ifndef CONFIG_MMU
@@ -4086,8 +4065,6 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping,
40864065
pgoff_t first_index, pgoff_t nr);
40874066
#endif
40884067

4089-
extern int sysctl_nr_trim_pages;
4090-
40914068
#ifdef CONFIG_ANON_VMA_NAME
40924069
int madvise_set_anon_name(struct mm_struct *mm, unsigned long start,
40934070
unsigned long len_in,

‎include/linux/mman.h

-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959
| MAP_HUGE_1GB)
6060

6161
extern int sysctl_overcommit_memory;
62-
extern int sysctl_overcommit_ratio;
63-
extern unsigned long sysctl_overcommit_kbytes;
6462
extern struct percpu_counter vm_committed_as;
6563

6664
#ifdef CONFIG_SMP

‎include/linux/swap.h

-9
Original file line numberDiff line numberDiff line change
@@ -433,19 +433,10 @@ extern int vm_swappiness;
433433
long remove_mapping(struct address_space *mapping, struct folio *folio);
434434

435435
#ifdef CONFIG_NUMA
436-
extern int node_reclaim_mode;
437436
extern int sysctl_min_unmapped_ratio;
438437
extern int sysctl_min_slab_ratio;
439-
#else
440-
#define node_reclaim_mode 0
441438
#endif
442439

443-
static inline bool node_reclaim_enabled(void)
444-
{
445-
/* Is any node_reclaim_mode bit set? */
446-
return node_reclaim_mode & (RECLAIM_ZONE|RECLAIM_WRITE|RECLAIM_UNMAP);
447-
}
448-
449440
void check_move_unevictable_folios(struct folio_batch *fbatch);
450441

451442
extern void __meminit kswapd_run(int nid);

‎include/linux/vmstat.h

-11
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@
1010
#include <linux/static_key.h>
1111
#include <linux/mmdebug.h>
1212

13-
extern int sysctl_stat_interval;
14-
1513
#ifdef CONFIG_NUMA
16-
#define ENABLE_NUMA_STAT 1
17-
#define DISABLE_NUMA_STAT 0
18-
extern int sysctl_vm_numa_stat;
1914
DECLARE_STATIC_KEY_TRUE(vm_numa_stat_key);
20-
int sysctl_vm_numa_stat_handler(const struct ctl_table *table, int write,
21-
void *buffer, size_t *length, loff_t *ppos);
2215
#endif
2316

2417
struct reclaim_stat {
@@ -304,10 +297,6 @@ void quiet_vmstat(void);
304297
void cpu_vm_stats_fold(int cpu);
305298
void refresh_zone_stat_thresholds(void);
306299

307-
struct ctl_table;
308-
int vmstat_refresh(const struct ctl_table *, int write, void *buffer, size_t *lenp,
309-
loff_t *ppos);
310-
311300
void drain_zonestat(struct zone *zone, struct per_cpu_zonestat *);
312301

313302
int calculate_pressure_threshold(struct zone *zone);

‎include/linux/writeback.h

-4
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,8 @@ extern struct wb_domain global_wb_domain;
327327
/* These are exported to sysctl. */
328328
extern unsigned int dirty_writeback_interval;
329329
extern unsigned int dirty_expire_interval;
330-
extern unsigned int dirtytime_expire_interval;
331330
extern int laptop_mode;
332331

333-
int dirtytime_interval_handler(const struct ctl_table *table, int write,
334-
void *buffer, size_t *lenp, loff_t *ppos);
335-
336332
void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty);
337333
unsigned long wb_calc_thresh(struct bdi_writeback *wb, unsigned long thresh);
338334
unsigned long cgwb_calc_thresh(struct bdi_writeback *wb);

0 commit comments

Comments
 (0)