Commit dc553428 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sysctl-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux 

Pull sysctl updates from Luis Chamberlain:
 "Just some boring cleanups on the sysctl front for this release"

* tag 'sysctl-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
  kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}
  kernel/sysctl.c: move sysctl_vals and sysctl_long_vals to sysctl.c
  sysctl: remove max_extfrag_threshold
  kernel/sysctl.c: remove unnecessary (void*) conversions
  proc: remove initialization assignment
parents 47cc75aa c06a17fe

fs/proc/proc_sysctl.c

+1 −8
Original line number Diff line number Diff line
@@ -28,13 +28,6 @@ static const struct inode_operations proc_sys_inode_operations; 
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[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };

EXPORT_SYMBOL(sysctl_vals);



const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };

EXPORT_SYMBOL_GPL(sysctl_long_vals);



/* Support for permanently empty directories */



struct ctl_table sysctl_mount_point[] = {
@@ -1246,7 +1239,7 @@ static bool get_links(struct ctl_dir *dir, 
static int insert_links(struct ctl_table_header *head)

{

	struct ctl_table_set *root_set = &sysctl_table_root.default_set;

	struct ctl_dir *core_parent = NULL;

	struct ctl_dir *core_parent;

	struct ctl_table_header *links;

	int err;

kernel/sysctl-test.c

+20 −23
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#define KUNIT_PROC_READ 0

#define KUNIT_PROC_WRITE 1



static int i_zero;

static int i_one_hundred = 100;



/*

 * Test that proc_dointvec will not try to use a NULL .data field even when the

 * length is non-zero.
@@ -29,8 +26,8 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	/*

	 * proc_dointvec expects a buffer in user space, so we allocate one. We
@@ -79,8 +76,8 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test) 
		.maxlen		= 0,

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),

							   GFP_USER);
@@ -122,8 +119,8 @@ static void sysctl_test_api_dointvec_table_len_is_zero(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),

							   GFP_USER);
@@ -156,8 +153,8 @@ static void sysctl_test_api_dointvec_table_read_but_position_set( 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	void __user *buffer = (void __user *)kunit_kzalloc(test, sizeof(int),

							   GFP_USER);
@@ -191,8 +188,8 @@ static void sysctl_test_dointvec_read_happy_single_positive(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	size_t len = 4;

	loff_t pos = 0;
@@ -222,8 +219,8 @@ static void sysctl_test_dointvec_read_happy_single_negative(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	size_t len = 5;

	loff_t pos = 0;
@@ -251,8 +248,8 @@ static void sysctl_test_dointvec_write_happy_single_positive(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	char input[] = "9";

	size_t len = sizeof(input) - 1;
@@ -281,8 +278,8 @@ static void sysctl_test_dointvec_write_happy_single_negative(struct kunit *test) 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	char input[] = "-9";

	size_t len = sizeof(input) - 1;
@@ -313,8 +310,8 @@ static void sysctl_test_api_dointvec_write_single_less_int_min( 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	size_t max_len = 32, len = max_len;

	loff_t pos = 0;
@@ -351,8 +348,8 @@ static void sysctl_test_api_dointvec_write_single_greater_int_max( 
		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.extra1		= &i_zero,

		.extra2         = &i_one_hundred,

		.extra1		= SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE_HUNDRED,

	};

	size_t max_len = 32, len = max_len;

	loff_t pos = 0;

kernel/sysctl.c

+12 −10
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ 
#include <linux/rtmutex.h>

#endif



/* shared constants to be used in various sysctls */

const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };

EXPORT_SYMBOL(sysctl_vals);



const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };

EXPORT_SYMBOL_GPL(sysctl_long_vals);



#if defined(CONFIG_SYSCTL)



/* Constants used for minimum and maximum */
@@ -129,11 +136,6 @@ static enum sysctl_writes_mode sysctl_writes_strict = SYSCTL_WRITES_STRICT; 
int sysctl_legacy_va_layout;

#endif



#ifdef CONFIG_COMPACTION

/* min_extfrag_threshold is SYSCTL_ZERO */;

static const int max_extfrag_threshold = 1000;

#endif



#endif /* CONFIG_SYSCTL */



/*
@@ -1052,9 +1054,9 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, 
		return 0;

	}



	i = (unsigned long *) data;

	min = (unsigned long *) table->extra1;

	max = (unsigned long *) table->extra2;

	i = data;

	min = table->extra1;

	max = table->extra2;

	vleft = table->maxlen / sizeof(unsigned long);

	left = *lenp;
@@ -2216,7 +2218,7 @@ static struct ctl_table vm_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= (void *)&max_extfrag_threshold,

		.extra2		= SYSCTL_ONE_THOUSAND,

	},

	{

		.procname	= "compact_unevictable_allowed",