[Xen-changelog] [xen-unstable] x86/mm/p2m: use NX bit in p2m entries.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1342692579 -3600
# Node ID 7d8a2e8412f2f86594abd3020776c0c58dfd1ee8
# Parent  43e21ce7f22151524b800a6cf0ac4ba1233b34a7
x86/mm/p2m: use NX bit in p2m entries.

In p2m_type_to_flags() honor _PAGE_NX_BIT for grant type mappings.
This brings this code in line with PV and EPT.

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>
---


diff -r 43e21ce7f221 -r 7d8a2e8412f2 xen/arch/x86/mm/p2m-pt.c
--- a/xen/arch/x86/mm/p2m-pt.c  Tue Jul 17 17:33:31 2012 +0100
+++ b/xen/arch/x86/mm/p2m-pt.c  Thu Jul 19 11:09:39 2012 +0100
@@ -89,14 +89,16 @@ static unsigned long p2m_type_to_flags(p
     case p2m_ram_paging_in:
     default:
         return flags;
+    case p2m_grant_map_ro:
+        return flags | P2M_BASE_FLAGS | _PAGE_NX_BIT;
     case p2m_ram_ro:
-    case p2m_grant_map_ro:
     case p2m_ram_logdirty:
     case p2m_ram_shared:
         return flags | P2M_BASE_FLAGS;
     case p2m_ram_rw:
+        return flags | P2M_BASE_FLAGS | _PAGE_RW;
     case p2m_grant_map_rw:
-        return flags | P2M_BASE_FLAGS | _PAGE_RW;
+        return flags | P2M_BASE_FLAGS | _PAGE_RW | _PAGE_NX_BIT;
     case p2m_mmio_direct:
         if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn_x(mfn)) )
             flags |= _PAGE_RW;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog