Skip to content

Commit

Permalink
bpf: bpf_iter_task_next: use next_task(kit->task) rather than next_ta…
Browse files Browse the repository at this point in the history
…sk(kit->pos)

This looks more clear and simplifies the code. While at it, remove the
unnecessary initialization of pos/task at the start of bpf_iter_task_new().

Note that we can even kill kit->task, we can just use pos->group_leader,
but I don't understand the BUILD_BUG_ON() checks in bpf_iter_task_new().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20231114163239.GA903@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Oleg Nesterov authored and Alexei Starovoitov committed Nov 19, 2023
1 parent 5a34f9d commit ac8148d
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions kernel/bpf/task_iter.c
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,6 @@ __bpf_kfunc int bpf_iter_task_new(struct bpf_iter_task *it,
BUILD_BUG_ON(__alignof__(struct bpf_iter_task_kern) !=
__alignof__(struct bpf_iter_task));

kit->task = kit->pos = NULL;
switch (flags) {
case BPF_TASK_ITER_ALL_THREADS:
case BPF_TASK_ITER_ALL_PROCS:
Expand Down Expand Up @@ -1016,18 +1015,15 @@ __bpf_kfunc struct task_struct *bpf_iter_task_next(struct bpf_iter_task *it)
goto get_next_task;

kit->pos = __next_thread(kit->pos);
if (!kit->pos) {
if (flags == BPF_TASK_ITER_PROC_THREADS)
return pos;
kit->pos = kit->task;
} else
if (kit->pos || flags == BPF_TASK_ITER_PROC_THREADS)
return pos;

get_next_task:
kit->pos = next_task(kit->pos);
kit->task = kit->pos;
if (kit->pos == &init_task)
kit->task = next_task(kit->task);
if (kit->task == &init_task)
kit->pos = NULL;
else
kit->pos = kit->task;

return pos;
}
Expand Down

0 comments on commit ac8148d

Please sign in to comment.