Removed 22506-x86-iommu-dom0-estimate.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=95
This commit is contained in:
Charles Arnold 2011-02-04 21:22:17 +00:00 committed by Git OBS Bridge
parent 0c76f22ef1
commit f5c941b113

View File

@ -1,40 +0,0 @@
# HG changeset patch
# User Keir Fraser <keir@xen.org>
# Date 1292320450 0
# Node ID 618ba64260faf45e6ec391582099d7388f013e81
# Parent 72326371ae8106b91da0ca6b0436dd2b6478b7a7
x86/iommu: account for necessary allocations when calculating Dom0's initial allocation size
References: bnc#658163
As of c/s 21812:e382656e4dcc, IOMMU related allocations for Dom0
happen only after it got all of its memory allocated, and hence the
reserve (mainly for setting up its swiotlb) may get exhausted without
accounting for the necessary allocations up front.
While not precise, the estimate has been found to be within a couple
of pages for the systems it got tested on.
For the calculation to be reasonably correct, this depends on the
patch titled "x86/iommu: don't map RAM holes above 4G" sent out
yesterday.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -188,6 +188,15 @@ static unsigned long __init compute_dom0
if ( is_pv_32on64_domain(d) )
avail -= opt_dom0_max_vcpus - 1;
+ /* Reserve memory for iommu_dom0_init() (rough estimate). */
+ if ( iommu_enabled )
+ {
+ unsigned int s;
+
+ for ( s = 9; s < BITS_PER_LONG; s += 9 )
+ avail -= max_pdx >> s;
+ }
+
/*
* If domain 0 allocation isn't specified, reserve 1/16th of available
* memory for things like DMA buffers. This reservation is clamped to