Remove use of current->cgns in bpf_cgroup_from_id
Subsystems (4)
Kumar Kartikeya Dwivedi
maintainerv3 cover Remove use of current->cgns in bpf_cgroup_from_id
bpf_cgroup_from_id currently ends up doing a check on whether the cgroup being looked up is a descendant of the root cgroup of the current task's cgroup namespace. This leads to unreliable results since this kfunc can be invoked from any arbitrary context, for any arbitrary value of current. Fix this by removing namespace-awarness in the kfunc, and include a test that detects such a case and fails without the fix.
Changelog:
----------
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]
* Refactor cgroup_get_from_id into non-ns version. (Andrii)
* Address nits from Eduard.
v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]
* Add Ack from Tejun.
* Fix selftest to perform namespace migration and cgroup setup in a child process to avoid changing test_progs namespace.
Kumar Kartikeya Dwivedi (2):
bpf: Do not limit bpf_cgroup_from_id to current's namespace selftests/bpf: Add a test for bpf_cgroup_from_id lookup in non-root
cgns
include/linux/cgroup.h | 1 + kernel/bpf/helpers.c | 2 +- kernel/cgroup/cgroup.c | 24 +++++-- tools/testing/selftests/bpf/cgroup_helpers.c | 20 ++++++ tools/testing/selftests/bpf/cgroup_helpers.h | 1 + .../selftests/bpf/prog_tests/cgrp_kfunc.c | 71 +++++++++++++++++++ .../selftests/bpf/progs/cgrp_kfunc_success.c | 12 ++++ 7 files changed, 126 insertions(+), 5 deletions(-)
base-commit: a578b54a8ad282dd739e4d1f4e8352fc8ac1c4a0
Signature · 1 line
2.51.0
Kumar Kartikeya Dwivedi
maintainerPATCH v3 1/2 bpf: Do not limit bpf_cgroup_from_id to current's namespace
The bpf_cgroup_from_id kfunc relies on cgroup_get_from_id to obtain the cgroup corresponding to a given cgroup ID. This helper can be called in a lot of contexts where the current thread can be random. A recent example was its use in sched_ext's ops.tick(), to obtain the root cgroup pointer. Since the current task can be whatever random user space task preempted by the timer tick, this makes the behavior of the helper unreliable.
Refactor out __cgroup_get_from_id as the non-namespace aware version of cgroup_get_from_id, and change bpf_cgroup_from_id to make use of it.
There is no compatibility breakage here, since changing the namespace against which the lookup is being done to the root cgroup namespace only permits a wider set of lookups to succeed now. The cgroup IDs across namespaces are globally unique, and thus don't need to be retranslated.
--- include/linux/cgroup.h | 1 + kernel/bpf/helpers.c | 2 +- kernel/cgroup/cgroup.c | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 5 deletions(-)
include/linux/cgroup.h +1 -0
@@ -650,6 +650,7 @@ static inline void cgroup_kthread_ready(void) }void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen); +struct cgroup *__cgroup_get_from_id (u64 id);struct cgroup *cgroup_get_from_id (u64 id);#else /* !CONFIG_CGROUPS */
kernel/bpf/helpers.c +1 -1
@@ -2546,7 +2546,7 @@ __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) {struct cgroup *cgrp; - cgrp =cgroup_get_from_id (cgid); + cgrp =__cgroup_get_from_id (cgid);if (IS_ERR (cgrp))return NULL ;return cgrp;
kernel/cgroup/cgroup.c +20 -4
@@ -6343,15 +6343,15 @@ void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen) }/* -* cgroup_get_from_id : get the cgroup associated with cgroup id +* __cgroup_get_from_id : get the cgroup associated with cgroup id * @id: cgroup id * On success return the cgrp or ERR_PTR on failure -* Only cgroups within current task's cgroup NS are valid. +* There are no cgroup NS restrictions. */ -struct cgroup *cgroup_get_from_id (u64 id) +struct cgroup *__cgroup_get_from_id (u64 id) {struct kernfs_node *kn; -struct cgroup *cgrp, *root_cgrp; +struct cgroup *cgrp; kn =kernfs_find_and_get_node_by_id (cgrp_dfl_root.kf_root, id);if (!kn)
@@ -6373,6 +6373,22 @@ struct cgroup *cgroup_get_from_id(u64 id)if (!cgrp)return ERR_PTR (-ENOENT ); +return cgrp; +} + +/* +* cgroup_get_from_id : get the cgroup associated with cgroup id +* @id: cgroup id +* On success return the cgrp or ERR_PTR on failure +* Only cgroups within current task's cgroup NS are valid. +*/ +struct cgroup *cgroup_get_from_id (u64 id) +{ +struct cgroup *cgrp, *root_cgrp; + + cgrp =__cgroup_get_from_id (id); +if (IS_ERR (cgrp)) +return cgrp; root_cgrp =current_cgns_cgroup_dfl ();if (!cgroup_is_descendant (cgrp, root_cgrp)) {
Signature · 1 line
2.51.0
Re: [PATCH bpf-next v3 1/2] bpf: Do not limit bpf_cgroup_from_id to current's namespace
Quoted 11 lines · Kumar Kartikeya Dwivedi
The
bpf_cgroup_from_idkfunc relies oncgroup_get_from_idto obtain the cgroup corresponding to a given cgroup ID. This helper can be called in a lot of contexts where the current thread can be random. A recent example was its use in sched_ext'sops.tick(), to obtain the root cgroup pointer. Since the current task can be whatever random user space task preempted by the timer tick, this makes the behavior of the helper unreliable.Refactor out
__cgroup_get_from_idas the non-namespace aware version ofcgroup_get_from_id, and changebpf_cgroup_from_idto make use of it.
Quoted 7 lines
There is no compatibility breakage here, since changing the namespace against which the lookup is being done to the root cgroup namespace only permits a wider set of lookups to succeed now. The cgroup IDs across namespaces are globally unique, and thus don't need to be retranslated.
Reported-by Dan Schatzberg <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>
Please feel free to route this through the BPF tree.
Thanks.
Signature · 1 line
tejun
Re: [PATCH bpf-next v3 1/2] bpf: Do not limit bpf_cgroup_from_id to current's namespace
In reply to Kumar Kartikeya DwivediQuoted 42 lines · Kumar Kartikeya Dwivedi
The
bpf_cgroup_from_idkfunc relies oncgroup_get_from_idto obtain the cgroup corresponding to a given cgroup ID. This helper can be called in a lot of contexts where the current thread can be random. A recent example was its use in sched_ext'sops.tick(), to obtain the root cgroup pointer. Since the current task can be whatever random user space task preempted by the timer tick, this makes the behavior of the helper unreliable.Refactor out
__cgroup_get_from_idas the non-namespace aware version ofcgroup_get_from_id, and changebpf_cgroup_from_idto make use of it.There is no compatibility breakage here, since changing the namespace against which the lookup is being done to the root cgroup namespace only permits a wider set of lookups to succeed now. The cgroup IDs across namespaces are globally unique, and thus don't need to be retranslated.
Reported-by Dan Schatzberg <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- include/linux/cgroup.h | 1 + kernel/bpf/helpers.c | 2 +- kernel/cgroup/cgroup.c | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 5 deletions(-)include/linux/cgroup.h +1
-0@@ -650,6 +650,7 @@ static inline void cgroup_kthread_ready(void) }void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen); +struct cgroup *__cgroup_get_from_id (u64 id);struct cgroup *cgroup_get_from_id (u64 id);#else /* !CONFIG_CGROUPS */ kernel/bpf/helpers.c +0
-0
kernel/bpf/helpers.c __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) · line 2549
Quoted 5 lines
kernel/bpf/helpers.c +1
-1@@ -2546,7 +2546,7 @@ __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) {struct cgroup *cgrp; - cgrp =cgroup_get_from_id (cgid); + cgrp =__cgroup_get_from_id (cgid);
All makes sense to me.
Should bpf cgroup iterator
in kernel/bpf/cgroup_iter.c bpf_iter_attach_cgroup() also use __cgroup_get_from_id() version
to allow iterating any cgroup ?
That can be a follow up, of course.
Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next v3 1/2] bpf: Do not limit bpf_cgroup_from_id to current's namespace
Quoted 53 lines · Alexei Starovoitov
Quoted 42 lines · Kumar Kartikeya Dwivedi
The
bpf_cgroup_from_idkfunc relies oncgroup_get_from_idto obtain the cgroup corresponding to a given cgroup ID. This helper can be called in a lot of contexts where the current thread can be random. A recent example was its use in sched_ext'sops.tick(), to obtain the root cgroup pointer. Since the current task can be whatever random user space task preempted by the timer tick, this makes the behavior of the helper unreliable.Refactor out
__cgroup_get_from_idas the non-namespace aware version ofcgroup_get_from_id, and changebpf_cgroup_from_idto make use of it.There is no compatibility breakage here, since changing the namespace against which the lookup is being done to the root cgroup namespace only permits a wider set of lookups to succeed now. The cgroup IDs across namespaces are globally unique, and thus don't need to be retranslated.
Reported-by Dan Schatzberg <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- include/linux/cgroup.h | 1 + kernel/bpf/helpers.c | 2 +- kernel/cgroup/cgroup.c | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 5 deletions(-)include/linux/cgroup.h +1
-0@@ -650,6 +650,7 @@ static inline void cgroup_kthread_ready(void) }void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen); +struct cgroup *__cgroup_get_from_id (u64 id);struct cgroup *cgroup_get_from_id (u64 id);#else /* !CONFIG_CGROUPS */ kernel/bpf/helpers.c +0
-0kernel/bpf/helpers.c __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) · line 2549
Quoted 5 lines
kernel/bpf/helpers.c +1
-1@@ -2546,7 +2546,7 @@ __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) {struct cgroup *cgrp; - cgrp =cgroup_get_from_id (cgid); + cgrp =__cgroup_get_from_id (cgid);All makes sense to me.
Quoted 6 lines
Should bpf cgroup iterator
inkernel/bpf/cgroup_iter.cbpf_iter_attach_cgroup()also use__cgroup_get_from_id()version
to allow iterating any cgroup ?That can be a follow up, of course.
I didn't change it because attach_target happens in a reliable context of the process setting up the iterator, so it might make sense to scope lookups to its cgroup namespace. init_seq_pidns in task_iter.c seems to agree. That said, I'm not sure what our policy for BPF iterators in general is, and whether they should be namespaced or not by default.
Kumar Kartikeya Dwivedi
maintainerPATCH v3 2/2 selftests/bpf: Add a test for bpf_cgroup_from_id lookup in non-root cgns
In reply to Kumar Kartikeya DwivediMake sure that we only switch the cgroup namespace and enter a new cgroup in a child process separate from test_progs, to not mess up the environment for subsequent tests.
To remove this cgroup, we need to wait for the child to exit, and then rmdir its cgroup. If the read call fails, or waitpid succeeds, we know the child exited (read call would fail when the last pipe end is closed, otherwise waitpid waits until exit(2) is called). We then invoke a newly introduced remove_cgroup_pid() helper, that identifies cgroup path using the passed in pid of the now dead child, instead of using the current process pid (getpid()).
--- tools/testing/selftests/bpf/cgroup_helpers.c | 20 ++++++ tools/testing/selftests/bpf/cgroup_helpers.h | 1 + .../selftests/bpf/prog_tests/cgrp_kfunc.c | 71 +++++++++++++++++++ .../selftests/bpf/progs/cgrp_kfunc_success.c | 12 ++++ 4 files changed, 104 insertions(+)
tools/testing/selftests/bpf/cgroup_helpers.c +20 -0
@@ -412,6 +412,26 @@ void remove_cgroup(const char *relative_path)log_err ("rmdiring cgroup %s .. %s" , relative_path, cgroup_path); } +/* +* remove_cgroup_pid() - Remove a cgroup setup by process identified by PID +* @relative_path: The cgroup path, relative to the workdir, to remove +* @pid: PID to be used to find cgroup_path +* +* This function expects a cgroup to already be created, relative to the cgroup +* work dir. It also expects the cgroup doesn't have any children or live +* processes and it removes the cgroup. +* +* On failure, it will print an error to stderr. +*/ +void remove_cgroup_pid (const char *relative_path,int pid) +{ +char cgroup_path[PATH_MAX +1 ]; + +format_cgroup_path_pid (cgroup_path, relative_path, pid); +if (rmdir (cgroup_path)) +log_err ("rmdiring cgroup %s .. %s" , relative_path, cgroup_path); +} +/** * create_and_get_cgroup() - Create a cgroup, relative to workdir, and get the FD * @relative_path: The cgroup path, relative to the workdir, to join
tools/testing/selftests/bpf/cgroup_helpers.h +1 -0
@@ -19,6 +19,7 @@ int cgroup_setup_and_join(const char *relative_path);int get_root_cgroup (void );int create_and_get_cgroup (const char *relative_path);void remove_cgroup (const char *relative_path); +void remove_cgroup_pid (const char *relative_path,int pid);unsigned long long get_cgroup_id (const char *relative_path);int get_cgroup1_hierarchy_id (const char *subsys_name);
tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c +71 -0
89 lines not on this page · raw message
tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c +12 -0
@@ -221,3 +221,15 @@ int BPF_PROG(test_cgrp_from_id, struct cgroup *cgrp, const char *path)return 0 ; } + +SEC("syscall") +int test_cgrp_from_id_ns (void *ctx) +{ +struct cgroup *cg; + + cg =bpf_cgroup_from_id (1 ); +if (!cg) +return 42 ; +bpf_cgroup_release (cg); +return 0 ; +}
Signature · 1 line
2.51.0
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Mon, 15 Sep 2025 03:26:16 +0000 you wrote:
bpf_cgroup_from_idcurrently ends up doing a check on whether the cgroup being looked up is a descendant of the root cgroup of the current task's cgroup namespace. This leads to unreliable results since this kfunc can be invoked from any arbitrary context, for any arbitrary value of current. Fix this by removing namespace-awarness in the kfunc, and include a test that detects such a case and fails without the fix.[...]
Here is the summary with links:
- [bpf-next,v3,1/2] bpf: Do not limit bpf_cgroup_from_id to current's namespace
https://git.kernel.org/bpf/bpf-next/c/2c8951339506 - [bpf-next,v3,2/2] selftests/bpf: Add a test for bpf_cgroup_from_id lookup in non-root cgns https://git.kernel.org/bpf/bpf-next/c/a8250d167c0c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html