sched: move autogroup sysctls into its own file
Subsystems (3)
PATCH 1/1 sched: move autogroup sysctls into its own file
move autogroup sysctls to autogroup.c and use the new register_sysctl_init() to register the sysctl interface.
Signed-off-by Zhen Ni <[email protected]>
--- include/linux/sched/sysctl.h | 4 ---- kernel/sched/autogroup.c | 23 +++++++++++++++++++++++ kernel/sched/autogroup.h | 1 + kernel/sysctl.c | 11 ----------- 4 files changed, 24 insertions(+), 15 deletions(-)
include/linux/sched/sysctl.h +0 -4
@@ -45,10 +45,6 @@ extern unsigned int sysctl_sched_uclamp_util_min_rt_default;extern unsigned int sysctl_sched_cfs_bandwidth_slice;#endif -#ifdef CONFIG_SCHED_AUTOGROUP -extern unsigned int sysctl_sched_autogroup_enabled; -#endif -extern int sysctl_sched_rr_timeslice;extern int sched_rr_timeslice;
kernel/sched/autogroup.c +23 -0
@@ -9,6 +9,28 @@ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;static struct autogroup autogroup_default;static atomic_t autogroup_seq_nr; +#ifdef CONFIG_SYSCTL +static struct ctl_table sched_autogroup_sysctls[] = { + { + .procname ="sched_autogroup_enabled" , + .data = &sysctl_sched_autogroup_enabled, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + {} +}; + +static void __init sched_autogroup_sysctl_init (void ) +{ +register_sysctl_init ("kernel" , sched_autogroup_sysctls); +} +#else +#define sched_autogroup_sysctl_init () do { } while (0) +#endif +void __init autogroup_init (struct task_struct *init_task) { autogroup_default.tg = &root_task_group;
@@ -198,6 +220,7 @@ void sched_autogroup_exit(struct signal_struct *sig)static int __init setup_autogroup (char *str) { sysctl_sched_autogroup_enabled =0 ; +sched_autogroup_sysctl_init ();return 1 ; }
kernel/sched/autogroup.h +1 -0
@@ -27,6 +27,7 @@ extern bool task_wants_autogroup(struct task_struct *p, struct task_group *tg);static inline struct task_group *autogroup_task_group (struct task_struct *p,struct task_group *tg) { +extern unsigned int sysctl_sched_autogroup_enabled;int enabled =READ_ONCE (sysctl_sched_autogroup_enabled);if (enabled &&task_wants_autogroup (p, tg))
kernel/sysctl.c +0 -11
@@ -1750,17 +1750,6 @@ static struct ctl_table kern_table[] = { .proc_handler = sysctl_sched_uclamp_handler, },#endif -#ifdef CONFIG_SCHED_AUTOGROUP - { - .procname = "sched_autogroup_enabled", - .data = &sysctl_sched_autogroup_enabled, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif#ifdef CONFIG_CFS_BANDWIDTH { .procname = "sched_cfs_bandwidth_slice_us",
Signature · 1 line
2.20.1
Peter Zijlstra
maintainerQuoted 4 lines · Zhen Ni
move autogroup sysctls to
autogroup.cand use the newregister_sysctl_init()to register the sysctl interface.Signed-off-by Zhen Ni <[email protected]>
Thanks!
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: c8eaf6ac76f40f6c59fc7d056e2e08c4a57ea9c7 Gitweb: https://git.kernel.org/tip/c8eaf6ac76f40f6c59fc7d056e2e08c4a57ea9c7 Author: Zhen Ni <[email protected]> AuthorDate: Fri, 28 Jan 2022 17:50:25 +08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 02 Feb 2022 13:11:37 +01:00
sched: move autogroup sysctls into its own file
move autogroup sysctls to autogroup.c and use the new register_sysctl_init() to register the sysctl interface.
Signed-off-by Zhen Ni <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
--- include/linux/sched/sysctl.h | 4 ---- kernel/sched/autogroup.c | 23 +++++++++++++++++++++++ kernel/sched/autogroup.h | 1 + kernel/sysctl.c | 11 ----------- 4 files changed, 24 insertions(+), 15 deletions(-)
include/linux/sched/sysctl.h +0 -4
@@ -45,10 +45,6 @@ extern unsigned int sysctl_sched_uclamp_util_min_rt_default;extern unsigned int sysctl_sched_cfs_bandwidth_slice;#endif -#ifdef CONFIG_SCHED_AUTOGROUP -extern unsigned int sysctl_sched_autogroup_enabled; -#endif -extern int sysctl_sched_rr_timeslice;extern int sched_rr_timeslice;
kernel/sched/autogroup.c +23 -0
@@ -9,6 +9,28 @@ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;static struct autogroup autogroup_default;static atomic_t autogroup_seq_nr; +#ifdef CONFIG_SYSCTL +static struct ctl_table sched_autogroup_sysctls[] = { + { + .procname ="sched_autogroup_enabled" , + .data = &sysctl_sched_autogroup_enabled, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = proc_dointvec_minmax, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + {} +}; + +static void __init sched_autogroup_sysctl_init (void ) +{ +register_sysctl_init ("kernel" , sched_autogroup_sysctls); +} +#else +#define sched_autogroup_sysctl_init () do { } while (0) +#endif +void __init autogroup_init (struct task_struct *init_task) { autogroup_default.tg = &root_task_group;
@@ -198,6 +220,7 @@ void sched_autogroup_exit(struct signal_struct *sig)static int __init setup_autogroup (char *str) { sysctl_sched_autogroup_enabled =0 ; +sched_autogroup_sysctl_init ();return 1 ; }
kernel/sched/autogroup.h +1 -0
@@ -27,6 +27,7 @@ extern bool task_wants_autogroup(struct task_struct *p, struct task_group *tg);static inline struct task_group *autogroup_task_group (struct task_struct *p,struct task_group *tg) { +extern unsigned int sysctl_sched_autogroup_enabled;int enabled =READ_ONCE (sysctl_sched_autogroup_enabled);if (enabled &&task_wants_autogroup (p, tg))
kernel/sysctl.c +0 -11
@@ -1750,17 +1750,6 @@ static struct ctl_table kern_table[] = { .proc_handler = sysctl_sched_uclamp_handler, },#endif -#ifdef CONFIG_SCHED_AUTOGROUP - { - .procname = "sched_autogroup_enabled", - .data = &sysctl_sched_autogroup_enabled, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif#ifdef CONFIG_CFS_BANDWIDTH { .procname = "sched_cfs_bandwidth_slice_us",