[Xen-devel] [PATCH 17 of 17] x86/mm/shadow: emulated writes are always guest-originated actions

[Tim Deegan <Tim.Deegan@xxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1307017012 -3600
# Node ID 840e161428246f0173cb41c2409a0b9481b4a457
# Parent  9974012f48be05a981c9db05c544ffd965bd33d9
x86/mm/shadow: emulated writes are always guest-originated actions
and never happen with the paging lock held.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>

diff -r 9974012f48be -r 840e16142824 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Thu Jun 02 13:16:52 2011 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c    Thu Jun 02 13:16:52 2011 +0100
@@ -4810,11 +4810,8 @@ static mfn_t emulate_gva_to_mfn(struct v
     }
 
     /* Translate the GFN to an MFN */
-    /* PoD: query only if paging lock is held (to avoid deadlock) */
-    if ( paging_locked_by_me(v->domain) )
-        mfn = gfn_to_mfn_query(v->domain, _gfn(gfn), &p2mt);
-    else
-        mfn = gfn_to_mfn(v->domain, _gfn(gfn), &p2mt);
+    ASSERT(!paging_locked_by_me(v->domain));
+    mfn = gfn_to_mfn_guest(v->domain, _gfn(gfn), &p2mt);
         
     if ( p2m_is_readonly(p2mt) )
         return _mfn(READONLY_GFN);

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel