[Xen-devel] [PATCH v2 2/2] x86: don't unmask disabled irqs when migrating them

["Tian, Kevin" <kevin.tian@xxxxxxxxx>]

x86: don't unmask disabled irqs when migrating them

it doesn't make sense to mask/unmask a disabled irq when migrating it
from offlined cpu to another, because it's not expected to handle
any instance of it. Current mask/set_affinity/unmask steps may trigger
unexpected instance on disabled irq which then simply bug on when there
is no handler for it. One failing example is observed in Xen. Xen pvops 
guest marks a special type of irqs as disabled, which are simply used 
as a notification mechanism to wake up blocked guest in event polling
state. Absolutely unmask them may cause the notification instance 
instead injected into the guest and then cause trouble.

Signed-off-by: Fengzhe Zhang <fengzhe.zhang@xxxxxxxxx>
Signed-off-by: Kevin Tian <kevin.tian@xxxxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxxxxx>
CC: H. Peter Anvin <hpa@xxxxxxxxx>
CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxxxx>

--- linux-2.6.39-rc6.orig/arch/x86/kernel/irq.c 2011-05-04 10:59:13.000000000 
+0800
+++ linux-2.6.39-rc6/arch/x86/kernel/irq.c      2011-05-06 09:20:25.563963000 
+0800
@@ -237,6 +237,7 @@ void fixup_irqs(void)
        for_each_irq_desc(irq, desc) {
                int break_affinity = 0;
                int set_affinity = 1;
+               int do_mask;
                const struct cpumask *affinity;
 
                if (!desc)
@@ -268,7 +269,9 @@ void fixup_irqs(void)
                }
 
                chip = irq_data_get_irq_chip(data);
-               if (!irqd_can_move_in_process_context(data) && chip->irq_mask)
+               do_mask = !irqd_irq_disabled(data) &&
+                       !irqd_can_move_in_process_context(data) && 
chip->irq_mask;
+               if (do_mask)
                        chip->irq_mask(data);
 
                if (chip->irq_set_affinity)
@@ -276,7 +279,7 @@ void fixup_irqs(void)
                else if (!(warned++))
                        set_affinity = 0;
 
-               if (!irqd_can_move_in_process_context(data) && chip->irq_unmask)
+               if (do_mask)
                        chip->irq_unmask(data);
 
                raw_spin_unlock(&desc->lock);

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel