|
@@ -39,29 +39,25 @@ static void xen_qlock_kick(int cpu)
|
|
|
*/
|
|
|
static void xen_qlock_wait(u8 *byte, u8 val)
|
|
|
{
|
|
|
+ unsigned long flags;
|
|
|
int irq = __this_cpu_read(lock_kicker_irq);
|
|
|
|
|
|
/* If kicker interrupts not initialized yet, just spin */
|
|
|
- if (irq == -1)
|
|
|
+ if (irq == -1 || in_nmi())
|
|
|
return;
|
|
|
|
|
|
- /* If irq pending already clear it and return. */
|
|
|
+ /* Guard against reentry. */
|
|
|
+ local_irq_save(flags);
|
|
|
+
|
|
|
+ /* If irq pending already clear it. */
|
|
|
if (xen_test_irq_pending(irq)) {
|
|
|
xen_clear_irq_pending(irq);
|
|
|
- return;
|
|
|
+ } else if (READ_ONCE(*byte) == val) {
|
|
|
+ /* Block until irq becomes pending (or a spurious wakeup) */
|
|
|
+ xen_poll_irq(irq);
|
|
|
}
|
|
|
|
|
|
- if (READ_ONCE(*byte) != val)
|
|
|
- return;
|
|
|
-
|
|
|
- /*
|
|
|
- * If an interrupt happens here, it will leave the wakeup irq
|
|
|
- * pending, which will cause xen_poll_irq() to return
|
|
|
- * immediately.
|
|
|
- */
|
|
|
-
|
|
|
- /* Block until irq becomes pending (or perhaps a spurious wakeup) */
|
|
|
- xen_poll_irq(irq);
|
|
|
+ local_irq_restore(flags);
|
|
|
}
|
|
|
|
|
|
static irqreturn_t dummy_handler(int irq, void *dev_id)
|