kvm: selftests: stop lying to aarch64 tests about PA-bits

Let's add the 40 PA-bit versions of the VM modes, that AArch64
should have been using, so we can extend the dirty log test without
breaking things.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index 3afc7d607a2e8c9fe339b02b14ca646037cf943c..61396882ad4e43c5da38e1e57162c3c3c1572d47 100644 (file)
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -230,9 +230,11 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations,
 
        switch (mode) {
        case VM_MODE_P52V48_4K:
+       case VM_MODE_P40V48_4K:
                guest_page_shift = 12;
                break;
        case VM_MODE_P52V48_64K:
+       case VM_MODE_P40V48_64K:
                guest_page_shift = 16;
                break;
        default:
@@ -317,11 +319,16 @@ static struct vm_guest_modes {
        bool supported;
        bool enabled;
 } vm_guest_modes[NUM_VM_MODES] = {
+#if defined(__x86_64__)
        { VM_MODE_P52V48_4K,    1, 1, },
-#ifdef __aarch64__
-       { VM_MODE_P52V48_64K,   1, 1, },
-#else
        { VM_MODE_P52V48_64K,   0, 0, },
+       { VM_MODE_P40V48_4K,    0, 0, },
+       { VM_MODE_P40V48_64K,   0, 0, },
+#elif defined(__aarch64__)
+       { VM_MODE_P52V48_4K,    0, 0, },
+       { VM_MODE_P52V48_64K,   0, 0, },
+       { VM_MODE_P40V48_4K,    1, 1, },
+       { VM_MODE_P40V48_64K,   1, 1, },
 #endif
 };
 

diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index 88df26c418453a0e485a18e381ab881a532cbc0a..a4e59e3b4826ac732f66ce118d48559c04848921 100644 (file)
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -36,6 +36,8 @@ typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */
 enum vm_guest_mode {
        VM_MODE_P52V48_4K,
        VM_MODE_P52V48_64K,
+       VM_MODE_P40V48_4K,
+       VM_MODE_P40V48_64K,
        NUM_VM_MODES,
 };
 

diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c
index b1dfc0d4b68e7f855798e6e8ddf3555f5f7cb331..b6022e2f116eab1e6ad6bc1489d3d5192350c0e0 100644 (file)
--- a/tools/testing/selftests/kvm/lib/aarch64/processor.c
+++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c
@@ -275,6 +275,14 @@ void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)
                tcr_el1 |= 1ul << 14; /* TG0 = 64KB */
                tcr_el1 |= 6ul << 32; /* IPS = 52 bits */
                break;
+       case VM_MODE_P40V48_4K:
+               tcr_el1 |= 0ul << 14; /* TG0 = 4KB */
+               tcr_el1 |= 2ul << 32; /* IPS = 40 bits */
+               break;
+       case VM_MODE_P40V48_64K:
+               tcr_el1 |= 1ul << 14; /* TG0 = 64KB */
+               tcr_el1 |= 2ul << 32; /* IPS = 40 bits */
+               break;
        default:
                TEST_ASSERT(false, "Unknown guest mode, mode: 0x%x", vm->mode);
        }

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index b37e52f4daad1c4e3ed34745d4716fda44e7b8ff..8c06da4f03db302612feecdec516bd343af863e3 100644 (file)
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -99,6 +99,8 @@ static void vm_open(struct kvm_vm *vm, int perm)
 const char * const vm_guest_mode_string[] = {
        "PA-bits:52, VA-bits:48, 4K pages",
        "PA-bits:52, VA-bits:48, 64K pages",
+       "PA-bits:40, VA-bits:48, 4K pages",
+       "PA-bits:40, VA-bits:48, 64K pages",
 };
 
 /*
@@ -146,6 +148,20 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)
                vm->page_shift = 16;
                vm->va_bits = 48;
                break;
+       case VM_MODE_P40V48_4K:
+               vm->pgtable_levels = 4;
+               vm->pa_bits = 40;
+               vm->va_bits = 48;
+               vm->page_size = 0x1000;
+               vm->page_shift = 12;
+               break;
+       case VM_MODE_P40V48_64K:
+               vm->pgtable_levels = 3;
+               vm->pa_bits = 40;
+               vm->va_bits = 48;
+               vm->page_size = 0x10000;
+               vm->page_shift = 16;
+               break;
        default:
                TEST_ASSERT(false, "Unknown guest mode, mode: 0x%x", mode);
        }