From 3e548530c8b12e422fdab08310868d3588820ba0 Mon Sep 17 00:00:00 2001 From: Jean Guyader Date: Mon, 9 Mar 2009 14:31:32 +0000 Subject: [PATCH] Import changeset 18788 from xen-unstable. x86, hvm: Fix domain restore bug with Intel VLAPIC acceleration. r18383 mark video memory as ram, and make all valid pages migrated, including vlapic page (0xFEE00), and share page(0xFFFFF). An extra memory population for lapic page would override previous mapping then cause HVM guest with vlapic acceleration hang. Signed-off-by: Keir Fraser --- xen/arch/x86/mm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4e8dd2d..0432534 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1549,6 +1549,7 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, unsigned long mfn; struct page_info *l1pg = mfn_to_page(gl1mfn); int rc = 1; + p2m_type_t p2mt; page_lock(l1pg); @@ -1565,9 +1566,9 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, if ( l1e_get_flags(nl1e) & _PAGE_PRESENT ) { /* Translate foreign guest addresses. */ - mfn = gmfn_to_mfn(FOREIGNDOM, l1e_get_pfn(nl1e)); - if ( unlikely(mfn == INVALID_MFN) ) - return page_unlock(l1pg), 0; + mfn = mfn_x(gfn_to_mfn(FOREIGNDOM, l1e_get_pfn(nl1e), &p2mt)); + if ( (mfn > 0xff && !p2m_is_ram(p2mt)) || unlikely(mfn == INVALID_MFN) ) + return page_unlock(l1pg), 0; ASSERT((mfn & ~(PADDR_MASK >> PAGE_SHIFT)) == 0); nl1e = l1e_from_pfn(mfn, l1e_get_flags(nl1e)); -- 2.39.5