From ee462f091066f463b449591746ff241371fc8929 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Feb 2024 15:13:06 +0100 Subject: [PATCH] drop exit-wait_task... patch --- ...nger-necessary-spin_lock_irq-siglock.patch | 59 ------------------- queue-6.1/series | 1 - ...nger-necessary-spin_lock_irq-siglock.patch | 59 ------------------- queue-6.6/series | 1 - ...nger-necessary-spin_lock_irq-siglock.patch | 59 ------------------- queue-6.7/series | 1 - 6 files changed, 180 deletions(-) delete mode 100644 queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch delete mode 100644 queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch delete mode 100644 queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch diff --git a/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch b/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch deleted file mode 100644 index ff9080b0229..00000000000 --- a/queue-6.1/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 Mon Sep 17 00:00:00 2001 -From: Oleg Nesterov -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 - -commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 upstream. - -After the recent changes nobody use siglock to read the values protected -by stats_lock, we can kill spin_lock_irq(¤t->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 -Signed-off-by: Dylan Hatch -Cc: Eric W. Biederman -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - kernel/exit.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - ---- a/kernel/exit.c -+++ b/kernel/exit.c -@@ -1146,17 +1146,14 @@ static int wait_task_zombie(struct wait_ - * 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(¤t->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_ - 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(¤t->sighand->siglock); -+ write_sequnlock_irq(&psig->stats_lock); - } - - if (wo->wo_rusage) diff --git a/queue-6.1/series b/queue-6.1/series index 1cc7ca76e3b..de7eee4e4a3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -139,7 +139,6 @@ nfp-use-correct-macro-for-lengthselect-in-bar-config.patch nfp-flower-prevent-re-adding-mac-index-for-bonded-port.patch wifi-cfg80211-fix-wiphy-delayed-work-queueing.patch wifi-mac80211-reload-info-pointer-in-ieee80211_tx_dequeue.patch -exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch irqchip-irq-brcmstb-l2-add-write-memory-barrier-before-exit.patch irqchip-gic-v3-its-fix-gicv4.1-vpe-affinity-update.patch zonefs-improve-error-handling.patch diff --git a/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch b/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch deleted file mode 100644 index 61e0a003801..00000000000 --- a/queue-6.6/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 Mon Sep 17 00:00:00 2001 -From: Oleg Nesterov -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 - -commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 upstream. - -After the recent changes nobody use siglock to read the values protected -by stats_lock, we can kill spin_lock_irq(¤t->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 -Signed-off-by: Dylan Hatch -Cc: Eric W. Biederman -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - kernel/exit.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - ---- a/kernel/exit.c -+++ b/kernel/exit.c -@@ -1148,17 +1148,14 @@ static int wait_task_zombie(struct wait_ - * 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(¤t->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_ - 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(¤t->sighand->siglock); -+ write_sequnlock_irq(&psig->stats_lock); - } - - if (wo->wo_rusage) diff --git a/queue-6.6/series b/queue-6.6/series index 9e793f32a4c..5f9e23641d0 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -207,7 +207,6 @@ wifi-iwlwifi-fix-double-free-bug.patch wifi-cfg80211-fix-wiphy-delayed-work-queueing.patch wifi-mac80211-reload-info-pointer-in-ieee80211_tx_dequeue.patch wifi-iwlwifi-mvm-fix-a-crash-when-we-run-out-of-stations.patch -exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch irqchip-irq-brcmstb-l2-add-write-memory-barrier-before-exit.patch irqchip-gic-v3-its-restore-quirk-probing-for-acpi-based-systems.patch irqchip-gic-v3-its-fix-gicv4.1-vpe-affinity-update.patch diff --git a/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch b/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch deleted file mode 100644 index 51596fe392d..00000000000 --- a/queue-6.7/exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 Mon Sep 17 00:00:00 2001 -From: Oleg Nesterov -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 - -commit c1be35a16b2f1fe21f4f26f9de030ad6eaaf6a25 upstream. - -After the recent changes nobody use siglock to read the values protected -by stats_lock, we can kill spin_lock_irq(¤t->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 -Signed-off-by: Dylan Hatch -Cc: Eric W. Biederman -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - kernel/exit.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - ---- a/kernel/exit.c -+++ b/kernel/exit.c -@@ -1125,17 +1125,14 @@ static int wait_task_zombie(struct wait_ - * 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(¤t->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_ - 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(¤t->sighand->siglock); -+ write_sequnlock_irq(&psig->stats_lock); - } - - if (wo->wo_rusage) diff --git a/queue-6.7/series b/queue-6.7/series index 5427ff679d8..c9a6a4976dc 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -254,7 +254,6 @@ wifi-cfg80211-fix-wiphy-delayed-work-queueing.patch wifi-mac80211-reload-info-pointer-in-ieee80211_tx_dequeue.patch wifi-iwlwifi-mvm-fix-a-crash-when-we-run-out-of-stations.patch pci-dwc-fix-a-64bit-bug-in-dw_pcie_ep_raise_msix_irq.patch -exit-wait_task_zombie-kill-the-no-longer-necessary-spin_lock_irq-siglock.patch irqchip-irq-brcmstb-l2-add-write-memory-barrier-before-exit.patch irqchip-gic-v3-its-restore-quirk-probing-for-acpi-based-systems.patch irqchip-gic-v3-its-fix-gicv4.1-vpe-affinity-update.patch -- 2.47.3