xen: fix MSI setup and teardown for PV on HVM guests

When remapping MSIs into pirqs for PV on HVM guests, qemu is responsible
for doing the actual mapping and unmapping.
We only give qemu the desired pirq number when we ask to do the mapping
the first time, after that we should be reading back the pirq number
from qemu every time we want to re-enable the MSI.

This fixes a bug in xen_hvm_setup_msi_irqs that manifests itself when
trying to enable the same MSI for the second time: the old MSI to pirq
mapping is still valid at this point but xen_hvm_setup_msi_irqs would
try to assign a new pirq anyway.
A simple way to reproduce this bug is to assign an MSI capable network
card to a PV on HVM guest, if the user brings down the corresponding
ethernet interface and up again, Linux would fail to enable MSIs on the
device.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

1 files changed, 17 insertions, 7 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7ab43c33f746..f78945ce8aeb 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -668,17 +668,21 @@ out:
 #include <linux/msi.h>
 #include "../pci/msi.h"
 
-void xen_allocate_pirq_msi(char *name, int *irq, int *pirq)
+void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc)
 {
         spin_lock(&irq_mapping_update_lock);
 
-        *irq = find_unbound_irq();
-        if (*irq == -1)
-                goto out;
+        if (alloc & XEN_ALLOC_IRQ) {
+                *irq = find_unbound_irq();
+                if (*irq == -1)
+                        goto out;
+        }
 
-        *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
-        if (*pirq == -1)
-                goto out;
+        if (alloc & XEN_ALLOC_PIRQ) {
+                *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
+                if (*pirq == -1)
+                        goto out;
+        }
 
         set_irq_chip_and_handler_name(*irq, &xen_pirq_chip,
                                       handle_level_irq, name);
@@ -766,6 +770,7 @@ int xen_destroy_irq(int irq)
                         printk(KERN_WARNING "unmap irq failed %d\n", rc);
                         goto out;
                 }
+                pirq_to_irq[info->u.pirq.pirq] = -1;
         }
         irq_info[irq] = mk_unbound_info();
 
@@ -786,6 +791,11 @@ int xen_gsi_from_irq(unsigned irq)
         return gsi_from_irq(irq);
 }
 
+int xen_irq_from_pirq(unsigned pirq)
+{
+        return pirq_to_irq[pirq];
+}
+
 int bind_evtchn_to_irq(unsigned int evtchn)
 {
         int irq;