[Xen-changelog] [xen staging] x86/dom0: Avoid using 1G superpages if shadowing may be necessary

[p***@xen.org]

commit 96f6ee15ad7ca96472779fc5c083b4149495c584
Author: Andrew Cooper <***@citrix.com>
AuthorDate: Fri Nov 9 14:14:08 2018 +0000
Commit: Andrew Cooper <***@citrix.com>
CommitDate: Mon Nov 12 11:26:04 2018 +0000

x86/dom0: Avoid using 1G superpages if shadowing may be necessary

The shadow code doesn't support 1G superpages, and will hand #PF[RSVD] back to
guests.

For dom0's with 512GB of RAM or more (and subject to the P2M alignment), Xen's
domain builder might use 1G superpages.

Avoid using 1G superpages (falling back to 2M superpages instead) if there is
a reasonable chance that we may have to shadow dom0. This assumes that there
are no circumstances where we will activate logdirty mode on dom0.

Signed-off-by: Andrew Cooper <***@citrix.com>
Reviewed-by: Jan Beulich <***@suse.com>
---
xen/arch/x86/pv/dom0_build.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index 812b0262cb..dc3c1e1202 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -148,7 +148,14 @@ static __init void setup_pv_physmap(struct domain *d, unsigned long pgtbl_pfn,
pl3e += l3_table_offset(vphysmap_start);
if ( !l3e_get_intpte(*pl3e) )
{
- if ( cpu_has_page1gb &&
+ /*
+ * 1G superpages aren't supported by the shadow code. Avoid using
+ * them if we are liable to need to start shadowing dom0. This
+ * assumes that there are no circumstances where we will activate
+ * logdirty mode on dom0.
+ */
+ if ( (!IS_ENABLED(CONFIG_SHADOW_PAGING) ||
+ !d->arch.pv.check_l1tf) && cpu_has_page1gb &&
!(vphysmap_start & ((1UL << L3_PAGETABLE_SHIFT) - 1)) &&
vphysmap_end >= vphysmap_start + (1UL << L3_PAGETABLE_SHIFT) &&
(page = alloc_domheap_pages(d,
--
generated by git-patchbot for /home/xen/git/xen.git#staging