Add SEV-SNP VM type to exercise the KVM_SEV_INIT2 call.

Signed-off-by: Pratik R. Sampat <pratikrajesh.sam...@amd.com>
---
 .../testing/selftests/kvm/x86_64/sev_init2_tests.c  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/testing/selftests/kvm/x86_64/sev_init2_tests.c 
b/tools/testing/selftests/kvm/x86_64/sev_init2_tests.c
index 7a4a61be119b..68f7edaa5526 100644
--- a/tools/testing/selftests/kvm/x86_64/sev_init2_tests.c
+++ b/tools/testing/selftests/kvm/x86_64/sev_init2_tests.c
@@ -28,6 +28,7 @@
 int kvm_fd;
 u64 supported_vmsa_features;
 bool have_sev_es;
+bool have_snp;
 
 static int __sev_ioctl(int vm_fd, int cmd_id, void *data)
 {
@@ -83,6 +84,9 @@ void test_vm_types(void)
        if (have_sev_es)
                test_init2(KVM_X86_SEV_ES_VM, &(struct kvm_sev_init){});
 
+       if (have_snp)
+               test_init2(KVM_X86_SNP_VM, &(struct kvm_sev_init){});
+
        test_init2_invalid(0, &(struct kvm_sev_init){},
                           "VM type is KVM_X86_DEFAULT_VM");
        if (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM))
@@ -138,15 +142,24 @@ int main(int argc, char *argv[])
                    "sev-es: KVM_CAP_VM_TYPES (%x) does not match cpuid 
(checking %x)",
                    kvm_check_cap(KVM_CAP_VM_TYPES), 1 << KVM_X86_SEV_ES_VM);
 
+       have_snp = kvm_cpu_has(X86_FEATURE_SNP);
+       TEST_ASSERT(have_snp == !!(kvm_check_cap(KVM_CAP_VM_TYPES) & 
BIT(KVM_X86_SNP_VM)),
+                   "sev-snp: KVM_CAP_VM_TYPES (%x) does not match cpuid 
(checking %x)",
+                   kvm_check_cap(KVM_CAP_VM_TYPES), 1 << KVM_X86_SNP_VM);
+
        test_vm_types();
 
        test_flags(KVM_X86_SEV_VM);
        if (have_sev_es)
                test_flags(KVM_X86_SEV_ES_VM);
+       if (have_snp)
+               test_flags(KVM_X86_SNP_VM);
 
        test_features(KVM_X86_SEV_VM, 0);
        if (have_sev_es)
                test_features(KVM_X86_SEV_ES_VM, supported_vmsa_features);
+       if (have_snp)
+               test_features(KVM_X86_SNP_VM, supported_vmsa_features);
 
        return 0;
 }
-- 
2.34.1


Reply via email to