Collecting cgroup statistics is expensive because the existing method opens and parses a cgroup file. memcg already provides an efficient BPF interface; extend that model to the CPU controller.
Register css_rstat_flush() as a common kfunc and add bpf_cgroup_base_stat(). The latter returns cgroup_base_stat after the same cputime adjustment used by cpu.stat. The BPF program reads the plain CFS bandwidth counters directly. Add bpf_css_to_task_group() to check the controller and give the verifier a typed task_group pointer for bpf_per_cpu_ptr(). css_rstat_flush() may reschedule and requires a sleepable program. bpf_cgroup_base_stat() only takes locks and is not marked sleepable, but those locks are not NMI-safe. Suggested-by: Shakeel Butt <[email protected]> Suggested-by: Tejun Heo <[email protected]> Assisted-by: Claude:claude-opus-5 Signed-off-by: Ziyang Men <[email protected]> --- kernel/cgroup/Makefile | 2 ++ kernel/cgroup/bpf_cgroup.c | 58 ++++++++++++++++++++++++++++++++++++++ kernel/cgroup/rstat.c | 54 ++++++++++++++++++++++++++++++++--- 3 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 kernel/cgroup/bpf_cgroup.c diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile index ede31601a363..29f29228865b 100644 --- a/kernel/cgroup/Makefile +++ b/kernel/cgroup/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := cgroup.o rstat.o namespace.o cgroup-v1.o freezer.o +obj-$(CONFIG_BPF_SYSCALL) += bpf_cgroup.o + obj-$(CONFIG_CGROUP_FREEZER) += legacy_freezer.o obj-$(CONFIG_CGROUP_PIDS) += pids.o obj-$(CONFIG_CGROUP_RDMA) += rdma.o diff --git a/kernel/cgroup/bpf_cgroup.c b/kernel/cgroup/bpf_cgroup.c new file mode 100644 index 000000000000..cd28c838dc7b --- /dev/null +++ b/kernel/cgroup/bpf_cgroup.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Cgroup BPF kfuncs + * + * Author: Ziyang Men <[email protected]> + */ + +#include <linux/bpf.h> +#include <linux/btf_ids.h> +#include <linux/cgroup.h> + +#include "../sched/sched.h" + +#ifdef CONFIG_CGROUP_SCHED +__bpf_kfunc_start_defs(); + +/** + * bpf_css_to_task_group - Cast a CPU controller css to its task group + * @css: CPU controller css + * + * Must be called under RCU. The kfunc gives BPF a typed task_group pointer. + * + * Return: The task group, or NULL if @css belongs to another controller. + */ +__bpf_kfunc struct task_group * +bpf_css_to_task_group(struct cgroup_subsys_state *css) +{ + if (unlikely(css->ss != &cpu_cgrp_subsys)) + return NULL; + + return container_of(css, struct task_group, css); +} + +__bpf_kfunc_end_defs(); + +BTF_KFUNCS_START(bpf_cpu_cgroup_kfunc_ids) +BTF_ID_FLAGS(func, bpf_css_to_task_group, + KF_RCU | KF_RCU_PROTECTED | KF_RET_NULL) +BTF_KFUNCS_END(bpf_cpu_cgroup_kfunc_ids) + +static const struct btf_kfunc_id_set bpf_cpu_cgroup_kfunc_set = { + .owner = THIS_MODULE, + .set = &bpf_cpu_cgroup_kfunc_ids, +}; + +static int __init bpf_cpu_cgroup_kfunc_init(void) +{ + int err; + + err = register_btf_kfunc_id_set(BPF_PROG_TYPE_UNSPEC, + &bpf_cpu_cgroup_kfunc_set); + if (err) + pr_warn("error while registering cpu cgroup kfuncs: %d\n", err); + + return err; +} +late_initcall(bpf_cpu_cgroup_kfunc_init); +#endif /* CONFIG_CGROUP_SCHED */ diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index de816a43db9f..5db72504a8a5 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -752,10 +752,49 @@ void cgroup_base_stat_cputime_show(struct seq_file *seq) cgroup_force_idle_show(seq, &bstat); } -/* Add bpf kfuncs for css_rstat_updated() and css_rstat_flush() */ +#ifdef CONFIG_BPF_SYSCALL + +__bpf_kfunc_start_defs(); + +/** + * bpf_cgroup_base_stat - Read a cgroup's base statistics + * @cgrp: cgroup to read from + * @out: zero-initialized output in nanoseconds + * + * CPU time is adjusted as for cpu.stat. + */ +__bpf_kfunc void bpf_cgroup_base_stat(struct cgroup *cgrp, + struct cgroup_base_stat *out) +{ + if (cgroup_parent(cgrp)) { + __css_rstat_lock(&cgrp->self, -1); + *out = cgrp->bstat; + cputime_adjust(&cgrp->bstat.cputime, &cgrp->prev_cputime, + &out->cputime.utime, &out->cputime.stime); + __css_rstat_unlock(&cgrp->self, -1); + } else { + root_cgroup_cputime(out); + } +} + +__bpf_kfunc_end_defs(); + +BTF_KFUNCS_START(bpf_rstat_common_kfunc_ids) +BTF_ID_FLAGS(func, css_rstat_flush, KF_SLEEPABLE) +/* The reader does not sleep, but its locks are not NMI-safe. */ +BTF_ID_FLAGS(func, bpf_cgroup_base_stat) +BTF_KFUNCS_END(bpf_rstat_common_kfunc_ids) + +static const struct btf_kfunc_id_set bpf_rstat_common_kfunc_set = { + .owner = THIS_MODULE, + .set = &bpf_rstat_common_kfunc_ids, +}; + +#endif /* CONFIG_BPF_SYSCALL */ + +/* Add a bpf kfunc for css_rstat_updated(). */ BTF_KFUNCS_START(bpf_rstat_kfunc_ids) BTF_ID_FLAGS(func, css_rstat_updated) -BTF_ID_FLAGS(func, css_rstat_flush, KF_SLEEPABLE) BTF_KFUNCS_END(bpf_rstat_kfunc_ids) static const struct btf_kfunc_id_set bpf_rstat_kfunc_set = { @@ -765,7 +804,14 @@ static const struct btf_kfunc_id_set bpf_rstat_kfunc_set = { static int __init bpf_rstat_kfunc_init(void) { - return register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, - &bpf_rstat_kfunc_set); + int ret; + + ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, + &bpf_rstat_kfunc_set); +#ifdef CONFIG_BPF_SYSCALL + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_UNSPEC, + &bpf_rstat_common_kfunc_set); +#endif + return ret; } late_initcall(bpf_rstat_kfunc_init); -- 2.53.0-Meta
