[kvm-unit-tests RFC PATCH 09/10] x86: vm: Enable non-identity paging

[Alexander Gordeev <agordeev@xxxxxxxxxx>]

This is a prerequisite to enable non-identity mapped paging

Cc: Radim Krčmář <rkrcmar@xxxxxxxxxx>
Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
---
 lib/x86/vm.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/x86/vm.c b/lib/x86/vm.c
index b3d547a2a7f1..85625e5c934e 100644
--- a/lib/x86/vm.c
+++ b/lib/x86/vm.c
@@ -96,7 +96,7 @@ unsigned long *install_page(unsigned long *cr3,
 }
 
 
-static void setup_mmu_range(unsigned long *cr3, unsigned long start,
+static void setup_mmu_range(unsigned long *cr3, unsigned long start, void *virt,
 			    unsigned long len)
 {
 	u64 max = (u64)len + (u64)start;
@@ -105,16 +105,19 @@ static void setup_mmu_range(unsigned long *cr3, unsigned long start,
 	while (phys + PAGE_SIZE <= max) {
 		if (!(phys % LARGE_PAGE_SIZE))
 			break;
-		install_page(cr3, phys, (void *)(ulong)phys);
+		install_page(cr3, phys, virt);
 		phys += PAGE_SIZE;
+		virt += PAGE_SIZE;
 	}
 	while (phys + LARGE_PAGE_SIZE <= max) {
-		install_large_page(cr3, phys, (void *)(ulong)phys);
+		install_large_page(cr3, phys, virt);
 		phys += LARGE_PAGE_SIZE;
+		virt += LARGE_PAGE_SIZE;
 	}
 	while (phys + PAGE_SIZE <= max) {
-		install_page(cr3, phys, (void *)(ulong)phys);
+		install_page(cr3, phys, virt);
 		phys += PAGE_SIZE;
+		virt += PAGE_SIZE;
 	}
 }
 
@@ -128,14 +131,14 @@ static void setup_mmu(unsigned long len)
     if (len < (1ul << 32))
         len = (1ul << 32);  /* map mmio 1:1 */
 
-    setup_mmu_range(cr3, 0, len);
+    setup_mmu_range(cr3, 0, (void *)0, len);
 #else
     if (len > (1ul << 31))
 	    len = (1ul << 31);
 
     /* 0 - 2G memory, 2G-3G valloc area, 3G-4G mmio */
-    setup_mmu_range(cr3, 0, len);
-    setup_mmu_range(cr3, 3ul << 30, (1ul << 30));
+    setup_mmu_range(cr3, 0, (void *)0, len);
+    setup_mmu_range(cr3, 3ul << 30, (void *)(3ul << 30), (1ul << 30));
     vfree_top = (void*)(3ul << 30);
 #endif
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html