bad5086f18
causes a hang during network setup. - Upstream patches from Jan. 21360-x86-mce-polling-diabled-init.patch 21372-x86-cross-cpu-wait.patch 21331-svm-vintr-during-nmi.patch 21333-xentrace-t_info-size.patch 21340-vtd-dom0-mapping-latency.patch 21346-x86-platform-timer-wrap.patch 21373-dummy-domain-io-caps.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=48
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
References: bnc#603008
|
|
|
|
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# 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@novell.com>
|
|
|
|
--- 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(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;
|
|
}
|
|
--- 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 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();
|
|
}
|
|
}
|
|
|