Description: AMD,IOMMU: Make per-device interrupt remapping table default
 Using global interrupt remapping table may be insecure, as
 described by XSA-36. This patch makes per-device mode default.
From: Boris Ostrovsky <boris.ostrovsky@amd.com>
From: Jan Beulich <jbeulich@suse.com>
Origin: upstream, commit:23451:e5ed73d172eb
Id: CVE-2013-0153
---
--- a/xen/arch/x86/irq.c	Tue Feb 05 15:36:11 2013 +0100
+++ b/xen/arch/x86/irq.c	Tue Feb 05 15:36:34 2013 +0100
@@ -1677,9 +1677,6 @@
         d->arch.pirq_irq[pirq] = irq;
         d->arch.irq_pirq[irq] = pirq;
         spin_unlock_irqrestore(&desc->lock, flags);
-
-        if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV )
-            printk(XENLOG_INFO "Per-device vector maps for GSIs not implemented yet.\n");
     }
 
 done:
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c	Tue Feb 05 15:36:11 2013 +0100
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c	Tue Feb 05 15:36:34 2013 +0100
@@ -195,6 +195,8 @@
     {
         printk("AMD-Vi: Not overriding irq_vector_map setting\n");
     }
+    if ( !amd_iommu_perdev_intremap )
+        printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table is not recommended (see XSA-36)!\n");
     return scan_pci_devices();
 }
 
--- a/xen/drivers/passthrough/iommu.c	Tue Feb 05 15:36:11 2013 +0100
+++ b/xen/drivers/passthrough/iommu.c	Tue Feb 05 15:36:34 2013 +0100
@@ -49,7 +49,7 @@
 bool_t __read_mostly iommu_intremap = 1;
 bool_t __read_mostly iommu_hap_pt_share;
 bool_t __read_mostly amd_iommu_debug;
-bool_t __read_mostly amd_iommu_perdev_intremap;
+bool_t __read_mostly amd_iommu_perdev_intremap = 1;
 
 static void __init parse_iommu_param(char *s)
 {
@@ -78,6 +78,8 @@
             amd_iommu_debug = 1;
         else if ( !strcmp(s, "amd-iommu-perdev-intremap") )
             amd_iommu_perdev_intremap = 1;
+        else if ( !strcmp(s, "amd-iommu-global-intremap") )
+            amd_iommu_perdev_intremap = 0;
         else if ( !strcmp(s, "dom0-passthrough") )
             iommu_passthrough = 1;
         else if ( !strcmp(s, "dom0-strict") )
