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 2/6] bpf: task_group_seq_get_next: cleanup the usage of get/put_task_struct
Date: Fri, 25 Aug 2023 18:19:43 +0200 [thread overview]
Message-ID: <20230825161943.GA16865@redhat.com> (raw)
In-Reply-To: <20230825161842.GA16750@redhat.com>
get_pid_task() makes no sense, the code does put_task_struct() soon after.
Use find_task_by_pid_ns() instead of find_pid_ns + get_pid_task and kill
put_task_struct(), this allows to do get_task_struct() only once before
return.
While at it, kill the unnecessary "if (!pid)" check in the "if (!*tid)"
block, this matches the next usage of find_pid_ns() + get_pid_task() in
this function.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
---
kernel/bpf/task_iter.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c
index 4d1125108014..1589ec3faded 100644
--- a/kernel/bpf/task_iter.c
+++ b/kernel/bpf/task_iter.c
@@ -42,9 +42,6 @@ static struct task_struct *task_group_seq_get_next(struct bpf_iter_seq_task_comm
if (!*tid) {
/* The first time, the iterator calls this function. */
pid = find_pid_ns(common->pid, common->ns);
- if (!pid)
- return NULL;
-
task = get_pid_task(pid, PIDTYPE_TGID);
if (!task)
return NULL;
@@ -66,17 +63,12 @@ static struct task_struct *task_group_seq_get_next(struct bpf_iter_seq_task_comm
return task;
}
- pid = find_pid_ns(common->pid_visiting, common->ns);
- if (!pid)
- return NULL;
-
- task = get_pid_task(pid, PIDTYPE_PID);
+ task = find_task_by_pid_ns(common->pid_visiting, common->ns);
if (!task)
return NULL;
retry:
next_task = next_thread(task);
- put_task_struct(task);
saved_tid = *tid;
*tid = __task_pid_nr_ns(next_task, PIDTYPE_PID, common->ns);
@@ -88,7 +80,6 @@ static struct task_struct *task_group_seq_get_next(struct bpf_iter_seq_task_comm
return NULL;
}
- get_task_struct(next_task);
common->pid_visiting = *tid;
if (skip_if_dup_files && task->files == task->group_leader->files) {
@@ -96,6 +87,7 @@ static struct task_struct *task_group_seq_get_next(struct bpf_iter_seq_task_comm
goto retry;
}
+ get_task_struct(next_task);
return next_task;
}
--
2.25.1.362.g51ebf55
next 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 ` Oleg Nesterov [this message]
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 ` [PATCH 6/6] bpf: task_group_seq_get_next: use __next_thread() rather than next_thread() Oleg Nesterov
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=20230825161943.GA16865@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).