[Xen-devel] [PATCH] Libxc: fix xc_translate_foreign_address()

[Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>]

Currently xc_translate_foreign_address only checks for PSE bit only on
level 2 entries (that's 2 MB pages on x64 and 32-bit with PAE, and 4 MB
pages on 32-bit). But linux kernel sometimes uses 1 GB pages. This patch
fixes that, and checks the PSE bit on level 3 entries if the guest has 4
translation levels (that means 64-bit guests only).

Signed-off-by: Cristian-Bogdan Sirb <csirb@xxxxxxxxxxxxxxx>
---
 tools/libxc/xc_pagetab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxc/xc_pagetab.c b/tools/libxc/xc_pagetab.c
index 92eebd6..db25c20 100644
--- a/tools/libxc/xc_pagetab.c
+++ b/tools/libxc/xc_pagetab.c
@@ -93,7 +93,7 @@ unsigned long xc_translate_foreign_address(xc_interface *xch, 
uint32_t dom,
             return 0;
         }
         paddr = pte & 0x000ffffffffff000ull;
-        if (level == 2 && (pte & PTE_PSE)) {
+        if ((level == 2 || (level == 3 && pt_levels == 4)) && (pte & PTE_PSE)) 
{
             mask = ((mask ^ ~-mask) >> 1); /* All bits below first set bit */
             return ((paddr & ~mask) | (virt & mask)) >> PAGE_SHIFT;
         }
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel