From: Tejun Heo <tj@kernel.org>
To: torvalds@linux-foundation.org, mingo@redhat.com,
peterz@infradead.org, juri.lelli@redhat.com,
vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de,
bristot@redhat.com, vschneid@redhat.com, ast@kernel.org,
daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org,
joshdon@google.com, brho@google.com, pjt@google.com,
derkling@google.com, haoluo@google.com, dvernet@meta.com,
dschatzberg@meta.com, dskarlat@cs.cmu.edu, riel@surriel.com
Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
kernel-team@meta.com, Tejun Heo <tj@kernel.org>
Subject: [PATCH 09/32] sched: Enumerate CPU cgroup file types
Date: Fri, 17 Mar 2023 11:33:10 -1000 [thread overview]
Message-ID: <20230317213333.2174969-10-tj@kernel.org> (raw)
In-Reply-To: <20230317213333.2174969-1-tj@kernel.org>
Rename cpu[_legacy]_files to cpu[_legacy]_cftypes for clarity and add
cpu_cftype_id which enumerates every cgroup2 interface file type. This
doesn't make any functional difference now. The enums will be used to access
specific cftypes by a new BPF extensible sched_class to selectively show and
hide CPU controller interface files depending on the capability of the
currently loaded BPF scheduler progs.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: David Vernet <dvernet@meta.com>
Acked-by: Josh Don <joshdon@google.com>
Acked-by: Hao Luo <haoluo@google.com>
Acked-by: Barret Rhoden <brho@google.com>
---
kernel/sched/core.c | 22 +++++++++++-----------
kernel/sched/sched.h | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2a602f93f5f8..59136fafa94c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -11014,7 +11014,7 @@ static int cpu_idle_write_s64(struct cgroup_subsys_state *css,
}
#endif
-static struct cftype cpu_legacy_files[] = {
+static struct cftype cpu_legacy_cftypes[] = {
#ifdef CONFIG_FAIR_GROUP_SCHED
{
.name = "shares",
@@ -11221,21 +11221,21 @@ static ssize_t cpu_max_write(struct kernfs_open_file *of,
}
#endif
-static struct cftype cpu_files[] = {
+struct cftype cpu_cftypes[CPU_CFTYPE_CNT + 1] = {
#ifdef CONFIG_FAIR_GROUP_SCHED
- {
+ [CPU_CFTYPE_WEIGHT] = {
.name = "weight",
.flags = CFTYPE_NOT_ON_ROOT,
.read_u64 = cpu_weight_read_u64,
.write_u64 = cpu_weight_write_u64,
},
- {
+ [CPU_CFTYPE_WEIGHT_NICE] = {
.name = "weight.nice",
.flags = CFTYPE_NOT_ON_ROOT,
.read_s64 = cpu_weight_nice_read_s64,
.write_s64 = cpu_weight_nice_write_s64,
},
- {
+ [CPU_CFTYPE_IDLE] = {
.name = "idle",
.flags = CFTYPE_NOT_ON_ROOT,
.read_s64 = cpu_idle_read_s64,
@@ -11243,13 +11243,13 @@ static struct cftype cpu_files[] = {
},
#endif
#ifdef CONFIG_CFS_BANDWIDTH
- {
+ [CPU_CFTYPE_MAX] = {
.name = "max",
.flags = CFTYPE_NOT_ON_ROOT,
.seq_show = cpu_max_show,
.write = cpu_max_write,
},
- {
+ [CPU_CFTYPE_MAX_BURST] = {
.name = "max.burst",
.flags = CFTYPE_NOT_ON_ROOT,
.read_u64 = cpu_cfs_burst_read_u64,
@@ -11257,13 +11257,13 @@ static struct cftype cpu_files[] = {
},
#endif
#ifdef CONFIG_UCLAMP_TASK_GROUP
- {
+ [CPU_CFTYPE_UCLAMP_MIN] = {
.name = "uclamp.min",
.flags = CFTYPE_NOT_ON_ROOT,
.seq_show = cpu_uclamp_min_show,
.write = cpu_uclamp_min_write,
},
- {
+ [CPU_CFTYPE_UCLAMP_MAX] = {
.name = "uclamp.max",
.flags = CFTYPE_NOT_ON_ROOT,
.seq_show = cpu_uclamp_max_show,
@@ -11283,8 +11283,8 @@ struct cgroup_subsys cpu_cgrp_subsys = {
.can_attach = cpu_cgroup_can_attach,
#endif
.attach = cpu_cgroup_attach,
- .legacy_cftypes = cpu_legacy_files,
- .dfl_cftypes = cpu_files,
+ .legacy_cftypes = cpu_legacy_cftypes,
+ .dfl_cftypes = cpu_cftypes,
.early_init = true,
.threaded = true,
};
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 866ce69a445e..67f7f1149630 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -3379,4 +3379,25 @@ static inline void switch_mm_cid(struct task_struct *prev, struct task_struct *n
static inline void switch_mm_cid(struct task_struct *prev, struct task_struct *next) { }
#endif
+#ifdef CONFIG_CGROUP_SCHED
+enum cpu_cftype_id {
+#ifdef CONFIG_FAIR_GROUP_SCHED
+ CPU_CFTYPE_WEIGHT,
+ CPU_CFTYPE_WEIGHT_NICE,
+ CPU_CFTYPE_IDLE,
+#endif
+#ifdef CONFIG_CFS_BANDWIDTH
+ CPU_CFTYPE_MAX,
+ CPU_CFTYPE_MAX_BURST,
+#endif
+#ifdef CONFIG_UCLAMP_TASK_GROUP
+ CPU_CFTYPE_UCLAMP_MIN,
+ CPU_CFTYPE_UCLAMP_MAX,
+#endif
+ CPU_CFTYPE_CNT,
+};
+
+extern struct cftype cpu_cftypes[CPU_CFTYPE_CNT + 1];
+#endif /* CONFIG_CGROUP_SCHED */
+
#endif /* _KERNEL_SCHED_SCHED_H */
--
2.39.2
next prev parent reply other threads:[~2023-03-17 21:36 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-17 21:33 [PATCHSET v3] sched: Implement BPF extensible scheduler class Tejun Heo
2023-03-17 21:33 ` [PATCH 01/32] cgroup: Implement cgroup_show_cftypes() Tejun Heo
2023-03-17 21:33 ` [PATCH 02/32] sched: Encapsulate task attribute change sequence into a helper macro Tejun Heo
2023-03-17 21:33 ` [PATCH 03/32] sched: Restructure sched_class order sanity checks in sched_init() Tejun Heo
2023-03-17 21:33 ` [PATCH 04/32] sched: Allow sched_cgroup_fork() to fail and introduce sched_cancel_fork() Tejun Heo
2023-03-17 21:33 ` [PATCH 05/32] sched: Add sched_class->reweight_task() Tejun Heo
2023-03-17 21:33 ` [PATCH 06/32] sched: Add sched_class->switching_to() and expose check_class_changing/changed() Tejun Heo
2023-03-17 21:33 ` [PATCH 07/32] sched: Factor out cgroup weight conversion functions Tejun Heo
2023-03-17 21:33 ` [PATCH 08/32] sched: Expose css_tg(), __setscheduler_prio() and SCHED_CHANGE_BLOCK() Tejun Heo
2023-03-17 21:33 ` Tejun Heo [this message]
2023-03-17 21:33 ` [PATCH 10/32] sched: Add @reason to sched_class->rq_{on|off}line() Tejun Heo
2023-03-17 21:33 ` [PATCH 11/32] sched: Add normal_policy() Tejun Heo
2023-03-17 21:33 ` [PATCH 12/32] sched_ext: Add boilerplate for extensible scheduler class Tejun Heo
2023-03-17 21:33 ` [PATCH 13/32] sched_ext: Implement BPF " Tejun Heo
2023-03-17 21:33 ` [PATCH 14/32] sched_ext: Add scx_example_simple and scx_example_qmap example schedulers Tejun Heo
2023-03-17 21:33 ` [PATCH 15/32] sched_ext: Add sysrq-S which disables the BPF scheduler Tejun Heo
2023-03-17 21:33 ` [PATCH 16/32] sched_ext: Implement runnable task stall watchdog Tejun Heo
2023-03-17 21:33 ` [PATCH 17/32] sched_ext: Allow BPF schedulers to disallow specific tasks from joining SCHED_EXT Tejun Heo
2023-03-17 21:33 ` [PATCH 18/32] sched_ext: Allow BPF schedulers to switch all eligible tasks into sched_ext Tejun Heo
2023-03-17 21:33 ` [PATCH 19/32] sched_ext: Implement scx_bpf_kick_cpu() and task preemption support Tejun Heo
2023-03-17 21:33 ` [PATCH 20/32] sched_ext: Make watchdog handle ops.dispatch() looping stall Tejun Heo
2023-03-17 21:33 ` [PATCH 21/32] sched_ext: Add task state tracking operations Tejun Heo
2023-03-17 21:33 ` [PATCH 22/32] sched_ext: Implement tickless support Tejun Heo
2023-03-17 21:33 ` [PATCH 23/32] sched_ext: Track tasks that are subjects of the in-flight SCX operation Tejun Heo
2023-03-17 21:33 ` [PATCH 24/32] sched_ext: Add cgroup support Tejun Heo
2023-04-20 20:02 ` Andrea Righi
2023-04-21 14:32 ` Tejun Heo
2023-03-17 21:33 ` [PATCH 25/32] sched_ext: Implement SCX_KICK_WAIT Tejun Heo
2023-03-17 21:33 ` [PATCH 26/32] sched_ext: Implement sched_ext_ops.cpu_acquire/release() Tejun Heo
2023-03-17 21:33 ` [PATCH 27/32] sched_ext: Implement sched_ext_ops.cpu_online/offline() Tejun Heo
2023-03-17 21:33 ` [PATCH 28/32] sched_ext: Implement core-sched support Tejun Heo
2023-04-20 19:56 ` Andrea Righi
2023-04-21 14:31 ` Tejun Heo
2023-03-17 21:33 ` [PATCH 29/32] sched_ext: Add vtime-ordered priority queue to dispatch_q's Tejun Heo
2023-03-17 21:33 ` [PATCH 30/32] sched_ext: Documentation: scheduler: Document extensible scheduler class Tejun Heo
2023-03-18 2:05 ` Bagas Sanjaya
2023-03-17 21:33 ` [PATCH 31/32] sched_ext: Add a basic, userland vruntime scheduler Tejun Heo
2023-03-17 21:33 ` [PATCH 32/32] sched_ext: Add a rust userspace hybrid example scheduler Tejun Heo
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=20230317213333.2174969-10-tj@kernel.org \
--to=tj@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brho@google.com \
--cc=bristot@redhat.com \
--cc=bsegall@google.com \
--cc=daniel@iogearbox.net \
--cc=derkling@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=dschatzberg@meta.com \
--cc=dskarlat@cs.cmu.edu \
--cc=dvernet@meta.com \
--cc=haoluo@google.com \
--cc=joshdon@google.com \
--cc=juri.lelli@redhat.com \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=riel@surriel.com \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.org \
--cc=vincent.guittot@linaro.org \
--cc=vschneid@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox