[Xen-changelog] [xen stable-4.2] AMD IOMMU: allow disabling only interrupt remapping when certain IVRS consistency checks fail

[patchbot@xxxxxxx]

commit 77c1e88c14bb6705f6fca091e12d2aa4d8882207
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Apr 2 10:52:26 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 2 10:52:26 2013 +0200

    AMD IOMMU: allow disabling only interrupt remapping when certain IVRS 
consistency checks fail
    
    After some more thought on the XSA-36 and specifically the comments we
    got regarding disabling the IOMMU in this situation altogether making
    things worse instead of better, I came to the conclusion that we can
    actually restrict the action in affected cases to just disabling
    interrupt remapping. That doesn't make the situation worse than prior
    to the XSA-36 fixes (where interrupt remapping didn't really protect
    domains from one another), but allows at least DMA isolation to still
    be utilized.
    
    To do so, disabling of interrupt remapping must be explicitly requested
    on the command line - respective checks will then be skipped.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Suravee Suthikulanit <suravee.suthikulpanit@xxxxxxx>
    master changeset: 92b8bc03bd4b582cb524db51494d0dba7607e7ac
    master date: 2013-03-25 16:55:22 +0100
---
 xen/drivers/passthrough/amd/iommu_acpi.c |    5 ++++-
 xen/drivers/passthrough/amd/iommu_init.c |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c 
b/xen/drivers/passthrough/amd/iommu_acpi.c
index 7205a5f..2b52ea9 100644
--- a/xen/drivers/passthrough/amd/iommu_acpi.c
+++ b/xen/drivers/passthrough/amd/iommu_acpi.c
@@ -664,6 +664,9 @@ static u16 __init parse_ivhd_device_special(
         return dev_length;
     }
 
+    if ( !iommu_intremap )
+        return dev_length;
+
     /*
      * Some BIOSes have IOAPIC broken entries so we check for IVRS
      * consistency here --- whether entry's IOAPIC ID is valid and
@@ -902,7 +905,7 @@ static int __init parse_ivrs_table(struct acpi_table_header 
*table)
     }
 
     /* Each IO-APIC must have been mentioned in the table. */
-    for ( apic = 0; !error && apic < nr_ioapics; ++apic )
+    for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic )
     {
         if ( !nr_ioapic_entries[apic] ||
              ioapic_sbdf[IO_APIC_ID(apic)].pin_setup )
diff --git a/xen/drivers/passthrough/amd/iommu_init.c 
b/xen/drivers/passthrough/amd/iommu_init.c
index a97b68b..ebf964c 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -1200,7 +1200,8 @@ int __init amd_iommu_init(void)
 
     BUG_ON( !iommu_found() );
 
-    if ( amd_iommu_perdev_intremap && amd_sp5100_erratum28() )
+    if ( iommu_intremap && amd_iommu_perdev_intremap &&
+         amd_sp5100_erratum28() )
         goto error_out;
 
     ivrs_bdf_entries = amd_iommu_get_ivrs_dev_entries();
@@ -1217,7 +1218,7 @@ int __init amd_iommu_init(void)
         goto error_out;
 
     /* initialize io-apic interrupt remapping entries */
-    if ( amd_iommu_setup_ioapic_remapping() != 0 )
+    if ( iommu_intremap && amd_iommu_setup_ioapic_remapping() != 0 )
         goto error_out;
 
     /* allocate and initialize a global device table shared by all iommus */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog