From: Leonardo Bras <leonardo@linux.ibm.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Enrico Weigelt <info@metux.net>,
Leonardo Bras <leonardo@linux.ibm.com>,
Alexios Zavras <alexios.zavras@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
peterz@infradead.org
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/1] ppc/crash: Reset spinlocks during crash
Date: Tue, 31 Mar 2020 21:00:21 -0300 [thread overview]
Message-ID: <20200401000020.590447-1-leonardo@linux.ibm.com> (raw)
During a crash, there is chance that the cpus that handle the NMI IPI
are holding a spin_lock. If this spin_lock is needed by crashing_cpu it
will cause a deadlock. (rtas.lock and printk logbuf_lock as of today)
This is a problem if the system has kdump set up, given if it crashes
for any reason kdump may not be saved for crash analysis.
After NMI IPI is sent to all other cpus, force unlock all spinlocks
needed for finishing crash routine.
Signed-off-by: Leonardo Bras <leonardo@linux.ibm.com>
---
Changes from v2:
- Instead of skipping spinlocks, unlock the needed ones.
Changes from v1:
- Exported variable
---
arch/powerpc/kexec/crash.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c
index d488311efab1..8d63fca3242c 100644
--- a/arch/powerpc/kexec/crash.c
+++ b/arch/powerpc/kexec/crash.c
@@ -24,6 +24,7 @@
#include <asm/smp.h>
#include <asm/setjmp.h>
#include <asm/debug.h>
+#include <asm/rtas.h>
/*
* The primary CPU waits a while for all secondary CPUs to enter. This is to
@@ -49,6 +50,8 @@ static int time_to_dump;
*/
int crash_wake_offline;
+extern raw_spinlock_t logbuf_lock;
+
#define CRASH_HANDLER_MAX 3
/* List of shutdown handles */
static crash_shutdown_t crash_shutdown_handles[CRASH_HANDLER_MAX];
@@ -129,6 +132,13 @@ static void crash_kexec_prepare_cpus(int cpu)
/* Would it be better to replace the trap vector here? */
if (atomic_read(&cpus_in_crash) >= ncpus) {
+ /*
+ * At this point no other CPU is running, and some of them may
+ * have been interrupted while holding one of the locks needed
+ * to complete crashing. Free them so there is no deadlock.
+ */
+ arch_spin_unlock(&logbuf_lock.raw_lock);
+ arch_spin_unlock(&rtas.lock);
printk(KERN_EMERG "IPI complete\n");
return;
}
--
2.25.1
next reply other threads:[~2020-04-01 0:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-01 0:00 Leonardo Bras [this message]
2020-04-01 3:07 ` [PATCH v3 1/1] ppc/crash: Reset spinlocks during crash kbuild test robot
2020-04-01 9:26 ` Peter Zijlstra
2020-04-01 23:53 ` Leonardo Bras
2020-04-02 11:28 ` Michael Ellerman
2020-04-03 0:37 ` Leonardo Bras
2020-04-03 6:41 ` Nicholas Piggin
2020-04-08 2:36 ` Leonardo Bras
2020-04-08 12:21 ` Michael Ellerman
2020-04-08 16:48 ` Leonardo Bras
2020-04-08 18:00 ` Leonardo Bras
2020-04-08 22:55 ` Leonardo Bras
2020-04-09 0:27 ` Paul Mackerras
2020-05-12 3:48 ` Leonardo Bras
2020-05-12 10:42 ` Michael Ellerman
2020-04-06 18:46 ` Leonardo Bras
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=20200401000020.590447-1-leonardo@linux.ibm.com \
--to=leonardo@linux.ibm.com \
--cc=alexios.zavras@intel.com \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@c-s.fr \
--cc=gregkh@linuxfoundation.org \
--cc=info@metux.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).