KVM: selftests: Add AMD PMU Host/Guest test
Sean Christopherson
maintainerv8 cover KVM: selftests: Add AMD PMU Host/Guest test
This is the selftests portion of the mediated PMU Host-Only/Guest-Only series. My plan is to get this into 7.2-rc1, but after the other KVM x86 pull requests have been merged by Paolo (several unpleasant conflicts across multiple branches). I'll either send a separate pull request, or see if Paolo wants to apply them directly.
v8:
- Add a kvm_is_mediated_pmu_enabled() helper.
- Drop the AMD Family check.
v7: https://lore.kernel.org/all/[email protected]
Jim Mattson (1):
KVM: selftests: Add svm_pmu_host_guest_test for Host-Only/Guest-Only
bits
Sean Christopherson (1):
KVM: selftests: Add a helper to query enable_mediated_pmu module param
Yosry Ahmed (3):
KVM: selftests: Refactor allocating guest stack into a helper
KVM: selftests: Allocate a dedicated guest page for x86 L2 guest stack
KVM: selftests: Drop L1-provided stacks for L2 guests on x86
tools/testing/selftests/kvm/Makefile.kvm | 1 + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + .../selftests/kvm/include/x86/processor.h | 10 + .../selftests/kvm/include/x86/svm_util.h | 5 +- tools/testing/selftests/kvm/include/x86/vmx.h | 4 +- .../testing/selftests/kvm/lib/x86/memstress.c | 19 +- .../testing/selftests/kvm/lib/x86/processor.c | 45 ++-- tools/testing/selftests/kvm/lib/x86/svm.c | 6 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 6 +- .../selftests/kvm/x86/aperfmperf_test.c | 9 +- .../kvm/x86/evmcs_smm_controls_test.c | 5 +- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 6 +- .../selftests/kvm/x86/hyperv_svm_test.c | 6 +- .../selftests/kvm/x86/kvm_buslock_test.c | 9 +- .../selftests/kvm/x86/nested_close_kvm_test.c | 12 +- .../selftests/kvm/x86/nested_dirty_log_test.c | 8 +- .../selftests/kvm/x86/nested_emulation_test.c | 4 +- .../kvm/x86/nested_exceptions_test.c | 9 +- .../kvm/x86/nested_invalid_cr3_test.c | 10 +- .../selftests/kvm/x86/nested_tdp_fault_test.c | 9 +- .../kvm/x86/nested_tsc_adjust_test.c | 10 +- .../kvm/x86/nested_tsc_scaling_test.c | 10 +- .../kvm/x86/nested_vmsave_vmload_test.c | 6 +- tools/testing/selftests/kvm/x86/smm_test.c | 8 +- tools/testing/selftests/kvm/x86/state_test.c | 11 +- .../selftests/kvm/x86/svm_int_ctl_test.c | 5 +- .../selftests/kvm/x86/svm_lbr_nested_state.c | 6 +- .../kvm/x86/svm_nested_clear_efer_svme.c | 7 +- .../selftests/kvm/x86/svm_nested_pat_test.c | 8 +- .../kvm/x86/svm_nested_shutdown_test.c | 5 +- .../kvm/x86/svm_nested_soft_inject_test.c | 6 +- .../selftests/kvm/x86/svm_nested_vmcb12_gpa.c | 13 +- .../kvm/x86/svm_pmu_host_guest_test.c | 215 ++++++++++++++++++ .../selftests/kvm/x86/svm_vmcall_test.c | 5 +- .../kvm/x86/triple_fault_event_test.c | 9 +- .../selftests/kvm/x86/vmx_apic_access_test.c | 5 +- .../kvm/x86/vmx_apicv_updates_test.c | 4 +- .../kvm/x86/vmx_invalid_nested_guest_state.c | 6 +- .../kvm/x86/vmx_nested_la57_state_test.c | 5 +- .../kvm/x86/vmx_preemption_timer_test.c | 5 +- 40 files changed, 323 insertions(+), 215 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c
base-commit: de3a35be92d2391ece4bf3143ef2887192625fd0
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
Sean Christopherson
maintainerPATCH v8 1/5 KVM: selftests: Refactor allocating guest stack into a helper
From: Yosry Ahmed <[email protected]>
In preparation for reusing the logic to allocate stacks for nested guests, refactoring allocating a guest stack and aligning RSP into a helper.
No functional change intended.
--- .../testing/selftests/kvm/lib/x86/processor.c | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-)
tools/testing/selftests/kvm/lib/x86/processor.c +25 -20
@@ -778,6 +778,30 @@ void assert_on_unhandled_exception(struct kvm_vcpu *vcpu)REPORT_GUEST_ASSERT (uc); } +static gva_t vm_alloc_stack (struct kvm_vm *vm,int nr_pages) +{ +int size = nr_pages *getpagesize (); +gva_t stack_gva; + + stack_gva =__vm_alloc (vm, size,DEFAULT_GUEST_STACK_VADDR_MIN ,MEM_REGION_DATA ); + stack_gva += size; + +/* +* Align stack to match calling sequence requirements in section "The +* Stack Frame" of the System V ABI AMD64 Architecture Processor +* Supplement, which requires the value (%rsp + 8) to be a multiple of +* 16 when control is transferred to the function entry point. +* +* If this code is ever used to launch a vCPU with 32-bit entry point it +* may need to subtract 4 bytes instead of 8 bytes. +*/ +TEST_ASSERT (IS_ALIGNED (stack_gva,PAGE_SIZE ), +"__vm_alloc() did not provide a page-aligned address" ); + stack_gva -=8 ; + +return stack_gva; +} +void kvm_arch_vm_post_create (struct kvm_vm *vm,unsigned int nr_vcpus) {int r;
@@ -820,27 +844,8 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, u32 vcpu_id) {struct kvm_mp_state mp_state;struct kvm_regs regs; -gva_t stack_gva;struct kvm_vcpu *vcpu; - stack_gva =__vm_alloc (vm,DEFAULT_STACK_PGS *getpagesize (), -DEFAULT_GUEST_STACK_VADDR_MIN ,MEM_REGION_DATA ); - - stack_gva +=DEFAULT_STACK_PGS *getpagesize (); - -/* -* Align stack to match calling sequence requirements in section "The -* Stack Frame" of the System V ABI AMD64 Architecture Processor -* Supplement, which requires the value (%rsp + 8) to be a multiple of -* 16 when control is transferred to the function entry point. -* -* If this code is ever used to launch a vCPU with 32-bit entry point it -* may need to subtract 4 bytes instead of 8 bytes. -*/ -TEST_ASSERT (IS_ALIGNED (stack_gva,PAGE_SIZE ), -"__vm_alloc() did not provide a page-aligned address" ); - stack_gva -=8 ; - vcpu =__vm_vcpu_add (vm, vcpu_id);vcpu_init_cpuid (vcpu,kvm_get_supported_cpuid ());vcpu_init_sregs (vm, vcpu);
@@ -849,7 +854,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, u32 vcpu_id)/* Setup guest general purpose registers */ vcpu_regs_get (vcpu, ®s); regs.rflags = regs.rflags |X86_EFLAGS_FIXED ; - regs.rsp = stack_gva; + regs.rsp =vm_alloc_stack (vm,DEFAULT_STACK_PGS );vcpu_regs_set (vcpu, ®s);/* Setup the MP state */
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
Sean Christopherson
maintainerPATCH v8 2/5 KVM: selftests: Allocate a dedicated guest page for x86 L2 guest stack
In reply to Sean ChristophersonFrom: Yosry Ahmed <[email protected]>
Instead of relying on the L1-provided stack for L2, which is usually an array on L1's own stack, allocate a dedicated page of VM memory for the L2 stack in vcpu_alloc_{vmx/svm}() and use that as L2's RSP in the VMCS/VMCB instead of the L1-provided value.
Most L1 guest code does not do anything with the L2 stack other than stuff it in RSP, so this change is transparent and the L1-provided stack is silently ignored. The only exception is memstress nested L1 code which puts the vCPU index on L2's stack, so update this code to use the newly allocated stack.
L1-provided stacks will be dropped and cleaned up separately.
--- tools/testing/selftests/kvm/include/x86/processor.h | 2 ++ tools/testing/selftests/kvm/include/x86/svm_util.h | 3 +++ tools/testing/selftests/kvm/include/x86/vmx.h | 2 ++ tools/testing/selftests/kvm/lib/x86/memstress.c | 5 ++--- tools/testing/selftests/kvm/lib/x86/processor.c | 2 +- tools/testing/selftests/kvm/lib/x86/svm.c | 4 +++- tools/testing/selftests/kvm/lib/x86/vmx.c | 4 +++- 7 files changed, 16 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/include/x86/processor.h +2 -0
@@ -1226,6 +1226,8 @@ struct idt_entry {void vm_install_exception_handler (struct kvm_vm *vm,int vector,void (*handler)(struct ex_regs *)); +gva_t vm_alloc_stack (struct kvm_vm *vm,int nr_pages); +/* * Exception fixup morphs #DE to an arbitrary magic vector so that '0' can be * used to signal "no expcetion".
tools/testing/selftests/kvm/include/x86/svm_util.h +3 -0
@@ -28,6 +28,9 @@ struct svm_test_data {void *msr_hva;u64 msr_gpa; +/* Stack */ +void *stack;/* gva */ +/* NPT */ u64 ncr3_gpa; };
tools/testing/selftests/kvm/include/x86/vmx.h +2 -0
@@ -524,6 +524,8 @@ struct vmx_pages {u64 apic_access_gpa;void *apic_access; +void *stack; +u64 eptp_gpa; };
tools/testing/selftests/kvm/lib/x86/memstress.c +2 -3
@@ -43,7 +43,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 vcpu_id)GUEST_ASSERT (ept_1g_pages_supported ()); rsp = &l2_guest_stack[L2_GUEST_STACK_SIZE -1 ]; - *rsp = vcpu_id; + *(u64 *)vmx->stack = vcpu_id;prepare_vmcs (vmx, memstress_l2_guest_entry, rsp);GUEST_ASSERT (!vmlaunch ());
@@ -56,9 +56,8 @@ static void l1_svm_code(struct svm_test_data *svm, u64 vcpu_id)unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];unsigned long *rsp; - rsp = &l2_guest_stack[L2_GUEST_STACK_SIZE -1 ]; - *rsp = vcpu_id; + *(u64 *)svm->stack = vcpu_id;generic_svm_setup (svm, memstress_l2_guest_entry, rsp);run_guest (svm->vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/lib/x86/processor.c +1 -1
@@ -778,7 +778,7 @@ void assert_on_unhandled_exception(struct kvm_vcpu *vcpu)REPORT_GUEST_ASSERT (uc); } -static gva_t vm_alloc_stack (struct kvm_vm *vm,int nr_pages) +gva_t vm_alloc_stack (struct kvm_vm *vm,int nr_pages) {int size = nr_pages *getpagesize ();gva_t stack_gva;
tools/testing/selftests/kvm/lib/x86/svm.c +3 -1
@@ -46,6 +46,8 @@ vcpu_alloc_svm(struct kvm_vm *vm, gva_t *p_svm_gva) svm->msr_gpa =addr_gva2gpa (vm, (uintptr_t )svm->msr);memset (svm->msr_hva,0 ,getpagesize ()); + svm->stack = (void *)vm_alloc_stack (vm,1 ); +if (vm->stage2_mmu.pgd_created) svm->ncr3_gpa = vm->stage2_mmu.pgd;
@@ -122,7 +124,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_r ctrl->msrpm_base_pa = svm->msr_gpa; vmcb->save.rip = (u64 )guest_rip; - vmcb->save.rsp = (u64 )guest_rsp; + vmcb->save.rsp = (u64 )svm->stack; guest_regs.rdi = (u64 )svm;if (svm->ncr3_gpa) {
tools/testing/selftests/kvm/lib/x86/vmx.c +3 -1
@@ -116,6 +116,8 @@ vcpu_alloc_vmx(struct kvm_vm *vm, gva_t *p_vmx_gva) vmx->vmwrite_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vmwrite);memset (vmx->vmwrite_hva,0 ,getpagesize ()); + vmx->stack = (void *)vm_alloc_stack (vm,1 ); +if (vm->stage2_mmu.pgd_created) vmx->eptp_gpa = vm->stage2_mmu.pgd;
@@ -370,7 +372,7 @@ void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp) {init_vmcs_control_fields (vmx);init_vmcs_host_state (); -init_vmcs_guest_state (guest_rip, guest_rsp); +init_vmcs_guest_state (guest_rip, vmx->stack); }bool kvm_cpu_has_ept (void )
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
Sean Christopherson
maintainerPATCH v8 3/5 KVM: selftests: Drop L1-provided stacks for L2 guests on x86
In reply to Sean ChristophersonFrom: Yosry Ahmed <[email protected]>
Now that a dedicated page is allocated for L2's stack and stuffed in RSP, the L1-provided stack is unused. Drop the stacks allocated by L1 guest code for L2 in all x86 tests.
--- tools/testing/selftests/kvm/include/x86/svm_util.h | 2 +- tools/testing/selftests/kvm/include/x86/vmx.h | 2 +- tools/testing/selftests/kvm/lib/x86/memstress.c | 14 ++------------ tools/testing/selftests/kvm/lib/x86/svm.c | 2 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 2 +- tools/testing/selftests/kvm/x86/aperfmperf_test.c | 9 ++------- .../selftests/kvm/x86/evmcs_smm_controls_test.c | 5 +---- tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 6 +----- tools/testing/selftests/kvm/x86/hyperv_svm_test.c | 6 +----- tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 9 ++------- .../selftests/kvm/x86/nested_close_kvm_test.c | 12 ++---------- .../selftests/kvm/x86/nested_dirty_log_test.c | 8 ++------ .../selftests/kvm/x86/nested_emulation_test.c | 4 ++-- .../selftests/kvm/x86/nested_exceptions_test.c | 9 ++------- .../selftests/kvm/x86/nested_invalid_cr3_test.c | 10 ++-------- .../selftests/kvm/x86/nested_tdp_fault_test.c | 9 ++------- .../selftests/kvm/x86/nested_tsc_adjust_test.c | 10 ++-------- .../selftests/kvm/x86/nested_tsc_scaling_test.c | 10 ++-------- .../selftests/kvm/x86/nested_vmsave_vmload_test.c | 6 +----- tools/testing/selftests/kvm/x86/smm_test.c | 8 ++------ tools/testing/selftests/kvm/x86/state_test.c | 11 ++--------- tools/testing/selftests/kvm/x86/svm_int_ctl_test.c | 5 +---- .../selftests/kvm/x86/svm_lbr_nested_state.c | 6 +----- .../selftests/kvm/x86/svm_nested_clear_efer_svme.c | 7 +------ .../selftests/kvm/x86/svm_nested_pat_test.c | 8 ++------ .../selftests/kvm/x86/svm_nested_shutdown_test.c | 5 +---- .../kvm/x86/svm_nested_soft_inject_test.c | 6 +----- .../selftests/kvm/x86/svm_nested_vmcb12_gpa.c | 13 ++++--------- tools/testing/selftests/kvm/x86/svm_vmcall_test.c | 5 +---- .../selftests/kvm/x86/triple_fault_event_test.c | 9 ++------- .../selftests/kvm/x86/vmx_apic_access_test.c | 5 +---- .../selftests/kvm/x86/vmx_apicv_updates_test.c | 4 +--- .../kvm/x86/vmx_invalid_nested_guest_state.c | 6 +----- .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 5 +---- .../selftests/kvm/x86/vmx_preemption_timer_test.c | 5 +---- 35 files changed, 53 insertions(+), 190 deletions(-)
tools/testing/selftests/kvm/include/x86/svm_util.h +1 -1
@@ -60,7 +60,7 @@ static inline void vmmcall(void) )struct svm_test_data *vcpu_alloc_svm (struct kvm_vm *vm,gva_t *p_svm_gva); -void generic_svm_setup (struct svm_test_data *svm,void *guest_rip,void *guest_rsp); +void generic_svm_setup (struct svm_test_data *svm,void *guest_rip);void run_guest (struct vmcb *vmcb,u64 vmcb_gpa);static inline bool kvm_cpu_has_npt (void )
tools/testing/selftests/kvm/include/x86/vmx.h +1 -1
@@ -554,7 +554,7 @@ union vmx_ctrl_msr {struct vmx_pages *vcpu_alloc_vmx (struct kvm_vm *vm,gva_t *p_vmx_gva);bool prepare_for_vmx_operation (struct vmx_pages *vmx); -void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip,void *guest_rsp); +void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip);bool load_vmcs (struct vmx_pages *vmx);bool ept_1g_pages_supported (void );
tools/testing/selftests/kvm/lib/x86/memstress.c +2 -12
@@ -30,21 +30,15 @@ __asm__(" ud2;" ); -#define L2_GUEST_STACK_SIZE 64 -static void l1_vmx_code (struct vmx_pages *vmx,u64 vcpu_id) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -unsigned long *rsp; -GUEST_ASSERT (vmx->vmcs_gpa);GUEST_ASSERT (prepare_for_vmx_operation (vmx));GUEST_ASSERT (load_vmcs (vmx));GUEST_ASSERT (ept_1g_pages_supported ()); - rsp = &l2_guest_stack[L2_GUEST_STACK_SIZE -1 ]; *(u64 *)vmx->stack = vcpu_id; -prepare_vmcs (vmx, memstress_l2_guest_entry, rsp); +prepare_vmcs (vmx, memstress_l2_guest_entry);GUEST_ASSERT (!vmlaunch ());GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_VMCALL );
@@ -53,12 +47,8 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 vcpu_id)static void l1_svm_code (struct svm_test_data *svm,u64 vcpu_id) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -unsigned long *rsp; - - rsp = &l2_guest_stack[L2_GUEST_STACK_SIZE -1 ]; *(u64 *)svm->stack = vcpu_id; -generic_svm_setup (svm, memstress_l2_guest_entry, rsp); +generic_svm_setup (svm, memstress_l2_guest_entry);run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT_EQ (svm->vmcb->control.exit_code,SVM_EXIT_VMMCALL );
tools/testing/selftests/kvm/lib/x86/svm.c +1 -1
@@ -83,7 +83,7 @@ void vm_enable_npt(struct kvm_vm *vm)tdp_mmu_init (vm, vm->mmu.pgtable_levels, &pte_masks); } -void generic_svm_setup (struct svm_test_data *svm,void *guest_rip,void *guest_rsp) +void generic_svm_setup (struct svm_test_data *svm,void *guest_rip) {struct vmcb *vmcb = svm->vmcb;u64 vmcb_gpa = svm->vmcb_gpa;
tools/testing/selftests/kvm/lib/x86/vmx.c +1 -1
@@ -368,7 +368,7 @@ static inline void init_vmcs_guest_state(void *rip, void *rsp)vmwrite (GUEST_SYSENTER_EIP ,vmreadz (HOST_IA32_SYSENTER_EIP )); } -void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip,void *guest_rsp) +void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip) {init_vmcs_control_fields (vmx);init_vmcs_host_state ();
tools/testing/selftests/kvm/x86/aperfmperf_test.c +2 -7
@@ -54,8 +54,6 @@ static void guest_read_aperf_mperf(void)GUEST_SYNC2 (rdmsr (MSR_IA32_APERF ),rdmsr (MSR_IA32_MPERF )); } -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code (void ) {guest_read_aperf_mperf ();
@@ -64,21 +62,18 @@ static void l2_guest_code(void)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb; -generic_svm_setup (svm, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);run_guest (vmcb, svm->vmcb_gpa); }static void l1_vmx_code (struct vmx_pages *vmx) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true);GUEST_ASSERT_EQ (load_vmcs (vmx), true); -prepare_vmcs (vmx,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx,NULL );/* * Enable MSR bitmaps (the bitmap itself is allocated, zeroed, and set
tools/testing/selftests/kvm/x86/evmcs_smm_controls_test.c +1 -4
@@ -52,8 +52,6 @@ static void l2_guest_code(void)static void guest_code (struct vmx_pages *vmx_pages,struct hyperv_test_pages *hv_pages) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];/* Set up Hyper-V enlightenments and eVMCS */ wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID );
@@ -62,8 +60,7 @@ static void guest_code(struct vmx_pages *vmx_pages,GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_evmcs (hv_pages)); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);GUEST_ASSERT (!vmlaunch ());
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +1 -5
@@ -78,9 +78,6 @@ void l2_guest_code(void)void guest_code (struct vmx_pages *vmx_pages,struct hyperv_test_pages *hv_pages,gpa_t hv_hcall_page_gpa) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -wrmsr (HV_X64_MSR_GUEST_OS_ID ,HYPERV_LINUX_OS_ID );wrmsr (HV_X64_MSR_HYPERCALL , hv_hcall_page_gpa);
@@ -100,8 +97,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_SYNC (4 );GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);GUEST_SYNC (5 );GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa);
tools/testing/selftests/kvm/x86/hyperv_svm_test.c +1 -5
@@ -18,8 +18,6 @@#include "svm_util.h" #include "hyperv.h" -#define L2_GUEST_STACK_SIZE 256 -/* Exit to L1 from L2 with RDMSR instruction */ static inline void rdmsr_from_l2 (u32 msr) {
@@ -69,7 +67,6 @@ static void __attribute__((__flatten__)) guest_code(struct svm_test_data *svm, struct hyperv_test_pages *hv_pages, gpa_t pgs_gpa) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments;
@@ -81,8 +78,7 @@ static void __attribute__((__flatten__)) guest_code(struct svm_test_data *svm,GUEST_ASSERT (svm->vmcb_gpa);/* Prepare for L2 execution. */ -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);/* L2 TLB flush setup */ hve->partition_assist_page = hv_pages->partition_assist_gpa;
tools/testing/selftests/kvm/x86/kvm_buslock_test.c +2 -7
@@ -26,8 +26,6 @@ static void guest_generate_buslocks(void)atomic_inc (val); } -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code (void ) {guest_generate_buslocks ();
@@ -36,21 +34,18 @@ static void l2_guest_code(void)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb; -generic_svm_setup (svm, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);run_guest (vmcb, svm->vmcb_gpa); }static void l1_vmx_code (struct vmx_pages *vmx) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true);GUEST_ASSERT_EQ (load_vmcs (vmx), true); -prepare_vmcs (vmx,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx,NULL );GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code));GUEST_ASSERT (!vmlaunch ());
tools/testing/selftests/kvm/x86/nested_close_kvm_test.c +2 -10
@@ -21,8 +21,6 @@ enum { PORT_L0_EXIT = 0x2000, }; -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code (void ) {/* Exit to L0 */
@@ -32,14 +30,11 @@ static void l2_guest_code(void)static void l1_vmx_code (struct vmx_pages *vmx_pages) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */ -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);GUEST_ASSERT (!vmlaunch ());GUEST_ASSERT (0 );
@@ -47,11 +42,8 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -/* Prepare the VMCB for L2 execution. */ -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT (0 );
tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +2 -6
@@ -40,8 +40,6 @@#define TEST_HVA (vm, idx) addr_gpa2hva(vm, TEST_GPA(idx)) -#define L2_GUEST_STACK_SIZE 64 -/* Use the page offset bits to communicate the access+fault type. */ #define TEST_SYNC_READ_FAULT BIT(0)#define TEST_SYNC_WRITE_FAULT BIT(1)
@@ -92,7 +90,6 @@ static void l2_guest_code_tdp_disabled(void)void l1_vmx_code (struct vmx_pages *vmx) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];void *l2_rip;GUEST_ASSERT (vmx->vmcs_gpa);
@@ -104,7 +101,7 @@ void l1_vmx_code(struct vmx_pages *vmx)else l2_rip = l2_guest_code_tdp_disabled; -prepare_vmcs (vmx, l2_rip, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx, l2_rip);GUEST_SYNC (TEST_SYNC_NO_FAULT );GUEST_ASSERT (!vmlaunch ());
@@ -115,7 +112,6 @@ void l1_vmx_code(struct vmx_pages *vmx)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];void *l2_rip;if (svm->ncr3_gpa)
@@ -123,7 +119,7 @@ static void l1_svm_code(struct svm_test_data *svm)else l2_rip = l2_guest_code_tdp_disabled; -generic_svm_setup (svm, l2_rip, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_rip);GUEST_SYNC (TEST_SYNC_NO_FAULT );run_guest (svm->vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/x86/nested_emulation_test.c +2 -2
@@ -57,7 +57,7 @@ static void guest_code(void *test_data)struct svm_test_data *svm = test_data;struct vmcb *vmcb = svm->vmcb; -generic_svm_setup (svm,NULL ,NULL ); +generic_svm_setup (svm,NULL ); vmcb->save.idtr.limit =0 ; vmcb->save.rip = (u64 )l2_guest_code;
@@ -69,7 +69,7 @@ static void guest_code(void *test_data)GUEST_ASSERT (prepare_for_vmx_operation (test_data));GUEST_ASSERT (load_vmcs (test_data)); -prepare_vmcs (test_data,NULL ,NULL ); +prepare_vmcs (test_data,NULL );GUEST_ASSERT (!vmwrite (GUEST_IDTR_LIMIT ,0 ));GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code));GUEST_ASSERT (!vmwrite (EXCEPTION_BITMAP ,0 ));
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +2 -7
@@ -5,8 +5,6 @@#include "vmx.h" #include "svm_util.h" -#define L2_GUEST_STACK_SIZE 256 -/* * Arbitrary, never shoved into KVM/hardware, just need to avoid conflict with * the "real" exceptions used, #SS/#GP/#DF (12/13/8).
@@ -91,9 +89,8 @@ static void svm_run_l2(struct svm_test_data *svm, void *l2_code, int vector,static void l1_svm_code (struct svm_test_data *svm) {struct vmcb_control_area *ctrl = &svm->vmcb->control; -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -generic_svm_setup (svm,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm,NULL ); svm->vmcb->save.idtr.limit =0 ; ctrl->intercept |=BIT_ULL (INTERCEPT_SHUTDOWN );
@@ -128,13 +125,11 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code)static void l1_vmx_code (struct vmx_pages *vmx) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true);GUEST_ASSERT_EQ (load_vmcs (vmx), true); -prepare_vmcs (vmx,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx,NULL );GUEST_ASSERT_EQ (vmwrite (GUEST_IDTR_LIMIT ,0 ),0 );/*
tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c +2 -8
@@ -11,8 +11,6 @@#include "kselftest.h" -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code (void ) {vmcall ();
@@ -20,11 +18,9 @@ static void l2_guest_code(void)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];uintptr_t save_cr3; -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);/* Try to run L2 with invalid CR3 and make sure it fails */ save_cr3 = svm->vmcb->save.cr3;
@@ -42,14 +38,12 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx_pages) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];uintptr_t save_cr3;GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages)); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);/* Try to run L2 with invalid CR3 and make sure it fails */ save_cr3 =vmreadz (GUEST_CR3 );
tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c +2 -7
@@ -9,8 +9,6 @@#include "svm_util.h" #include "vmx.h" -#define L2_GUEST_STACK_SIZE 64 -enum test_type {TEST_FINAL_PAGE_UNMAPPED ,/* Final data page not present */ TEST_PT_PAGE_UNMAPPED ,/* Page table page not present */
@@ -54,14 +52,13 @@ static void l2_guest_code_ins(void)static void l1_vmx_code (struct vmx_pages *vmx,u64 expected_fault_gpa,u64 test_type) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u64 exit_qual;GUEST_ASSERT (vmx->vmcs_gpa);GUEST_ASSERT (prepare_for_vmx_operation (vmx));GUEST_ASSERT (load_vmcs (vmx)); -prepare_vmcs (vmx, l2_entry, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx, l2_entry);GUEST_ASSERT (!vmlaunch ());
@@ -120,12 +117,10 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 expected_fault_gpa,static void l1_svm_code (struct svm_test_data *svm,u64 expected_fault_gpa,u64 test_type) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;u64 exit_info_1; -generic_svm_setup (svm, l2_entry, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_entry);run_guest (vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c +2 -8
@@ -34,8 +34,6 @@#define TSC_ADJUST_VALUE (1ll << 32)#define TSC_OFFSET_VALUE -(1ll << 48) -#define L2_GUEST_STACK_SIZE 64 -enum {PORT_ABORT =0x1000 ,PORT_REPORT ,
@@ -75,8 +73,6 @@ static void l2_guest_code(void)static void l1_guest_code (void *data) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -/* Set TSC from L1 and make sure TSC_ADJUST is updated correctly */ GUEST_ASSERT (rdtsc () <TSC_ADJUST_VALUE );wrmsr (MSR_IA32_TSC ,rdtsc () -TSC_ADJUST_VALUE );
@@ -93,8 +89,7 @@ static void l1_guest_code(void *data)GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages)); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code); control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_USE_MSR_BITMAPS |CPU_BASED_USE_TSC_OFFSETTING ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);
@@ -105,8 +100,7 @@ static void l1_guest_code(void *data) }else {struct svm_test_data *svm = data; -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code); svm->vmcb->control.tsc_offset =TSC_OFFSET_VALUE ;run_guest (svm->vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c +2 -8
@@ -22,8 +22,6 @@#define TSC_OFFSET_L2 ((u64)-33125236320908)#define TSC_MULTIPLIER_L2 (L2_SCALE_FACTOR << 48) -#define L2_GUEST_STACK_SIZE 64 -enum {USLEEP ,UCHECK_L1 ,UCHECK_L2 };#define GUEST_SLEEP (sec) ucall(UCALL_SYNC, 2, USLEEP, sec)#define GUEST_CHECK (level, freq) ucall(UCALL_SYNC, 2, level, freq)
@@ -82,13 +80,10 @@ static void l2_guest_code(void)static void l1_svm_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -/* check that L1's frequency looks alright before launching L2 */ check_tsc_freq (UCHECK_L1 ); -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);/* enable TSC scaling for L2 */ wrmsr (MSR_AMD64_TSC_RATIO ,L2_SCALE_FACTOR <<32 );
@@ -105,7 +100,6 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx_pages) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u32 control;/* check that L1's frequency looks alright before launching L2 */
@@ -115,7 +109,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (load_vmcs (vmx_pages));/* prepare the VMCS for L2 execution */ -prepare_vmcs (vmx_pages, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);/* enable TSC offsetting and TSC scaling for L2 */ control =vmreadz (CPU_BASED_VM_EXEC_CONTROL );
tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c +1 -5
@@ -28,8 +28,6 @@#define TEST_VMCB_L2_GPA TEST_VMCB_L1_GPA(0) -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code_vmsave (void ) { asmvolatile ("vmsave %0" : :"a" (TEST_VMCB_L2_GPA ) :"memory" );
@@ -70,10 +68,8 @@ static void l2_guest_code_vmcb1(void)static void l1_guest_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -/* Each test case initializes the guest RIP below */ -generic_svm_setup (svm,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm,NULL );/* Set VMSAVE/VMLOAD intercepts and make sure they work with.. */ svm->vmcb->control.intercept |= (BIT_ULL(INTERCEPT_VMSAVE) |
tools/testing/selftests/kvm/x86/smm_test.c +2 -6
@@ -63,8 +63,6 @@ static void l2_guest_code(void)static void guest_code (void *arg) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u64 apicbase =rdmsr (MSR_IA32_APICBASE );struct svm_test_data *svm = arg;struct vmx_pages *vmx_pages = arg;
@@ -81,13 +79,11 @@ static void guest_code(void *arg)if (arg) {if (this_cpu_has (X86_FEATURE_SVM )) { -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code); }else {GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages)); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code); }sync_with_host (5 );
tools/testing/selftests/kvm/x86/state_test.c +2 -9
@@ -19,8 +19,6 @@#include "vmx.h" #include "svm_util.h" -#define L2_GUEST_STACK_SIZE 256 -void svm_l2_guest_code (void ) {GUEST_SYNC (4 );
@@ -35,13 +33,11 @@ void svm_l2_guest_code(void)static void svm_l1_guest_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;GUEST_ASSERT (svm->vmcb_gpa);/* Prepare for L2 execution. */ -generic_svm_setup (svm, svm_l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, svm_l2_guest_code); vmcb->control.int_ctl |= (V_GIF_ENABLE_MASK |V_GIF_MASK );
@@ -78,8 +74,6 @@ void vmx_l2_guest_code(void)static void vmx_l1_guest_code (struct vmx_pages *vmx_pages) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT (vmx_pages->vmcs_gpa);GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_SYNC (3 );
@@ -89,8 +83,7 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_SYNC (4 );GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); -prepare_vmcs (vmx_pages, vmx_l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, vmx_l2_guest_code);GUEST_SYNC (5 );GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa);
tools/testing/selftests/kvm/x86/svm_int_ctl_test.c +1 -4
@@ -54,15 +54,12 @@ static void l2_guest_code(struct svm_test_data *svm)static void l1_guest_code (struct svm_test_data *svm) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;x2apic_enable ();/* Prepare for L2 execution. */ -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);/* No virtual interrupt masking */ vmcb->control.int_ctl &= ~V_INTR_MASKING_MASK ;
tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c +1 -5
@@ -9,8 +9,6 @@#include "svm_util.h" -#define L2_GUEST_STACK_SIZE 64 -#define DO_BRANCH () do { asm volatile("jmp 1f\n 1: nop"); } while (0)struct lbr_branch {
@@ -55,7 +53,6 @@ static void l2_guest_code(struct svm_test_data *svm)static void l1_guest_code (struct svm_test_data *svm,bool nested_lbrv) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;struct lbr_branch l1_branch;
@@ -65,8 +62,7 @@ static void l1_guest_code(struct svm_test_data *svm, bool nested_lbrv)CHECK_BRANCH_MSRS (&l1_branch);/* Run L2, which will also do the same */ -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);if (nested_lbrv) vmcb->control.misc_ctl2 =SVM_MISC2_ENABLE_V_LBR ;
tools/testing/selftests/kvm/x86/svm_nested_clear_efer_svme.c +1 -6
@@ -8,8 +8,6 @@#include "kselftest.h" -#define L2_GUEST_STACK_SIZE 64 -static void l2_guest_code (void ) {unsigned long efer =rdmsr (MSR_EFER );
@@ -24,10 +22,7 @@ static void l2_guest_code(void)static void l1_guest_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; - -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);run_guest (svm->vmcb, svm->vmcb_gpa);/* Unreachable, L1 should be shutdown */
tools/testing/selftests/kvm/x86/svm_nested_pat_test.c +2 -6
@@ -25,8 +25,6 @@#include "processor.h" #include "svm_util.h" -#define L2_GUEST_STACK_SIZE 256 -#define PAT_DEFAULT 0x0007040600070406ULL#define L1_PAT_VALUE 0x0007040600070404ULL/* Change PA0 to WT */ #define L2_VMCB12_PAT 0x0606060606060606ULL/* All WB */
@@ -59,14 +57,13 @@ static void l2_guest_code(void)static void l1_guest_code (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;int i;wrmsr (MSR_IA32_CR_PAT ,L1_PAT_VALUE );GUEST_ASSERT_EQ (rdmsr (MSR_IA32_CR_PAT ),L1_PAT_VALUE ); -generic_svm_setup (svm, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code); vmcb->save.g_pat =L2_VMCB12_PAT ; vmcb->control.intercept &= ~(1ULL <<INTERCEPT_MSR_PROT );
@@ -94,11 +91,10 @@ static void l1_guest_code(struct svm_test_data *svm)static void l1_guest_code_invalid_gpat (struct svm_test_data *svm) { -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;/* VMRUN should fail without running L2 */ -generic_svm_setup (svm,NULL , &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm,NULL ); vmcb->save.g_pat =INVALID_PAT_VALUE ;run_guest (vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/x86/svm_nested_shutdown_test.c +1 -4
@@ -19,12 +19,9 @@ static void l2_guest_code(struct svm_test_data *svm)static void l1_guest_code (struct svm_test_data *svm,struct idt_entry *idt) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb; -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code); vmcb->control.intercept &= ~(BIT (INTERCEPT_SHUTDOWN ));
tools/testing/selftests/kvm/x86/svm_nested_soft_inject_test.c +1 -5
@@ -78,17 +78,13 @@ static void l2_guest_code_nmi(void)static void l1_guest_code (struct svm_test_data *svm,u64 is_nmi,u64 idt_alt) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;if (is_nmi)x2apic_enable ();/* Prepare for L2 execution. */ -generic_svm_setup (svm, - is_nmi ? l2_guest_code_nmi : l2_guest_code_int, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, is_nmi ? l2_guest_code_nmi : l2_guest_code_int); vmcb->control.intercept_exceptions |=BIT (PF_VECTOR ) |BIT (UD_VECTOR ); vmcb->control.intercept |=BIT (INTERCEPT_NMI ) |BIT (INTERCEPT_HLT );
tools/testing/selftests/kvm/x86/svm_nested_vmcb12_gpa.c +4 -9
@@ -9,14 +9,9 @@#include "kvm_test_harness.h" #include "test_util.h" - -#define L2_GUEST_STACK_SIZE 64 -#define SYNC_GP 101#define SYNC_L2_STARTED 102 -static unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -static void guest_gp_handler (struct ex_regs *regs) {GUEST_SYNC (SYNC_GP );
@@ -30,28 +25,28 @@ static void l2_code(void)static void l1_vmrun (struct svm_test_data *svm,gpa_t gpa) { -generic_svm_setup (svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_code); asmvolatile ("vmrun %[gpa]" : : [gpa]"a" (gpa) :"memory" ); }static void l1_vmload (struct svm_test_data *svm,gpa_t gpa) { -generic_svm_setup (svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_code); asmvolatile ("vmload %[gpa]" : : [gpa]"a" (gpa) :"memory" ); }static void l1_vmsave (struct svm_test_data *svm,gpa_t gpa) { -generic_svm_setup (svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_code); asmvolatile ("vmsave %[gpa]" : : [gpa]"a" (gpa) :"memory" ); }static void l1_vmexit (struct svm_test_data *svm,gpa_t gpa) { -generic_svm_setup (svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_code);run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT (svm->vmcb->control.exit_code ==SVM_EXIT_VMMCALL );
tools/testing/selftests/kvm/x86/svm_vmcall_test.c +1 -4
@@ -19,13 +19,10 @@ static void l2_guest_code(struct svm_test_data *svm)static void l1_guest_code (struct svm_test_data *svm) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];struct vmcb *vmcb = svm->vmcb;/* Prepare for L2 execution. */ -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);run_guest (vmcb, svm->vmcb_gpa);
tools/testing/selftests/kvm/x86/triple_fault_event_test.c +2 -7
@@ -21,9 +21,6 @@ static void l2_guest_code(void) : : [port] "d" (ARBITRARY_IO_PORT) : "rax"); } -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -void l1_guest_code_vmx (struct vmx_pages *vmx) {
@@ -31,8 +28,7 @@ void l1_guest_code_vmx(struct vmx_pages *vmx)GUEST_ASSERT (prepare_for_vmx_operation (vmx));GUEST_ASSERT (load_vmcs (vmx)); -prepare_vmcs (vmx, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx, l2_guest_code);GUEST_ASSERT (!vmlaunch ());/* L2 should triple fault after a triple fault event injected. */
@@ -44,8 +40,7 @@ void l1_guest_code_svm(struct svm_test_data *svm) {struct vmcb *vmcb = svm->vmcb; -generic_svm_setup (svm, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +generic_svm_setup (svm, l2_guest_code);/* don't intercept shutdown to test the case of SVM allowing to do so */ vmcb->control.intercept &= ~(BIT (INTERCEPT_SHUTDOWN ));
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c +1 -4
@@ -36,16 +36,13 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages,unsigned long high_gpa) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u32 control;GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */ -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code); control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);
tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c +1 -3
@@ -31,15 +31,13 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u32 control;GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */ -prepare_vmcs (vmx_pages, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code); control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_USE_MSR_BITMAPS ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c +1 -5
@@ -25,15 +25,11 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ]; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */ -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);/* * L2 must be run without unrestricted guest, verify that the selftests
tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +1 -4
@@ -27,8 +27,6 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u64 guest_cr4;gpa_t pml5_pa, pml4_pa;u64 *pml5;
@@ -42,8 +40,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages)); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);/* * Set up L2 with a 4-level page table by pointing its CR3 to
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +1 -4
@@ -66,8 +66,6 @@ void l2_guest_code(void)void l1_guest_code (struct vmx_pages *vmx_pages) { -#define L2_GUEST_STACK_SIZE 64 -unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE ];u64 l1_vmx_pt_start;u64 l1_vmx_pt_finish;u64 l1_tsc_deadline, l2_tsc_deadline;
@@ -77,8 +75,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (load_vmcs (vmx_pages));GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); -prepare_vmcs (vmx_pages, l2_guest_code, - &l2_guest_stack[L2_GUEST_STACK_SIZE ]); +prepare_vmcs (vmx_pages, l2_guest_code);/* * Check for Preemption timer support
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
Sean Christopherson
maintainerPATCH v8 4/5 KVM: selftests: Add a helper to query enable_mediated_pmu module param
In reply to Sean ChristophersonAdd a utility to check whether or not the mediated PMU is enabled, pivoting on Intel vs. AMD since the module param is defined by vendor code.
--- tools/testing/selftests/kvm/include/x86/processor.h | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/testing/selftests/kvm/include/x86/processor.h +8 -0
@@ -1394,6 +1394,14 @@ static inline bool kvm_is_pmu_enabled(void)return get_kvm_param_bool ("enable_pmu" ); } +static inline bool kvm_is_mediated_pmu_enabled (void ) +{ +if (host_cpu_is_intel) +return get_kvm_intel_param_bool ("enable_mediated_pmu" ); + +return get_kvm_amd_param_bool ("enable_mediated_pmu" ); +} +static inline bool kvm_is_forced_emulation_enabled (void ) {return !!get_kvm_param_integer ("force_emulation_prefix" );
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
[email protected]
AI reviewRe: [PATCH v8 4/5] KVM: selftests: Add a helper to query enable_mediated_pmu module param
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] kvm_is_mediated_pmu_enabled() incorrectly queries the kvm_amd module on Centaur and Zhaoxin…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] kvm_is_mediated_pmu_enabled() incorrectly queries the kvm_amd module on Centaur and Zhaoxin CPUs, causing tests to needlessly skip. --
commit f89432ff2f99beb9b018032f8161522a25f18627
Author: Sean Christopherson <[email protected]>
KVM: selftests: Add a helper to query enable_mediated_pmu module param
This commit adds a utility function to check if the mediated PMU is enabled by querying the vendor-specific KVM module parameter.
Quoted 3 lines
tools/testing/selftests/kvm/include/x86/processor.h +0
-0
[ ... ]
tools/testing/selftests/kvm/include/x86/processor.h static inline bool kvm_is_pmu_enabled(void) · line 1402
Quoted 6 lines
tools/testing/selftests/kvm/include/x86/processor.h +6
-0+static inline bool kvm_is_mediated_pmu_enabled (void ) +{ +if (host_cpu_is_intel) +return get_kvm_intel_param_bool ("enable_mediated_pmu" ); + +return get_kvm_amd_param_bool ("enable_mediated_pmu" );
[Severity: Medium]
Will this cause tests to needlessly skip on Centaur and Zhaoxin CPUs?
Since host_cpu_is_intel only evaluates to true for GenuineIntel CPUs, VMX-compatible CPUs like Centaur and Zhaoxin will fall through and call get_kvm_amd_param_bool("enable_mediated_pmu").
Because those platforms use the kvm_intel module, querying the kvm_amd parameters will result in a missing file (ENOENT), which aborts the execution with a ksft_exit_skip().
Would it be safer to pivot on host_cpu_is_amd_compatible to check AMD, and then fall back to Intel for everything else?
Quoted 4 lines
tools/testing/selftests/kvm/include/x86/processor.h +2
-0+} +static inline bool kvm_is_forced_emulation_enabled (void ) {
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Sean Christopherson
maintainerPATCH v8 5/5 KVM: selftests: Add svm_pmu_host_guest_test for Host-Only/Guest-Only bits
In reply to Sean ChristophersonFrom: Jim Mattson <[email protected]>
Add a selftest to verify KVM correctly virtualizes the AMD PMU Host-Only (bit 41) and Guest-Only (bit 40) event selector bits across all relevant SVM state transitions.
The test programs 4 PMCs simultaneously with all combinations of the Host-Only and Guest-Only bits, then verifies correct counting behavior with EFER.SVME clear and set, as well as in host mode and guest mode. The test also verifies that updating Host-Only / Guest-Only bits for a PMC works as intended, and that event filtering is still respected.
--- tools/testing/selftests/kvm/Makefile.kvm | 1 + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + .../kvm/x86/svm_pmu_host_guest_test.c | 215 ++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
@@ -120,6 +120,7 @@ TEST_GEN_PROGS_x86 += x86/svm_nested_soft_inject_test TEST_GEN_PROGS_x86 += x86/svm_nested_vmcb12_gpa TEST_GEN_PROGS_x86 += x86/svm_nested_pat_test TEST_GEN_PROGS_x86 += x86/svm_lbr_nested_state +TEST_GEN_PROGS_x86 += x86/svm_pmu_host_guest_test TEST_GEN_PROGS_x86 += x86/tsc_scaling_sync TEST_GEN_PROGS_x86 += x86/sync_regs_test TEST_GEN_PROGS_x86 += x86/ucna_injection_test
tools/testing/selftests/kvm/include/x86/pmu.h +6 -0
@@ -38,6 +38,12 @@#define ARCH_PERFMON_EVENTSEL_INV BIT_ULL(23)#define ARCH_PERFMON_EVENTSEL_CMASK GENMASK_ULL(31, 24) +/* +* These are AMD-specific bits. +*/ +#define AMD64_EVENTSEL_GUESTONLY BIT_ULL(40) +#define AMD64_EVENTSEL_HOSTONLY BIT_ULL(41) +/* RDPMC control flags, Intel only. */ #define INTEL_RDPMC_METRICS BIT_ULL(29)#define INTEL_RDPMC_FIXED BIT_ULL(30)
tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c new file +215 -0
215 lines not on this page · raw message
Signature · 1 line
2.54.0.1099.g489fc7bff1-goog
Re: [PATCH v8 5/5] KVM: selftests: Add svm_pmu_host_guest_test for Host-Only/Guest-Only bits
tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c line 183
Quoted 10 lines
tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c new file +10
-0+int main (int argc,char *argv[]) +{ +struct kvm_pmu_event_filter *filter; +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +struct ucall uc; +gva_t svm_gva; + +TEST_REQUIRE (kvm_cpu_has (X86_FEATURE_SVM )); +TEST_REQUIRE (kvm_is_pmu_enabled ());
Nit: This is probably redundant since we can't enable the mediated PMU when the PMU is disabled, but it might be useful to tell us that the mediated PMU is disabled *because* the PMU is disabled.
Quoted 10 lines · Sean Christopherson
This is the selftests portion of the mediated PMU Host-Only/Guest-Only series. My plan is to get this into 7.2-rc1, but after the other KVM x86 pull requests have been merged by Paolo (several unpleasant conflicts across multiple branches). I'll either send a separate pull request, or see if Paolo wants to apply them directly.
v8:
- Add akvm_is_mediated_pmu_enabled()helper.
- Drop the AMD Family check.
Thanks for sending the new version!