Drop exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-4.19/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index 8b06e95..0000000
--- a/queue-4.19/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0e387f9976f89c7172d46ff6d0fdbb14d453ae07 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 24e6953f606d2..a948ce8927975 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1165,17 +1165,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1198,8 +1195,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 6da763d9197b45d25a60a4a513d7c54f6622550d..8aaa47b27c91f9d3e10bd6a3aa6ce3fc109ce21e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -35,6 +35,5 @@ getrusage-move-thread_group_cputime_adjusted-outside.patch
 getrusage-use-__for_each_thread.patch
 getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch
 exit-fix-typo-in-comment-s-sub-theads-sub-threads.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 selftests-vm-fix-display-of-page-size-in-map_hugetlb.patch
 selftests-vm-fix-map_hugetlb-length-used-for-testing.patch

diff --git a/queue-5.10/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-5.10/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index a9f4daa..0000000
--- a/queue-5.10/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 2b40d3238f9ea8a9cf9a61ce0cbec94ef5d2ced8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index c41bdc0a7f06b..8f25abdd5fa7d 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1106,17 +1106,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1139,8 +1136,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index b0baee683db5f67b76879600b714de3cc99b02c9..c7cf0f5e3eab1be241caadab8c89ee92e771bf8b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -62,7 +62,6 @@ getrusage-move-thread_group_cputime_adjusted-outside.patch
 getrusage-use-__for_each_thread.patch
 getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch
 exit-fix-typo-in-comment-s-sub-theads-sub-threads.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 serial-max310x-unprepare-and-disable-clock-in-error-.patch
 drivers-hv-vmbus-drop-error-message-when-no-request-.patch
 regmap-allow-to-define-reg_update_bits-for-no-bus-co.patch

diff --git a/queue-5.15/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-5.15/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index b45c19a..0000000
--- a/queue-5.15/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 604746c31bdbf34966405f2a75644d27728068e3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index e982111c489a9..85baaa31b2997 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1120,17 +1120,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1153,8 +1150,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 3c246de83ce911b636b3625dfdad81d70722e474..e5b8d033aa25bcbfe9e4da7591dce498a591973c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -64,7 +64,6 @@ getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch
 proc-use-task_is_running-for-wchan-in-proc-pid-stat.patch
 fs-proc-do_task_stat-move-thread_group_cputime_adjus.patch
 exit-fix-typo-in-comment-s-sub-theads-sub-threads.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 alsa-usb-audio-fix-wrong-kfree-issue-in-snd_usb_endp.patch
 alsa-usb-audio-always-initialize-fixed_rate-in-snd_u.patch
 alsa-usb-audio-add-fixed_rate-quirk-for-jbl-quantum6.patch

diff --git a/queue-5.4/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-5.4/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index 2a2eb86..0000000
--- a/queue-5.4/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7e23a3520b944858b6c7c096b9e9f907b668c73f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index b2a005acb6cda..7a8a67aed9cac 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1107,17 +1107,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1140,8 +1137,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index e3d826d00b50a56384c38a4eee924430c52e94ef..ab404a01a73f6f07dc1d92dfbaa357c5b1075146 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -41,7 +41,6 @@ getrusage-move-thread_group_cputime_adjusted-outside.patch
 getrusage-use-__for_each_thread.patch
 getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch
 exit-fix-typo-in-comment-s-sub-theads-sub-threads.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 serial-max310x-unprepare-and-disable-clock-in-error-.patch
 regmap-allow-to-define-reg_update_bits-for-no-bus-co.patch
 regmap-add-bulk-read-write-callbacks-into-regmap_con.patch

diff --git a/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index 102d360..0000000
--- a/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 253749176dc92e57dc90d7bf99dd82310f3bf2ad Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index bccfa4218356e..c95fffc625fcd 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1146,17 +1146,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1179,8 +1176,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 2ad877f93b1a7ca38e0b334bd6834252fc7d270d..9b3a6f9597bda41ca237692e76c646e4238268e6 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -65,6 +65,5 @@ getrusage-use-__for_each_thread.patch
 getrusage-use-sig-stats_lock-rather-than-lock_task_s.patch
 fs-proc-do_task_stat-use-__for_each_thread.patch
 fs-proc-do_task_stat-use-sig-stats_lock-to-gather-th.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 blk-wbt-fix-that-wbt-can-t-be-disabled-by-default.patch
 blk-iocost-pass-gendisk-to-ioc_refresh_params.patch

diff --git a/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index 54f7357..0000000
--- a/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 89169857789368f0471c81a3509f2412f7a7ce52 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 21a59a6e1f2e8..1867d420c36c4 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1148,17 +1148,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1181,8 +1178,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 291ceeab3c51876e81a2ce384f9c675eb865f9b4..dfc668beb35ca5f9b0155f3eeb5253282a63f9b5 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -49,7 +49,6 @@ kvm-s390-add-stat-counter-for-shadow-gmap-events.patch
 kvm-s390-vsie-fix-race-during-shadow-creation.patch
 readahead-avoid-multiple-marked-readahead-pages.patch
 selftests-mptcp-decrease-bw-in-simult-flows.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 x86-mmio-disable-kvm-mitigation-when-x86_feature_clear_cpu_buf-is-set.patch
 documentation-hw-vuln-add-documentation-for-rfds.patch
 x86-rfds-mitigate-register-file-data-sampling-rfds.patch

diff --git a/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch b/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
deleted file mode 100644 (file)
index 0df6a0a..0000000
--- a/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 012eb1842d26ca778ee092274d9b186dd24d5123 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 23 Jan 2024 16:34:00 +0100
-Subject: exit: wait_task_zombie: kill the no longer necessary
- spin_lock_irq(siglock)
-
-From: Oleg Nesterov <oleg@redhat.com>
-
-[ Upstream commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 ]
-
-After the recent changes nobody use siglock to read the values protected
-by stats_lock, we can kill spin_lock_irq(&current->sighand->siglock) and
-update the comment.
-
-With this patch only __exit_signal() and thread_group_start_cputime() take
-stats_lock under siglock.
-
-Link: https://lkml.kernel.org/r/20240123153359.GA21866@redhat.com
-Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index aedc0832c9f4d..0c4858581c98c 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -1125,17 +1125,14 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                * and nobody can change them.
-                *
-                * psig->stats_lock also protects us from our sub-threads
--               * which can reap other children at the same time. Until
--               * we change k_getrusage()-like users to rely on this lock
--               * we have to take ->siglock as well.
-+               * which can reap other children at the same time.
-                *
-                * We use thread_group_cputime_adjusted() to get times for
-                * the thread group, which consolidates times for all threads
-                * in the group including the group leader.
-                */
-               thread_group_cputime_adjusted(p, &tgutime, &tgstime);
--              spin_lock_irq(&current->sighand->siglock);
--              write_seqlock(&psig->stats_lock);
-+              write_seqlock_irq(&psig->stats_lock);
-               psig->cutime += tgutime + sig->cutime;
-               psig->cstime += tgstime + sig->cstime;
-               psig->cgtime += task_gtime(p) + sig->gtime + sig->cgtime;
-@@ -1158,8 +1155,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
-                       psig->cmaxrss = maxrss;
-               task_io_accounting_add(&psig->ioac, &p->ioac);
-               task_io_accounting_add(&psig->ioac, &sig->ioac);
--              write_sequnlock(&psig->stats_lock);
--              spin_unlock_irq(&current->sighand->siglock);
-+              write_sequnlock_irq(&psig->stats_lock);
-       }
- 
-       if (wo->wo_rusage)
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index e2e69ee06be7ad00526932dd584feb259c45abf9..1968f7dfe0c7027c0577f1cd192d4e3fd012842b 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -55,6 +55,5 @@ netrom-fix-data-races-around-sysctl_net_busy_read.patch
 net-pds_core-fix-possible-double-free-in-error-handl.patch
 readahead-avoid-multiple-marked-readahead-pages.patch
 selftests-mptcp-decrease-bw-in-simult-flows.patch
-exit-wait_task_zombie-kill-the-no-longer-necessary-s.patch
 arm-9328-1-mm-try-vma-lock-based-page-fault-handling.patch
 arch-arm-mm-fix-major-fault-accounting-when-retrying.patch