KVM: selftests: avoid test failures with 'nested=0'
cover KVM: selftests: avoid test failures with 'nested=0'
Commit 33b22172452f ("KVM: x86: move nested-related kvm_x86_ops to a separate struct") made nested hooks (e.g. ->get_state(), ->enable_evmcs()) always available, even when kvm module is loaded with 'nested=0'. Assuming the change was intentional, update selftests to not fail in this situation.
Vitaly Kuznetsov (2):
KVM: selftests: do not substitute SVM/VMX check with
KVM_CAP_NESTED_STATE check
KVM: selftests: Don't probe KVM_CAP_HYPERV_ENLIGHTENED_VMCS when
nested VMX is unsupported
.../testing/selftests/kvm/include/x86_64/svm_util.h | 1 + tools/testing/selftests/kvm/include/x86_64/vmx.h | 1 + tools/testing/selftests/kvm/lib/x86_64/svm.c | 10 +++++++--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 9 +++++++-- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 5 +++-- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 3 ++- tools/testing/selftests/kvm/x86_64/smm_test.c | 13 +++++++------ tools/testing/selftests/kvm/x86_64/state_test.c | 13 +++++++------ 8 files changed, 35 insertions(+), 20 deletions(-)
Signature · 1 line
2.25.4
PATCH 1/2 KVM: selftests: do not substitute SVM/VMX check with KVM_CAP_NESTED_STATE check
state_test/smm_test use KVM_CAP_NESTED_STATE check as an indicator for nested VMX/SVM presence and this is incorrect. Check for the required features dirrectly.
--- .../testing/selftests/kvm/include/x86_64/svm_util.h | 1 + tools/testing/selftests/kvm/include/x86_64/vmx.h | 1 + tools/testing/selftests/kvm/lib/x86_64/svm.c | 10 +++++++--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 9 +++++++-- tools/testing/selftests/kvm/x86_64/smm_test.c | 13 +++++++------ tools/testing/selftests/kvm/x86_64/state_test.c | 13 +++++++------ 6 files changed, 30 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/include/x86_64/svm_util.h +1 -0
@@ -33,6 +33,7 @@ struct svm_test_data {struct svm_test_data *vcpu_alloc_svm (struct kvm_vm *vm,vm_vaddr_t *p_svm_gva);void generic_svm_setup (struct svm_test_data *svm,void *guest_rip,void *guest_rsp);void run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa); +bool nested_svm_supported (void );void nested_svm_check_supported (void );static inline bool cpu_has_svm (void )
tools/testing/selftests/kvm/include/x86_64/vmx.h +1 -0
@@ -603,6 +603,7 @@ bool prepare_for_vmx_operation(struct vmx_pages *vmx);void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip,void *guest_rsp);bool load_vmcs (struct vmx_pages *vmx); +bool nested_vmx_supported (void );void nested_vmx_check_supported (void ); void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,
tools/testing/selftests/kvm/lib/x86_64/svm.c +7 -3
@@ -148,14 +148,18 @@ void run_guest(struct vmcb *vmcb, uint64_t vmcb_gpa) : "r15", "memory"); } -void nested_svm_check_supported (void ) +bool nested_svm_supported (void ) {struct kvm_cpuid_entry2 *entry =kvm_get_supported_cpuid_entry (0x80000001 ); -if (!(entry->ecx &CPUID_SVM )) { +return entry->ecx &CPUID_SVM ; +} + +void nested_svm_check_supported (void ) +{ +if (!nested_svm_supported ()) {print_skip ("nested SVM not enabled" );exit (KSFT_SKIP ); } } -
tools/testing/selftests/kvm/lib/x86_64/vmx.c +7 -2
@@ -379,11 +379,16 @@ void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp)init_vmcs_guest_state (guest_rip, guest_rsp); } -void nested_vmx_check_supported (void ) +bool nested_vmx_supported (void ) {struct kvm_cpuid_entry2 *entry =kvm_get_supported_cpuid_entry (1 ); -if (!(entry->ecx &CPUID_VMX )) { +return entry->ecx &CPUID_VMX ; +} + +void nested_vmx_check_supported (void ) +{ +if (!nested_vmx_supported ()) {print_skip ("nested VMX not enabled" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/smm_test.c +7 -6
@@ -118,16 +118,17 @@ int main(int argc, char *argv[])vcpu_set_msr (vm,VCPU_ID ,MSR_IA32_SMBASE ,SMRAM_GPA );if (kvm_check_cap (KVM_CAP_NESTED_STATE )) { -if (kvm_get_supported_cpuid_entry (0x80000001 )->ecx &CPUID_SVM ) +if (nested_svm_supported ())vcpu_alloc_svm (vm, &nested_gva); -else +else if (nested_vmx_supported ())vcpu_alloc_vmx (vm, &nested_gva); -vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); - }else { -pr_info ("will skip SMM test with VMX enabled\n" ); -vcpu_args_set (vm,VCPU_ID ,1 ,0 ); } +if (!nested_gva) +pr_info ("will skip SMM test with VMX enabled\n" ); + +vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); +for (stage =1 ;; stage++) {_vcpu_run (vm,VCPU_ID ); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
tools/testing/selftests/kvm/x86_64/state_test.c +7 -6
@@ -171,16 +171,17 @@ int main(int argc, char *argv[])vcpu_regs_get (vm,VCPU_ID , ®s1);if (kvm_check_cap (KVM_CAP_NESTED_STATE )) { -if (kvm_get_supported_cpuid_entry (0x80000001 )->ecx &CPUID_SVM ) +if (nested_svm_supported ())vcpu_alloc_svm (vm, &nested_gva); -else +else if (nested_vmx_supported ())vcpu_alloc_vmx (vm, &nested_gva); -vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); - }else { -pr_info ("will skip nested state checks\n" ); -vcpu_args_set (vm,VCPU_ID ,1 ,0 ); } +if (!nested_gva) +pr_info ("will skip nested state checks\n" ); + +vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); +for (stage =1 ;; stage++) {_vcpu_run (vm,VCPU_ID ); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
Signature · 1 line
2.25.4
PATCH 2/2 KVM: selftests: Don't probe KVM_CAP_HYPERV_ENLIGHTENED_VMCS when nested VMX is unsupported
In reply to Vitaly KuznetsovKVM_CAP_HYPERV_ENLIGHTENED_VMCS will be reported as supported even when nested VMX is not, fix evmcs_test/hyperv_cpuid tests to check for both.
--- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 5 +++-- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/kvm/x86_64/evmcs_test.c +3 -2
@@ -94,9 +94,10 @@ int main(int argc, char *argv[])vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); -if (!kvm_check_cap (KVM_CAP_NESTED_STATE ) || +if (!nested_vmx_supported () || + !kvm_check_cap (KVM_CAP_NESTED_STATE ) || !kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { -print_skip ("capabilities not available" ); +print_skip ("Enlightened VMCS is unsupported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +2 -1
@@ -170,7 +170,8 @@ int main(int argc, char *argv[])case 1 :break ;case 2 : -if (!kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { +if (!nested_vmx_supported () || + !kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) {print_skip ("Enlightened VMCS is unsupported" );continue ; }
Signature · 1 line
2.25.4