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 01/32] cgroup: Implement cgroup_show_cftypes()
Date: Fri, 17 Mar 2023 11:33:02 -1000 [thread overview]
Message-ID: <20230317213333.2174969-2-tj@kernel.org> (raw)
In-Reply-To: <20230317213333.2174969-1-tj@kernel.org>
Implement cgroup_show_cftypes() which shows and hides all cgroup files
associated with the specified set of cgroup file types. CFTYPE_HIDDEN flag
is added so that files can be created hidden from the get-go.
cgroup_show_cftypes() can be used whether the cftypes are added or not. It
also combines with cgroup_show_file() so that a given file is visible iff
both its cftype and cfile are visible.
This will be used by a new sched_class to selectively show and hide CPU
controller interface files depending on whether they're supported.
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>
---
include/linux/cgroup-defs.h | 8 +++
include/linux/cgroup.h | 1 +
kernel/cgroup/cgroup.c | 97 ++++++++++++++++++++++++++++++++++---
3 files changed, 99 insertions(+), 7 deletions(-)
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 8a0d5466c7be..8af1e7d487cb 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -127,12 +127,18 @@ enum {
CFTYPE_WORLD_WRITABLE = (1 << 4), /* (DON'T USE FOR NEW FILES) S_IWUGO */
CFTYPE_DEBUG = (1 << 5), /* create when cgroup_debug */
+ CFTYPE_HIDDEN = (1 << 6), /* file type hidden, see cgroup_show_cftypes() */
+
/* internal flags, do not use outside cgroup core proper */
__CFTYPE_ONLY_ON_DFL = (1 << 16), /* only on default hierarchy */
__CFTYPE_NOT_ON_DFL = (1 << 17), /* not on default hierarchy */
__CFTYPE_ADDED = (1 << 18),
};
+enum cfile_flags {
+ CFILE_HIDDEN = (1 << 0), /* file instance hidden */
+};
+
/*
* cgroup_file is the handle for a file instance created in a cgroup which
* is used, for example, to generate file changed notifications. This can
@@ -140,7 +146,9 @@ enum {
*/
struct cgroup_file {
/* do not access any fields from outside cgroup core */
+ struct cftype *cft;
struct kernfs_node *kn;
+ unsigned int flags;
unsigned long notified_at;
struct timer_list notify_timer;
};
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 3410aecffdb4..a8c6982c2c24 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -115,6 +115,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);
int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
int cgroup_rm_cftypes(struct cftype *cfts);
+void cgroup_show_cftype(struct cftype *cft, bool show);
void cgroup_file_notify(struct cgroup_file *cfile);
void cgroup_file_show(struct cgroup_file *cfile, bool show);
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 8a5294f4ce72..f762bfb78f4a 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4206,10 +4206,13 @@ static int cgroup_add_file(struct cgroup_subsys_state *css, struct cgroup *cgrp,
return ret;
}
+ kernfs_show(kn, !(cft->flags & CFTYPE_HIDDEN));
+
if (cft->file_offset) {
struct cgroup_file *cfile = (void *)css + cft->file_offset;
timer_setup(&cfile->notify_timer, cgroup_file_notify_timer, 0);
+ cfile->cft = cft;
spin_lock_irq(&cgroup_file_kn_lock);
cfile->kn = kn;
@@ -4488,6 +4491,24 @@ void cgroup_file_notify(struct cgroup_file *cfile)
spin_unlock_irqrestore(&cgroup_file_kn_lock, flags);
}
+static struct kernfs_node *cfile_kn_get(struct cgroup_file *cfile)
+{
+ struct kernfs_node *kn;
+
+ spin_lock_irq(&cgroup_file_kn_lock);
+ kn = cfile->kn;
+ kernfs_get(kn);
+ spin_unlock_irq(&cgroup_file_kn_lock);
+
+ return kn;
+}
+
+static bool cfile_visible(struct cgroup_file *cfile)
+{
+ return !(cfile->cft->flags & CFTYPE_HIDDEN) &&
+ !(cfile->flags & CFILE_HIDDEN);
+}
+
/**
* cgroup_file_show - show or hide a hidden cgroup file
* @cfile: target cgroup_file obtained by setting cftype->file_offset
@@ -4497,15 +4518,20 @@ void cgroup_file_show(struct cgroup_file *cfile, bool show)
{
struct kernfs_node *kn;
- spin_lock_irq(&cgroup_file_kn_lock);
- kn = cfile->kn;
- kernfs_get(kn);
- spin_unlock_irq(&cgroup_file_kn_lock);
+ mutex_lock(&cgroup_mutex);
- if (kn)
- kernfs_show(kn, show);
+ if (show)
+ cfile->flags &= ~CFILE_HIDDEN;
+ else
+ cfile->flags |= CFILE_HIDDEN;
- kernfs_put(kn);
+ kn = cfile_kn_get(cfile);
+ if (kn) {
+ kernfs_show(kn, cfile_visible(cfile));
+ kernfs_put(kn);
+ }
+
+ mutex_unlock(&cgroup_mutex);
}
/**
@@ -5519,6 +5545,63 @@ static void offline_css(struct cgroup_subsys_state *css)
wake_up_all(&css->cgroup->offline_waitq);
}
+/**
+ * cgroup_show_cftype - show or hide a cgroup file type
+ * @cft: cftype to show or hide
+ * @show: whether to show or hide
+ *
+ * Sets %CFTYPE_HIDDEN and shows/hides the matching files according to @show.
+ * @cft may or may not be added at the time of this call. After hiding, it's
+ * guaranteed that there are no in-flight operations on the hidden files.
+ */
+void cgroup_show_cftype(struct cftype *cft, bool show)
+{
+ struct cgroup_subsys *ss = cft->ss;
+ struct cgroup *root = ss ? &ss->root->cgrp : &cgrp_dfl_root.cgrp;
+ struct cgroup_subsys_state *css;
+
+ mutex_lock(&cgroup_mutex);
+
+ if (show)
+ cft->flags &= ~CFTYPE_HIDDEN;
+ else
+ cft->flags |= CFTYPE_HIDDEN;
+
+ if (!(cft->flags & __CFTYPE_ADDED))
+ goto out_unlock;
+
+ css_for_each_descendant_pre(css, cgroup_css(root, ss)) {
+ struct cgroup *cgrp = css->cgroup;
+ struct kernfs_node *kn;
+
+ if (!(css->flags & CSS_VISIBLE))
+ continue;
+
+ if (cft->file_offset) {
+ struct cgroup_file *cfile =
+ (void *)css + cft->file_offset;
+
+ kn = cfile_kn_get(cfile);
+ if (kn) {
+ kernfs_show(kn, cfile_visible(cfile));
+ kernfs_put(kn);
+ }
+ } else {
+ char buf[CGROUP_FILE_NAME_MAX];
+
+ kn = kernfs_find_and_get(cgrp->kn,
+ cgroup_file_name(cgrp, cft, buf));
+ if (kn) {
+ kernfs_show(kn, show);
+ kernfs_put(kn);
+ }
+ }
+ }
+
+out_unlock:
+ mutex_unlock(&cgroup_mutex);
+}
+
/**
* css_create - create a cgroup_subsys_state
* @cgrp: the cgroup new css will be associated with
--
2.39.2
next prev parent reply other threads:[~2023-03-17 21:35 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 ` Tejun Heo [this message]
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 ` [PATCH 09/32] sched: Enumerate CPU cgroup file types Tejun Heo
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-2-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