From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>, Yonghong Song <yhs@fb.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Kui-Feng Lee <kuifeng@fb.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@kernel.org>,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] bpf: task_group_seq_get_next: use __next_thread() rather than next_thread()
Date: Fri, 25 Aug 2023 18:19:59 +0200 [thread overview]
Message-ID: <20230825161959.GA16893@redhat.com> (raw)
In-Reply-To: <20230825161842.GA16750@redhat.com>
Lockless use of next_thread() should be avoided, task_group_seq_get_next()
is the last user, it too can return the group leader twice if it races with
mt-thread exec which changes the group->leader's pid.
Change the main loop to use __next_thread(), kill "next_tid == common->pid"
check.
__next_thread() can't loop forever, so we can also change this code to retry
if next_tid == 0.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/bpf/task_iter.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c
index 7473068ed313..8c847d91cdd9 100644
--- a/kernel/bpf/task_iter.c
+++ b/kernel/bpf/task_iter.c
@@ -68,15 +68,13 @@ static struct task_struct *task_group_seq_get_next(struct bpf_iter_seq_task_comm
return NULL;
retry:
- task = next_thread(task);
+ task = __next_thread(task);
+ if (!task)
+ return NULL;
next_tid = __task_pid_nr_ns(task, PIDTYPE_PID, common->ns);
- if (!next_tid || next_tid == common->pid) {
- /* Run out of tasks of a process. The tasks of a
- * thread_group are linked as circular linked list.
- */
- return NULL;
- }
+ if (!next_tid)
+ goto retry;
if (skip_if_dup_files && task->files == task->group_leader->files)
goto retry;
--
2.25.1.362.g51ebf55
prev parent reply other threads:[~2023-08-25 16:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-25 16:18 [PATCH 0/6] bpf: task_group_seq_get_next: use __next_thread() Oleg Nesterov
2023-08-25 16:19 ` [PATCH 1/6] bpf: task_group_seq_get_next: cleanup the usage of next_thread() Oleg Nesterov
2023-08-25 22:45 ` Yonghong Song
2023-08-25 16:19 ` [PATCH 2/6] bpf: task_group_seq_get_next: cleanup the usage of get/put_task_struct Oleg Nesterov
2023-08-25 16:19 ` [PATCH 3/6] bpf: task_group_seq_get_next: fix the skip_if_dup_files check Oleg Nesterov
2023-08-25 17:04 ` Oleg Nesterov
2023-08-25 22:52 ` Yonghong Song
2023-08-27 20:19 ` Oleg Nesterov
2023-08-28 1:18 ` Yonghong Song
2023-08-28 10:54 ` Oleg Nesterov
2023-08-29 0:30 ` Yonghong Song
2023-08-30 23:54 ` Oleg Nesterov
2023-08-31 11:29 ` Yonghong Song
2023-08-31 12:06 ` Oleg Nesterov
2023-08-25 22:49 ` Yonghong Song
2023-08-25 16:19 ` [PATCH 4/6] bpf: task_group_seq_get_next: kill next_task Oleg Nesterov
2023-08-25 22:55 ` Yonghong Song
2023-08-25 16:19 ` [PATCH 5/6] bpf: task_group_seq_get_next: simplify the "next tid" logic Oleg Nesterov
2023-08-25 22:57 ` Yonghong Song
2023-08-25 16:19 ` Oleg Nesterov [this message]
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=20230825161959.GA16893@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=ebiederm@xmission.com \
--cc=kuifeng@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=yhs@fb.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.