History

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.

Joel Granados committed 1 year ago

Commit fff67031 parent f1b4f233 files · +31 −24Browse files

Unified · Split

3 files
  1. include/linux/panic.h +0 −2
  2. kernel/rcu/tree_stall.h +31 −2
  3. kernel/sysctl.c +0 −20
include/linux/panic.h+0−2
@@ -25,8 +25,6 @@ extern int panic_on_warn; · 24 unmodified lines
25extern unsigned long panic_on_taint;25extern unsigned long panic_on_taint;
26extern bool panic_on_taint_nousertaint;26extern bool panic_on_taint_nousertaint;
27 27
28extern int sysctl_panic_on_rcu_stall;
29extern int sysctl_max_rcu_stall_to_panic;
30extern int sysctl_panic_on_stackoverflow;28extern int sysctl_panic_on_stackoverflow;
31 29
32extern bool crash_kexec_post_notifiers;30extern bool crash_kexec_post_notifiers;
kernel/rcu/tree_stall.h+31−2
@@ -17,8 +17,37 @@ · 16 unmodified lines
17// Controlling CPU stall warnings, including delay calculation.17// Controlling CPU stall warnings, including delay calculation.
18 18
19/* panic() on RCU Stall sysctl. */19/* panic() on RCU Stall sysctl. */
20int sysctl_panic_on_rcu_stall __read_mostly;20static int sysctl_panic_on_rcu_stall __read_mostly;
21int sysctl_max_rcu_stall_to_panic __read_mostly;21static int sysctl_max_rcu_stall_to_panic __read_mostly;
22
23static const struct ctl_table rcu_stall_sysctl_table[] = {
24 {
25 .procname = "panic_on_rcu_stall",
26 .data = &sysctl_panic_on_rcu_stall,
27 .maxlen = sizeof(sysctl_panic_on_rcu_stall),
28 .mode = 0644,
29 .proc_handler = proc_dointvec_minmax,
30 .extra1 = SYSCTL_ZERO,
31 .extra2 = SYSCTL_ONE,
32 },
33 {
34 .procname = "max_rcu_stall_to_panic",
35 .data = &sysctl_max_rcu_stall_to_panic,
36 .maxlen = sizeof(sysctl_max_rcu_stall_to_panic),
37 .mode = 0644,
38 .proc_handler = proc_dointvec_minmax,
39 .extra1 = SYSCTL_ONE,
40 .extra2 = SYSCTL_INT_MAX,
41 },
42};
43
44static int __init init_rcu_stall_sysctl(void)
45{
46 register_sysctl_init("kernel", rcu_stall_sysctl_table);
47 return 0;
48}
49
50subsys_initcall(init_rcu_stall_sysctl);
22 51
23#ifdef CONFIG_SYSFS52#ifdef CONFIG_SYSFS
24 53
kernel/sysctl.c+0−20
@@ -1706,26 +1706,6 @@ static const struct ctl_table kern_table[] = { · 1705 unmodified lines
1706 .proc_handler = proc_dointvec,1706 .proc_handler = proc_dointvec,
1707 },1707 },
1708#endif1708#endif
1709#ifdef CONFIG_TREE_RCU
1710 {
1711 .procname = "panic_on_rcu_stall",
1712 .data = &sysctl_panic_on_rcu_stall,
1713 .maxlen = sizeof(sysctl_panic_on_rcu_stall),
1714 .mode = 0644,
1715 .proc_handler = proc_dointvec_minmax,
1716 .extra1 = SYSCTL_ZERO,
1717 .extra2 = SYSCTL_ONE,
1718 },
1719 {
1720 .procname = "max_rcu_stall_to_panic",
1721 .data = &sysctl_max_rcu_stall_to_panic,
1722 .maxlen = sizeof(sysctl_max_rcu_stall_to_panic),
1723 .mode = 0644,
1724 .proc_handler = proc_dointvec_minmax,
1725 .extra1 = SYSCTL_ONE,
1726 .extra2 = SYSCTL_INT_MAX,
1727 },
1728#endif
1729};1709};
1730 1710
1731int __init sysctl_init_bases(void)1711int __init sysctl_init_bases(void)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t