Merge tag 'kvmarm-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

[sfrench/cifs-2.6.git] / tools / testing / selftests / kvm / lib / aarch64 / processor.c

diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c
index 0de4aabc0c764eaf2d7e5fc889df61a7bc6f4a7e..316de70db91dab5820c0968f1ef43eaa990f8276 100644 (file)
--- a/tools/testing/selftests/kvm/lib/aarch64/processor.c
+++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c
@@ -11,6 +11,7 @@
 #include "guest_modes.h"
 #include "kvm_util.h"
 #include "processor.h"
+#include <linux/bitfield.h>
 
 #define DEFAULT_ARM64_GUEST_STACK_VADDR_MIN    0xac0000
 
@@ -76,13 +77,15 @@ static uint64_t __maybe_unused ptrs_per_pte(struct kvm_vm *vm)
 
 void virt_arch_pgd_alloc(struct kvm_vm *vm)
 {
-       if (!vm->pgd_created) {
-               vm_paddr_t paddr = vm_phy_pages_alloc(vm,
-                       page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size,
-                       KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);
-               vm->pgd = paddr;
-               vm->pgd_created = true;
-       }
+       size_t nr_pages = page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size;
+
+       if (vm->pgd_created)
+               return;
+
+       vm->pgd = vm_phy_pages_alloc(vm, nr_pages,
+                                    KVM_GUEST_PAGE_TABLE_MIN_PADDR,
+                                    vm->memslots[MEM_REGION_PT]);
+       vm->pgd_created = true;
 }
 
 static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
@@ -133,12 +136,12 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
 
 void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)
 {
-       uint64_t attr_idx = 4; /* NORMAL (See DEFAULT_MAIR_EL1) */
+       uint64_t attr_idx = MT_NORMAL;
 
        _virt_pg_map(vm, vaddr, paddr, attr_idx);
 }
 
-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)
+uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva)
 {
        uint64_t *ptep;
 
@@ -169,11 +172,18 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)
                TEST_FAIL("Page table levels must be 2, 3, or 4");
        }
 
-       return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1));
+       return ptep;
 
 unmapped_gva:
        TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva);
-       exit(1);
+       exit(EXIT_FAILURE);
+}
+
+vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)
+{
+       uint64_t *ptep = virt_get_pte_hva(vm, gva);
+
+       return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1));
 }
 
 static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t page, int level)
@@ -318,13 +328,16 @@ void vcpu_arch_dump(FILE *stream, struct kvm_vcpu *vcpu, uint8_t indent)
 struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id,
                                  struct kvm_vcpu_init *init, void *guest_code)
 {
-       size_t stack_size = vm->page_size == 4096 ?
-                                       DEFAULT_STACK_PGS * vm->page_size :
-                                       vm->page_size;
-       uint64_t stack_vaddr = vm_vaddr_alloc(vm, stack_size,
-                                             DEFAULT_ARM64_GUEST_STACK_VADDR_MIN);
+       size_t stack_size;
+       uint64_t stack_vaddr;
        struct kvm_vcpu *vcpu = __vm_vcpu_add(vm, vcpu_id);
 
+       stack_size = vm->page_size == 4096 ? DEFAULT_STACK_PGS * vm->page_size :
+                                            vm->page_size;
+       stack_vaddr = __vm_vaddr_alloc(vm, stack_size,
+                                      DEFAULT_ARM64_GUEST_STACK_VADDR_MIN,
+                                      MEM_REGION_DATA);
+
        aarch64_vcpu_setup(vcpu, init);
 
        vcpu_set_reg(vcpu, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size);
@@ -428,8 +441,8 @@ unexpected_exception:
 
 void vm_init_descriptor_tables(struct kvm_vm *vm)
 {
-       vm->handlers = vm_vaddr_alloc(vm, sizeof(struct handlers),
-                       vm->page_size);
+       vm->handlers = __vm_vaddr_alloc(vm, sizeof(struct handlers),
+                                       vm->page_size, MEM_REGION_DATA);
 
        *(vm_vaddr_t *)addr_gva2hva(vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers;
 }
@@ -486,9 +499,9 @@ void aarch64_get_supported_page_sizes(uint32_t ipa,
        err = ioctl(vcpu_fd, KVM_GET_ONE_REG, &reg);
        TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_GET_ONE_REG, vcpu_fd));
 
-       *ps4k = ((val >> 28) & 0xf) != 0xf;
-       *ps64k = ((val >> 24) & 0xf) == 0;
-       *ps16k = ((val >> 20) & 0xf) != 0;
+       *ps4k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN4), val) != 0xf;
+       *ps64k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN64), val) == 0;
+       *ps16k = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_TGRAN16), val) != 0;
 
        close(vcpu_fd);
        close(vm_fd);