1 files changed, 69 insertions, 32 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7d24b0d94ed4..347f17edad77 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -261,7 +261,7 @@ static void init_evtchn_cpu_bindings(void)
         }
 #endif
 
-        memset(cpu_evtchn_mask(0), ~0, sizeof(cpu_evtchn_mask(0)));
+        memset(cpu_evtchn_mask(0), ~0, sizeof(struct cpu_evtchn_s));
 }
 
 static inline void clear_evtchn(int port)
@@ -377,7 +377,7 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                 irq = find_unbound_irq();
 
                 set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
-                                              handle_edge_irq, "event");
+                                              handle_fasteoi_irq, "event");
 
                 evtchn_to_irq[evtchn] = irq;
                 irq_info[irq] = mk_evtchn_info(evtchn);
@@ -435,6 +435,11 @@ static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
         irq = per_cpu(virq_to_irq, cpu)[virq];
 
         if (irq == -1) {
+                irq = find_unbound_irq();
+
+                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
+                                              handle_percpu_irq, "virq");
+
                 bind_virq.virq = virq;
                 bind_virq.vcpu = cpu;
                 if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
@@ -442,11 +447,6 @@ static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                         BUG();
                 evtchn = bind_virq.port;
 
-                irq = find_unbound_irq();
-
-                set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
-                                              handle_percpu_irq, "virq");
-
                 evtchn_to_irq[evtchn] = irq;
                 irq_info[irq] = mk_virq_info(evtchn, virq);
 
@@ -578,41 +578,75 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
 {
         struct shared_info *sh = HYPERVISOR_shared_info;
         int cpu = smp_processor_id();
+        unsigned long *cpu_evtchn = cpu_evtchn_mask(cpu);
         int i;
         unsigned long flags;
         static DEFINE_SPINLOCK(debug_lock);
+        struct vcpu_info *v;
 
         spin_lock_irqsave(&debug_lock, flags);
 
-        printk("vcpu %d\n  ", cpu);
+        printk("\nvcpu %d\n  ", cpu);
 
         for_each_online_cpu(i) {
-                struct vcpu_info *v = per_cpu(xen_vcpu, i);
-                printk("%d: masked=%d pending=%d event_sel %08lx\n  ", i,
-                        (get_irq_regs() && i == cpu) ? xen_irqs_disabled(get_irq_regs()) : v->evtchn_upcall_mask,
-                        v->evtchn_upcall_pending,
-                        v->evtchn_pending_sel);
+                int pending;
+                v = per_cpu(xen_vcpu, i);
+                pending = (get_irq_regs() && i == cpu)
+                        ? xen_irqs_disabled(get_irq_regs())
+                        : v->evtchn_upcall_mask;
+                printk("%d: masked=%d pending=%d event_sel %0*lx\n  ", i,
+                       pending, v->evtchn_upcall_pending,
+                       (int)(sizeof(v->evtchn_pending_sel)*2),
+                       v->evtchn_pending_sel);
+        }
+        v = per_cpu(xen_vcpu, cpu);
+
+        printk("\npending:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_pending)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)sizeof(sh->evtchn_pending[0])*2,
+                       sh->evtchn_pending[i],
+                       i % 8 == 0 ? "\n   " : " ");
+        printk("\nglobal mask:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
+                printk("%0*lx%s",
+                       (int)(sizeof(sh->evtchn_mask[0])*2),
+                       sh->evtchn_mask[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nglobally unmasked:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+                       sh->evtchn_pending[i] & ~sh->evtchn_mask[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nlocal cpu%d mask:\n   ", cpu);
+        for (i = (NR_EVENT_CHANNELS/BITS_PER_LONG)-1; i >= 0; i--)
+                printk("%0*lx%s", (int)(sizeof(cpu_evtchn[0])*2),
+                       cpu_evtchn[i],
+                       i % 8 == 0 ? "\n   " : " ");
+
+        printk("\nlocally unmasked:\n   ");
+        for (i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--) {
+                unsigned long pending = sh->evtchn_pending[i]
+                        & ~sh->evtchn_mask[i]
+                        & cpu_evtchn[i];
+                printk("%0*lx%s", (int)(sizeof(sh->evtchn_mask[0])*2),
+                       pending, i % 8 == 0 ? "\n   " : " ");
         }
-        printk("pending:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_pending)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_pending[i],
-                        i % 8 == 0 ? "\n   " : " ");
-        printk("\nmasks:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_mask[i],
-                        i % 8 == 0 ? "\n   " : " ");
-
-        printk("\nunmasked:\n   ");
-        for(i = ARRAY_SIZE(sh->evtchn_mask)-1; i >= 0; i--)
-                printk("%08lx%s", sh->evtchn_pending[i] & ~sh->evtchn_mask[i],
-                        i % 8 == 0 ? "\n   " : " ");
 
         printk("\npending list:\n");
-        for(i = 0; i < NR_EVENT_CHANNELS; i++) {
+        for (i = 0; i < NR_EVENT_CHANNELS; i++) {
                 if (sync_test_bit(i, sh->evtchn_pending)) {
-                        printk("  %d: event %d -> irq %d\n",
+                        int word_idx = i / BITS_PER_LONG;
+                        printk("  %d: event %d -> irq %d%s%s%s\n",
                                cpu_from_evtchn(i), i,
-                               evtchn_to_irq[i]);
+                               evtchn_to_irq[i],
+                               sync_test_bit(word_idx, &v->evtchn_pending_sel)
+                                             ? "" : " l2-clear",
+                               !sync_test_bit(i, sh->evtchn_mask)
+                                             ? "" : " globally-masked",
+                               sync_test_bit(i, cpu_evtchn)
+                                             ? "" : " locally-masked");
                 }
         }
 
@@ -663,6 +697,9 @@ static void __xen_evtchn_do_upcall(void)
                                 int irq = evtchn_to_irq[port];
                                 struct irq_desc *desc;
 
+                                mask_evtchn(port);
+                                clear_evtchn(port);
+
                                 if (irq != -1) {
                                         desc = irq_to_desc(irq);
                                         if (desc)
@@ -800,10 +837,10 @@ static void ack_dynirq(unsigned int irq)
 {
         int evtchn = evtchn_from_irq(irq);
 
-        move_native_irq(irq);
+        move_masked_irq(irq);
 
         if (VALID_EVTCHN(evtchn))
-                clear_evtchn(evtchn);
+                unmask_evtchn(evtchn);
 }
 
 static int retrigger_dynirq(unsigned int irq)
@@ -959,7 +996,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
         .mask           = disable_dynirq,
         .unmask         = enable_dynirq,
 
-        .ack            = ack_dynirq,
+        .eoi            = ack_dynirq,
         .set_affinity   = set_affinity_irq,
         .retrigger      = retrigger_dynirq,
 };