Commit fff6703f authored by Joel Granados's avatar Joel Granados
Browse files

rcu: Move rcu_stall related sysctls into rcu/tree_stall.h 



Move sysctl_panic_on_rcu_stall and sysctl_max_rcu_stall_to_panic into
the kernel/rcu subdirectory. Make these static in tree_stall.h and
removed them as extern from panic.h as their scope is now confined into
one file.

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent f1b4f23a

include/linux/panic.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ extern int panic_on_warn; 
extern unsigned long panic_on_taint;

extern bool panic_on_taint_nousertaint;



extern int sysctl_panic_on_rcu_stall;

extern int sysctl_max_rcu_stall_to_panic;

extern int sysctl_panic_on_stackoverflow;



extern bool crash_kexec_post_notifiers;

kernel/rcu/tree_stall.h

+31 −2
Original line number Diff line number Diff line
@@ -17,8 +17,37 @@ 
// Controlling CPU stall warnings, including delay calculation.



/* panic() on RCU Stall sysctl. */

int sysctl_panic_on_rcu_stall __read_mostly;

int sysctl_max_rcu_stall_to_panic __read_mostly;

static int sysctl_panic_on_rcu_stall __read_mostly;

static int sysctl_max_rcu_stall_to_panic __read_mostly;



static const struct ctl_table rcu_stall_sysctl_table[] = {

	{

		.procname	= "panic_on_rcu_stall",

		.data		= &sysctl_panic_on_rcu_stall,

		.maxlen		= sizeof(sysctl_panic_on_rcu_stall),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

	{

		.procname	= "max_rcu_stall_to_panic",

		.data		= &sysctl_max_rcu_stall_to_panic,

		.maxlen		= sizeof(sysctl_max_rcu_stall_to_panic),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_INT_MAX,

	},

};



static int __init init_rcu_stall_sysctl(void)

{

	register_sysctl_init("kernel", rcu_stall_sysctl_table);

	return 0;

}



subsys_initcall(init_rcu_stall_sysctl);



#ifdef CONFIG_SYSFS

kernel/sysctl.c

+0 −20
Original line number Diff line number Diff line
@@ -1706,26 +1706,6 @@ static const struct ctl_table kern_table[] = { 
		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_TREE_RCU

	{

		.procname	= "panic_on_rcu_stall",

		.data		= &sysctl_panic_on_rcu_stall,

		.maxlen		= sizeof(sysctl_panic_on_rcu_stall),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

	{

		.procname	= "max_rcu_stall_to_panic",

		.data		= &sysctl_max_rcu_stall_to_panic,

		.maxlen		= sizeof(sysctl_max_rcu_stall_to_panic),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_INT_MAX,

	},

#endif

};



int __init sysctl_init_bases(void)