diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-11 08:41:13 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-11 08:41:13 +0100 |
| commit | a623f4a9200640a72b8a868f54e4315c488db687 (patch) | |
| tree | 6f5b95ac7e8418a5bcb2ab875508fe35ee3c5624 | |
| parent | a80b94ef602eec55dc2bf22cb981543bbf8820bd (diff) | |
| download | xen-a623f4a9200640a72b8a868f54e4315c488db687.tar.gz xen-a623f4a9200640a72b8a868f54e4315c488db687.tar.bz2 xen-a623f4a9200640a72b8a868f54e4315c488db687.zip | |
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@novell.com>
xen-unstable changeset: 21340:220fa418eaae
xen-unstable date: Tue May 11 08:35:45 2010 +0100
| -rw-r--r-- | xen/drivers/passthrough/vtd/ia64/vtd.c | 4 | ||||
| -rw-r--r-- | xen/drivers/passthrough/vtd/x86/vtd.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c b/xen/drivers/passthrough/vtd/ia64/vtd.c index 7b740d2d84..660bcd3512 100644 --- a/xen/drivers/passthrough/vtd/ia64/vtd.c +++ b/xen/drivers/passthrough/vtd/ia64/vtd.c @@ -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(unsigned long start, unsigned long end, 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 --git a/xen/drivers/passthrough/vtd/x86/vtd.c b/xen/drivers/passthrough/vtd/x86/vtd.c index 74e31ccb72..580fc03eda 100644 --- a/xen/drivers/passthrough/vtd/x86/vtd.c +++ b/xen/drivers/passthrough/vtd/x86/vtd.c @@ -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 domain *d) 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(); } } |