]> xenbits.xensource.com Git - xen.git/commitdiff
AMD/IOMMU: Process softirqs while building dom0 iommu mappings
authorAndrew Cooper <andrew.cooper3@citrix.com>
Wed, 20 Mar 2013 09:00:01 +0000 (10:00 +0100)
committerJan Beulich <jbeulich@suse.com>
Wed, 20 Mar 2013 09:00:01 +0000 (10:00 +0100)
Recent changes which have made their way into xen-4.2 stable have pushed the
runtime of construct_dom0() over 5 seconds, which has caused regressions in
XenServer testing because of our 5 second watchdog.

The root cause is that amd_iommu_dom0_init() does not process softirqs and in
particular the nmi_timer which causes the watchdog to decide that no useful
progress is being made.

This patch adds periodic calls to process_pending_softirqs() at the same
interval as the Intel variant of this function.  The server which was failing
with the watchdog test now boots reliably with a timeout of 1 second.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/drivers/passthrough/amd/pci_amd_iommu.c

index 2098e419a6d806a98128a5814af9e9657352b3c4..60696d74d83cdec7b7fb85c4f9f5c952f15fdfdc 100644 (file)
@@ -317,6 +317,9 @@ static void __init amd_iommu_dom0_init(struct domain *d)
             if ( mfn_valid(pfn) )
                 amd_iommu_map_page(d, pfn, pfn, 
                                    IOMMUF_readable|IOMMUF_writable);
+
+            if ( !(i & 0xfffff) )
+                process_pending_softirqs();
         }
     }