sched: Move a series of sysctls starting with sys/kernel/sched_*
Subsystems (3)
cover sched: Move a series of sysctls starting with sys/kernel/sched_*
*** BLURB HERE ***
Zhen Ni (8):
sched: Move child_runs_first sysctls to fair.c
sched: Move schedstats sysctls to core.c
sched: Move rt_period/runtime sysctls to rt.c
sched: Move deadline_period sysctls to deadline.c
sched: Move rr_timeslice sysctls to rt.c
sched: Move uclamp_util sysctls to core.c
sched: Move cfs_bandwidth_slice sysctls to fair.c
sched: Move energy_aware sysctls to topology.c
include/linux/sched/sysctl.h | 41 --------------- kernel/sched/core.c | 69 ++++++++++++++++++------- kernel/sched/deadline.c | 42 +++++++++++++--- kernel/sched/fair.c | 32 +++++++++++- kernel/sched/rt.c | 56 +++++++++++++++++++-- kernel/sched/sched.h | 7 +++ kernel/sched/topology.c | 25 +++++++++- kernel/sysctl.c | 97 ------------------------------------ 8 files changed, 199 insertions(+), 170 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/8 sched: Move child_runs_first sysctls to fair.c
move child_runs_first sysctls to fair.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 2 -- kernel/sched/fair.c | 19 +++++++++++++++++++ kernel/sched/sched.h | 2 ++ kernel/sysctl.c | 7 ------- 4 files changed, 21 insertions(+), 9 deletions(-)
include/linux/sched/sysctl.h +0 -2
@@ -14,8 +14,6 @@ extern unsigned long sysctl_hung_task_timeout_secs;enum { sysctl_hung_task_timeout_secs =0 };#endif -extern unsigned int sysctl_sched_child_runs_first; -enum sched_tunable_scaling {SCHED_TUNABLESCALING_NONE ,SCHED_TUNABLESCALING_LOG ,
kernel/sched/fair.c +19 -0
@@ -77,6 +77,25 @@ static unsigned int sched_nr_latency = 8;* parent will (try to) run first. */ unsigned int sysctl_sched_child_runs_first__read_mostly ; +#ifdef CONFIG_SYSCTL +static struct ctl_table sched_child_runs_first_sysctls[] = { + { + .procname ="sched_child_runs_first" , + .data = &sysctl_sched_child_runs_first, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = proc_dointvec, + }, + {} +}; + +static int __init sched_child_runs_first_sysctl_init (void ) +{ +register_sysctl_init ("kernel" , sched_child_runs_first_sysctls); +return 0 ; +} +late_initcall (sched_child_runs_first_sysctl_init); +#endif /* * SCHED_OTHER wake-up granularity.
kernel/sched/sched.h +2 -0
@@ -96,6 +96,8 @@ extern __read_mostly int scheduler_running;extern unsigned long calc_load_update;extern atomic_long_t calc_load_tasks; +extern unsigned int sysctl_sched_child_runs_first; +extern void calc_global_load_tick (struct rq *this_rq);extern long calc_load_fold_active (struct rq *this_rq,long adjust);
kernel/sysctl.c +0 -7
@@ -1652,13 +1652,6 @@ int proc_do_static_key(struct ctl_table *table, int write, } static struct ctl_table kern_table[] = { - { - .procname ="sched_child_runs_first" , - .data = &sysctl_sched_child_runs_first, - .maxlen =sizeof (unsigned int ), - .mode =0644 , - .proc_handler = proc_dointvec, - }, #ifdef CONFIG_SCHEDSTATS { .procname = "sched_schedstats",
Signature · 4 lines
2.20.1 .
PATCH 2/8 sched: Move schedstats sysctls to core.c
In reply to Zhen Nimove schedstats sysctls to core.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 2 -- kernel/sched/core.c | 22 +++++++++++++++++++++- kernel/sysctl.c | 11 ----------- 3 files changed, 21 insertions(+), 14 deletions(-)
include/linux/sched/sysctl.h +0 -2
@@ -54,8 +54,6 @@ int sysctl_sched_uclamp_handler(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos);int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); -int sysctl_schedstats (struct ctl_table *table,int write,void *buffer, -size_t *lenp,loff_t *ppos);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )extern unsigned int sysctl_sched_energy_aware;
kernel/sched/core.c +21 -1
@@ -4354,7 +4354,7 @@ static int __init setup_schedstats(char *str)__setup ("schedstats=" , setup_schedstats);#ifdef CONFIG_PROC_SYSCTL -int sysctl_schedstats (struct ctl_table *table,int write,void *buffer, +static int sysctl_schedstats (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {struct ctl_table t;
@@ -4373,6 +4373,26 @@ int sysctl_schedstats(struct ctl_table *table, int write, void *buffer,set_schedstats (state);return err; } + +static struct ctl_table sched_schedstats_sysctls[] = { + { + .procname ="sched_schedstats" , + .data =NULL , + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = sysctl_schedstats, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + {} +}; + +static int __init sched_schedstats_sysctl_init (void ) +{ +register_sysctl_init ("kernel" , sched_schedstats_sysctls); +return 0 ; +} +late_initcall (sched_schedstats_sysctl_init);#endif /* CONFIG_PROC_SYSCTL */ #endif /* CONFIG_SCHEDSTATS */
kernel/sysctl.c +0 -11
@@ -1652,17 +1652,6 @@ int proc_do_static_key(struct ctl_table *table, int write, } static struct ctl_table kern_table[] = { -#ifdef CONFIG_SCHEDSTATS - { - .procname = "sched_schedstats", - .data = NULL, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_schedstats, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif /* CONFIG_SCHEDSTATS */ #ifdef CONFIG_TASK_DELAY_ACCT { .procname = "task_delayacct",
Signature · 1 line
2.20.1
PATCH 3/8 sched: Move rt_period/runtime sysctls to rt.c
In reply to Zhen Nimove rt_period/runtime sysctls to rt.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 11 --------- kernel/sched/core.c | 13 ----------- kernel/sched/rt.c | 43 +++++++++++++++++++++++++++++++++++- kernel/sched/sched.h | 4 ++++ kernel/sysctl.c | 14 ------------ 5 files changed, 46 insertions(+), 39 deletions(-)
include/linux/sched/sysctl.h +0 -11
@@ -21,15 +21,6 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; -/* -* control realtime throttling: -* -* /proc/sys/kernel/sched_rt_period_us -* /proc/sys/kernel/sched_rt_runtime_us -*/ -extern unsigned int sysctl_sched_rt_period; -extern int sysctl_sched_rt_runtime; -extern unsigned int sysctl_sched_dl_period_max;extern unsigned int sysctl_sched_dl_period_min;
@@ -48,8 +39,6 @@ extern int sched_rr_timeslice;int sched_rr_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); -int sched_rt_handler (struct ctl_table *table,int write,void *buffer, -size_t *lenp,loff_t *ppos);int sysctl_sched_uclamp_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); int sysctl_numa_balancing(struct ctl_table *table, int write, void *buffer,
kernel/sched/core.c +0 -13
@@ -81,12 +81,6 @@ const_debug unsigned int sysctl_sched_nr_migrate = 8; const_debug unsigned int sysctl_sched_nr_migrate = 32;#endif -/* -* period over which we measure -rt task CPU usage in us. -* default: 1s -*/ -unsigned int sysctl_sched_rt_period =1000000 ; -__read_mostly int scheduler_running;#ifdef CONFIG_SCHED_CORE
@@ -380,13 +374,6 @@ sched_core_dequeue(struct rq *rq, struct task_struct *p, int flags) { }#endif /* CONFIG_SCHED_CORE */ -/* -* part of the period that we allow rt tasks to run in us. -* default: 0.95s -*/ -int sysctl_sched_rt_runtime =950000 ; - -/* * Serialization rules: *
kernel/sched/rt.c +42 -1
55 lines not on this page · raw message
kernel/sched/sched.h +4 -0
@@ -102,6 +102,10 @@ extern void calc_global_load_tick(struct rq *this_rq);extern long calc_load_fold_active (struct rq *this_rq,long adjust);extern void call_trace_sched_update_nr_running (struct rq *rq,int count); + +extern unsigned int sysctl_sched_rt_period; +extern int sysctl_sched_rt_runtime; +/* * Helpers for converting nanosecond timing to jiffy resolution */
kernel/sysctl.c +0 -14
@@ -1674,20 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ - { - .procname = "sched_rt_period_us", - .data = &sysctl_sched_rt_period, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sched_rt_handler, - }, - { - .procname = "sched_rt_runtime_us", - .data = &sysctl_sched_rt_runtime, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = sched_rt_handler, - }, { .procname = "sched_deadline_period_max_us", .data = &sysctl_sched_dl_period_max,
Signature · 1 line
2.20.1
kernel test robot
build botRe: [PATCH 3/8] sched: Move rt_period/runtime sysctls to rt.c
Thank you for the patch! Yet something to improve:
Hi Zhen,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on tip/sched/core]
[also build test ERROR on linus/master kees/for-next/pstore v5.17-rc4] [cannot apply to next-20220214]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhen-Ni/sched-Move-a-series-of-sysctls-starting-with-sys-kernel-sched_/20220215-132416 base: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 3624ba7b5e2acc02b01301ea5fd3534971eb9896 config: parisc-randconfig-r023-20220214 (https://download.01.org/0day-ci/archive/20220215/202202151509.TszSxsaB-lkp(a)intel.com/config) compiler: hppa-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f93266963b3b3629980fa3384a5e37fd13f4c350
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zhen-Ni/sched-Move-a-series-of-sysctls-starting-with-sys-kernel-sched_/20220215-132416 git checkout f93266963b3b3629980fa3384a5e37fd13f4c350
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=parisc SHELL=/bin/bash kernel/rcu/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
kernel/rcu/rcutorture.c: In function 'rcu_torture_disable_rt_throttle':
>> kernel/rcu/rcutorture.c:921:26: error: 'sysctl_sched_rt_runtime' undeclared (first use in this function); did you mean 'sysctl_sched_rr_timeslice'?
921 | old_rt_runtime = sysctl_sched_rt_runtime;
| ^~~~~~~~~~~~~~~~~~~~~~~
| sysctl_sched_rr_timeslice
kernel/rcu/rcutorture.c:921:26: note: each undeclared identifier is reported only once for each function it appears in
kernel/rcu/rcutorture.c: In function 'rcu_torture_enable_rt_throttle':
kernel/rcu/rcutorture.c:930:9: error: 'sysctl_sched_rt_runtime' undeclared (first use in this function); did you mean 'sysctl_sched_rr_timeslice'?
930 | sysctl_sched_rt_runtime = old_rt_runtime;
| ^~~~~~~~~~~~~~~~~~~~~~~
| sysctl_sched_rr_timeslicevim +921 kernel/rcu/rcutorture.c
450efca7182a51 Joel Fernandes (Google 2018-06-10 909)
450efca7182a51 Joel Fernandes (Google 2018-06-10 910) static void rcu_torture_disable_rt_throttle(void)
450efca7182a51 Joel Fernandes (Google 2018-06-10 911) {
450efca7182a51 Joel Fernandes (Google 2018-06-10 912) /*
450efca7182a51 Joel Fernandes (Google 2018-06-10 913) * Disable RT throttling so that rcutorture's boost threads don't get
450efca7182a51 Joel Fernandes (Google 2018-06-10 914) * throttled. Only possible if rcutorture is built-in otherwise the
450efca7182a51 Joel Fernandes (Google 2018-06-10 915) * user should manually do this by setting the sched_rt_period_us and
450efca7182a51 Joel Fernandes (Google 2018-06-10 916) * sched_rt_runtime sysctls.
450efca7182a51 Joel Fernandes (Google 2018-06-10 917) */
450efca7182a51 Joel Fernandes (Google 2018-06-10 918) if (!IS_BUILTIN(CONFIG_RCU_TORTURE_TEST) || old_rt_runtime != -1)
450efca7182a51 Joel Fernandes (Google 2018-06-10 919) return;
450efca7182a51 Joel Fernandes (Google 2018-06-10 920)
450efca7182a51 Joel Fernandes (Google 2018-06-10 @921) old_rt_runtime = sysctl_sched_rt_runtime;
450efca7182a51 Joel Fernandes (Google 2018-06-10 922) sysctl_sched_rt_runtime = -1;
450efca7182a51 Joel Fernandes (Google 2018-06-10 923) }
450efca7182a51 Joel Fernandes (Google 2018-06-10 924) ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 3/8] sched: Move rt_period/runtime sysctls to rt.c
Zhen,
please get lkp to add your git tree to test it before you submit patches. The FAQ for Intel lkp describes what to do.
Luis
kernel test robot
build botRe: [PATCH 3/8] sched: Move rt_period/runtime sysctls to rt.c
In reply to Zhen NiThank you for the patch! Yet something to improve:
Hi Zhen,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on tip/sched/core]
[also build test ERROR on linus/master kees/for-next/pstore v5.17-rc4] [cannot apply to next-20220214]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhen-Ni/sched-Move-a-series-of-sysctls-starting-with-sys-kernel-sched_/20220215-132416 base: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 3624ba7b5e2acc02b01301ea5fd3534971eb9896 config: hexagon-randconfig-r033-20220214 (https://download.01.org/0day-ci/archive/20220215/202202151705.Uez40mBM-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 37f422f4ac31c8b8041c6b62065263314282dab6)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f93266963b3b3629980fa3384a5e37fd13f4c350
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zhen-Ni/sched-Move-a-series-of-sysctls-starting-with-sys-kernel-sched_/20220215-132416 git checkout f93266963b3b3629980fa3384a5e37fd13f4c350
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash kernel/rcu/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
kernel/rcu/rcutorture.c:380:16: warning: variable 'started' set but not used [-Wunused-but-set-variable]
unsigned long started;
^
kernel/rcu/rcutorture.c:381:16: warning: variable 'completed' set but not used [-Wunused-but-set-variable]
unsigned long completed;
^
kernel/rcu/rcutorture.c:384:21: warning: variable 'ts' set but not used [-Wunused-but-set-variable]
unsigned long long ts;
^
>> kernel/rcu/rcutorture.c:921:19: error: use of undeclared identifier 'sysctl_sched_rt_runtime'; did you mean 'sysctl_sched_rr_timeslice'?
old_rt_runtime = sysctl_sched_rt_runtime;
^~~~~~~~~~~~~~~~~~~~~~~
sysctl_sched_rr_timeslice
include/linux/sched/sysctl.h:37:12: note: 'sysctl_sched_rr_timeslice' declared here
extern int sysctl_sched_rr_timeslice;
^
kernel/rcu/rcutorture.c:922:2: error: use of undeclared identifier 'sysctl_sched_rt_runtime'
sysctl_sched_rt_runtime = -1;
^
kernel/rcu/rcutorture.c:930:2: error: use of undeclared identifier 'sysctl_sched_rt_runtime'
sysctl_sched_rt_runtime = old_rt_runtime;
^
kernel/rcu/rcutorture.c:1620:21: warning: variable 'ts' set but not used [-Wunused-but-set-variable]
unsigned long long ts;
^4 warnings and 3 errors generated.
vim +921 kernel/rcu/rcutorture.c
450efca7182a516 Joel Fernandes (Google 2018-06-10 909)
450efca7182a516 Joel Fernandes (Google 2018-06-10 910) static void rcu_torture_disable_rt_throttle(void)
450efca7182a516 Joel Fernandes (Google 2018-06-10 911) {
450efca7182a516 Joel Fernandes (Google 2018-06-10 912) /*
450efca7182a516 Joel Fernandes (Google 2018-06-10 913) * Disable RT throttling so that rcutorture's boost threads don't get
450efca7182a516 Joel Fernandes (Google 2018-06-10 914) * throttled. Only possible if rcutorture is built-in otherwise the
450efca7182a516 Joel Fernandes (Google 2018-06-10 915) * user should manually do this by setting the sched_rt_period_us and
450efca7182a516 Joel Fernandes (Google 2018-06-10 916) * sched_rt_runtime sysctls.
450efca7182a516 Joel Fernandes (Google 2018-06-10 917) */
450efca7182a516 Joel Fernandes (Google 2018-06-10 918) if (!IS_BUILTIN(CONFIG_RCU_TORTURE_TEST) || old_rt_runtime != -1)
450efca7182a516 Joel Fernandes (Google 2018-06-10 919) return;
450efca7182a516 Joel Fernandes (Google 2018-06-10 920)
450efca7182a516 Joel Fernandes (Google 2018-06-10 @921) old_rt_runtime = sysctl_sched_rt_runtime;
450efca7182a516 Joel Fernandes (Google 2018-06-10 922) sysctl_sched_rt_runtime = -1;
450efca7182a516 Joel Fernandes (Google 2018-06-10 923) }
450efca7182a516 Joel Fernandes (Google 2018-06-10 924) ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH 4/8 sched: Move deadline_period sysctls to deadline.c
In reply to Zhen Nimove deadline_period sysctls to deadline.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 3 --- kernel/sched/deadline.c | 42 +++++++++++++++++++++++++++++------- kernel/sysctl.c | 14 ------------ 3 files changed, 34 insertions(+), 25 deletions(-)
include/linux/sched/sysctl.h +0 -3
@@ -21,9 +21,6 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; -extern unsigned int sysctl_sched_dl_period_max; -extern unsigned int sysctl_sched_dl_period_min; -#ifdef CONFIG_UCLAMP_TASK extern unsigned int sysctl_sched_uclamp_util_min;extern unsigned int sysctl_sched_uclamp_util_max;
kernel/sched/deadline.c +34 -8
54 lines not on this page · raw message
kernel/sysctl.c +0 -14
@@ -1674,20 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ - { - .procname = "sched_deadline_period_max_us", - .data = &sysctl_sched_dl_period_max, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "sched_deadline_period_min_us", - .data = &sysctl_sched_dl_period_min, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, { .procname = "sched_rr_timeslice_ms", .data = &sysctl_sched_rr_timeslice,
Signature · 1 line
2.20.1
PATCH 5/8 sched: Move rr_timeslice sysctls to rt.c
In reply to Zhen Nimove rr_timeslice sysctls to rt.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 5 ----- kernel/sched/rt.c | 13 +++++++++++-- kernel/sched/sched.h | 1 + kernel/sysctl.c | 7 ------- 4 files changed, 12 insertions(+), 14 deletions(-)
include/linux/sched/sysctl.h +0 -5
@@ -31,11 +31,6 @@ extern unsigned int sysctl_sched_uclamp_util_min_rt_default;extern unsigned int sysctl_sched_cfs_bandwidth_slice;#endif -extern int sysctl_sched_rr_timeslice; -extern int sched_rr_timeslice; - -int sched_rr_handler (struct ctl_table *table,int write,void *buffer, -size_t *lenp,loff_t *ppos);int sysctl_sched_uclamp_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); int sysctl_numa_balancing(struct ctl_table *table, int write, void *buffer,
kernel/sched/rt.c +11 -2
@@ -8,7 +8,7 @@#include "pelt.h" int sched_rr_timeslice =RR_TIMESLICE ; -int sysctl_sched_rr_timeslice = (MSEC_PER_SEC /HZ ) *RR_TIMESLICE ; +static int sysctl_sched_rr_timeslice = (MSEC_PER_SEC /HZ ) *RR_TIMESLICE ;/* More than 4 hours if BW_SHIFT equals 20. */ static const u64 max_rt_runtime =MAX_BW ;
@@ -30,6 +30,8 @@ int sysctl_sched_rt_runtime = 950000;static int sched_rt_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); +static int sched_rr_handler (struct ctl_table *table,int write,void *buffer, +size_t *lenp,loff_t *ppos); #ifdef CONFIG_SYSCTL static struct ctl_table sched_rt_sysctls[] = { {
@@ -46,6 +48,13 @@ static struct ctl_table sched_rt_sysctls[] = { .mode = 0644, .proc_handler = sched_rt_handler, }, + { + .procname = "sched_rr_timeslice_ms", + .data = &sysctl_sched_rr_timeslice, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = sched_rr_handler, + }, {} };
@@ -3008,7 +3017,7 @@ static int sched_rt_handler(struct ctl_table *table, int write, void *buffer,return ret; } -int sched_rr_handler (struct ctl_table *table,int write,void *buffer, +static int sched_rr_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {int ret;
kernel/sched/sched.h +1 -0
@@ -105,6 +105,7 @@ extern void call_trace_sched_update_nr_running(struct rq *rq, int count);extern unsigned int sysctl_sched_rt_period;extern int sysctl_sched_rt_runtime; +extern int sched_rr_timeslice;/* * Helpers for converting nanosecond timing to jiffy resolution
kernel/sysctl.c +0 -7
@@ -1674,13 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ - { - .procname = "sched_rr_timeslice_ms", - .data = &sysctl_sched_rr_timeslice, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = sched_rr_handler, - },#ifdef CONFIG_UCLAMP_TASK { .procname = "sched_util_clamp_min",
Signature · 1 line
2.20.1
PATCH 6/8 sched: Move uclamp_util sysctls to core.c
In reply to Zhen Nimove uclamp_util sysctls to core.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 8 ------ kernel/sched/core.c | 48 +++++++++++++++++++++++++++--------- kernel/sysctl.c | 23 ----------------- 3 files changed, 37 insertions(+), 42 deletions(-)
include/linux/sched/sysctl.h +0 -8
@@ -21,18 +21,10 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; -#ifdef CONFIG_UCLAMP_TASK -extern unsigned int sysctl_sched_uclamp_util_min; -extern unsigned int sysctl_sched_uclamp_util_max; -extern unsigned int sysctl_sched_uclamp_util_min_rt_default; -#endif -#ifdef CONFIG_CFS_BANDWIDTH extern unsigned int sysctl_sched_cfs_bandwidth_slice;#endif -int sysctl_sched_uclamp_handler (struct ctl_table *table,int write, -void *buffer,size_t *lenp,loff_t *ppos);int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos);
kernel/sched/core.c +37 -11
86 lines not on this page · raw message
kernel/sysctl.c +0 -23
@@ -1674,29 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ -#ifdef CONFIG_UCLAMP_TASK - { - .procname = "sched_util_clamp_min", - .data = &sysctl_sched_uclamp_util_min, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_sched_uclamp_handler, - }, - { - .procname = "sched_util_clamp_max", - .data = &sysctl_sched_uclamp_util_max, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_sched_uclamp_handler, - }, - { - .procname = "sched_util_clamp_min_rt_default", - .data = &sysctl_sched_uclamp_util_min_rt_default, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_sched_uclamp_handler, - }, -#endif#ifdef CONFIG_CFS_BANDWIDTH { .procname = "sched_cfs_bandwidth_slice_us",
Signature · 1 line
2.20.1
PATCH 7/8 sched: Move cfs_bandwidth_slice sysctls to fair.c
In reply to Zhen Nimove cfs_bandwidth_slice sysctls to fair.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 4 --- kernel/sched/fair.c | 51 ++++++++++++++++++++++-------------- kernel/sysctl.c | 10 ------- 3 files changed, 31 insertions(+), 34 deletions(-)
include/linux/sched/sysctl.h +0 -4
@@ -21,10 +21,6 @@ enum sched_tunable_scaling { SCHED_TUNABLESCALING_END, }; -#ifdef CONFIG_CFS_BANDWIDTH -extern unsigned int sysctl_sched_cfs_bandwidth_slice; -#endif -int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos);
kernel/sched/fair.c +31 -20
63 lines not on this page · raw message
kernel/sysctl.c +0 -10
@@ -1674,16 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ -#ifdef CONFIG_CFS_BANDWIDTH - { - .procname = "sched_cfs_bandwidth_slice_us", - .data = &sysctl_sched_cfs_bandwidth_slice, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ONE, - }, -#endif#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) { .procname = "sched_energy_aware",
Signature · 1 line
2.20.1
PATCH 8/8 sched: Move energy_aware sysctls to topology.c
In reply to Zhen Nimove energy_aware sysctls to topology.c and use the new register_sysctl_init() to register the sysctl interface.
--- include/linux/sched/sysctl.h | 6 ------ kernel/sched/topology.c | 25 +++++++++++++++++++++++-- kernel/sysctl.c | 11 ----------- 3 files changed, 23 insertions(+), 19 deletions(-)
include/linux/sched/sysctl.h +0 -6
@@ -24,10 +24,4 @@ enum sched_tunable_scaling {int sysctl_numa_balancing (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos); -#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) -extern unsigned int sysctl_sched_energy_aware; -int sched_energy_aware_handler (struct ctl_table *table,int write, -void *buffer,size_t *lenp,loff_t *ppos); -#endif -#endif /* _LINUX_SCHED_SYSCTL_H */
kernel/sched/topology.c +23 -2
@@ -207,7 +207,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )DEFINE_STATIC_KEY_FALSE (sched_energy_present); -unsigned int sysctl_sched_energy_aware =1 ; +static unsigned int sysctl_sched_energy_aware =1 ;DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update;
@@ -221,7 +221,7 @@ void rebuild_sched_domains_energy(void) }#ifdef CONFIG_PROC_SYSCTL -int sched_energy_aware_handler (struct ctl_table *table,int write, +static int sched_energy_aware_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {int ret, state;
@@ -238,6 +238,27 @@ int sched_energy_aware_handler(struct ctl_table *table, int write, return ret; } + +static struct ctl_table sched_energy_aware_sysctls[] = { + { + .procname ="sched_energy_aware" , + .data = &sysctl_sched_energy_aware, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = sched_energy_aware_handler, + .extra1 =SYSCTL_ZERO , + .extra2 =SYSCTL_ONE , + }, + {} +}; + +static int __init sched_energy_aware_sysctl_init (void ) +{ +register_sysctl_init ("kernel" , sched_energy_aware_sysctls); +return 0 ; +} + +late_initcall (sched_energy_aware_sysctl_init);#endif static void free_pd (struct perf_domain *pd)
kernel/sysctl.c +0 -11
@@ -1674,17 +1674,6 @@ static struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, },#endif /* CONFIG_NUMA_BALANCING */ -#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) - { - .procname = "sched_energy_aware", - .data = &sysctl_sched_energy_aware, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sched_energy_aware_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif#ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking",
Signature · 1 line
2.20.1
Quoted 2 lines · Zhen Ni
*** BLURB HERE ***
empty Cover-letter ?
-ck