Commit 44d35720 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sysctl updates from Luis Chamberlain:
 "For two kernel releases now kernel/sysctl.c has been being cleaned up
  slowly, since the tables were grossly long, sprinkled with tons of
  #ifdefs and all this caused merge conflicts with one susbystem or
  another.

  This tree was put together to help try to avoid conflicts with these
  cleanups going on different trees at time. So nothing exciting on this
  pull request, just cleanups.

  Thanks a lot to the Uniontech and Huawei folks for doing some of this
  nasty work"

* tag 'sysctl-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux: (28 commits)
  sched: Fix build warning without CONFIG_SYSCTL
  reboot: Fix build warning without CONFIG_SYSCTL
  kernel/kexec_core: move kexec_core sysctls into its own file
  sysctl: minor cleanup in new_dir()
  ftrace: fix building with SYSCTL=y but DYNAMIC_FTRACE=n
  fs/proc: Introduce list_for_each_table_entry for proc sysctl
  mm: fix unused variable kernel warning when SYSCTL=n
  latencytop: move sysctl to its own file
  ftrace: fix building with SYSCTL=n but DYNAMIC_FTRACE=y
  ftrace: Fix build warning
  ftrace: move sysctl_ftrace_enabled to ftrace.c
  kernel/do_mount_initrd: move real_root_dev sysctls to its own file
  kernel/delayacct: move delayacct sysctls to its own file
  kernel/acct: move acct sysctls to its own file
  kernel/panic: move panic sysctls to its own file
  kernel/lockdep: move lockdep sysctls to its own file
  mm: move page-writeback sysctls to their own file
  mm: move oom_kill sysctls to their own file
  kernel/reboot: move reboot sysctls to its own file
  sched: Move energy_aware sysctls to topology.c
  ...
parents cdeffe87 494dcdf4

fs/proc/proc_sysctl.c

+50 −39
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#include <linux/kmemleak.h>

#include "internal.h"



#define list_for_each_table_entry(entry, table) \

	for ((entry) = (table); (entry)->procname; (entry)++)



static const struct dentry_operations proc_sys_dentry_operations;

static const struct file_operations proc_sys_file_operations;

static const struct inode_operations proc_sys_inode_operations;
@@ -215,15 +218,19 @@ static void init_header(struct ctl_table_header *head, 
	INIT_HLIST_HEAD(&head->inodes);

	if (node) {

		struct ctl_table *entry;

		for (entry = table; entry->procname; entry++, node++)



		list_for_each_table_entry(entry, table) {

			node->header = head;

			node++;

		}

	}

}



static void erase_header(struct ctl_table_header *head)

{

	struct ctl_table *entry;

	for (entry = head->ctl_table; entry->procname; entry++)



	list_for_each_table_entry(entry, head->ctl_table)

		erase_entry(head, entry);

}
@@ -248,7 +255,7 @@ static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header) 
	err = insert_links(header);

	if (err)

		goto fail_links;

	for (entry = header->ctl_table; entry->procname; entry++) {

	list_for_each_table_entry(entry, header->ctl_table) {

		err = insert_entry(header, entry);

		if (err)

			goto fail;
@@ -978,7 +985,6 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, 
	table = (struct ctl_table *)(node + 1);

	new_name = (char *)(table + 2);

	memcpy(new_name, name, namelen);

	new_name[namelen] = '\0';

	table[0].procname = new_name;

	table[0].mode = S_IFDIR|S_IRUGO|S_IXUGO;

	init_header(&new->header, set->dir.header.root, set, node, table);
@@ -1130,35 +1136,36 @@ static int sysctl_check_table_array(const char *path, struct ctl_table *table) 


static int sysctl_check_table(const char *path, struct ctl_table *table)

{

	struct ctl_table *entry;

	int err = 0;

	for (; table->procname; table++) {

		if (table->child)

			err |= sysctl_err(path, table, "Not a file");



		if ((table->proc_handler == proc_dostring) ||

		    (table->proc_handler == proc_dointvec) ||

		    (table->proc_handler == proc_douintvec) ||

		    (table->proc_handler == proc_douintvec_minmax) ||

		    (table->proc_handler == proc_dointvec_minmax) ||

		    (table->proc_handler == proc_dou8vec_minmax) ||

		    (table->proc_handler == proc_dointvec_jiffies) ||

		    (table->proc_handler == proc_dointvec_userhz_jiffies) ||

		    (table->proc_handler == proc_dointvec_ms_jiffies) ||

		    (table->proc_handler == proc_doulongvec_minmax) ||

		    (table->proc_handler == proc_doulongvec_ms_jiffies_minmax)) {

			if (!table->data)

				err |= sysctl_err(path, table, "No data");

			if (!table->maxlen)

				err |= sysctl_err(path, table, "No maxlen");

	list_for_each_table_entry(entry, table) {

		if (entry->child)

			err |= sysctl_err(path, entry, "Not a file");



		if ((entry->proc_handler == proc_dostring) ||

		    (entry->proc_handler == proc_dointvec) ||

		    (entry->proc_handler == proc_douintvec) ||

		    (entry->proc_handler == proc_douintvec_minmax) ||

		    (entry->proc_handler == proc_dointvec_minmax) ||

		    (entry->proc_handler == proc_dou8vec_minmax) ||

		    (entry->proc_handler == proc_dointvec_jiffies) ||

		    (entry->proc_handler == proc_dointvec_userhz_jiffies) ||

		    (entry->proc_handler == proc_dointvec_ms_jiffies) ||

		    (entry->proc_handler == proc_doulongvec_minmax) ||

		    (entry->proc_handler == proc_doulongvec_ms_jiffies_minmax)) {

			if (!entry->data)

				err |= sysctl_err(path, entry, "No data");

			if (!entry->maxlen)

				err |= sysctl_err(path, entry, "No maxlen");

			else

				err |= sysctl_check_table_array(path, table);

				err |= sysctl_check_table_array(path, entry);

		}

		if (!table->proc_handler)

			err |= sysctl_err(path, table, "No proc_handler");

		if (!entry->proc_handler)

			err |= sysctl_err(path, entry, "No proc_handler");



		if ((table->mode & (S_IRUGO|S_IWUGO)) != table->mode)

			err |= sysctl_err(path, table, "bogus .mode 0%o",

				table->mode);

		if ((entry->mode & (S_IRUGO|S_IWUGO)) != entry->mode)

			err |= sysctl_err(path, entry, "bogus .mode 0%o",

				entry->mode);

	}

	return err;

}
@@ -1174,7 +1181,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table 


	name_bytes = 0;

	nr_entries = 0;

	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		nr_entries++;

		name_bytes += strlen(entry->procname) + 1;

	}
@@ -1191,14 +1198,16 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table 
	node = (struct ctl_node *)(links + 1);

	link_table = (struct ctl_table *)(node + nr_entries);

	link_name = (char *)&link_table[nr_entries + 1];

	link = link_table;



	for (link = link_table, entry = table; entry->procname; link++, entry++) {

	list_for_each_table_entry(entry, table) {

		int len = strlen(entry->procname) + 1;

		memcpy(link_name, entry->procname, len);

		link->procname = link_name;

		link->mode = S_IFLNK|S_IRWXUGO;

		link->data = link_root;

		link_name += len;

		link++;

	}

	init_header(links, dir->header.root, dir->header.set, node, link_table);

	links->nreg = nr_entries;
@@ -1213,7 +1222,7 @@ static bool get_links(struct ctl_dir *dir, 
	struct ctl_table *entry, *link;



	/* Are there links available for every entry in table? */

	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		const char *procname = entry->procname;

		link = find_entry(&head, dir, procname, strlen(procname));

		if (!link)
@@ -1226,7 +1235,7 @@ static bool get_links(struct ctl_dir *dir, 
	}



	/* The checks passed.  Increase the registration count on the links */

	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		const char *procname = entry->procname;

		link = find_entry(&head, dir, procname, strlen(procname));

		head->nreg++;
@@ -1329,7 +1338,7 @@ struct ctl_table_header *__register_sysctl_table( 
	struct ctl_node *node;

	int nr_entries = 0;



	for (entry = table; entry->procname; entry++)

	list_for_each_table_entry(entry, table)

		nr_entries++;



	header = kzalloc(sizeof(struct ctl_table_header) +
@@ -1456,7 +1465,7 @@ static int count_subheaders(struct ctl_table *table) 
	if (!table || !table->procname)

		return 1;



	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		if (entry->child)

			nr_subheaders += count_subheaders(entry->child);

		else
@@ -1475,7 +1484,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, 
	int nr_dirs = 0;

	int err = -ENOMEM;



	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		if (entry->child)

			nr_dirs++;

		else
@@ -1492,7 +1501,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, 
			goto out;



		ctl_table_arg = files;

		for (new = files, entry = table; entry->procname; entry++) {

		new = files;



		list_for_each_table_entry(entry, table) {

			if (entry->child)

				continue;

			*new = *entry;
@@ -1516,7 +1527,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, 
	}



	/* Recurse into the subdirectories. */

	for (entry = table; entry->procname; entry++) {

	list_for_each_table_entry(entry, table) {

		char *child_pos;



		if (!entry->child)
@@ -1670,7 +1681,7 @@ static void put_links(struct ctl_table_header *header) 
	if (IS_ERR(core_parent))

		return;



	for (entry = header->ctl_table; entry->procname; entry++) {

	list_for_each_table_entry(entry, header->ctl_table) {

		struct ctl_table_header *link_head;

		struct ctl_table *link;

		const char *name = entry->procname;

include/linux/acct.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#ifdef CONFIG_BSD_PROCESS_ACCT

struct pid_namespace;

extern int acct_parm[]; /* for sysctl */

extern void acct_collect(long exitcode, int group_dead);

extern void acct_process(void);

extern void acct_exit_ns(struct pid_namespace *);

include/linux/delayacct.h

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ extern int delayacct_on; /* Delay accounting turned on/off */ 
extern struct kmem_cache *delayacct_cache;

extern void delayacct_init(void);



extern int sysctl_delayacct(struct ctl_table *table, int write, void *buffer,

			    size_t *lenp, loff_t *ppos);



extern void __delayacct_tsk_init(struct task_struct *);

extern void __delayacct_tsk_exit(struct task_struct *);

extern void __delayacct_blkio_start(void);

include/linux/ftrace.h

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ static inline int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *val 
#ifdef CONFIG_FUNCTION_TRACER



extern int ftrace_enabled;

extern int

ftrace_enable_sysctl(struct ctl_table *table, int write,

		     void *buffer, size_t *lenp, loff_t *ppos);



#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS

include/linux/initrd.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ static inline void wait_for_initramfs(void) {} 
extern phys_addr_t phys_initrd_start;

extern unsigned long phys_initrd_size;



extern unsigned int real_root_dev;



extern char __initramfs_start[];

extern unsigned long __initramfs_size;