From: Zhen Ni <nizhen@uniontech.com>
To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com,
vincent.guittot@linaro.org, mcgrof@kernel.org,
keescook@chromium.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Zhen Ni <nizhen@uniontech.com>
Subject: [PATCH v3 7/8] sched: Move cfs_bandwidth_slice sysctls to fair.c
Date: Tue, 15 Feb 2022 19:46:03 +0800 [thread overview]
Message-ID: <20220215114604.25772-8-nizhen@uniontech.com> (raw)
In-Reply-To: <20220215114604.25772-1-nizhen@uniontech.com>
move cfs_bandwidth_slice sysctls to fair.c and use the
new register_sysctl_init() to register the sysctl interface.
Signed-off-by: Zhen Ni <nizhen@uniontech.com>
---
include/linux/sched/sysctl.h | 4 ---
kernel/sched/fair.c | 51 ++++++++++++++++++++++--------------
kernel/sysctl.c | 10 -------
3 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index 9fe879602c4f..053688eafd51 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -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);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 4ac1bfe8ca4f..321ddda16909 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -77,25 +77,6 @@ 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.
@@ -160,7 +141,37 @@ int __weak arch_asym_cpu_priority(int cpu)
*
* (default: 5 msec, units: microseconds)
*/
-unsigned int sysctl_sched_cfs_bandwidth_slice = 5000UL;
+static unsigned int sysctl_sched_cfs_bandwidth_slice = 5000UL;
+#endif
+
+#ifdef CONFIG_SYSCTL
+static struct ctl_table sched_fair_sysctls[] = {
+ {
+ .procname = "sched_child_runs_first",
+ .data = &sysctl_sched_child_runs_first,
+ .maxlen = sizeof(unsigned int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
+#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
+ {}
+};
+
+static int __init sched_fair_sysctl_init(void)
+{
+ register_sysctl_init("kernel", sched_fair_sysctls);
+ return 0;
+}
+late_initcall(sched_fair_sysctl_init);
#endif
static inline void update_load_add(struct load_weight *lw, unsigned long inc)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index d811e471f7d3..21b797906cc4 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -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",
--
2.20.1
next prev parent reply other threads:[~2022-02-15 11:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 11:45 [PATCH v3 0/8] sched: Move a series of sysctls starting with sys/kernel/sched_* Zhen Ni
2022-02-15 11:45 ` [PATCH v3 1/8] sched: Move child_runs_first sysctls to fair.c Zhen Ni
2022-02-15 11:45 ` [PATCH v3 2/8] sched: Move schedstats sysctls to core.c Zhen Ni
2022-02-15 11:45 ` [PATCH v3 3/8] sched: Move rt_period/runtime sysctls to rt.c Zhen Ni
2022-02-15 11:46 ` [PATCH v3 4/8] sched: Move deadline_period sysctls to deadline.c Zhen Ni
2022-02-15 11:46 ` [PATCH v3 5/8] sched: Move rr_timeslice sysctls to rt.c Zhen Ni
2022-02-15 11:46 ` [PATCH v3 6/8] sched: Move uclamp_util sysctls to core.c Zhen Ni
2022-02-15 11:46 ` Zhen Ni [this message]
2022-02-15 11:46 ` [PATCH v3 8/8] sched: Move energy_aware sysctls to topology.c Zhen Ni
2022-02-17 7:51 ` [PATCH v3 0/8] sched: Move a series of sysctls starting with sys/kernel/sched_* Luis Chamberlain
2022-02-18 2:52 ` Andrew Morton
2022-02-18 18:21 ` Luis Chamberlain
2022-02-20 0:05 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220215114604.25772-8-nizhen@uniontech.com \
--to=nizhen@uniontech.com \
--cc=juri.lelli@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.