KVM: selftests: Use kvm_cpu_has() for nSVM soft INT injection test

Use kvm_cpu_has() to query for NRIPS support instead of open coding
equivalent functionality using kvm_get_supported_cpuid_entry().

Signed-off-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220614200707.3315957-16-seanjc@google.com

diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index 15bccdd6d78c93728a40098ee2a7004a42c74a69..a66d625da3d42354fb79797e6a5edc9b1f52bdb3 100644 (file)
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -164,9 +164,6 @@ struct kvm_x86_cpu_feature {
 #define CPUID_XSAVE            (1ul << 26)
 #define CPUID_OSXSAVE          (1ul << 27)
 
-/* CPUID.0x8000_000A.EDX */
-#define CPUID_NRIPS            BIT(3)
-
 /* Page table bitfield declarations */
 #define PTE_PRESENT_MASK        BIT_ULL(0)
 #define PTE_WRITABLE_MASK       BIT_ULL(1)

diff --git a/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c b/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c
index 2cc09ab41570ef1d639da0a42adddc6f9e00435d..e637d773601239a7d1532fdfb6f8049609c26c32 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c
+++ b/tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c
@@ -194,16 +194,13 @@ done:
 
 int main(int argc, char *argv[])
 {
-       struct kvm_cpuid_entry2 *cpuid;
-
        /* Tell stdout not to buffer its content */
        setbuf(stdout, NULL);
 
        TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SVM));
 
-       cpuid = kvm_get_supported_cpuid_entry(0x8000000a);
-       TEST_ASSERT(cpuid->edx & CPUID_NRIPS,
-                   "KVM with nSVM is supposed to unconditionally advertise nRIP Save\n");
+       TEST_ASSERT(kvm_cpu_has(X86_FEATURE_NRIPS),
+                   "KVM with nSVM is supposed to unconditionally advertise nRIP Save");
 
        atomic_init(&nmi_stage, 0);