patchbot at xen
Aug 17, 2012, 1:55 AM
Post #1 of 1
(27 views)
Permalink
|
|
[xen-unstable] EPT/PoD: fix interaction with 1Gb pages
|
|
# HG changeset patch
# User Jan Beulich <jbeulich [at] suse>
# Date 1345135085 -3600
# Node ID 3468a834be8d7d36e135706639c4c61965ab8116
# Parent 8918737c7e80fb3e5fd410c6f386cd21afa0683a
EPT/PoD: fix interaction with 1Gb pages
When PoD got enabled to support 1Gb pages, ept_get_entry() didn't get
updated to match - the assertion in there triggered, indicating that
the call to p2m_pod_demand_populate() needed adjustment.
Signed-off-by: Jan Beulich <jbeulich [at] suse>
Acked-by: Tim Deegan <tim [at] xen>
Committed-by: Tim Deegan <tim [at] xen>
---
diff -r 8918737c7e80 -r 3468a834be8d xen/arch/x86/mm/p2m-ept.c
--- a/xen/arch/x86/mm/p2m-ept.c Thu Aug 16 14:31:09 2012 +0100
+++ b/xen/arch/x86/mm/p2m-ept.c Thu Aug 16 17:38:05 2012 +0100
@@ -521,13 +521,12 @@ static mfn_t ept_get_entry(struct p2m_do
}
/* Populate this superpage */
- ASSERT(i == 1);
+ ASSERT(i <= 2);
index = gfn_remainder >> ( i * EPT_TABLE_ORDER);
ept_entry = table + index;
- if ( !p2m_pod_demand_populate(p2m, gfn,
- PAGE_ORDER_2M, q) )
+ if ( !p2m_pod_demand_populate(p2m, gfn, i * EPT_TABLE_ORDER, q) )
goto retry;
else
goto out;
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
