Date: Mon, 31 Oct 2016 17:07:25 -0500 From: Eric Badger <badger@FreeBSD.org> To: freebsd-hackers@freebsd.org Subject: Crashes with 'reboot -d' Message-ID: <b2b9dd83-239d-57b9-0f7c-5bbd19b69dde@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--Xox9P59LvAhc1C3GBVWmiiPqhNNbAxATi
Content-Type: multipart/mixed; boundary="WEJPSSThNMXMKeKlUmh1E0a988bRNENDT";
protected-headers="v1"
From: Eric Badger <badger@FreeBSD.org>
To: freebsd-hackers@freebsd.org
Message-ID: <b2b9dd83-239d-57b9-0f7c-5bbd19b69dde@FreeBSD.org>
Subject: Crashes with 'reboot -d'
--WEJPSSThNMXMKeKlUmh1E0a988bRNENDT
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
I've run into crashes when using 'reboot -d' (or a slightly tweaked
version of it in our FreeBSD spin at work). The problem is that dump
code is written to run in a panic/crash scenario, when all other CPUs
are stopped. In the case of 'reboot -d', all other CPUs are not stopped.
The code in xpt_polled_action runs what would normally be done by the
interrupt handler, polling start_ccb->ccb_h.status to see when the
operation has been completed. If the real interrupt handler is still
running, however, polling start_ccb->ccb_h.status is not sufficient; the
ccb may be placed in the cam kproc's doneq after start_ccb->ccb_h.status
has been updated. The dumper will reuse the ccb's memory, but when the
cam kproc processes that item in its doneq, it will twiddle bits and
corrupt the now reused ccb memory.
I fixed this by shutting off other CPUs when doing a dump during reboot
(patch below). This seems fine, but perhaps heavy handed. I also
experimented with letting the normal interrupt handler and cam kproc do
the work when we're not in a SCHEDULER_STOPPED() scenario. This seemed
to reduce dump performance and make performance less consistent, but
otherwise worked ok.
I'd appreciate any comments on things I may have failed to consider. If
no objections are raised, I will proceed with the patch here.
Thanks,
Eric
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 79c4c30..bdc0182 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -319,8 +319,9 @@ void
kern_reboot(int howto)
{
static int once =3D 0;
+#ifdef SMP
+ cpuset_t other_cpus;
-#if defined(SMP)
/*
* Bind us to CPU 0 so that all shutdown code runs there. Some
* systems don't shutdown properly (i.e., ACPI power off) if we
@@ -362,8 +363,28 @@ kern_reboot(int howto)
*/
EVENTHANDLER_INVOKE(shutdown_post_sync, howto);
- if ((howto & (RB_HALT|RB_DUMP)) =3D=3D RB_DUMP && !cold && !dumping)
+ if ((howto & (RB_HALT|RB_DUMP)) =3D=3D RB_DUMP && !cold && !dumping) {
+#ifdef SMP
+ /*
+ * Dump code assumes that all other CPUs have stopped, and thus
+ * handles disk interrupts manually. This assumption must be enforced,
+ * as otherwise the real interrupt handler may race with the dumper.
+ */
+ if (!SCHEDULER_STOPPED()) {
+ spinlock_enter();
+
+ other_cpus =3D all_cpus;
+ CPU_CLR(PCPU_GET(cpuid), &other_cpus);
+ stop_cpus_hard(other_cpus);
+
+ curthread->td_stopsched =3D 1;
+
+ /* Module shutdown is no longer safe. */
+ howto |=3D RB_NOSYNC;
+ }
+#endif
doadump(TRUE);
+ }
/* Now that we're going to really halt the system... */
EVENTHANDLER_INVOKE(shutdown_final, howto);
--WEJPSSThNMXMKeKlUmh1E0a988bRNENDT--
--Xox9P59LvAhc1C3GBVWmiiPqhNNbAxATi
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQGQBAEBCgB6BQJYF8CmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQTlFODAxM0JDQTdDOTQ1ODI1Mzc3NTk2
MkU1MDA5NjVBM0YyNEFDExxiYWRnZXJAZnJlZWJzZC5vcmcACgkQYuUAllo/JKyk
fwgA3Bq+vMAeSVV/Wqbw03yWnH0EUJ3uvc9HkrJX9yFiiHtHO0CyLNJZw8+qnyFQ
V/IRBePEUebCDAVrCzlp5493ZERdqSkOwLehXeaaLJ2e02Uo5WbQIn5/7+1Lw/u9
1u0iDMPLFVaxWlSXRGNmmg2NHXXfI2lITzNl5xUcu1GwH6cNrIgSNRMGUhrDumlH
HJZopA1C6+Durn93Au5jtFd2kKxsEI1wbpKBdK4qpkM34fkMugE6rha8ZcZkX0xF
aghiywSvRT4ylPeDh86i8yUkC5rHNfrLAuKNfyQ6OatVDnrXQCApGZ9mz/4JMC+U
lYfrdKuQvHIbydvI9j5syQ+rMQ==
=Fx5o
-----END PGP SIGNATURE-----
--Xox9P59LvAhc1C3GBVWmiiPqhNNbAxATi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2b9dd83-239d-57b9-0f7c-5bbd19b69dde>