Rework (x86) KVM selftests' handling of CPUID to track CPUID on a per-vCPU basis, and add X86_FEATURE_* / CPUID support in the style of KVM-Unit-Tests, e.g. add kvm_cpu_has(), vcpu_{clear,set}_cpuid_feature(), this_cpu_has(), etc... The two main goals are to simplify checking or modifying CPUID-based features, and to eliminate the absolutely awful behavior of modifying the global "cpuid" that is cached by kvm_get_supported_cpuid(). This builds on the selftests overhaul[*]. Build tested on all architectures, all tests except AMX and SEV run on x86. https://lore.kernel.org/all/20220603004331.1523888-1-seanjc@xxxxxxxxxx Sean Christopherson (42): KVM: selftests: Set KVM's supported CPUID as vCPU's CPUID during recreate KVM: sefltests: Use CPUID_XSAVE and CPUID_OSXAVE instead of X86_FEATURE_* KVM: selftests: Add framework to query KVM CPUID bits KVM: selftests: Use kvm_cpu_has() in the SEV migration test KVM: selftests: Use kvm_cpu_has() for nested SVM checks KVM: selftests: Use kvm_cpu_has() for nested VMX checks KVM: selftests: Use kvm_cpu_has() to query PDCM in PMU selftest KVM: selftests: Drop redundant vcpu_set_cpuid() from PMU selftest KVM: selftests: Use kvm_cpu_has() for XSAVES in XSS MSR test KVM: selftests: Check for _both_ XTILE data and cfg in AMX test KVM: selftests: Use kvm_cpu_has() in AMX test KVM: selftests: Use kvm_cpu_has() for XSAVE in cr4_cpuid_sync_test KVM: selftests: Remove the obsolete/dead MMU role test KVM: selftests: Use kvm_cpu_has() for KVM's PV steal time KVM: selftests: Use kvm_cpu_has() for nSVM soft INT injection test KVM: selftests: Verify that kvm_cpuid2.entries layout is unchanged by KVM KVM: selftests: Split out kvm_cpuid2_size() from allocate_kvm_cpuid2() KVM: selftests: Cache CPUID in struct kvm_vcpu KVM: selftests: Don't use a static local in vcpu_get_supported_hv_cpuid() KVM: selftests: Rename and tweak get_cpuid() to get_cpuid_entry() KVM: selftests: Use get_cpuid_entry() in kvm_get_supported_cpuid_index() KVM: selftests: Add helpers to get and modify a vCPU's CPUID entries KVM: selftests: Use vm->pa_bits to generate reserved PA bits KVM: selftests: Add and use helper to set vCPU's CPUID maxphyaddr KVM: selftests: Use vcpu_get_cpuid_entry() in PV features test (sort of) KVM: selftests: Use vCPU's CPUID directly in Hyper-V test KVM: selftests: Use vcpu_get_cpuid_entry() in CPUID test KVM: selftests: Use vcpu_{set,clear}_cpuid_feature() in nVMX state test KVM: selftests: Use vcpu_clear_cpuid_feature() to clear x2APIC KVM: selftests: Make get_supported_cpuid() returns "const" KVM: selftests: Set input function/index in raw CPUID helper(s) KVM: selftests: Add this_cpu_has() to query X86_FEATURE_* via cpuid() KVM: selftests: Use this_cpu_has() in CR4/CPUID sync test KVM: selftests: Use this_cpu_has() to detect SVM support in L1 KVM: selftests: Drop unnecessary use of kvm_get_supported_cpuid_index() KVM: selftests: Rename kvm_get_supported_cpuid_index() to __..._entry() KVM: selftests: Inline "get max CPUID leaf" helpers KVM: selftests: Check KVM's supported CPUID, not host CPUID, for XFD KVM: selftests: Skip AMX test if ARCH_REQ_XCOMP_GUEST_PERM isn't supported KVM: selftests: Clean up requirements for XFD-aware XSAVE features KVM: selftests: Use the common cpuid() helper in cpu_vendor_string_is() KVM: selftests: Drop unused SVM_CPUID_FUNC macro tools/testing/selftests/kvm/.gitignore | 1 - tools/testing/selftests/kvm/Makefile | 1 - .../selftests/kvm/include/kvm_util_base.h | 14 + .../selftests/kvm/include/x86_64/processor.h | 297 +++++++++++++++--- .../selftests/kvm/include/x86_64/svm.h | 2 - .../selftests/kvm/include/x86_64/svm_util.h | 15 - .../selftests/kvm/include/x86_64/vmx.h | 3 - tools/testing/selftests/kvm/lib/kvm_util.c | 17 +- .../selftests/kvm/lib/x86_64/processor.c | 289 +++++++---------- tools/testing/selftests/kvm/lib/x86_64/svm.c | 13 - tools/testing/selftests/kvm/lib/x86_64/vmx.c | 12 - tools/testing/selftests/kvm/steal_time.c | 4 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 48 +-- .../testing/selftests/kvm/x86_64/cpuid_test.c | 89 +++--- .../kvm/x86_64/cr4_cpuid_sync_test.c | 21 +- .../kvm/x86_64/emulator_error_test.c | 10 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 2 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 14 +- .../selftests/kvm/x86_64/hyperv_features.c | 126 ++++---- .../selftests/kvm/x86_64/hyperv_svm_test.c | 2 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 14 +- .../selftests/kvm/x86_64/mmu_role_test.c | 137 -------- .../kvm/x86_64/pmu_event_filter_test.c | 14 +- .../selftests/kvm/x86_64/set_sregs_test.c | 28 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 13 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 9 +- .../testing/selftests/kvm/x86_64/state_test.c | 7 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 2 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 10 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 2 +- .../kvm/x86_64/triple_fault_event_test.c | 2 +- .../kvm/x86_64/vmx_apic_access_test.c | 2 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +- .../x86_64/vmx_invalid_nested_guest_state.c | 2 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 2 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 14 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 4 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 22 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- .../selftests/kvm/x86_64/xapic_state_test.c | 10 +- .../selftests/kvm/x86_64/xss_msr_test.c | 8 +- 42 files changed, 561 insertions(+), 727 deletions(-) delete mode 100644 tools/testing/selftests/kvm/x86_64/mmu_role_test.c base-commit: fa72038b1752a8f9b7ac57b1351d729239e6b6d8 -- 2.36.1.255.ge46751e96f-goog