KVM: selftests: Test slot move/delete with slot zap quirk enabled/disabled

Update set_memory_region_test to make sure memslot move and deletion
function correctly both when slot zap quirk KVM_X86_QUIRK_SLOT_ZAP_ALL is
enabled and disabled.

Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
Message-ID: <20240703021119.13904-1-yan.y.zhao@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c
index bb8002084f52e943dba092846224a729d7b63ad7..a8267628e9ed130cffd24ad525dd3cad1c679328 100644 (file)
--- a/tools/testing/selftests/kvm/set_memory_region_test.c
+++ b/tools/testing/selftests/kvm/set_memory_region_test.c
@@ -175,7 +175,7 @@ static void guest_code_move_memory_region(void)
        GUEST_DONE();
 }
 
-static void test_move_memory_region(void)
+static void test_move_memory_region(bool disable_slot_zap_quirk)
 {
        pthread_t vcpu_thread;
        struct kvm_vcpu *vcpu;
@@ -184,6 +184,9 @@ static void test_move_memory_region(void)
 
        vm = spawn_vm(&vcpu, &vcpu_thread, guest_code_move_memory_region);
 
+       if (disable_slot_zap_quirk)
+               vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, KVM_X86_QUIRK_SLOT_ZAP_ALL);
+
        hva = addr_gpa2hva(vm, MEM_REGION_GPA);
 
        /*
@@ -266,7 +269,7 @@ static void guest_code_delete_memory_region(void)
        GUEST_ASSERT(0);
 }
 
-static void test_delete_memory_region(void)
+static void test_delete_memory_region(bool disable_slot_zap_quirk)
 {
        pthread_t vcpu_thread;
        struct kvm_vcpu *vcpu;
@@ -276,6 +279,9 @@ static void test_delete_memory_region(void)
 
        vm = spawn_vm(&vcpu, &vcpu_thread, guest_code_delete_memory_region);
 
+       if (disable_slot_zap_quirk)
+               vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, KVM_X86_QUIRK_SLOT_ZAP_ALL);
+
        /* Delete the memory region, the guest should not die. */
        vm_mem_region_delete(vm, MEM_REGION_SLOT);
        wait_for_vcpu();
@@ -553,7 +559,10 @@ int main(int argc, char *argv[])
 {
 #ifdef __x86_64__
        int i, loops;
+       int j, disable_slot_zap_quirk = 0;
 
+       if (kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) & KVM_X86_QUIRK_SLOT_ZAP_ALL)
+               disable_slot_zap_quirk = 1;
        /*
         * FIXME: the zero-memslot test fails on aarch64 and s390x because
         * KVM_RUN fails with ENOEXEC or EFAULT.
@@ -579,13 +588,17 @@ int main(int argc, char *argv[])
        else
                loops = 10;
 
-       pr_info("Testing MOVE of in-use region, %d loops\n", loops);
-       for (i = 0; i < loops; i++)
-               test_move_memory_region();
+       for (j = 0; j <= disable_slot_zap_quirk; j++) {
+               pr_info("Testing MOVE of in-use region, %d loops, slot zap quirk %s\n",
+                       loops, j ? "disabled" : "enabled");
+               for (i = 0; i < loops; i++)
+                       test_move_memory_region(!!j);
 
-       pr_info("Testing DELETE of in-use region, %d loops\n", loops);
-       for (i = 0; i < loops; i++)
-               test_delete_memory_region();
+               pr_info("Testing DELETE of in-use region, %d loops, slot zap quirk %s\n",
+                       loops, j ? "disabled" : "enabled");
+               for (i = 0; i < loops; i++)
+                       test_delete_memory_region(!!j);
+       }
 #endif
 
        return 0;