Skip to content

Commit f49843a

Browse files
kchuyizhouAlexei Starovoitov
authored andcommitted
selftests/bpf: Add tests for css_task iter combining with cgroup iter
This patch adds a test which demonstrates how css_task iter can be combined with cgroup iter and it won't cause deadlock, though cgroup iter is not sleepable. Signed-off-by: Chuyi Zhou <zhouchuyi@bytedance.com> Acked-by: Yonghong Song <yonghong.song@linux.dev> Link: https://lore.kernel.org/r/20231031050438.93297-3-zhouchuyi@bytedance.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 3091b66 commit f49843a

File tree

2 files changed

+77
-0
lines changed

2 files changed

+77
-0
lines changed

tools/testing/selftests/bpf/prog_tests/cgroup_iter.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <test_progs.h>
55
#include <bpf/libbpf.h>
66
#include <bpf/btf.h>
7+
#include "iters_css_task.skel.h"
78
#include "cgroup_iter.skel.h"
89
#include "cgroup_helpers.h"
910

@@ -263,6 +264,35 @@ static void test_walk_dead_self_only(struct cgroup_iter *skel)
263264
close(cgrp_fd);
264265
}
265266

267+
static void test_walk_self_only_css_task(void)
268+
{
269+
struct iters_css_task *skel;
270+
int err;
271+
272+
skel = iters_css_task__open();
273+
if (!ASSERT_OK_PTR(skel, "skel_open"))
274+
return;
275+
276+
bpf_program__set_autoload(skel->progs.cgroup_id_printer, true);
277+
278+
err = iters_css_task__load(skel);
279+
if (!ASSERT_OK(err, "skel_load"))
280+
goto cleanup;
281+
282+
err = join_cgroup(cg_path[CHILD2]);
283+
if (!ASSERT_OK(err, "join_cgroup"))
284+
goto cleanup;
285+
286+
skel->bss->target_pid = getpid();
287+
snprintf(expected_output, sizeof(expected_output),
288+
PROLOGUE "%8llu\n" EPILOGUE, cg_id[CHILD2]);
289+
read_from_cgroup_iter(skel->progs.cgroup_id_printer, cg_fd[CHILD2],
290+
BPF_CGROUP_ITER_SELF_ONLY, "test_walk_self_only_css_task");
291+
ASSERT_EQ(skel->bss->css_task_cnt, 1, "css_task_cnt");
292+
cleanup:
293+
iters_css_task__destroy(skel);
294+
}
295+
266296
void test_cgroup_iter(void)
267297
{
268298
struct cgroup_iter *skel = NULL;
@@ -293,6 +323,9 @@ void test_cgroup_iter(void)
293323
test_walk_self_only(skel);
294324
if (test__start_subtest("cgroup_iter__dead_self_only"))
295325
test_walk_dead_self_only(skel);
326+
if (test__start_subtest("cgroup_iter__self_only_css_task"))
327+
test_walk_self_only_css_task();
328+
296329
out:
297330
cgroup_iter__destroy(skel);
298331
cleanup_cgroups();

tools/testing/selftests/bpf/progs/iters_css_task.c

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
char _license[] SEC("license") = "GPL";
1212

13+
struct cgroup *bpf_cgroup_acquire(struct cgroup *p) __ksym;
1314
struct cgroup *bpf_cgroup_from_id(u64 cgid) __ksym;
1415
void bpf_cgroup_release(struct cgroup *p) __ksym;
1516

@@ -45,3 +46,46 @@ int BPF_PROG(iter_css_task_for_each, struct vm_area_struct *vma,
4546

4647
return -EPERM;
4748
}
49+
50+
static inline u64 cgroup_id(struct cgroup *cgrp)
51+
{
52+
return cgrp->kn->id;
53+
}
54+
55+
SEC("?iter/cgroup")
56+
int cgroup_id_printer(struct bpf_iter__cgroup *ctx)
57+
{
58+
struct seq_file *seq = ctx->meta->seq;
59+
struct cgroup *cgrp, *acquired;
60+
struct cgroup_subsys_state *css;
61+
struct task_struct *task;
62+
u64 cgrp_id;
63+
64+
cgrp = ctx->cgroup;
65+
66+
/* epilogue */
67+
if (cgrp == NULL) {
68+
BPF_SEQ_PRINTF(seq, "epilogue\n");
69+
return 0;
70+
}
71+
72+
/* prologue */
73+
if (ctx->meta->seq_num == 0)
74+
BPF_SEQ_PRINTF(seq, "prologue\n");
75+
76+
cgrp_id = cgroup_id(cgrp);
77+
78+
BPF_SEQ_PRINTF(seq, "%8llu\n", cgrp_id);
79+
80+
acquired = bpf_cgroup_from_id(cgrp_id);
81+
if (!acquired)
82+
return 0;
83+
css = &acquired->self;
84+
css_task_cnt = 0;
85+
bpf_for_each(css_task, task, css, CSS_TASK_ITER_PROCS) {
86+
if (task->pid == target_pid)
87+
css_task_cnt++;
88+
}
89+
bpf_cgroup_release(acquired);
90+
return 0;
91+
}

0 commit comments

Comments
 (0)