From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Rachel Menge <rachelmenge@linux.microsoft.com>
Cc: linux-kernel@vger.kernel.org, rcu@vger.kernel.org,
Wei Fu <fuweid89@gmail.com>,
apais@linux.microsoft.com,
Sudhanva Huruli <Sudhanva.Huruli@microsoft.com>,
Jens Axboe <axboe@kernel.dk>,
Christian Brauner <brauner@kernel.org>,
Mike Christie <michael.christie@oracle.com>,
Joel Granados <j.granados@samsung.com>,
Mateusz Guzik <mjguzik@gmail.com>,
"Paul E. McKenney" <paulmck@kernel.org>,
Frederic Weisbecker <frederic@kernel.org>,
Neeraj Upadhyay <neeraj.upadhyay@kernel.org>,
Joel Fernandes <joel@joelfernandes.org>,
Josh Triplett <josh@joshtriplett.org>,
Boqun Feng <boqun.feng@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Zqiang <qiang.zhang1211@gmail.com>
Subject: [PATCH] zap_pid_ns_processes: don't send SIGKILL to sub-threads
Date: Sat, 8 Jun 2024 17:48:35 +0200 [thread overview]
Message-ID: <20240608154835.GD7947@redhat.com> (raw)
In-Reply-To: <1386cd49-36d0-4a5c-85e9-bc42056a5a38@linux.microsoft.com>
The comment above the idr_for_each_entry_continue() loop tries to explain
why we have to signal each thread in the namespace, but it is outdated.
This code no longer uses kill_proc_info(), we have a target task so we can
check thread_group_leader() and avoid the unnecessary group_send_sig_info.
Better yet, we can change pid_task() to use PIDTYPE_TGID rather than _PID,
this way it returns NULL if this pid is not a group-leader pid.
Also, change this code to check SIGNAL_GROUP_EXIT, the exiting process /
thread doesn't necessarily has a pending SIGKILL. Either way these checks
are racy without siglock, so the patch uses data_race() to shut up KCSAN.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/pid_namespace.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 25f3cf679b35..0f9bd67c9e75 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -191,21 +191,14 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
* The last thread in the cgroup-init thread group is terminating.
* Find remaining pid_ts in the namespace, signal and wait for them
* to exit.
- *
- * Note: This signals each threads in the namespace - even those that
- * belong to the same thread group, To avoid this, we would have
- * to walk the entire tasklist looking a processes in this
- * namespace, but that could be unnecessarily expensive if the
- * pid namespace has just a few processes. Or we need to
- * maintain a tasklist for each pid namespace.
- *
*/
rcu_read_lock();
read_lock(&tasklist_lock);
nr = 2;
idr_for_each_entry_continue(&pid_ns->idr, pid, nr) {
- task = pid_task(pid, PIDTYPE_PID);
- if (task && !__fatal_signal_pending(task))
+ task = pid_task(pid, PIDTYPE_TGID);
+ /* reading signal->flags is racy without sighand->siglock */
+ if (task && !(data_race(task->signal->flags) & SIGNAL_GROUP_EXIT))
group_send_sig_info(SIGKILL, SEND_SIG_PRIV, task, PIDTYPE_MAX);
}
read_unlock(&tasklist_lock);
--
2.25.1.362.g51ebf55
next prev parent reply other threads:[~2024-06-08 15:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 23:42 [RCU] zombie task hung in synchronize_rcu_expedited Rachel Menge
2024-06-06 11:10 ` Oleg Nesterov
2024-06-06 15:45 ` Wei Fu
2024-06-06 17:28 ` Oleg Nesterov
2024-06-07 3:02 ` Wei Fu
2024-06-07 6:25 ` Oleg Nesterov
2024-06-07 15:04 ` Wei Fu
2024-06-07 21:22 ` Oleg Nesterov
2024-06-08 12:42 ` Oleg Nesterov
2024-06-10 0:07 ` Wei Fu
2024-06-08 12:06 ` [PATCH] zap_pid_ns_processes: clear TIF_NOTIFY_SIGNAL along with TIF_SIGPENDING Oleg Nesterov
2024-06-08 17:00 ` Boqun Feng
2024-06-09 14:12 ` Wei Fu
2024-06-12 16:57 ` Jens Axboe
2024-06-13 12:40 ` Eric W. Biederman
2024-06-13 14:02 ` Wei Fu
2024-06-13 14:49 ` Oleg Nesterov
2024-06-13 15:30 ` Oleg Nesterov
2024-06-08 15:48 ` Oleg Nesterov [this message]
2024-06-13 13:01 ` [PATCH] zap_pid_ns_processes: don't send SIGKILL to sub-threads Eric W. Biederman
2024-06-13 15:00 ` Oleg Nesterov
2024-06-13 16:23 ` Eric W. Biederman
2024-07-05 16:08 ` 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=20240608154835.GD7947@redhat.com \
--to=oleg@redhat.com \
--cc=Sudhanva.Huruli@microsoft.com \
--cc=akpm@linux-foundation.org \
--cc=apais@linux.microsoft.com \
--cc=axboe@kernel.dk \
--cc=boqun.feng@gmail.com \
--cc=brauner@kernel.org \
--cc=frederic@kernel.org \
--cc=fuweid89@gmail.com \
--cc=j.granados@samsung.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=michael.christie@oracle.com \
--cc=mjguzik@gmail.com \
--cc=neeraj.upadhyay@kernel.org \
--cc=paulmck@kernel.org \
--cc=qiang.zhang1211@gmail.com \
--cc=rachelmenge@linux.microsoft.com \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
/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