Add Hyper-v extended hypercall support in KVM
v2 cover Add Hyper-v extended hypercall support in KVM
This patch series adds Hyper-V extended hypercall support. All hypercalls will exit to userspace if CPUID.0x40000003.EBX BIT(20) is set.
v2:
- Intorduced ASSERT_EXIT_REASON macro and replaced all occurences of TEST_ASSERT for vcpu exit reason.
- Skip hyperv_extended_hypercalls test if extended hypercalls are not supported by the kernel.
- Rebased with latest KVM queue.
- Addressed all of the comments in patch 6 of v1.
v1: https://lore.kernel.org/lkml/[email protected]/
RFC: https://lore.kernel.org/lkml/[email protected]/
Vipin Sharma (6):
KVM: x86: hyper-v: Use common code for hypercall userspace exit
KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
KVM: selftests: Test Hyper-V extended hypercall enablement
KVM: selftests: Replace hardcoded Linux OS id with HYPERV_LINUX_OS_ID
KVM: selftests: Make vCPU exit reason test assertion common.
KVM: selftests: Test Hyper-V extended hypercall exit to userspace
arch/x86/kvm/hyperv.c | 43 +++++---- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../testing/selftests/kvm/aarch64/psci_test.c | 4 +- .../testing/selftests/kvm/include/test_util.h | 10 ++ .../selftests/kvm/include/x86_64/hyperv.h | 4 + .../selftests/kvm/include/x86_64/processor.h | 3 + .../kvm/lib/s390x/diag318_test_handler.c | 3 +- .../selftests/kvm/s390x/sync_regs_test.c | 15 +-- .../selftests/kvm/set_memory_region_test.c | 6 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 8 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 8 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 2 +- .../selftests/kvm/x86_64/flds_emulation.h | 5 +- .../selftests/kvm/x86_64/hyperv_clock.c | 9 +- .../selftests/kvm/x86_64/hyperv_evmcs.c | 8 +- .../kvm/x86_64/hyperv_extended_hypercalls.c | 94 +++++++++++++++++++ .../selftests/kvm/x86_64/hyperv_features.c | 23 +++-- .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 6 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 7 +- .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 14 +-- .../selftests/kvm/x86_64/kvm_clock_test.c | 5 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +- .../selftests/kvm/x86_64/monitor_mwait_test.c | 9 +- .../kvm/x86_64/nested_exceptions_test.c | 5 +- .../selftests/kvm/x86_64/platform_info_test.c | 14 +-- .../kvm/x86_64/pmu_event_filter_test.c | 6 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 9 +- .../testing/selftests/kvm/x86_64/state_test.c | 8 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 8 +- .../kvm/x86_64/svm_nested_shutdown_test.c | 7 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 6 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 6 +- .../selftests/kvm/x86_64/sync_regs_test.c | 25 +---- .../kvm/x86_64/triple_fault_event_test.c | 9 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 6 +- .../kvm/x86_64/ucna_injection_test.c | 22 +---- .../selftests/kvm/x86_64/userspace_io_test.c | 6 +- .../kvm/x86_64/userspace_msr_exit_test.c | 22 +---- .../kvm/x86_64/vmx_apic_access_test.c | 11 +-- .../kvm/x86_64/vmx_close_while_nested_test.c | 5 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 7 +- .../vmx_exception_with_invalid_guest_state.c | 4 +- .../x86_64/vmx_invalid_nested_guest_state.c | 4 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 6 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 8 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 6 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 6 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 7 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 5 +- 50 files changed, 211 insertions(+), 310 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
PATCH v2 1/6 KVM: x86: hyper-v: Use common code for hypercall userspace exit
Remove duplicate code to exit to userspace for hyper-v hypercalls and use a common place to exit.
--- arch/x86/kvm/hyperv.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
arch/x86/kvm/hyperv.c +11 -16
@@ -2503,14 +2503,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) ret =HV_STATUS_INVALID_HYPERCALL_INPUT ;break ; } - vcpu->run->exit_reason =KVM_EXIT_HYPERV ; - vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; - vcpu->run->hyperv.u.hcall.input = hc.param; - vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; - vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; - vcpu->arch.complete_userspace_io = - kvm_hv_hypercall_complete_userspace; -return 0 ; + goto hypercall_userspace_exit;case HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST :if (unlikely (hc.var_cnt)) { ret =HV_STATUS_INVALID_HYPERCALL_INPUT ;
@@ -2569,14 +2562,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) ret =HV_STATUS_OPERATION_DENIED ;break ; } - vcpu->run->exit_reason =KVM_EXIT_HYPERV ; - vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; - vcpu->run->hyperv.u.hcall.input = hc.param; - vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; - vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; - vcpu->arch.complete_userspace_io = - kvm_hv_hypercall_complete_userspace; -return 0 ; + goto hypercall_userspace_exit; }default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;
@@ -2585,6 +2571,15 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) hypercall_complete:return kvm_hv_hypercall_complete (vcpu, ret); + +hypercall_userspace_exit: + vcpu->run->exit_reason =KVM_EXIT_HYPERV ; + vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; + vcpu->run->hyperv.u.hcall.input = hc.param; + vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; + vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; + vcpu->arch.complete_userspace_io = kvm_hv_hypercall_complete_userspace; +return 0 ; }void kvm_hv_init_vm (struct kvm *kvm)
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Re: [PATCH v2 1/6] KVM: x86: hyper-v: Use common code for hypercall userspace exit
Quoted 3 lines · Vipin Sharma
Remove duplicate code to exit to userspace for hyper-v hypercalls and use a common place to exit.
"No functional change intended." as it was suggested by Sean :-)
Quoted 48 lines
Signed-off-by Vipin Sharma <[email protected]>Suggested-by Sean Christopherson <[email protected]>--- arch/x86/kvm/hyperv.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)arch/x86/kvm/hyperv.c +4
-16@@ -2503,14 +2503,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) ret =HV_STATUS_INVALID_HYPERCALL_INPUT ;break ; } - vcpu->run->exit_reason =KVM_EXIT_HYPERV ; - vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; - vcpu->run->hyperv.u.hcall.input = hc.param; - vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; - vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; - vcpu->arch.complete_userspace_io = - kvm_hv_hypercall_complete_userspace; -return 0 ; + goto hypercall_userspace_exit;case HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST :if (unlikely (hc.var_cnt)) { ret =HV_STATUS_INVALID_HYPERCALL_INPUT ;@@ -2569,14 +2562,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) ret =HV_STATUS_OPERATION_DENIED ;break ; } - vcpu->run->exit_reason =KVM_EXIT_HYPERV ; - vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; - vcpu->run->hyperv.u.hcall.input = hc.param; - vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; - vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; - vcpu->arch.complete_userspace_io = - kvm_hv_hypercall_complete_userspace; -return 0 ; + goto hypercall_userspace_exit; }default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;@@ -2585,6 +2571,15 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) hypercall_complete:return kvm_hv_hypercall_complete (vcpu, ret); + +hypercall_userspace_exit:
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2585
Quoted 10 lines
arch/x86/kvm/hyperv.c +7
-0+ vcpu->run->exit_reason =KVM_EXIT_HYPERV ; + vcpu->run->hyperv.type =KVM_EXIT_HYPERV_HCALL ; + vcpu->run->hyperv.u.hcall.input = hc.param; + vcpu->run->hyperv.u.hcall.params[0 ] = hc.ingpa; + vcpu->run->hyperv.u.hcall.params[1 ] = hc.outgpa; + vcpu->arch.complete_userspace_io = kvm_hv_hypercall_complete_userspace; +return 0 ; }void kvm_hv_init_vm (struct kvm *kvm)
Signature · 1 line
Vitaly
Sean Christopherson
maintainerRe: [PATCH v2 1/6] KVM: x86: hyper-v: Use common code for hypercall userspace exit
Quoted 7 lines · Vitaly Kuznetsov
Quoted 3 lines · Vipin Sharma
Remove duplicate code to exit to userspace for hyper-v hypercalls and use a common place to exit.
"No functional change intended." as it was suggested by Sean :-)
Heh, I need to find a way to collect royalties.
Re: [PATCH v2 1/6] KVM: x86: hyper-v: Use common code for hypercall userspace exit
Quoted 11 lines · Sean Christopherson
Quoted 7 lines · Vitaly Kuznetsov
Quoted 3 lines · Vipin Sharma
Remove duplicate code to exit to userspace for hyper-v hypercalls and use a common place to exit.
"No functional change intended." as it was suggested by Sean :-)
Heh, I need to find a way to collect royalties.
Suffixed with a ®
PATCH v2 2/6 KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
In reply to Vipin SharmaAdd support for extended hypercall in Hyper-v. Hyper-v TLFS 6.0b describes hypercalls above call code 0x8000 as extended hypercalls.
A Hyper-v hypervisor's guest VM finds availability of extended hypercalls via CPUID.0x40000003.EBX BIT(20). If the bit is set then the guest can call extended hypercalls.
All extended hypercalls will exit to userspace by default. This allows for easy support of future hypercalls without being dependent on KVM releases.
If there will be need to process the hypercall in KVM instead of userspace then KVM can create a capability which userspace can query to know which hypercalls can be handled by the KVM and enable handling of those hypercalls.
--- arch/x86/kvm/hyperv.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/x86/kvm/hyperv.c +16 -0
@@ -43,6 +43,12 @@#define KVM_HV_MAX_SPARSE_VCPU_SET_BITS DIV_ROUND_UP(KVM_MAX_VCPUS, HV_VCPUS_PER_SPARSE_BANK) +/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +static void stimer_mark_pending (struct kvm_vcpu_hv_stimer *stimer,bool vcpu_kick);
@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }
@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; } + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ; +break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;
@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ; ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Re: [PATCH v2 2/6] KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
Quoted 26 lines · Vipin Sharma
Add support for extended hypercall in Hyper-v. Hyper-v TLFS 6.0b describes hypercalls above call code
0x8000as extended hypercalls.A Hyper-v hypervisor's guest VM finds availability of extended hypercalls via CPUID.0x40000003.EBX BIT(20). If the bit is set then the guest can call extended hypercalls.
All extended hypercalls will exit to userspace by default. This allows for easy support of future hypercalls without being dependent on KVM releases.
If there will be need to process the hypercall in KVM instead of userspace then KVM can create a capability which userspace can query to know which hypercalls can be handled by the KVM and enable handling of those hypercalls.
Signed-off-by Vipin Sharma <[email protected]>--- arch/x86/kvm/hyperv.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)arch/x86/kvm/hyperv.c +0
-0
arch/x86/kvm/hyperv.c line 51
Quoted 9 lines
arch/x86/kvm/hyperv.c +6
-0@@ -43,6 +43,12 @@#define KVM_HV_MAX_SPARSE_VCPU_SET_BITS DIV_ROUND_UP(KVM_MAX_VCPUS, HV_VCPUS_PER_SPARSE_BANK) +/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +
First, I thought there's an off-by-one here (and should be '63') but then I checked with TLFS and figured out that the limit comes from HvExtCallQueryCapabilities's response which doesn't include itself (0x8001) in the mask, this means it can encode
0x8002 == bit00x8003 == bit1
..0x8041 == bit63
so indeed, the last one supported is 0x8041 == 0x8001 + 64
maybe it's worth extending the commont on where '64' comes from.
Quoted 14 lines
arch/x86/kvm/hyperv.c +3
-0static void stimer_mark_pending (struct kvm_vcpu_hv_stimer *stimer,bool vcpu_kick);@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2578
Quoted 6 lines
arch/x86/kvm/hyperv.c +3
-0@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; } + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ;
I wasn't able to find any statement in TLFS stating whether extended hypercalls can be 'fast', I can imagine e.g. MemoryHeatHintAsync using it. Unfortunatelly, our userspace exit will have to be modified to handle such stuff. This can stay for the time being I guess..
Quoted 7 lines
arch/x86/kvm/hyperv.c +3
-0+break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;
arch/x86/kvm/hyperv.c int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, · line 2743
Quoted 7 lines
arch/x86/kvm/hyperv.c +1
-0@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ; ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;
Signature · 1 line
Vitaly
Re: [PATCH v2 2/6] KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
Quoted 15 lines · Vitaly Kuznetsov
arch/x86/kvm/hyperv.c line 51
Quoted 6 lines · Vipin Sharma
arch/x86/kvm/hyperv.c +6
-0+/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +First, I thought there's an off-by-one here (and should be '63') but then I checked with TLFS and figured out that the limit comes from HvExtCallQueryCapabilities's response which doesn't include itself (
0x8001) in the mask, this means it can encode
Quoted 9 lines
0x8002== bit00x8003== bit1
..0x8041== bit63so indeed, the last one supported is
0x8041==0x8001+ 64maybe it's worth extending the commont on where '64' comes from.
Yeah, I will expand comments.
Quoted 17 lines
Quoted 17 lines
static void stimer_mark_pending(struct
kvm_vcpu_hv_stimer*stimer,bool vcpu_kick);arch/x86/kvm/hyperv.c +3
-0@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; }
Quoted 9 lines
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2578
Quoted 3 lines
arch/x86/kvm/hyperv.c +3
-0+ case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ;I wasn't able to find any statement in TLFS stating whether extended hypercalls can be 'fast', I can imagine e.g. MemoryHeatHintAsync using it. Unfortunatelly, our userspace exit will have to be modified to handle such stuff. This can stay for the time being I guess..
I agree TLFS doesn't state anything about "fast" extended hypercall but nothing stops in future for some call to be "fast". I think this condition should also be handled by userspace as it is handling everything else.
I will remove it in the next version of the patch. I don't see any value in verification here.
Quoted 20 lines
Quoted 7 lines
arch/x86/kvm/hyperv.c +3
-0+break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;arch/x86/kvm/hyperv.c int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, · line 2743
Quoted 7 lines
arch/x86/kvm/hyperv.c +1
-0@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ; ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;Reviewed-by Vitaly Kuznetsov <[email protected]>--
Vitaly
Vitaly Kuznetsov
maintainerRe: [PATCH v2 2/6] KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
Quoted 55 lines · Vipin Sharma
Quoted 15 lines · Vitaly Kuznetsov
arch/x86/kvm/hyperv.c line 51
Quoted 6 lines · Vipin Sharma
arch/x86/kvm/hyperv.c +6
-0+/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +First, I thought there's an off-by-one here (and should be '63') but then I checked with TLFS and figured out that the limit comes from HvExtCallQueryCapabilities's response which doesn't include itself (
0x8001) in the mask, this means it can encodeQuoted 9 lines
0x8002== bit00x8003== bit1
..0x8041== bit63so indeed, the last one supported is
0x8041==0x8001+ 64maybe it's worth extending the commont on where '64' comes from.
Yeah, I will expand comments.
Quoted 17 lines
Quoted 17 lines
static void stimer_mark_pending(struct
kvm_vcpu_hv_stimer*stimer,bool vcpu_kick);arch/x86/kvm/hyperv.c +3
-0@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; }Quoted 9 lines
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2578
Quoted 3 lines
arch/x86/kvm/hyperv.c +3
-0+ case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ;I wasn't able to find any statement in TLFS stating whether extended hypercalls can be 'fast', I can imagine e.g. MemoryHeatHintAsync using it. Unfortunatelly, our userspace exit will have to be modified to handle such stuff. This can stay for the time being I guess..
Quoted 7 lines
I agree TLFS doesn't state anything about "fast" extended hypercall but nothing stops in future for some call to be "fast". I think this condition should also be handled by userspace as it is handling everything else.
I will remove it in the next version of the patch. I don't see any value in verification here.
The problem is that we don't currently pass 'fast' flag to userspace, let alone XMM registers. This means that it won't be able to handle fast hypercalls anyway, I guess it's better to keep your check but add a comment saying that it's an implementation shortcoming and not a TLFS requirement.
Quoted 22 lines
Quoted 21 lines
Quoted 8 lines
arch/x86/kvm/hyperv.c +3
-0+break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;arch/x86/kvm/hyperv.c int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, · line 2743
Quoted 7 lines
arch/x86/kvm/hyperv.c +1
-0@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ; ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;Reviewed-by Vitaly Kuznetsov <[email protected]>--
Vitaly
Signature · 1 line
Vitaly
Re: [PATCH v2 2/6] KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
Quoted 63 lines · Vitaly Kuznetsov
Quoted 60 lines · Vipin Sharma
Quoted 15 lines · Vitaly Kuznetsov
arch/x86/kvm/hyperv.c line 51
Quoted 6 lines · Vipin Sharma
arch/x86/kvm/hyperv.c +6
-0+/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +First, I thought there's an off-by-one here (and should be '63') but then I checked with TLFS and figured out that the limit comes from HvExtCallQueryCapabilities's response which doesn't include itself (
0x8001) in the mask, this means it can encodeQuoted 9 lines
0x8002== bit00x8003== bit1
..0x8041== bit63so indeed, the last one supported is
0x8041==0x8001+ 64maybe it's worth extending the commont on where '64' comes from.
Yeah, I will expand comments.
Quoted 17 lines
Quoted 17 lines
static void stimer_mark_pending(struct
kvm_vcpu_hv_stimer*stimer,bool vcpu_kick);arch/x86/kvm/hyperv.c +3
-0@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; }Quoted 9 lines
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2578
Quoted 3 lines
arch/x86/kvm/hyperv.c +3
-0+ case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ;I wasn't able to find any statement in TLFS stating whether extended hypercalls can be 'fast', I can imagine e.g. MemoryHeatHintAsync using it. Unfortunatelly, our userspace exit will have to be modified to handle such stuff. This can stay for the time being I guess..
I agree TLFS doesn't state anything about "fast" extended hypercall but nothing stops in future for some call to be "fast". I think this condition should also be handled by userspace as it is handling everything else.
Quoted 9 lines
Quoted 2 lines
I will remove it in the next version of the patch. I don't see any value in verification here.
The problem is that we don't currently pass 'fast' flag to userspace, let alone XMM registers. This means that it won't be able to handle fast hypercalls anyway, I guess it's better to keep your check but add a comment saying that it's an implementation shortcoming and not a TLFS requirement.
I think "fast" flag gets passed to the userspace via:
vcpu->run->hyperv.u.hcall.input = hc.param;
Yeah, XMM registers won't be passed, that will require userspace API change. I will keep the check and explain in the comments.
Quoted 27 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
arch/x86/kvm/hyperv.c +4
-0+break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ;Quoted 9 lines
Quoted 8 lines
arch/x86/kvm/hyperv.c int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, · line 2743
Quoted 2 lines
arch/x86/kvm/hyperv.c +0
-0ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;Reviewed-by Vitaly Kuznetsov <[email protected]>--
Vitaly--
Vitaly
Vitaly Kuznetsov
maintainerRe: [PATCH v2 2/6] KVM: x86: hyper-v: Add extended hypercall support in Hyper-v
Quoted 74 lines · Vipin Sharma
Quoted 63 lines · Vitaly Kuznetsov
Quoted 60 lines · Vipin Sharma
Quoted 15 lines · Vitaly Kuznetsov
arch/x86/kvm/hyperv.c line 51
Quoted 6 lines · Vipin Sharma
arch/x86/kvm/hyperv.c +6
-0+/* +* The TLFS carves out 64 possible extended hypercalls, numbered sequentially +* after the base capabilities extended hypercall. +*/ +#define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64) +First, I thought there's an off-by-one here (and should be '63') but then I checked with TLFS and figured out that the limit comes from HvExtCallQueryCapabilities's response which doesn't include itself (
0x8001) in the mask, this means it can encodeQuoted 9 lines
0x8002== bit00x8003== bit1
..0x8041== bit63so indeed, the last one supported is
0x8041==0x8001+ 64maybe it's worth extending the commont on where '64' comes from.
Yeah, I will expand comments.
Quoted 17 lines
Quoted 17 lines
static void stimer_mark_pending(struct
kvm_vcpu_hv_stimer*stimer,bool vcpu_kick);arch/x86/kvm/hyperv.c +3
-0@@ -2411,6 +2417,9 @@ static bool hv_check_hypercall_access(struct kvm_vcpu_hv *hv_vcpu, u16 code)case HVCALL_SEND_IPI :return hv_vcpu->cpuid_cache.enlightenments_eax &HV_X64_CLUSTER_IPI_RECOMMENDED ; + case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +return hv_vcpu->cpuid_cache.features_ebx & +HV_ENABLE_EXTENDED_HYPERCALLS ;default :break ; }@@ -2564,6 +2573,12 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) } goto hypercall_userspace_exit; }Quoted 9 lines
arch/x86/kvm/hyperv.c int kvm_hv_hypercall(struct kvm_vcpu *vcpu) · line 2578
Quoted 3 lines
arch/x86/kvm/hyperv.c +3
-0+ case HV_EXT_CALL_QUERY_CAPABILITIES ... HV_EXT_CALL_MAX: +if (unlikely (hc.fast)) { + ret =HV_STATUS_INVALID_PARAMETER ;I wasn't able to find any statement in TLFS stating whether extended hypercalls can be 'fast', I can imagine e.g. MemoryHeatHintAsync using it. Unfortunatelly, our userspace exit will have to be modified to handle such stuff. This can stay for the time being I guess..
I agree TLFS doesn't state anything about "fast" extended hypercall but nothing stops in future for some call to be "fast". I think this condition should also be handled by userspace as it is handling everything else.
Quoted 9 lines
Quoted 2 lines
I will remove it in the next version of the patch. I don't see any value in verification here.
The problem is that we don't currently pass 'fast' flag to userspace, let alone XMM registers. This means that it won't be able to handle fast hypercalls anyway, I guess it's better to keep your check but add a comment saying that it's an implementation shortcoming and not a TLFS requirement.
Quoted 2 lines
I think "fast" flag gets passed to the userspace via:
vcpu->run->hyperv.u.hcall.input= hc.param;
True, for some reason I thought it's just the hypercall code but it's actually the full 64bit thing!
Quoted 4 lines
Yeah, XMM registers won't be passed, that will require userspace API change. I will keep the check and explain in the comments.
Thanks!
Quoted 28 lines
Quoted 27 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
arch/x86/kvm/hyperv.c +4
-0+break ; + } + goto hypercall_userspace_exit;default : ret =HV_STATUS_INVALID_HYPERCALL_CODE ;break ;@@ -2722,6 +2737,7 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, ent->ebx |=HV_POST_MESSAGES ; ent->ebx |=HV_SIGNAL_EVENTS ; + ent->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ;Quoted 9 lines
Quoted 8 lines
arch/x86/kvm/hyperv.c int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, · line 2743
Quoted 2 lines
arch/x86/kvm/hyperv.c +0
-0ent->edx |=HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE ; ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ;Reviewed-by Vitaly Kuznetsov <[email protected]>--
Vitaly--
Vitaly
Signature · 1 line
Vitaly
PATCH v2 3/6 KVM: selftests: Test Hyper-V extended hypercall enablement
In reply to Vipin SharmaTest Hyper-V extended hypercall, HV_EXT_CALL_QUERY_CAPABILITIES (0x8001), access denied and invalid parameter
cases.
Access is denied if CPUID.0x40000003.EBX BIT(20) is not set. Invalid parameter if call has fast bit set.
--- tools/testing/selftests/kvm/include/x86_64/hyperv.h | 4 ++++ tools/testing/selftests/kvm/x86_64/hyperv_features.c | 9 +++++++++ 2 files changed, 13 insertions(+)
tools/testing/selftests/kvm/include/x86_64/hyperv.h +4 -0
@@ -112,6 +112,7 @@#define HV_ACCESS_STATS BIT(8)#define HV_DEBUGGING BIT(11)#define HV_CPU_MANAGEMENT BIT(12) +#define HV_ENABLE_EXTENDED_HYPERCALLS BIT(20)#define HV_ISOLATION BIT(22)/* HYPERV_CPUID_FEATURES.EDX */
@@ -166,6 +167,9 @@#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 +/* Extended hypercalls */ +#define HV_EXT_CALL_QUERY_CAPABILITIES 0x8001 +#define HV_FLUSH_ALL_PROCESSORS BIT(0)#define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES BIT(1)#define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY BIT(2)
tools/testing/selftests/kvm/x86_64/hyperv_features.c +9 -0
@@ -583,6 +583,15 @@ static void guest_test_hcalls_access(void) hcall->expect =HV_STATUS_SUCCESS ;break ;case 19 : + hcall->control =HV_EXT_CALL_QUERY_CAPABILITIES ; + hcall->expect =HV_STATUS_ACCESS_DENIED ; +break ; +case 20 : + feat->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ; + hcall->control =HV_EXT_CALL_QUERY_CAPABILITIES |HV_HYPERCALL_FAST_BIT ; + hcall->expect =HV_STATUS_INVALID_PARAMETER ; +break ; +case 21 :kvm_vm_free (vm);return ; }
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Vitaly Kuznetsov
maintainerRe: [PATCH v2 3/6] KVM: selftests: Test Hyper-V extended hypercall enablement
Quoted 40 lines · Vipin Sharma
Test Hyper-V extended hypercall,
HV_EXT_CALL_QUERY_CAPABILITIES(0x8001), access denied and invalid parameter
cases.Access is denied if CPUID.0x40000003.EBX BIT(20) is not set. Invalid parameter if call has fast bit set.
Signed-off-by Vipin Sharma <[email protected]>--- tools/testing/selftests/kvm/include/x86_64/hyperv.h | 4 ++++ tools/testing/selftests/kvm/x86_64/hyperv_features.c | 9 +++++++++ 2 files changed, 13 insertions(+)tools/testing/selftests/kvm/include/x86_64/hyperv.h +4
-0@@ -112,6 +112,7 @@#define HV_ACCESS_STATS BIT(8)#define HV_DEBUGGING BIT(11)#define HV_CPU_MANAGEMENT BIT(12) +#define HV_ENABLE_EXTENDED_HYPERCALLS BIT(20)#define HV_ISOLATION BIT(22)/* HYPERV_CPUID_FEATURES.EDX */ @@ -166,6 +167,9 @@#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 +/* Extended hypercalls */ +#define HV_EXT_CALL_QUERY_CAPABILITIES 0x8001 +#define HV_FLUSH_ALL_PROCESSORS BIT(0)#define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES BIT(1)#define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY BIT(2)tools/testing/selftests/kvm/x86_64/hyperv_features.c +0
-0
tools/testing/selftests/kvm/x86_64/hyperv_features.c static void guest_test_hcalls_access(void) · line 590
Quoted 8 lines
tools/testing/selftests/kvm/x86_64/hyperv_features.c +5
-0@@ -583,6 +583,15 @@ static void guest_test_hcalls_access(void) hcall->expect =HV_STATUS_SUCCESS ;break ;case 19 : + hcall->control =HV_EXT_CALL_QUERY_CAPABILITIES ; + hcall->expect =HV_STATUS_ACCESS_DENIED ; +break ; +case 20 : + feat->ebx |=HV_ENABLE_EXTENDED_HYPERCALLS ;
As I've mentioned on another patch, things look significantly better after https://lore.kernel.org/kvm/[email protected]/
cleanup, hope we can have it in soon.
Quoted 7 lines
tools/testing/selftests/kvm/x86_64/hyperv_features.c +4
-0+ hcall->control =HV_EXT_CALL_QUERY_CAPABILITIES |HV_HYPERCALL_FAST_BIT ; + hcall->expect =HV_STATUS_INVALID_PARAMETER ; +break ; +case 21 :kvm_vm_free (vm);return ; }
Signature · 1 line
Vitaly
PATCH v2 4/6 KVM: selftests: Replace hardcoded Linux OS id with HYPERV_LINUX_OS_ID
In reply to Vipin SharmaUse HYPERV_LINUX_OS_ID macro instead of hardcoded 0x8100 << 48
--- tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +1 -1
@@ -104,7 +104,7 @@ static void guest_main(struct ms_hyperv_tsc_page *tsc_page, vm_paddr_t tsc_page_/* Set Guest OS id to enable Hyper-V emulation */ GUEST_SYNC (1 ); -wrmsr (HV_X64_MSR_GUEST_OS_ID , (u64 )0x8100 <<48 ); +wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID );GUEST_SYNC (2 );check_tsc_msr_rdtsc ();
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Re: [PATCH v2 4/6] KVM: selftests: Replace hardcoded Linux OS id with HYPERV_LINUX_OS_ID
Quoted 12 lines · Vipin Sharma
Use
HYPERV_LINUX_OS_IDmacro instead of hardcoded0x8100<< 48Signed-off-by Vipin Sharma <[email protected]>--- tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/kvm/x86_64/hyperv_clock.c +0
-0
tools/testing/selftests/kvm/x86_64/hyperv_clock.c static void guest_main(struct ms_hyperv_tsc_page *tsc_page, vm_paddr_t tsc_page_ · line 110
Quoted 8 lines
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +1
-1@@ -104,7 +104,7 @@ static void guest_main(struct ms_hyperv_tsc_page *tsc_page, vm_paddr_t tsc_page_/* Set Guest OS id to enable Hyper-V emulation */ GUEST_SYNC (1 ); -wrmsr (HV_X64_MSR_GUEST_OS_ID , (u64 )0x8100 <<48 ); +wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID );GUEST_SYNC (2 );check_tsc_msr_rdtsc ();
Signature · 1 line
Vitaly
PATCH v2 5/6 KVM: selftests: Make vCPU exit reason test assertion common.
In reply to Vipin SharmaMake ASSERT_EXIT_REASON() macro and replace all exit reason test assert statements with it.
No functional changes intended.
--- .../testing/selftests/kvm/aarch64/psci_test.c | 4 +-- .../testing/selftests/kvm/include/test_util.h | 10 ++++++++ .../kvm/lib/s390x/diag318_test_handler.c | 3 +-- .../selftests/kvm/s390x/sync_regs_test.c | 15 +++-------- .../selftests/kvm/set_memory_region_test.c | 6 +---- tools/testing/selftests/kvm/x86_64/amx_test.c | 8 +----- .../kvm/x86_64/cr4_cpuid_sync_test.c | 8 +----- .../testing/selftests/kvm/x86_64/debug_regs.c | 2 +- .../selftests/kvm/x86_64/flds_emulation.h | 5 +--- .../selftests/kvm/x86_64/hyperv_clock.c | 7 +----- .../selftests/kvm/x86_64/hyperv_evmcs.c | 8 +----- .../selftests/kvm/x86_64/hyperv_features.c | 14 ++--------- .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 6 +---- .../selftests/kvm/x86_64/hyperv_svm_test.c | 7 +----- .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 14 ++--------- .../selftests/kvm/x86_64/kvm_clock_test.c | 5 +--- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +--- .../selftests/kvm/x86_64/monitor_mwait_test.c | 9 +------ .../kvm/x86_64/nested_exceptions_test.c | 5 +--- .../selftests/kvm/x86_64/platform_info_test.c | 14 +++-------- .../kvm/x86_64/pmu_event_filter_test.c | 6 +---- tools/testing/selftests/kvm/x86_64/smm_test.c | 9 +------ .../testing/selftests/kvm/x86_64/state_test.c | 8 +----- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 8 +----- .../kvm/x86_64/svm_nested_shutdown_test.c | 7 +----- .../kvm/x86_64/svm_nested_soft_inject_test.c | 6 +---- .../selftests/kvm/x86_64/svm_vmcall_test.c | 6 +---- .../selftests/kvm/x86_64/sync_regs_test.c | 25 ++++--------------- .../kvm/x86_64/triple_fault_event_test.c | 9 ++----- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 6 +---- .../kvm/x86_64/ucna_injection_test.c | 22 +++------------- .../selftests/kvm/x86_64/userspace_io_test.c | 6 +---- .../kvm/x86_64/userspace_msr_exit_test.c | 22 +++------------- .../kvm/x86_64/vmx_apic_access_test.c | 11 ++------ .../kvm/x86_64/vmx_close_while_nested_test.c | 5 +--- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 7 +----- .../vmx_exception_with_invalid_guest_state.c | 4 +-- .../x86_64/vmx_invalid_nested_guest_state.c | 4 +-- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 6 +---- .../kvm/x86_64/vmx_preemption_timer_test.c | 8 +----- .../kvm/x86_64/vmx_tsc_adjust_test.c | 6 +---- .../selftests/kvm/x86_64/xapic_ipi_test.c | 6 +---- .../selftests/kvm/x86_64/xen_shinfo_test.c | 7 +----- .../selftests/kvm/x86_64/xen_vmcall_test.c | 5 +--- 44 files changed, 71 insertions(+), 293 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -3
@@ -180,9 +180,7 @@ static void host_test_system_suspend(void)enter_guest (source); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SYSTEM_EVENT , -"Unhandled exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (source,KVM_EXIT_SYSTEM_EVENT );TEST_ASSERT (run->system_event.type ==KVM_SYSTEM_EVENT_SUSPEND ,"Unhandled system event: %u (expected: %u)" , run->system_event.type,KVM_SYSTEM_EVENT_SUSPEND );
tools/testing/selftests/kvm/include/test_util.h +10 -0
@@ -63,6 +63,16 @@ void test_assert(bool exp, const char *exp_str,#a , #b, #a, (unsigned long) __a, #b, (unsigned long) __b); \ } while (0) +#define ASSERT_EXIT_REASON (vcpu, expected_exit_reason) \ +({ \ + __u32 exit_reason = (vcpu)->run->exit_reason; \ + \ + TEST_ASSERT(exit_reason == (expected_exit_reason), \ + "Unexpected exit reason: %u (%s)", \ + exit_reason, \ + exit_reason_str(exit_reason)); \ +}) +#define TEST_FAIL (fmt, ...) do { \ TEST_ASSERT(false, fmt, ##__VA_ARGS__); \ __builtin_unreachable(); \
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +1 -2
@@ -35,8 +35,7 @@ static uint64_t diag318_handler(void)vcpu_run (vcpu); run = vcpu->run; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"DIAGNOSE 0x0318 instruction was not intercepted" ); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s390_sieic.icptcode ==ICPT_INSTRUCTION ,"Unexpected intercept code: 0x%x" , run->s390_sieic.icptcode); TEST_ASSERT((run->s390_sieic.ipa & 0xff00) == IPA0_DIAG,
tools/testing/selftests/kvm/s390x/sync_regs_test.c +3 -12
@@ -126,10 +126,7 @@ void test_req_and_verify_all_valid_regs(struct kvm_vcpu *vcpu) run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC ); TEST_ASSERT(run->s390_sieic.icptcode == 4 && (run->s390_sieic.ipa >> 8) == 0x83 && (run->s390_sieic.ipb >> 16) == 0x501,
@@ -165,10 +162,7 @@ void test_set_and_verify_various_reg_values(struct kvm_vcpu *vcpu) rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s.regs.gprs[11 ] ==0xBAD1DEA +1 ,"r11 sync regs value incorrect 0x%llx." , run->s.regs.gprs[11 ]);
@@ -200,10 +194,7 @@ void test_clear_kvm_dirty_regs_bits(struct kvm_vcpu *vcpu) run->s.regs.diag318 =0x4B1D ; rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s.regs.gprs[11 ] !=0xDEADBEEF ,"r11 sync regs value incorrect 0x%llx." , run->s.regs.gprs[11 ]);
tools/testing/selftests/kvm/set_memory_region_test.c +1 -5
@@ -308,7 +308,6 @@ static void test_delete_memory_region(void)static void test_zero_memory_regions (void ) {struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;pr_info ("Testing KVM_RUN with zero added memory regions\n" );
@@ -318,10 +317,7 @@ static void test_zero_memory_regions(void)vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul );vcpu_run (vcpu); - - run = vcpu->run; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Unexpected exit_reason = %u\n" , run->exit_reason); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );kvm_vm_free (vm); }
tools/testing/selftests/kvm/x86_64/amx_test.c +1 -7
@@ -241,7 +241,6 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;int xsave_restore_size;vm_vaddr_t amx_cfg, tiledata, xsavedata;
@@ -263,7 +262,6 @@ int main(int argc, char *argv[]) "KVM should enumerate max XSAVE size when XSAVE is supported"); xsave_restore_size =kvm_cpu_property (X86_PROPERTY_XSTATE_MAX_SIZE ); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);/* Register #NM handler */
@@ -286,10 +284,7 @@ int main(int argc, char *argv[])for (stage =1 ; ; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -345,7 +340,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +1 -7
@@ -50,7 +50,6 @@ static void guest_code(void)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct kvm_sregs sregs;struct ucall uc;
@@ -58,15 +57,10 @@ int main(int argc, char *argv[])TEST_REQUIRE (kvm_cpu_has (X86_FEATURE_XSAVE )); vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/debug_regs.c +1 -1
@@ -204,7 +204,7 @@ int main(void)vcpu_guest_debug_set (vcpu, &debug);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"KVM_EXIT_IO" ); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); cmd =get_ucall (vcpu, &uc);TEST_ASSERT (cmd ==UCALL_DONE ,"UCALL_DONE" );
tools/testing/selftests/kvm/x86_64/flds_emulation.h +1 -4
@@ -24,10 +24,7 @@ static inline void handle_flds_emulation_failure_exit(struct kvm_vcpu *vcpu)uint8_t *insn_bytes;uint64_t flags; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR ); TEST_ASSERT(run->emulation_failure.suberror == KVM_INTERNAL_ERROR_EMULATION, "Unexpected suberror: %u",
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +1 -6
@@ -207,13 +207,11 @@ int main(void) {struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;vm_vaddr_t tsc_page_gva;int stage; vm =vm_create_with_one_vcpu (&vcpu, guest_main); - run = vcpu->run;vcpu_set_hv_cpuid (vcpu);
@@ -227,10 +225,7 @@ int main(void)for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c +1 -7
@@ -237,7 +237,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;int stage;
@@ -266,13 +265,8 @@ int main(int argc, char *argv[])pr_info ("Running L1 which uses EVMCS to run L2\n" );for (stage =1 ;; stage++) { - run = vcpu->run; -vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_features.c +2 -12
@@ -91,7 +91,6 @@ static void guest_test_msrs_access(void)struct kvm_cpuid2 *prev_cpuid =NULL ;struct kvm_cpuid_entry2 *feat, *dbg;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int stage =0 ;
@@ -122,8 +121,6 @@ static void guest_test_msrs_access(void)vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu); - run = vcpu->run; -/* TODO: Make this entire test easier to maintain. */ if (stage >=21 )vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_SYNIC2 ,0 );
@@ -423,9 +420,7 @@ static void guest_test_msrs_access(void) msr->idx, msr->write ? "write" : "read");vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -448,7 +443,6 @@ static void guest_test_hcalls_access(void)struct kvm_cpuid_entry2 *feat, *recomm, *dbg;struct kvm_cpuid2 *prev_cpuid =NULL ;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int stage =0 ;
@@ -484,8 +478,6 @@ static void guest_test_hcalls_access(void) recomm =vcpu_get_cpuid_entry (vcpu,HYPERV_CPUID_ENLIGHTMENT_INFO ); dbg =vcpu_get_cpuid_entry (vcpu,HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES ); - run = vcpu->run; -switch (stage) {case 0 : feat->eax |=HV_MSR_HYPERCALL_AVAILABLE ;
@@ -603,9 +595,7 @@ static void guest_test_hcalls_access(void)pr_debug ("Stage %d: testing hcall: 0x%lx\n" , stage, hcall->control);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_ipi.c +1 -5
@@ -242,7 +242,6 @@ int main(int argc, char *argv[]) {struct kvm_vm *vm;struct kvm_vcpu *vcpu[3 ]; -unsigned int exit_reason;vm_vaddr_t hcall_page;pthread_t threads[2 ];int stage =1 , r;
@@ -282,10 +281,7 @@ int main(int argc, char *argv[])while (true) {vcpu_run (vcpu[0 ]); - exit_reason = vcpu[0 ]->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (vcpu[0 ],KVM_EXIT_IO );switch (get_ucall (vcpu[0 ], &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +1 -6
@@ -156,7 +156,6 @@ int main(int argc, char *argv[])vm_vaddr_t hcall_page;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;int stage;
@@ -165,7 +164,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_set_hv_cpuid (vcpu); - run = vcpu->run;vcpu_alloc_svm (vm, &nested_gva);vcpu_alloc_hyperv_test_pages (vm, &hv_pages_gva);
@@ -177,10 +175,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c +2 -12
@@ -542,18 +542,13 @@ static void *vcpu_thread(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old);TEST_ASSERT (!r,"pthread_setcanceltype failed on vcpu_id=%u with errno=%d" , vcpu->id, r);vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; - -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"vCPU %u exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - vcpu->id, exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -587,7 +582,6 @@ int main(int argc, char *argv[]) {struct kvm_vm *vm;struct kvm_vcpu *vcpu[3 ]; -unsigned int exit_reason;pthread_t threads[2 ];vm_vaddr_t test_data_page, gva;vm_paddr_t gpa;
@@ -657,11 +651,7 @@ int main(int argc, char *argv[])while (true) {vcpu_run (vcpu[0 ]); - exit_reason = vcpu[0 ]->run->exit_reason; - -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (vcpu[0 ],KVM_EXIT_IO );switch (get_ucall (vcpu[0 ], &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +1 -4
@@ -105,7 +105,6 @@ static void setup_clock(struct kvm_vm *vm, struct test_case *test_case)static void enter_guest (struct kvm_vcpu *vcpu) {struct kvm_clock_data start, end; -struct kvm_run *run = vcpu->run;struct kvm_vm *vm = vcpu->vm;struct ucall uc;int i;
@@ -118,9 +117,7 @@ static void enter_guest(struct kvm_vcpu *vcpu)vcpu_run (vcpu);vm_ioctl (vm,KVM_GET_CLOCK , &end); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -4
@@ -111,14 +111,11 @@ static void pr_hcall(struct ucall *uc)static void enter_guest (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;while (true) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_PR_MSR :
tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +1 -8
@@ -64,7 +64,6 @@ int main(int argc, char *argv[]) {uint64_t disabled_quirks;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int testcase;
@@ -74,18 +73,12 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_clear_cpuid_feature (vcpu,X86_FEATURE_MWAIT ); - run = vcpu->run; -vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu);while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/nested_exceptions_test.c +1 -4
@@ -166,12 +166,9 @@ static void __attribute__((__flatten__)) l1_guest_code(void *test_data)static void assert_ucall_vector (struct kvm_vcpu *vcpu,int vector) { -struct kvm_run *run = vcpu->run;struct ucall uc; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/platform_info_test.c +3 -11
@@ -36,15 +36,12 @@ static void guest_code(void)static void test_msr_platform_info_enabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , true);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Exit_reason other than KVM_EXIT_IO: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); +get_ucall (vcpu, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu\n" , uc.cmd);
@@ -56,14 +53,9 @@ static void test_msr_platform_info_enabled(struct kvm_vcpu *vcpu)static void test_msr_platform_info_disabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run; -vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , false);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN ); }int main (int argc,char *argv[])
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -5
@@ -151,14 +151,10 @@ static void amd_guest_code(void)*/ static uint64_t run_vcpu_to_sync (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );get_ucall (vcpu, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu" , uc.cmd);
tools/testing/selftests/kvm/x86_64/smm_test.c +1 -8
@@ -133,7 +133,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;int stage, stage_reported;
@@ -142,8 +141,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run; -vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,SMRAM_GPA ,SMRAM_MEMSLOT ,SMRAM_PAGES ,0 ); TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, SMRAM_GPA, SMRAM_MEMSLOT)
@@ -169,10 +166,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );memset (®s,0 ,sizeof (regs));vcpu_regs_get (vcpu, ®s);
@@ -208,7 +202,6 @@ int main(int argc, char *argv[]) vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state); }
tools/testing/selftests/kvm/x86_64/state_test.c +1 -7
@@ -158,14 +158,12 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;struct ucall uc;int stage;/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);
@@ -183,10 +181,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -214,7 +209,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c +1 -7
@@ -85,7 +85,6 @@ static void l1_guest_code(struct svm_test_data *svm)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;vm_vaddr_t svm_gva;struct kvm_vm *vm;struct ucall uc;
@@ -103,13 +102,8 @@ int main(int argc, char *argv[])vcpu_alloc_svm (vm, &svm_gva);vcpu_args_set (vcpu,1 , svm_gva); - run = vcpu->run; -vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c +1 -6
@@ -42,7 +42,6 @@ static void l1_guest_code(struct svm_test_data *svm, struct idt_entry *idt)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;vm_vaddr_t svm_gva;struct kvm_vm *vm;
@@ -55,13 +54,9 @@ int main(int argc, char *argv[])vcpu_alloc_svm (vm, &svm_gva);vcpu_args_set (vcpu,2 , svm_gva, vm->idt); - run = vcpu->run;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN );kvm_vm_free (vm); }
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +1 -5
@@ -167,16 +167,12 @@ static void run_test(bool is_nmi)memset (&debug,0 ,sizeof (debug));vcpu_guest_debug_set (vcpu, &debug); -struct kvm_run *run = vcpu->run;struct ucall uc;alarm (2 );vcpu_run (vcpu);alarm (0 ); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +1 -5
@@ -47,14 +47,10 @@ int main(int argc, char *argv[])vcpu_args_set (vcpu,1 , svm_gva);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/sync_regs_test.c +5 -20
@@ -132,10 +132,7 @@ int main(int argc, char *argv[])/* TODO: BUILD TIME CHECK: TEST_ASSERT(KVM_SYNC_X86_NUM_FIELDS != 3); */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );vcpu_regs_get (vcpu, ®s);compare_regs (®s, &run->s.regs.regs);
@@ -154,10 +151,7 @@ int main(int argc, char *argv[]) run->kvm_valid_regs =TEST_SYNC_FIELDS ; run->kvm_dirty_regs =KVM_SYNC_X86_REGS |KVM_SYNC_X86_SREGS ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xBAD1DEA +1 ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -181,10 +175,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =0 ; run->s.regs.regs.rbx =0xDEADBEEF ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx !=0xDEADBEEF ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -199,10 +190,7 @@ int main(int argc, char *argv[]) regs.rbx =0xBAC0 ;vcpu_regs_set (vcpu, ®s); rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xAAAA ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -219,10 +207,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =TEST_SYNC_FIELDS ; run->s.regs.regs.rbx =0xBBBB ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xBBBB ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +2 -7
@@ -89,9 +89,7 @@ int main(void) run = vcpu->run;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Expected KVM_EXIT_IO, got: %u (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->io.port ==ARBITRARY_IO_PORT ,"Expected IN from port %d from L2, got port %d" ,ARBITRARY_IO_PORT , run->io.port);
@@ -111,10 +109,7 @@ int main(void)if (has_svm) { -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN ); }else {switch (get_ucall (vcpu, &uc)) {case UCALL_DONE :
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -5
@@ -64,14 +64,10 @@ static void *run_vcpu(void *_cpu_nr)pthread_spin_unlock (&create_lock);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_DONE :
tools/testing/selftests/kvm/x86_64/ucna_injection_test.c +4 -18
@@ -137,15 +137,11 @@ static void guest_gp_handler(struct ex_regs *regs)static void run_vcpu_expect_gp (struct kvm_vcpu *vcpu) { -unsigned int exit_reason;struct ucall uc;vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_GP ,"#GP is expected." );
@@ -182,7 +178,6 @@ static void *run_ucna_injection(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old); TEST_ASSERT(r == 0,
@@ -191,10 +186,7 @@ static void *run_ucna_injection(void *arg)vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (params->vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (params->vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_FIRST_UCNA ,"Injecting first UCNA." );
@@ -204,10 +196,7 @@ static void *run_ucna_injection(void *arg)inject_ucna (params->vcpu,FIRST_UCNA_ADDR );vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (params->vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (params->vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_SECOND_UCNA ,"Injecting second UCNA." );
@@ -217,10 +206,7 @@ static void *run_ucna_injection(void *arg)inject_ucna (params->vcpu,SECOND_UCNA_ADDR );vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (params->vcpu,KVM_EXIT_IO );if (get_ucall (params->vcpu, &uc) ==UCALL_ABORT ) {TEST_ASSERT (false,"vCPU assertion failure: %s.\n" , (const char *)uc.args[0 ]);
tools/testing/selftests/kvm/x86_64/userspace_io_test.c +1 -5
@@ -63,11 +63,7 @@ int main(int argc, char *argv[])while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );if (get_ucall (vcpu, &uc))break ;
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +4 -18
@@ -410,10 +410,7 @@ static void process_rdmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_X86_RDMSR , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_X86_RDMSR );TEST_ASSERT (run->msr.index == msr_index,"Unexpected msr (0x%04x), expected 0x%04x" , run->msr.index, msr_index);
@@ -445,10 +442,7 @@ static void process_wrmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_X86_WRMSR , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_X86_WRMSR );TEST_ASSERT (run->msr.index == msr_index,"Unexpected msr (0x%04x), expected 0x%04x" , run->msr.index, msr_index);
@@ -472,15 +466,11 @@ static void process_wrmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)static void process_ucall_done (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); TEST_ASSERT(get_ucall(vcpu, &uc) == UCALL_DONE, "Unexpected ucall command: %lu, expected UCALL_DONE (%d)",
@@ -489,15 +479,11 @@ static void process_ucall_done(struct kvm_vcpu *vcpu)static uint64_t process_ucall (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc = {};check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +2 -9
@@ -96,21 +96,14 @@ int main(int argc, char *argv[])vcpu_run (vcpu);if (apic_access_addr == high_gpa) { -TEST_ASSERT (run->exit_reason == -KVM_EXIT_INTERNAL_ERROR , -"Got exit reason other than KVM_EXIT_INTERNAL_ERROR: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );TEST_ASSERT (run->internal.suberror ==KVM_INTERNAL_ERROR_EMULATION ,"Got internal suberror other than KVM_INTERNAL_ERROR_EMULATION: %u\n" , run->internal.suberror);break ; } -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c +1 -4
@@ -64,10 +64,7 @@ int main(int argc, char *argv[])struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );if (run->io.port ==PORT_L0_EXIT )break ;
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +1 -6
@@ -73,7 +73,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;bool done = false;
@@ -84,7 +83,6 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code); vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva);vcpu_args_set (vcpu,1 , vmx_pages_gva); - run = vcpu->run;/* Add an extra memory slot for testing dirty logging */ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
@@ -117,10 +115,7 @@ int main(int argc, char *argv[])while (!done) {memset (host_test_mem,0xaa ,TEST_MEM_PAGES *4096 );vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +1 -3
@@ -26,9 +26,7 @@ static void __run_vcpu_with_invalid_state(struct kvm_vcpu *vcpu)vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Expected KVM_EXIT_INTERNAL_ERROR, got %d (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );TEST_ASSERT (run->emulation_failure.suberror ==KVM_INTERNAL_ERROR_EMULATION ,"Expected emulation failure, got %d\n" , run->emulation_failure.suberror);
tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c +1 -3
@@ -74,9 +74,7 @@ int main(int argc, char *argv[])* The first exit to L0 userspace should be an I/O access from L2. * Running L1 should launch L2 without triggering an exit to userspace. */ -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Expected KVM_EXIT_IO, got: %u (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); TEST_ASSERT(run->io.port == ARBITRARY_IO_PORT, "Expected IN from port %d from L2, got port %d",
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +1 -5
@@ -183,14 +183,10 @@ int main(int argc, char *argv[])vcpu_ioctl (vcpu,KVM_SET_TSC_KHZ , (void *) (tsc_khz / l1_scale_factor));for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +1 -7
@@ -157,7 +157,6 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_vcpu *vcpu;struct kvm_x86_state *state;struct ucall uc;
@@ -173,7 +172,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);
@@ -182,10 +180,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -237,7 +232,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +1 -5
@@ -136,14 +136,10 @@ int main(int argc, char *argv[])vcpu_args_set (vcpu,1 , vmx_pages_gva);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -5
@@ -198,7 +198,6 @@ static void *vcpu_thread(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old); TEST_ASSERT(r == 0,
@@ -207,11 +206,8 @@ static void *vcpu_thread(void *arg)fprintf (stderr,"vCPU thread running vCPU %u\n" , vcpu->id);vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"vCPU %u exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - vcpu->id, exit_reason,exit_reason_str (exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );if (get_ucall (vcpu, &uc) ==UCALL_ABORT ) { TEST_ASSERT(false,
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +1 -6
@@ -605,15 +605,10 @@ int main(int argc, char *argv[])bool evtchn_irq_expected = false;for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +1 -4
@@ -122,10 +122,7 @@ int main(int argc, char *argv[])continue ; } -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
PATCH v2 6/6 KVM: selftests: Test Hyper-V extended hypercall exit to userspace
In reply to Vipin SharmaHyper-V extended hypercalls by default exit to userspace. Verify userspace gets the call, update the result and then verify in guest correct result is received.
--- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/x86_64/processor.h | 3 + .../kvm/x86_64/hyperv_extended_hypercalls.c | 94 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -24,6 +24,7 @@ /x86_64/hyperv_clock /x86_64/hyperv_cpuid /x86_64/hyperv_evmcs +/x86_64/hyperv_extended_hypercalls /x86_64/hyperv_features /x86_64/hyperv_ipi /x86_64/hyperv_svm_test
tools/testing/selftests/kvm/Makefile +1 -0
@@ -87,6 +87,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/fix_hypercall_test TEST_GEN_PROGS_x86_64 += x86_64/hyperv_clock TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid TEST_GEN_PROGS_x86_64 += x86_64/hyperv_evmcs +TEST_GEN_PROGS_x86_64 += x86_64/hyperv_extended_hypercalls TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features TEST_GEN_PROGS_x86_64 += x86_64/hyperv_ipi TEST_GEN_PROGS_x86_64 += x86_64/hyperv_svm_test
tools/testing/selftests/kvm/include/x86_64/processor.h +3 -0
@@ -168,6 +168,9 @@ struct kvm_x86_cpu_feature {#define X86_FEATURE_KVM_HC_MAP_GPA_RANGE KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 16)#define X86_FEATURE_KVM_MIGRATION_CONTROL KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 17) +/* Hyper-V defined paravirt features */ +#define X86_FEATURE_HYPERV_EXTENDED_HYPERCALLS KVM_X86_CPU_FEATURE(0x40000003, 0, EBX, 20) +/* * Same idea as X86_FEATURE_XXX, but X86_PROPERTY_XXX retrieves a multi-bit * value/property as opposed to a single-bit feature. Again, pack the info
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Vitaly Kuznetsov
maintainerRe: [PATCH v2 6/6] KVM: selftests: Test Hyper-V extended hypercall exit to userspace
Quoted 18 lines · Vipin Sharma
Hyper-V extended hypercalls by default exit to userspace. Verify userspace gets the call, update the result and then verify in guest correct result is received.
Signed-off-by Vipin Sharma <[email protected]>--- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/x86_64/processor.h | 3 + .../kvm/x86_64/hyperv_extended_hypercalls.c | 94 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.ctools/testing/selftests/kvm/.gitignore +0
-0
tools/testing/selftests/kvm/.gitignore line 27
Quoted 4 lines
tools/testing/selftests/kvm/.gitignore +1
-0@@ -24,6 +24,7 @@ /x86_64/hyperv_clock /x86_64/hyperv_cpuid /x86_64/hyperv_evmcs +/x86_64/hyperv_extended_hypercalls
My personal preference would be to shorten the name to something like "hyperv_ext_hcalls", doesn't seem to be ambiguos. No strong preference though, feel free to keep the long version.
Quoted 20 lines
tools/testing/selftests/kvm/.gitignore +0
-0/x86_64/hyperv_features /x86_64/hyperv_ipi /x86_64/hyperv_svm_testtools/testing/selftests/kvm/Makefile +1
-0@@ -87,6 +87,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/fix_hypercall_test TEST_GEN_PROGS_x86_64 += x86_64/hyperv_clock TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid TEST_GEN_PROGS_x86_64 += x86_64/hyperv_evmcs +TEST_GEN_PROGS_x86_64 += x86_64/hyperv_extended_hypercalls TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features TEST_GEN_PROGS_x86_64 += x86_64/hyperv_ipi TEST_GEN_PROGS_x86_64 += x86_64/hyperv_svm_testtools/testing/selftests/kvm/include/x86_64/processor.h +0
-0
tools/testing/selftests/kvm/include/x86_64/processor.h struct kvm_x86_cpu_feature { · line 173
Quoted 6 lines
tools/testing/selftests/kvm/include/x86_64/processor.h +3
-0@@ -168,6 +168,9 @@ struct kvm_x86_cpu_feature {#define X86_FEATURE_KVM_HC_MAP_GPA_RANGE KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 16)#define X86_FEATURE_KVM_MIGRATION_CONTROL KVM_X86_CPU_FEATURE(0x40000001, 0, EAX, 17) +/* Hyper-V defined paravirt features */ +#define X86_FEATURE_HYPERV_EXTENDED_HYPERCALLS KVM_X86_CPU_FEATURE(0x40000003, 0, EBX, 20) +
I completely forgot about my other series where I've converted the whole hyperv_features test to using KVM_X86_CPU_FEATURE():
https://lore.kernel.org/kvm/[email protected]/
but your define reminded me of it, thanks! Hope the whole thing will get queued soon.
As for your change, I think it is better suited for include/x86_64/hyperv.h instead of include/x86_64/processor.h anyway, I'm trying to keep all Hyper-V related stuff separate as Hyper-V CPUID leaves intersect with KVM's, e.g. 0x40000001.
Quoted 55 lines
tools/testing/selftests/kvm/include/x86_64/processor.h +0
-0/* * Same idea as X86_FEATURE_XXX, but X86_PROPERTY_XXX retrieves a multi-bit * value/property as opposed to a single-bit feature. Again, pack the info tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +46
-0@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Test Hyper-V extended hypercall, HV_EXT_CALL_QUERY_CAPABILITIES (0x8001), +* exit to userspace and receive result in guest. +* +* Negative tests are present in hyperv_features.c +* +* Copyright 2022 Google LLC +* Author: Vipin Sharma <[email protected]> +*/ + +#include "kvm_util.h" +#include "processor.h" +#include "hyperv.h" + +/* Any value is fine */ +#define EXT_CAPABILITIES 0xbull + +static void guest_code (vm_vaddr_t in_pg_gpa,vm_vaddr_t out_pg_gpa, +vm_vaddr_t out_pg_gva) +{ +uint64_t *output_gva; + +wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID ); +wrmsr (HV_X64_MSR_HYPERCALL , in_pg_gpa); + + output_gva = (uint64_t *)out_pg_gva; + +hyperv_hypercall (HV_EXT_CALL_QUERY_CAPABILITIES , in_pg_gpa, out_pg_gpa); + +/* TLFS states output will be a uint64_t value */ +GUEST_ASSERT_EQ (*output_gva,EXT_CAPABILITIES ); + +GUEST_DONE (); +} + +int main (void ) +{ +vm_vaddr_t hcall_out_page; +vm_vaddr_t hcall_in_page; +struct kvm_vcpu *vcpu; +struct kvm_run *run; +struct kvm_vm *vm; +uint64_t *outval; +struct ucall uc; +
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c line 56
Quoted 10 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +10
-0+/* Verify if extended hypercalls are supported */ +if (!kvm_cpuid_has (kvm_get_supported_hv_cpuid (), +X86_FEATURE_HYPERV_EXTENDED_HYPERCALLS )) { +print_skip ("Extended calls not supported by the kernel" ); +exit (KSFT_SKIP ); + } + + vm =vm_create_with_one_vcpu (&vcpu, guest_code); + run = vcpu->run; +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 );
Do we need this enforcement assuming we have no plans to add 'negative' tests here (hyperv_features does it just fine)? vcpu_set_hv_cpuid() enables everything anyway...
Quoted 38 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +38
-0+vcpu_set_hv_cpuid (vcpu); + +/* Hypercall input */ + hcall_in_page =vm_vaddr_alloc_pages (vm,1 ); +memset (addr_gva2hva (vm, hcall_in_page),0x0 , vm->page_size); + +/* Hypercall output */ + hcall_out_page =vm_vaddr_alloc_pages (vm,1 ); +memset (addr_gva2hva (vm, hcall_out_page),0x0 , vm->page_size); + +vcpu_args_set (vcpu,3 ,addr_gva2gpa (vm, hcall_in_page), +addr_gva2gpa (vm, hcall_out_page), hcall_out_page); + +vcpu_run (vcpu); + +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_HYPERV ); + + outval =addr_gpa2hva (vm, run->hyperv.u.hcall.params[1 ]); + *outval =EXT_CAPABILITIES ; + run->hyperv.u.hcall.result =HV_STATUS_SUCCESS ; + +vcpu_run (vcpu); + +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); + +switch (get_ucall (vcpu, &uc)) { +case UCALL_ABORT : +REPORT_GUEST_ASSERT_2 (uc,"arg1 = %ld, arg2 = %ld" ); +break ; +case UCALL_DONE : +break ; +default : +TEST_FAIL ("Unhandled ucall: %ld" , uc.cmd); + } + +kvm_vm_free (vm); +return 0 ; +}
Signature · 1 line
Vitaly
Re: [PATCH v2 6/6] KVM: selftests: Test Hyper-V extended hypercall exit to userspace
Quoted 16 lines · Vitaly Kuznetsov
tools/testing/selftests/kvm/.gitignore line 27
Quoted 8 lines · Vipin Sharma
index
082855d94c72..b17874697d74100644tools/testing/selftests/kvm/.gitignore +1
-0@@ -24,6 +24,7 @@ /x86_64/hyperv_clock /x86_64/hyperv_cpuid /x86_64/hyperv_evmcs +/x86_64/hyperv_extended_hypercallsMy personal preference would be to shorten the name to something like "
hyperv_ext_hcalls", doesn't seem to be ambiguos. No strong preference though, feel free to keep the long version.
I will keep the long one, in v1 David was suggesting it will be easier for non Hyperv developers to read and understand.
Quoted 11 lines
tools/testing/selftests/kvm/.gitignore line 30
Quoted 3 lines
tools/testing/selftests/kvm/.gitignore +3
-0+/* Hyper-V defined paravirt features */ +#define X86_FEATURE_HYPERV_EXTENDED_HYPERCALLS KVM_X86_CPU_FEATURE(0x40000003, 0, EBX, 20) +I completely forgot about my other series where I've converted the whole
hyperv_featurestest to usingKVM_X86_CPU_FEATURE():
https://lore.kernel.org/kvm/[email protected]/but your define reminded me of it, thanks! Hope the whole thing will get queued soon.
Your patches are always one step ahead of me :D
If your series doesn't show up in the KVM queue soon, I will rebase my patch series on top of your series
Quoted 5 lines
As for your change, I think it is better suited for
include/x86_64/hyperv.hinstead ofinclude/x86_64/processor.hanyway, I'm trying to keep all Hyper-V related stuff separate as Hyper-V CPUID leaves intersect with KVM's, e.g.0x40000001.
Sounds good.
Quoted 61 lines
Quoted 61 lines
tools/testing/selftests/kvm/.gitignore +0
-0/* * Same idea as X86_FEATURE_XXX, but X86_PROPERTY_XXX retrieves a multi-bit * value/property as opposed to a single-bit feature. Again, pack the infotools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +52
-0@@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Test Hyper-V extended hypercall, HV_EXT_CALL_QUERY_CAPABILITIES (0x8001), +* exit to userspace and receive result in guest. +* +* Negative tests are present in hyperv_features.c +* +* Copyright 2022 Google LLC +* Author: Vipin Sharma <[email protected]> +*/ + +#include "kvm_util.h" +#include "processor.h" +#include "hyperv.h" + +/* Any value is fine */ +#define EXT_CAPABILITIES 0xbull + +static void guest_code (vm_vaddr_t in_pg_gpa,vm_vaddr_t out_pg_gpa, +vm_vaddr_t out_pg_gva) +{ +uint64_t *output_gva; + +wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID ); +wrmsr (HV_X64_MSR_HYPERCALL , in_pg_gpa); + + output_gva = (uint64_t *)out_pg_gva; + +hyperv_hypercall (HV_EXT_CALL_QUERY_CAPABILITIES , in_pg_gpa, out_pg_gpa); + +/* TLFS states output will be a uint64_t value */ +GUEST_ASSERT_EQ (*output_gva,EXT_CAPABILITIES ); + +GUEST_DONE (); +} + +int main (void ) +{ +vm_vaddr_t hcall_out_page; +vm_vaddr_t hcall_in_page; +struct kvm_vcpu *vcpu; +struct kvm_run *run; +struct kvm_vm *vm; +uint64_t *outval; +struct ucall uc; + +/* Verify if extended hypercalls are supported */ +if (!kvm_cpuid_has (kvm_get_supported_hv_cpuid (), +X86_FEATURE_HYPERV_EXTENDED_HYPERCALLS )) { +print_skip ("Extended calls not supported by the kernel" ); +exit (KSFT_SKIP ); + }
Quoted 9 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c line 56
Quoted 4 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +4
-0+ + vm =vm_create_with_one_vcpu (&vcpu, guest_code); + run = vcpu->run; +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 );Do we need this enforcement assuming we have no plans to add 'negative' tests here (
hyperv_featuresdoes it just fine)?vcpu_set_hv_cpuid()enables everything anyway...
We do not. I will remove it.
Quoted 42 lines
Quoted 28 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +28
-0+vcpu_set_hv_cpuid (vcpu); + +/* Hypercall input */ + hcall_in_page =vm_vaddr_alloc_pages (vm,1 ); +memset (addr_gva2hva (vm, hcall_in_page),0x0 , vm->page_size); + +/* Hypercall output */ + hcall_out_page =vm_vaddr_alloc_pages (vm,1 ); +memset (addr_gva2hva (vm, hcall_out_page),0x0 , vm->page_size); + +vcpu_args_set (vcpu,3 ,addr_gva2gpa (vm, hcall_in_page), +addr_gva2gpa (vm, hcall_out_page), hcall_out_page); + +vcpu_run (vcpu); + +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_HYPERV ); + + outval =addr_gpa2hva (vm, run->hyperv.u.hcall.params[1 ]); + *outval =EXT_CAPABILITIES ; + run->hyperv.u.hcall.result =HV_STATUS_SUCCESS ; + +vcpu_run (vcpu); + +ASSERT_EXIT_REASON (vcpu,KVM_EXIT_IO ); + +switch (get_ucall (vcpu, &uc)) { +case UCALL_ABORT : +REPORT_GUEST_ASSERT_2 (uc,"arg1 = %ld, arg2 = %ld" );tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c line 94
Quoted 10 lines
tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c new file +10
-0+break ; +case UCALL_DONE : +break ; +default : +TEST_FAIL ("Unhandled ucall: %ld" , uc.cmd); + } + +kvm_vm_free (vm); +return 0 ; +}--
Vitaly