aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2015-05-23 23:08:16 +0000
committerAndrew Turner <andrew@FreeBSD.org>2015-05-23 23:08:16 +0000
commite81032ad243db32b8fd615b2d55ee94b9f6a5b6a (patch)
treed78186deeec09d550c81b1ad26d887f11aee2684
parentf22cb06aeb40c35aa1868c88dc0ad7db50d1a2bb (diff)
downloadsrc-e81032ad243db32b8fd615b2d55ee94b9f6a5b6a.tar.gz
src-e81032ad243db32b8fd615b2d55ee94b9f6a5b6a.zip
Fix a lock up where we enter swapper() with interrupts disabled.
In smp_rendezvous_cpus we expect to wait for all cpus to enter smp_rendezvous_action. If we call this holding a proc lock swapper may attempt to also lock it, however as interrupts are disabled the cpu never handles the ipi. Because smp_rendezvous_action waits for all signaled cpus before contining it may get caught waiting for the cpu running swapper as the proc mutex will be unlocked after smp_rendezvous_cpus finishes. The fix is to enable interrupts in the configure stage as we should be doing. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=283337
-rw-r--r--sys/arm/arm/autoconf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c
index 417639894bff..f18f67dcda8f 100644
--- a/sys/arm/arm/autoconf.c
+++ b/sys/arm/arm/autoconf.c
@@ -94,6 +94,7 @@ static void
configure_final(void *dummy)
{
+ enable_interrupts(PSR_I | PSR_F);
cninit_finish();
cold = 0;
}