selftests: KVM: allow sev_migrate_tests on machines without SEV-ES

I managed to get hold of a machine that has SEV but not SEV-ES, and
sev_migrate_tests fails because sev_vm_create(true) returns ENOTTY.
Fix this, and while at it also return KSFT_SKIP on machines that do
not have SEV at all, instead of returning 0.

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

diff --git a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
index 2e5a42c..d1dc1ac 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
+++ b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c
@@ -21,6 +21,8 @@
 #define NR_LOCK_TESTING_THREADS 3
 #define NR_LOCK_TESTING_ITERATIONS 10000
 
+bool have_sev_es;
+
 static int __sev_ioctl(int vm_fd, int cmd_id, void *data, __u32 *fw_error)
 {
        struct kvm_sev_cmd cmd = {
@@ -172,10 +174,18 @@ static void test_sev_migrate_parameters(void)
                *sev_es_vm_no_vmsa;
        int ret;
 
-       sev_vm = sev_vm_create(/* es= */ false);
-       sev_es_vm = sev_vm_create(/* es= */ true);
        vm_no_vcpu = vm_create(VM_MODE_DEFAULT, 0, O_RDWR);
        vm_no_sev = aux_vm_create(true);
+       ret = __sev_migrate_from(vm_no_vcpu->fd, vm_no_sev->fd);
+       TEST_ASSERT(ret == -1 && errno == EINVAL,
+                   "Migrations require SEV enabled. ret %d, errno: %d\n", ret,
+                   errno);
+
+       if (!have_sev_es)
+               goto out;
+
+       sev_vm = sev_vm_create(/* es= */ false);
+       sev_es_vm = sev_vm_create(/* es= */ true);
        sev_es_vm_no_vmsa = vm_create(VM_MODE_DEFAULT, 0, O_RDWR);
        sev_ioctl(sev_es_vm_no_vmsa->fd, KVM_SEV_ES_INIT, NULL);
        vm_vcpu_add(sev_es_vm_no_vmsa, 1);
@@ -204,14 +214,10 @@ static void test_sev_migrate_parameters(void)
                "SEV-ES migrations require UPDATE_VMSA. ret %d, errno: %d\n",
                ret, errno);
 
-       ret = __sev_migrate_from(vm_no_vcpu->fd, vm_no_sev->fd);
-       TEST_ASSERT(ret == -1 && errno == EINVAL,
-                   "Migrations require SEV enabled. ret %d, errno: %d\n", ret,
-                   errno);
-
        kvm_vm_free(sev_vm);
        kvm_vm_free(sev_es_vm);
        kvm_vm_free(sev_es_vm_no_vmsa);
+out:
        kvm_vm_free(vm_no_vcpu);
        kvm_vm_free(vm_no_sev);
 }
@@ -300,7 +306,6 @@ static void test_sev_mirror_parameters(void)
        int ret;
 
        sev_vm = sev_vm_create(/* es= */ false);
-       sev_es_vm = sev_vm_create(/* es= */ true);
        vm_with_vcpu = aux_vm_create(true);
        vm_no_vcpu = aux_vm_create(false);
 
@@ -310,6 +315,21 @@ static void test_sev_mirror_parameters(void)
                "Should not be able copy context to self. ret: %d, errno: %d\n",
                ret, errno);
 
+       ret = __sev_mirror_create(vm_no_vcpu->fd, vm_with_vcpu->fd);
+       TEST_ASSERT(ret == -1 && errno == EINVAL,
+                   "Copy context requires SEV enabled. ret %d, errno: %d\n", ret,
+                   errno);
+
+       ret = __sev_mirror_create(vm_with_vcpu->fd, sev_vm->fd);
+       TEST_ASSERT(
+               ret == -1 && errno == EINVAL,
+               "SEV copy context requires no vCPUS on the destination. ret: %d, errno: %d\n",
+               ret, errno);
+
+       if (!have_sev_es)
+               goto out;
+
+       sev_es_vm = sev_vm_create(/* es= */ true);
        ret = __sev_mirror_create(sev_vm->fd, sev_es_vm->fd);
        TEST_ASSERT(
                ret == -1 && errno == EINVAL,
@@ -322,19 +342,10 @@ static void test_sev_mirror_parameters(void)
                "Should not be able copy context to SEV-ES enabled VM. ret: %d, errno: %d\n",
                ret, errno);
 
-       ret = __sev_mirror_create(vm_no_vcpu->fd, vm_with_vcpu->fd);
-       TEST_ASSERT(ret == -1 && errno == EINVAL,
-                   "Copy context requires SEV enabled. ret %d, errno: %d\n", ret,
-                   errno);
-
-       ret = __sev_mirror_create(vm_with_vcpu->fd, sev_vm->fd);
-       TEST_ASSERT(
-               ret == -1 && errno == EINVAL,
-               "SEV copy context requires no vCPUS on the destination. ret: %d, errno: %d\n",
-               ret, errno);
+       kvm_vm_free(sev_es_vm);
 
+out:
        kvm_vm_free(sev_vm);
-       kvm_vm_free(sev_es_vm);
        kvm_vm_free(vm_with_vcpu);
        kvm_vm_free(vm_no_vcpu);
 }
@@ -393,11 +404,35 @@ static void test_sev_move_copy(void)
        kvm_vm_free(sev_vm);
 }
 
+#define X86_FEATURE_SEV (1 << 1)
+#define X86_FEATURE_SEV_ES (1 << 3)
+
 int main(int argc, char *argv[])
 {
+       struct kvm_cpuid_entry2 *cpuid;
+
+       if (!kvm_check_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM) &&
+           !kvm_check_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM)) {
+               print_skip("Capabilities not available");
+               exit(KSFT_SKIP);
+       }
+
+       cpuid = kvm_get_supported_cpuid_entry(0x80000000);
+       if (cpuid->eax < 0x8000001f) {
+               print_skip("AMD memory encryption not available");
+               exit(KSFT_SKIP);
+       }
+       cpuid = kvm_get_supported_cpuid_entry(0x8000001f);
+       if (!(cpuid->eax & X86_FEATURE_SEV)) {
+               print_skip("AMD SEV not available");
+               exit(KSFT_SKIP);
+       }
+       have_sev_es = !!(cpuid->eax & X86_FEATURE_SEV_ES);
+
        if (kvm_check_cap(KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM)) {
                test_sev_migrate_from(/* es= */ false);
-               test_sev_migrate_from(/* es= */ true);
+               if (have_sev_es)
+                       test_sev_migrate_from(/* es= */ true);
                test_sev_migrate_locking();
                test_sev_migrate_parameters();
                if (kvm_check_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM))
@@ -405,7 +440,8 @@ int main(int argc, char *argv[])
        }
        if (kvm_check_cap(KVM_CAP_VM_COPY_ENC_CONTEXT_FROM)) {
                test_sev_mirror(/* es= */ false);
-               test_sev_mirror(/* es= */ true);
+               if (have_sev_es)
+                       test_sev_mirror(/* es= */ true);
                test_sev_mirror_parameters();
        }
        return 0;