From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 17 Dec 2018 15:36:30 +0000 (+0000)
Subject: x86: always use vmap for global mapping
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=41d293a5c0e7783fc6c0561c0189fd7bfab006a9;p=people%2Fliuw%2Fxen.git

x86: always use vmap for global mapping

We will remove direct map soon. In that case we can't rely on direct
map for global mapping. Remove the fast path.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c
index 9ea74b456c..563efa9420 100644
--- a/xen/arch/x86/domain_page.c
+++ b/xen/arch/x86/domain_page.c
@@ -309,11 +309,6 @@ void *map_domain_page_global(mfn_t mfn)
              system_state < SYS_STATE_active) ||
             local_irq_is_enabled()));
 
-#ifdef NDEBUG
-    if ( mfn_x(mfn) <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) )
-        return mfn_to_virt(mfn_x(mfn));
-#endif
-
     return vmap(&mfn, 1);
 }
 
@@ -321,9 +316,6 @@ void unmap_domain_page_global(const void *ptr)
 {
     unsigned long va = (unsigned long)ptr;
 
-    if ( va >= DIRECTMAP_VIRT_START )
-        return;
-
     ASSERT(va >= VMAP_VIRT_START && va < VMAP_VIRT_END);
 
     vunmap(ptr);