drop queue-4.4/powerpc-perf-fix-soft-lockups-due-to-missed-interrup.patch

diff --git a/queue-4.4/powerpc-perf-fix-soft-lockups-due-to-missed-interrup.patch b/queue-4.4/powerpc-perf-fix-soft-lockups-due-to-missed-interrup.patch
deleted file mode 100644 (file)
index 5ac6041..0000000
--- a/queue-4.4/powerpc-perf-fix-soft-lockups-due-to-missed-interrup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6f18ab50a35b60904bc15460f5cdbfe959f98f09 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 6 Aug 2020 08:46:32 -0400
-Subject: powerpc/perf: Fix soft lockups due to missed interrupt accounting
-
-From: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
-
-[ Upstream commit 17899eaf88d689529b866371344c8f269ba79b5f ]
-
-Performance monitor interrupt handler checks if any counter has
-overflown and calls record_and_restart() in core-book3s which invokes
-perf_event_overflow() to record the sample information. Apart from
-creating sample, perf_event_overflow() also does the interrupt and
-period checks via perf_event_account_interrupt().
-
-Currently we record information only if the SIAR (Sampled Instruction
-Address Register) valid bit is set (using siar_valid() check) and
-hence the interrupt check.
-
-But it is possible that we do sampling for some events that are not
-generating valid SIAR, and hence there is no chance to disable the
-event if interrupts are more than max_samples_per_tick. This leads to
-soft lockup.
-
-Fix this by adding perf_event_account_interrupt() in the invalid SIAR
-code path for a sampling event. ie if SIAR is invalid, just do
-interrupt check and don't record the sample information.
-
-Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
-Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://lore.kernel.org/r/1596717992-7321-1-git-send-email-atrajeev@linux.vnet.ibm.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/perf/core-book3s.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/powerpc/perf/core-book3s.c
-+++ b/arch/powerpc/perf/core-book3s.c
-@@ -2040,6 +2040,10 @@ static void record_and_restart(struct pe
- 
-               if (perf_event_overflow(event, &data, regs))
-                       power_pmu_stop(event, 0);
-+      } else if (period) {
-+              /* Account for interrupt in case of invalid SIAR */
-+              if (perf_event_account_interrupt(event))
-+                      power_pmu_stop(event, 0);
-       }
- }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index b233855153a3a0c98e3b32142ef2994e68cc88f9..96e862431757ab179bf2849181e26555e7c054f7 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -36,7 +36,6 @@ jbd2-abort-journal-if-free-a-async-write-error-metad.patch
 s390-cio-add-cond_resched-in-the-slow_eval_known_fn-.patch
 scsi-ufs-fix-possible-infinite-loop-in-ufshcd_hold.patch
 net-gianfar-add-of_node_put-before-goto-statement.patch
-powerpc-perf-fix-soft-lockups-due-to-missed-interrup.patch
 fbcon-prevent-user-font-height-or-width-change-from-causing-potential-out-of-bounds-access.patch
 usb-lvtest-return-proper-error-code-in-probe.patch
 vt-defer-kfree-of-vc_screenbuf-in-vc_do_resize.patch