[Xen-changelog] [xen-unstable] VT-d: prevent watchdog timer from kicking in when

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273563345 -3600
# Node ID 220fa418eaae499cdc14359e83092401290a6211
# Parent  804304d4e05d98289de9a107c6b26c5a1db09cd8
VT-d: prevent watchdog timer from kicking in when
initializing on systems with huge amounts of memory

Process pending soft-IRQs every 4G worth of pages initialized for Dom0
to keep timekeeping happy and prevent the NMI watchdog (when enabled)
from kicking in.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/drivers/passthrough/vtd/ia64/vtd.c |    4 ++++
 xen/drivers/passthrough/vtd/x86/vtd.c  |    4 ++++
 2 files changed, 8 insertions(+)

diff -r 804304d4e05d -r 220fa418eaae xen/drivers/passthrough/vtd/ia64/vtd.c
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c    Tue May 11 08:34:58 2010 +0100
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c    Tue May 11 08:35:45 2010 +0100
@@ -19,6 +19,7 @@
  */
 
 #include <xen/sched.h>
+#include <xen/softirq.h>
 #include <xen/domain_page.h>
 #include <xen/iommu.h>
 #include <xen/numa.h>
@@ -110,6 +111,9 @@ static int do_dom0_iommu_mapping(unsigne
             iommu_map_page(d, (pfn*tmp+j), (pfn*tmp+j));
 
        page_addr += PAGE_SIZE;
+
+        if (!(pfn & (0xfffff >> (PAGE_SHIFT - PAGE_SHIFT_4K))))
+            process_pending_softirqs();
     }
     return 0;
 }
diff -r 804304d4e05d -r 220fa418eaae xen/drivers/passthrough/vtd/x86/vtd.c
--- a/xen/drivers/passthrough/vtd/x86/vtd.c     Tue May 11 08:34:58 2010 +0100
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c     Tue May 11 08:35:45 2010 +0100
@@ -19,6 +19,7 @@
  */
 
 #include <xen/sched.h>
+#include <xen/softirq.h>
 #include <xen/domain_page.h>
 #include <asm/paging.h>
 #include <xen/iommu.h>
@@ -153,6 +154,9 @@ void iommu_set_dom0_mapping(struct domai
         tmp = 1 << (PAGE_SHIFT - PAGE_SHIFT_4K);
         for ( j = 0; j < tmp; j++ )
             iommu_map_page(d, (i*tmp+j), (i*tmp+j));
+
+        if (!(i & (0xfffff >> (PAGE_SHIFT - PAGE_SHIFT_4K))))
+            process_pending_softirqs();
     }
 }
 

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