[PATCH v7 01/30] KVM: selftests: Add function to allow one-to-one GVA to GPA mappings

[Sagi Shahar]

From: Ackerley Tng <ackerley...@google.com>

One-to-one GVA to GPA mappings can be used in the guest to set up boot
sequences during which paging is enabled, hence requiring a transition
from using physical to virtual addresses in consecutive instructions.

Signed-off-by: Ackerley Tng <ackerley...@google.com>
Signed-off-by: Sagi Shahar <sa...@google.com>
---
 .../testing/selftests/kvm/include/kvm_util.h  |  3 +++
 tools/testing/selftests/kvm/lib/kvm_util.c    | 27 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/kvm_util.h 
b/tools/testing/selftests/kvm/include/kvm_util.h
index bee65ca08721..9994861d2acb 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -650,6 +650,9 @@ vm_vaddr_t __vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, 
vm_vaddr_t vaddr_min,
 vm_vaddr_t vm_vaddr_alloc_shared(struct kvm_vm *vm, size_t sz,
                                 vm_vaddr_t vaddr_min,
                                 enum kvm_mem_region_type type);
+vm_vaddr_t vm_vaddr_identity_alloc(struct kvm_vm *vm, size_t sz,
+                                  vm_vaddr_t vaddr_min,
+                                  enum kvm_mem_region_type type);
 vm_vaddr_t vm_vaddr_alloc_pages(struct kvm_vm *vm, int nr_pages);
 vm_vaddr_t __vm_vaddr_alloc_page(struct kvm_vm *vm,
                                 enum kvm_mem_region_type type);
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c 
b/tools/testing/selftests/kvm/lib/kvm_util.c
index a055343a7bf7..8f3dbf749afa 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1460,15 +1460,14 @@ vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, 
size_t sz,
 }
 
 static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,
-                                    vm_vaddr_t vaddr_min,
+                                    vm_vaddr_t vaddr_min, vm_paddr_t paddr_min,
                                     enum kvm_mem_region_type type,
                                     bool protected)
 {
        uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) != 0);
 
        virt_pgd_alloc(vm);
-       vm_paddr_t paddr = __vm_phy_pages_alloc(vm, pages,
-                                               KVM_UTIL_MIN_PFN * 
vm->page_size,
+       vm_paddr_t paddr = __vm_phy_pages_alloc(vm, pages, paddr_min,
                                                vm->memslots[type], protected);
 
        /*
@@ -1492,7 +1491,7 @@ static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, 
size_t sz,
 vm_vaddr_t __vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,
                            enum kvm_mem_region_type type)
 {
-       return ____vm_vaddr_alloc(vm, sz, vaddr_min, type,
+       return ____vm_vaddr_alloc(vm, sz, vaddr_min, KVM_UTIL_MIN_PFN * 
vm->page_size, type,
                                  vm_arch_has_protected_memory(vm));
 }
 
@@ -1500,7 +1499,25 @@ vm_vaddr_t vm_vaddr_alloc_shared(struct kvm_vm *vm, 
size_t sz,
                                 vm_vaddr_t vaddr_min,
                                 enum kvm_mem_region_type type)
 {
-       return ____vm_vaddr_alloc(vm, sz, vaddr_min, type, false);
+       return ____vm_vaddr_alloc(vm, sz, vaddr_min, KVM_UTIL_MIN_PFN * 
vm->page_size, type, false);
+}
+
+/*
+ * Allocate memory in @vm of size @sz beginning with the desired virtual 
address
+ * of @vaddr_min and backed by physical address equal to returned virtual
+ * address.
+ *
+ * Return the address where the memory is allocated.
+ */
+vm_vaddr_t vm_vaddr_identity_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t 
vaddr_min,
+                                  enum kvm_mem_region_type type)
+{
+       vm_vaddr_t gva = ____vm_vaddr_alloc(vm, sz, vaddr_min,
+                                           (vm_paddr_t)vaddr_min, type,
+                                           vm_arch_has_protected_memory(vm));
+       TEST_ASSERT_EQ(gva, addr_gva2gpa(vm, gva));
+
+       return gva;
 }
 
 /*
-- 
2.50.0.rc2.692.g299adb8693-goog