KVM: selftests: Overhaul APIs, purge VCPU_ID
Subsystems (5)
Sean Christopherson
reviewerPATCH v2 91/144 KVM: selftests: Convert set_memory_region_test away from VCPU_ID
In reply to Sean ChristophersonConvert set_memory_region_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/set_memory_region_test.c | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-)
tools/testing/selftests/kvm/set_memory_region_test.c +18 -18
@@ -17,8 +17,6 @@#include <kvm_util.h> #include <processor.h> -#define VCPU_ID 0 -/* * s390x needs at least 1MB alignment, and the x86_64 MOVE/DELETE tests need a * 2MB sized and aligned region so that the initial region corresponds to
@@ -54,8 +52,8 @@ static inline uint64_t guest_spin_on_val(uint64_t spin_val)static void *vcpu_worker (void *data) { -struct kvm_vm *vm = data; -struct kvm_run *run; +struct kvm_vcpu *vcpu = data; +struct kvm_run *run = vcpu->run;struct ucall uc;uint64_t cmd;
@@ -64,13 +62,11 @@ static void *vcpu_worker(void *data)* which will occur if the guest attempts to access a memslot after it * has been deleted or while it is being moved . */ - run =vcpu_state (vm,VCPU_ID ); -while (1 ) { -vcpu_run (vm,VCPU_ID ); +vcpu_run (vcpu->vm, vcpu->id);if (run->exit_reason ==KVM_EXIT_IO ) { - cmd =get_ucall (vm,VCPU_ID , &uc); + cmd =get_ucall (vcpu->vm, vcpu->id, &uc);if (cmd !=UCALL_SYNC )break ;
@@ -113,13 +109,14 @@ static void wait_for_vcpu(void)usleep (100000 ); } -static struct kvm_vm *spawn_vm (pthread_t *vcpu_thread,void *guest_code) +static struct kvm_vm *spawn_vm (struct kvm_vcpu **vcpu,pthread_t *vcpu_thread, +void *guest_code) {struct kvm_vm *vm;uint64_t *hva;uint64_t gpa; - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (vcpu, guest_code); vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS_THP, MEM_REGION_GPA, MEM_REGION_SLOT,
@@ -138,7 +135,7 @@ static struct kvm_vm *spawn_vm(pthread_t *vcpu_thread, void *guest_code) hva =addr_gpa2hva (vm,MEM_REGION_GPA );memset (hva,0 ,2 *4096 ); -pthread_create (vcpu_thread,NULL , vcpu_worker, vm); +pthread_create (vcpu_thread,NULL , vcpu_worker, *vcpu);/* Ensure the guest thread is spun up. */ wait_for_vcpu ();
@@ -180,10 +177,11 @@ static void guest_code_move_memory_region(void)static void test_move_memory_region (void ) {pthread_t vcpu_thread; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;uint64_t *hva; - vm =spawn_vm (&vcpu_thread, guest_code_move_memory_region); + vm =spawn_vm (&vcpu, &vcpu_thread, guest_code_move_memory_region); hva =addr_gpa2hva (vm,MEM_REGION_GPA );
@@ -258,11 +256,12 @@ static void guest_code_delete_memory_region(void)static void test_delete_memory_region (void ) {pthread_t vcpu_thread; +struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_run *run;struct kvm_vm *vm; - vm =spawn_vm (&vcpu_thread, guest_code_delete_memory_region); + vm =spawn_vm (&vcpu, &vcpu_thread, guest_code_delete_memory_region);/* Delete the memory region, the guest should not die. */ vm_mem_region_delete (vm,MEM_REGION_SLOT );
@@ -286,13 +285,13 @@ static void test_delete_memory_region(void)pthread_join (vcpu_thread,NULL ); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN || run->exit_reason ==KVM_EXIT_INTERNAL_ERROR ,"Unexpected exit reason = %d" , run->exit_reason); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);/* * On AMD, after KVM_EXIT_SHUTDOWN the VMCB has been reinitialized already,
@@ -309,18 +308,19 @@ 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" ); vm =vm_create_barebones (); -vm_vcpu_add (vm,VCPU_ID ); + vcpu =vm_vcpu_add (vm,0 );vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul ); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR ,"Unexpected exit_reason = %u\n" , run->exit_reason);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 92/144 KVM: selftests: Convert system_counter_offset_test away from VCPU_ID
In reply to Sean ChristophersonConvert system_counter_offset_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../kvm/system_counter_offset_test.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/system_counter_offset_test.c +14 -14
@@ -14,8 +14,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 -#ifdef __x86_64__ struct test_case {
@@ -28,18 +26,19 @@ static struct test_case test_cases[] = { { -180 * NSEC_PER_SEC }, }; -static void check_preconditions (struct kvm_vm *vm) +static void check_preconditions (struct kvm_vcpu *vcpu) { -if (!__vcpu_has_device_attr (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET )) +if (!__vcpu_has_device_attr (vcpu->vm, vcpu->id,KVM_VCPU_TSC_CTRL , +KVM_VCPU_TSC_OFFSET ))return ;print_skip ("KVM_VCPU_TSC_OFFSET not supported; skipping test" );exit (KSFT_SKIP ); } -static void setup_system_counter (struct kvm_vm *vm,struct test_case *test) +static void setup_system_counter (struct kvm_vcpu *vcpu,struct test_case *test) { -vcpu_device_attr_set (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL , +vcpu_device_attr_set (vcpu->vm, vcpu->id,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET , &test->tsc_offset); }
@@ -91,7 +90,7 @@ static void handle_abort(struct ucall *uc) __FILE__, uc->args[1]); } -static void enter_guest (struct kvm_vm *vm) +static void enter_guest (struct kvm_vcpu *vcpu) {uint64_t start, end;struct ucall uc;
@@ -100,12 +99,12 @@ static void enter_guest(struct kvm_vm *vm)for (i =0 ; i <ARRAY_SIZE (test_cases); i++) {struct test_case *test = &test_cases[i]; -setup_system_counter (vm, test); +setup_system_counter (vcpu, test); start =host_read_guest_system_counter (test); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vcpu->vm, vcpu->id); end =host_read_guest_system_counter (test); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :handle_sync (&uc, start, end);break ;
@@ -114,19 +113,20 @@ static void enter_guest(struct kvm_vm *vm)return ;default :TEST_ASSERT (0 ,"unhandled ucall %ld\n" , -get_ucall (vm,VCPU_ID , &uc)); +get_ucall (vcpu->vm, vcpu->id, &uc)); } } }int main (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm; - vm =vm_create_default (VCPU_ID ,0 , guest_main); -check_preconditions (vm); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); +check_preconditions (vcpu);ucall_init (vm,NULL ); -enter_guest (vm); +enter_guest (vcpu);kvm_vm_free (vm); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 93/144 KVM: selftests: Track kvm_vcpu object in tsc_scaling_sync
In reply to Sean ChristophersonTrack the added 'struct kvm_vcpu' object in tsc_scaling_sync instead of relying purely on the VM + vcpu_id combination. Ideally, the test wouldn't need to manually manage vCPUs, but the need to invoke a per-VM ioctl before creating vCPUs is not handled by the selftests framework, at least not yet...
--- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +10 -7
@@ -46,38 +46,41 @@ static void guest_code(void)static void *run_vcpu (void *_cpu_nr) { -unsigned long cpu = (unsigned long )_cpu_nr; +unsigned long vcpu_id = (unsigned long )_cpu_nr;unsigned long failures =0 ;static bool first_cpu_done; +struct kvm_vcpu *vcpu;/* The kernel is fine, but vm_vcpu_add_default() needs locking */ pthread_spin_lock (&create_lock); -vm_vcpu_add_default (vm, cpu, guest_code); +vm_vcpu_add_default (vm, vcpu_id, guest_code); + vcpu =vcpu_get (vm, vcpu_id);if (!first_cpu_done) { first_cpu_done = true; -vcpu_set_msr (vm, cpu,MSR_IA32_TSC ,TEST_TSC_OFFSET ); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_TSC ,TEST_TSC_OFFSET ); }pthread_spin_unlock (&create_lock);for (;;) { -volatile struct kvm_run *run =vcpu_state (vm, cpu); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm, cpu); +vcpu_run (vm, vcpu->id);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)); -switch (get_ucall (vm, cpu, &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_DONE : goto out;case UCALL_SYNC : -printf ("Guest %ld sync %lx %lx %ld\n" , cpu, uc.args[2 ], uc.args[3 ], uc.args[2 ] - uc.args[3 ]); +printf ("Guest %d sync %lx %lx %ld\n" , vcpu->id, + uc.args[2 ], uc.args[3 ], uc.args[2 ] - uc.args[3 ]); failures++;break ;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 093/144] KVM: selftests: Track kvm_vcpu object in tsc_scaling_sync
Quoted 44 lines · Sean Christopherson
Track the added 'struct
kvm_vcpu' object intsc_scaling_syncinstead of relying purely on the VM +vcpu_idcombination. Ideally, the test wouldn't need to manually manage vCPUs, but the need to invoke a per-VM ioctl before creating vCPUs is not handled by the selftests framework, at least not yet...Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +6
-4@@ -46,38 +46,41 @@ static void guest_code(void)static void *run_vcpu (void *_cpu_nr) { -unsigned long cpu = (unsigned long )_cpu_nr; +unsigned long vcpu_id = (unsigned long )_cpu_nr;unsigned long failures =0 ;static bool first_cpu_done; +struct kvm_vcpu *vcpu;/* The kernel is fine, but vm_vcpu_add_default() needs locking */ pthread_spin_lock (&create_lock); -vm_vcpu_add_default (vm, cpu, guest_code); +vm_vcpu_add_default (vm, vcpu_id, guest_code); + vcpu =vcpu_get (vm, vcpu_id);if (!first_cpu_done) { first_cpu_done = true; -vcpu_set_msr (vm, cpu,MSR_IA32_TSC ,TEST_TSC_OFFSET ); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_TSC ,TEST_TSC_OFFSET ); }pthread_spin_unlock (&create_lock);for (;;) { -volatile struct kvm_run *run =vcpu_state (vm, cpu); +volatile struct kvm_run *run = vcpu->run;struct ucall uc;
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c static void guest_code(void) · line 77
Quoted 10 lines
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +2
-2-vcpu_run (vm, cpu); +vcpu_run (vm, vcpu->id);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)); -switch (get_ucall (vm, cpu, &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {
The two changes above show that this file had some space vs. tab issues. I just checked and these two lines weren't the only ones, so I guess we can add cleaning up whitespace of x86_64/tsc_scaling_sync.c to the rainy day TODO.
Thanks,
drew
Quoted 13 lines
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +2
-1case UCALL_DONE : goto out;case UCALL_SYNC : -printf ("Guest %ld sync %lx %lx %ld\n" , cpu, uc.args[2 ], uc.args[3 ], uc.args[2 ] - uc.args[3 ]); +printf ("Guest %d sync %lx %lx %ld\n" , vcpu->id, + uc.args[2 ], uc.args[3 ], uc.args[2 ] - uc.args[3 ]); failures++;break ;Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 94/144 KVM: selftests: Convert xapic_state_test away from hardcoded vCPU ID
In reply to Sean ChristophersonConvert xapic_state_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of the raw vCPU ID.
--- .../selftests/kvm/x86_64/xapic_state_test.c | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-)
tools/testing/selftests/kvm/x86_64/xapic_state_test.c +25 -23
@@ -12,7 +12,7 @@#include "test_util.h" struct xapic_vcpu { -uint32_t id; +struct kvm_vcpu *vcpu;bool is_x2apic; };
@@ -47,8 +47,9 @@ static void x2apic_guest_code(void) }while (1 ); } -static void ____test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu,uint64_t val) +static void ____test_icr (struct kvm_vm *vm,struct xapic_vcpu *x,uint64_t val) { +struct kvm_vcpu *vcpu = x->vcpu;struct kvm_lapic_state xapic;struct ucall uc;uint64_t icr;
@@ -70,28 +71,29 @@ static void ____test_icr(struct kvm_vm *vm, struct xapic_vcpu *vcpu, uint64_t vavcpu_ioctl (vm, vcpu->id,KVM_GET_LAPIC , &xapic); icr = (u64)(*((u32 *)&xapic.regs[APIC_ICR ])) | (u64)(*((u32 *)&xapic.regs[APIC_ICR2 ])) <<32 ; -if (!vcpu->is_x2apic) +if (!x->is_x2apic) val &= (-1u | (0xffull << (32 +24 )));ASSERT_EQ (icr, val & ~APIC_ICR_BUSY ); } -static void __test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu,uint64_t val) +static void __test_icr (struct kvm_vm *vm,struct xapic_vcpu *x,uint64_t val) { -____test_icr (vm, vcpu, val |APIC_ICR_BUSY ); -____test_icr (vm, vcpu, val & ~(u64 )APIC_ICR_BUSY ); +____test_icr (vm, x, val |APIC_ICR_BUSY ); +____test_icr (vm, x, val & ~(u64 )APIC_ICR_BUSY ); } -static void test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu) +static void test_icr (struct kvm_vm *vm,struct xapic_vcpu *x) { +struct kvm_vcpu *vcpu = x->vcpu;uint64_t icr, i, j; icr =APIC_DEST_SELF |APIC_INT_ASSERT |APIC_DM_FIXED ;for (i =0 ; i <=0xff ; i++) -__test_icr (vm, vcpu, icr | i); +__test_icr (vm, x, icr | i); icr =APIC_INT_ASSERT |APIC_DM_FIXED ;for (i =0 ; i <=0xff ; i++) -__test_icr (vm, vcpu, icr | i); +__test_icr (vm, x, icr | i);/* * Send all flavors of IPIs to non-existent vCPUs. TODO: use number of
@@ -100,32 +102,32 @@ static void test_icr(struct kvm_vm *vm, struct xapic_vcpu *vcpu) icr =APIC_INT_ASSERT |0xff ;for (i = vcpu->id +1 ; i <0xff ; i++) {for (j =0 ; j <8 ; j++) -__test_icr (vm, vcpu, i << (32 +24 ) |APIC_INT_ASSERT | (j <<8 )); +__test_icr (vm, x, i << (32 +24 ) |APIC_INT_ASSERT | (j <<8 )); }/* And again with a shorthand destination for all types of IPIs. */ icr =APIC_DEST_ALLBUT |APIC_INT_ASSERT ;for (i =0 ; i <8 ; i++) -__test_icr (vm, vcpu, icr | (i <<8 )); +__test_icr (vm, x, icr | (i <<8 ));/* And a few garbage value, just make sure it's an IRQ (blocked). */ -__test_icr (vm, vcpu,0xa5a5a5a5a5a5a5a5 & ~APIC_DM_FIXED_MASK ); -__test_icr (vm, vcpu,0x5a5a5a5a5a5a5a5a & ~APIC_DM_FIXED_MASK ); -__test_icr (vm, vcpu,-1ull & ~APIC_DM_FIXED_MASK ); +__test_icr (vm, x,0xa5a5a5a5a5a5a5a5 & ~APIC_DM_FIXED_MASK ); +__test_icr (vm, x,0x5a5a5a5a5a5a5a5a & ~APIC_DM_FIXED_MASK ); +__test_icr (vm, x,-1ull & ~APIC_DM_FIXED_MASK ); }int main (int argc,char *argv[]) { -struct xapic_vcpu vcpu = { - .id =0 , +struct xapic_vcpu x = { + .vcpu =NULL , .is_x2apic = true, };struct kvm_cpuid2 *cpuid;struct kvm_vm *vm;int i; - vm =vm_create_default (vcpu.id,0 , x2apic_guest_code); -test_icr (vm, &vcpu); + vm =vm_create_with_one_vcpu (&x.vcpu, x2apic_guest_code); +test_icr (vm, &x);kvm_vm_free (vm);/*
@@ -133,18 +135,18 @@ int main(int argc, char *argv[])* the guest in order to test AVIC. KVM disallows changing CPUID after * KVM_RUN and AVIC is disabled if _any_ vCPU is allowed to use x2APIC. */ - vm =vm_create_default (vcpu.id,0 , xapic_guest_code); - vcpu.is_x2apic = false; + vm =vm_create_with_one_vcpu (&x.vcpu, xapic_guest_code); + x.is_x2apic = false; - cpuid =vcpu_get_cpuid (vm, vcpu.id); + cpuid =vcpu_get_cpuid (vm, x.vcpu->id);for (i =0 ; i < cpuid->nent; i++) {if (cpuid->entries[i].function ==1 )break ; } cpuid->entries[i].ecx &= ~BIT (21 ); -vcpu_set_cpuid (vm, vcpu.id, cpuid); +vcpu_set_cpuid (vm, x.vcpu->id, cpuid);virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ); -test_icr (vm, &vcpu); +test_icr (vm, &x);kvm_vm_free (vm); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 95/144 KVM: selftests: Convert debug-exceptions away from VCPU_ID
In reply to Sean ChristophersonConvert debug-exceptions to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/aarch64/debug-exceptions.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +8 -9
@@ -3,8 +3,6 @@#include <kvm_util.h> #include <processor.h> -#define VCPU_ID 0 -#define MDSCR_KDE (1 << 13)#define MDSCR_MDE (1 << 15)#define MDSCR_SS (1 << 0)
@@ -240,27 +238,28 @@ static void guest_svc_handler(struct ex_regs *regs) svc_addr = regs->pc; } -static int debug_version (struct kvm_vm *vm) +static int debug_version (struct kvm_vcpu *vcpu) {uint64_t id_aa64dfr0; -get_reg (vm,VCPU_ID ,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0); +get_reg (vcpu->vm, vcpu->id,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0);return id_aa64dfr0 &0xf ; }int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct ucall uc;int stage; - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);ucall_init (vm,NULL );vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id); -if (debug_version (vm) <6 ) { +if (debug_version (vcpu) <6 ) {print_skip ("Armv8 debug architecture not supported." );kvm_vm_free (vm);exit (KSFT_SKIP );
@@ -278,9 +277,9 @@ int main(int argc, char *argv[]) ESR_EC_SVC64, guest_svc_handler);for (stage =0 ; stage <11 ; stage++) { -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == stage, "Stage %d: Unexpected sync ucall, got %lx",
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 96/144 KVM: selftests: Convert fix_hypercall_test away from VCPU_ID
In reply to Sean ChristophersonConvert fix_hypercall_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/x86_64/fix_hypercall_test.c | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-)
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +16 -18
@@ -14,8 +14,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 -static bool ud_expected;static void guest_ud_handler (struct ex_regs *regs)
@@ -94,22 +92,20 @@ static void guest_main(void)GUEST_DONE (); } -static void setup_ud_vector (struct kvm_vm *vm) +static void setup_ud_vector (struct kvm_vcpu *vcpu) { -vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); -vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler); +vm_init_descriptor_tables (vcpu->vm); +vcpu_init_descriptor_tables (vcpu->vm, vcpu->id); +vm_install_exception_handler (vcpu->vm,UD_VECTOR , guest_ud_handler); } -static void enter_guest (struct kvm_vm *vm) +static void enter_guest (struct kvm_vcpu *vcpu) { -struct kvm_run *run; +struct kvm_run *run = vcpu->run;struct ucall uc; - run =vcpu_state (vm,VCPU_ID ); - -vcpu_run (vm,VCPU_ID ); -switch (get_ucall (vm,VCPU_ID , &uc)) { +vcpu_run (vcpu->vm, vcpu->id); +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :pr_info ("%s: %016lx\n" , (const char *)uc.args[2 ], uc.args[3 ]);break ;
@@ -125,25 +121,27 @@ static void enter_guest(struct kvm_vm *vm)static void test_fix_hypercall (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm; - vm =vm_create_default (VCPU_ID ,0 , guest_main); -setup_ud_vector (vm); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); +setup_ud_vector (vcpu); ud_expected = false;sync_global_to_guest (vm, ud_expected);virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ); -enter_guest (vm); +enter_guest (vcpu); }static void test_fix_hypercall_disabled (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm; - vm =vm_create_default (VCPU_ID ,0 , guest_main); -setup_ud_vector (vm); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); +setup_ud_vector (vcpu);vm_enable_cap (vm,KVM_CAP_DISABLE_QUIRKS2 ,KVM_X86_QUIRK_FIX_HYPERCALL_INSN );
@@ -153,7 +151,7 @@ static void test_fix_hypercall_disabled(void)virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ); -enter_guest (vm); +enter_guest (vcpu); }int main (void )
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 97/144 KVM: selftests: Convert vgic_irq away from VCPU_ID
In reply to Sean ChristophersonConvert vgic_irq to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of passing around a vCPU ID (which is always the global VCPU_ID...).
Opportunstically align the indentation for multiple functions' parameters.
--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 30 ++++++++++--------- .../selftests/kvm/include/aarch64/vgic.h | 6 ++-- .../testing/selftests/kvm/lib/aarch64/vgic.c | 10 +++---- 3 files changed, 25 insertions(+), 21 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_irq.c +16 -14
@@ -22,7 +22,6 @@#define GICD_BASE_GPA 0x08000000ULL#define GICR_BASE_GPA 0x080A0000ULL -#define VCPU_ID 0/* * Stores the user specified args; it's passed to the guest and to every test
@@ -589,7 +588,8 @@ static void kvm_set_gsi_routing_irqchip_check(struct kvm_vm *vm, }static void kvm_irq_write_ispendr_check (int gic_fd,uint32_t intid, -uint32_t vcpu,bool expect_failure) +struct kvm_vcpu *vcpu, +bool expect_failure) {/* * Ignore this when expecting failure as invalid intids will lead to
@@ -659,15 +659,16 @@ static void kvm_routing_and_irqfd_check(struct kvm_vm *vm, (tmp) < (uint64_t )(first) + (uint64_t )(num); \ (tmp)++, (i)++) -static void run_guest_cmd (struct kvm_vm *vm,int gic_fd, -struct kvm_inject_args *inject_args, -struct test_args *test_args) +static void run_guest_cmd (struct kvm_vcpu *vcpu,int gic_fd, +struct kvm_inject_args *inject_args, +struct test_args *test_args) {kvm_inject_cmd cmd = inject_args->cmd;uint32_t intid = inject_args->first_intid;uint32_t num = inject_args->num;int level = inject_args->level;bool expect_failure = inject_args->expect_failure; +struct kvm_vm *vm = vcpu->vm;uint64_t tmp;uint32_t i;
@@ -705,12 +706,12 @@ static void run_guest_cmd(struct kvm_vm *vm, int gic_fd,break ;case KVM_WRITE_ISPENDR :for (i = intid; i < intid + num; i++) -kvm_irq_write_ispendr_check (gic_fd, i, -VCPU_ID , expect_failure); +kvm_irq_write_ispendr_check (gic_fd, i, vcpu, + expect_failure);break ;case KVM_WRITE_ISACTIVER :for (i = intid; i < intid + num; i++) -kvm_irq_write_isactiver (gic_fd, i,VCPU_ID ); +kvm_irq_write_isactiver (gic_fd, i, vcpu);break ;default :break ;
@@ -739,6 +740,7 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) {struct ucall uc;int gic_fd; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_inject_args inject_args;vm_vaddr_t args_gva;
@@ -753,16 +755,16 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split)print_args (&args); - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);ucall_init (vm,NULL );vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);/* Setup the guest args page (so it gets the args). */ args_gva =vm_vaddr_alloc_page (vm);memcpy (addr_gva2hva (vm, args_gva), &args,sizeof (args)); -vcpu_args_set (vm,0 ,1 , args_gva); +vcpu_args_set (vm, vcpu->id,1 , args_gva); gic_fd =vgic_v3_setup (vm,1 , nr_irqs,GICD_BASE_GPA ,GICR_BASE_GPA );
@@ -775,12 +777,12 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) guest_irq_handlers[args.eoi_split][args.level_sensitive]);while (1 ) { -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_SYNC :kvm_inject_get_call (vm, &uc, &inject_args); -run_guest_cmd (vm, gic_fd, &inject_args, &args); +run_guest_cmd (vcpu, gic_fd, &inject_args, &args);break ;case UCALL_ABORT : TEST_FAIL("%s at %s:%ld\n\tvalues: %#lx, %#lx",
tools/testing/selftests/kvm/include/aarch64/vgic.h +4 -2
@@ -8,6 +8,8 @@#include <linux/kvm.h> +#include "kvm_util.h" +#define REDIST_REGION_ATTR_ADDR (count, base, flags, index) \ (((uint64_t)(count) << 52) | \ ((uint64_t)((base) >> 16) << 16) | \
@@ -26,8 +28,8 @@ void kvm_arm_irq_line(struct kvm_vm *vm, uint32_t intid, int level);int _kvm_arm_irq_line (struct kvm_vm *vm,uint32_t intid,int level);/* The vcpu arg only applies to private interrupts. */ -void kvm_irq_write_ispendr (int gic_fd,uint32_t intid,uint32_t vcpu); -void kvm_irq_write_isactiver (int gic_fd,uint32_t intid,uint32_t vcpu); +void kvm_irq_write_ispendr (int gic_fd,uint32_t intid,struct kvm_vcpu *vcpu); +void kvm_irq_write_isactiver (int gic_fd,uint32_t intid,struct kvm_vcpu *vcpu);#define KVM_IRQCHIP_NUM_PINS (1020 - 32)
tools/testing/selftests/kvm/lib/aarch64/vgic.c +5 -5
@@ -127,8 +127,8 @@ void kvm_arm_irq_line(struct kvm_vm *vm, uint32_t intid, int level)TEST_ASSERT (!ret,KVM_IOCTL_ERROR (KVM_IRQ_LINE , ret)); } -static void vgic_poke_irq (int gic_fd,uint32_t intid, -uint32_t vcpu,uint64_t reg_off) +static void vgic_poke_irq (int gic_fd,uint32_t intid,struct kvm_vcpu *vcpu, +uint64_t reg_off) {uint64_t reg = intid /32 ;uint64_t index = intid %32 ;
@@ -141,7 +141,7 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid,if (intid_is_private) {/* TODO: only vcpu 0 implemented for now. */ -assert (vcpu ==0 ); +assert (vcpu->id ==0 ); attr +=SZ_64K ; }
@@ -159,12 +159,12 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid,kvm_device_attr_set (gic_fd, group, attr, &val); } -void kvm_irq_write_ispendr (int gic_fd,uint32_t intid,uint32_t vcpu) +void kvm_irq_write_ispendr (int gic_fd,uint32_t intid,struct kvm_vcpu *vcpu) {vgic_poke_irq (gic_fd, intid, vcpu,GICD_ISPENDR ); } -void kvm_irq_write_isactiver (int gic_fd,uint32_t intid,uint32_t vcpu) +void kvm_irq_write_isactiver (int gic_fd,uint32_t intid,struct kvm_vcpu *vcpu) {vgic_poke_irq (gic_fd, intid, vcpu,GICD_ISACTIVER ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 98/144 KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only
In reply to Sean ChristophersonMove the declaration of guest_get_vcpuid() to include/aarch64/processor.h, it is implemented and used only by arm64.
--- tools/testing/selftests/kvm/include/aarch64/processor.h | 2 ++ tools/testing/selftests/kvm/include/kvm_util_base.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/aarch64/processor.h +2 -0
@@ -207,4 +207,6 @@ void smccc_hvc(uint32_t function_id, uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6, struct arm_smccc_res *res); +uint32_t guest_get_vcpuid (void ); +#endif /* SELFTEST_KVM_PROCESSOR_H */
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -2
@@ -707,6 +707,4 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,void assert_on_unhandled_exception (struct kvm_vm *vm,uint32_t vcpuid); -uint32_t guest_get_vcpuid (void ); -#endif /* SELFTEST_KVM_UTIL_BASE_H */
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 99/144 KVM: selftests: Move vm_is_unrestricted_guest() to x86-64
In reply to Sean ChristophersonAn "unrestricted guest" is an VMX-only concept, move the relevant helper to x86-64 code. Assume most readers can correctly convert underscores to spaces and oppurtunistically trim the function comment.
--- .../selftests/kvm/include/kvm_util_base.h | 2 -- .../selftests/kvm/include/x86_64/processor.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 33 ------------------- .../selftests/kvm/lib/x86_64/processor.c | 21 ++++++++++++ 4 files changed, 22 insertions(+), 35 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -2
@@ -667,8 +667,6 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm);*/ void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code); -bool vm_is_unrestricted_guest (struct kvm_vm *vm); -unsigned int vm_get_page_size (struct kvm_vm *vm);unsigned int vm_get_page_shift (struct kvm_vm *vm);unsigned long vm_compute_max_gfn (struct kvm_vm *vm);
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
@@ -526,6 +526,7 @@ static inline void vcpu_set_msr(struct kvm_vm *vm, uint32_t vcpuid,uint32_t kvm_get_cpuid_max_basic (void );uint32_t kvm_get_cpuid_max_extended (void );void kvm_get_cpu_address_width (unsigned int *pa_bits,unsigned int *va_bits); +bool vm_is_unrestricted_guest (struct kvm_vm *vm);struct ex_regs {uint64_t rax, rcx, rdx, rbx;
tools/testing/selftests/kvm/lib/kvm_util.c +0 -33
@@ -1948,39 +1948,6 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva)return addr_gpa2hva (vm,addr_gva2gpa (vm, gva)); } -/* -* Is Unrestricted Guest -* -* Input Args: -* vm - Virtual Machine -* -* Output Args: None -* -* Return: True if the unrestricted guest is set to 'Y', otherwise return false. -* -* Check if the unrestricted guest flag is enabled. -*/ -bool vm_is_unrestricted_guest (struct kvm_vm *vm) -{ -char val ='N' ; -size_t count; -FILE *f; - -if (vm ==NULL ) { -/* Ensure that the KVM vendor-specific module is loaded. */ -close (open_kvm_dev_path_or_exit ()); - } - - f =fopen ("/sys/module/kvm_intel/parameters/unrestricted_guest" ,"r" ); -if (f) { - count =fread (&val,sizeof (char ),1 , f); -TEST_ASSERT (count ==1 ,"Unable to read from param file." ); -fclose (f); - } - -return val =='Y' ; -} -unsigned int vm_get_page_size (struct kvm_vm *vm) {return vm->page_size;
tools/testing/selftests/kvm/lib/x86_64/processor.c +21 -0
@@ -1358,3 +1358,24 @@ unsigned long vm_compute_max_gfn(struct kvm_vm *vm) done:return min (max_gfn, ht_gfn -1 ); } + +/* Returns true if kvm_intel was loaded with unrestricted_guest=1. */ +bool vm_is_unrestricted_guest (struct kvm_vm *vm) +{ +char val ='N' ; +size_t count; +FILE *f; + +/* Ensure that a KVM vendor-specific module is loaded. */ +if (vm ==NULL ) +close (open_kvm_dev_path_or_exit ()); + + f =fopen ("/sys/module/kvm_intel/parameters/unrestricted_guest" ,"r" ); +if (f) { + count =fread (&val,sizeof (char ),1 , f); +TEST_ASSERT (count ==1 ,"Unable to read from param file." ); +fclose (f); + } + +return val =='Y' ; +}
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 100/144 KVM: selftests: Add "arch" to common utils that have arch implementations
In reply to Sean ChristophersonAdd "arch" into the name of utility functions that are declared in common code, but (surprise!) have arch-specific implementations. Shuffle code around so that all such helpers' declarations are bundled together.
--- .../selftests/kvm/include/kvm_util_base.h | 200 ++++++++++-------- .../selftests/kvm/lib/aarch64/processor.c | 12 +- .../selftests/kvm/lib/riscv/processor.c | 12 +- .../selftests/kvm/lib/s390x/processor.c | 12 +- .../selftests/kvm/lib/x86_64/processor.c | 12 +- 5 files changed, 141 insertions(+), 107 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +117 -83
@@ -95,23 +95,6 @@ struct kvm_vm {struct kvm_vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpuid); -/* -* Virtual Translation Tables Dump -* -* Input Args: -* stream - Output FILE stream -* vm - Virtual Machine -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps to the FILE stream given by @stream, the contents of all the -* virtual translation tables for the VM given by @vm. -*/ -void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent); -struct userspace_mem_region *memslot2region (struct kvm_vm *vm,uint32_t memslot);
@@ -291,25 +274,6 @@ static inline int vm_get_stats_fd(struct kvm_vm *vm)return fd; } -/* -* VM VCPU Dump -* -* Input Args: -* stream - Output FILE stream -* vm - Virtual Machine -* vcpuid - VCPU ID -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps the current state of the VCPU specified by @vcpuid, within the VM -* given by @vm, to the FILE stream given by @stream. -*/ -void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid, -uint8_t indent); -void vm_create_irqchip (struct kvm_vm *vm); void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags,
@@ -336,23 +300,6 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva);vm_paddr_t addr_hva2gpa (struct kvm_vm *vm,void *hva);void *addr_gpa2alias (struct kvm_vm *vm,vm_paddr_t gpa); -/* -* Address Guest Virtual to Guest Physical -* -* Input Args: -* vm - Virtual Machine -* gva - VM virtual address -* -* Output Args: None -* -* Return: -* Equivalent VM physical address -* -* Returns the VM physical address of the translated VM virtual -* address given by @gva. -*/ -vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva); -struct kvm_run *vcpu_state (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_run (struct kvm_vm *vm,uint32_t vcpuid);int _vcpu_run (struct kvm_vm *vm,uint32_t vcpuid);
@@ -569,26 +516,6 @@ void kvm_gsi_routing_write(struct kvm_vm *vm, struct kvm_irq_routing *routing);const char *exit_reason_str (unsigned int exit_reason); -void virt_pgd_alloc (struct kvm_vm *vm); - -/* -* VM Virtual Page Map -* -* Input Args: -* vm - Virtual Machine -* vaddr - VM Virtual Address -* paddr - VM Physical Address -* memslot - Memory region slot for new virtual translation tables -* -* Output Args: None -* -* Return: None -* -* Within @vm, creates a virtual translation for the page starting -* at @vaddr to the page starting at @paddr. -*/ -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr); -vm_paddr_t vm_phy_page_alloc (struct kvm_vm *vm,vm_paddr_t paddr_min,uint32_t memslot); vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,
@@ -657,16 +584,6 @@ static inline struct kvm_vm *vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm); -/* -* Adds a vCPU with reasonable defaults (e.g. a stack) -* -* Input Args: -* vm - Virtual Machine -* vcpuid - The id of the VCPU to add to the VM. -* guest_code - The vCPU's entry point -*/ -void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code); -unsigned int vm_get_page_size (struct kvm_vm *vm);unsigned int vm_get_page_shift (struct kvm_vm *vm);unsigned long vm_compute_max_gfn (struct kvm_vm *vm);
@@ -705,4 +622,121 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,void assert_on_unhandled_exception (struct kvm_vm *vm,uint32_t vcpuid); +/* +* VM VCPU Dump +* +* Input Args: +* stream - Output FILE stream +* vm - Virtual Machine +* vcpuid - VCPU ID +* indent - Left margin indent amount +* +* Output Args: None +* +* Return: None +* +* Dumps the current state of the VCPU specified by @vcpuid, within the VM +* given by @vm, to the FILE stream given by @stream. +*/ + +void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid, +uint8_t indent); + +static inline void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid, +uint8_t indent) +{ +vcpu_arch_dump (stream, vm, vcpuid, indent); +} + +/* +* Adds a vCPU with reasonable defaults (e.g. a stack) +* +* Input Args: +* vm - Virtual Machine +* vcpuid - The id of the VCPU to add to the VM. +* guest_code - The vCPU's entry point +*/ +void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code); + +static inline void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid, +void *guest_code) +{ +vm_arch_vcpu_add (vm, vcpuid, guest_code); +} + +void virt_arch_pgd_alloc (struct kvm_vm *vm); + +static inline void virt_pgd_alloc (struct kvm_vm *vm) +{ +virt_arch_pgd_alloc (vm); +} + +/* +* VM Virtual Page Map +* +* Input Args: +* vm - Virtual Machine +* vaddr - VM Virtual Address +* paddr - VM Physical Address +* memslot - Memory region slot for new virtual translation tables +* +* Output Args: None +* +* Return: None +* +* Within @vm, creates a virtual translation for the page starting +* at @vaddr to the page starting at @paddr. +*/ +void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr); + +static inline void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) +{ +virt_arch_pg_map (vm, vaddr, paddr); +} + + +/* +* Address Guest Virtual to Guest Physical +* +* Input Args: +* vm - Virtual Machine +* gva - VM virtual address +* +* Output Args: None +* +* Return: +* Equivalent VM physical address +* +* Returns the VM physical address of the translated VM virtual +* address given by @gva. +*/ +vm_paddr_t addr_arch_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva); + +static inline vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) +{ +return addr_arch_gva2gpa (vm, gva); +} + +/* +* Virtual Translation Tables Dump +* +* Input Args: +* stream - Output FILE stream +* vm - Virtual Machine +* indent - Left margin indent amount +* +* Output Args: None +* +* Return: None +* +* Dumps to the FILE stream given by @stream, the contents of all the +* virtual translation tables for the VM given by @vm. +*/ +void virt_arch_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent); + +static inline void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) +{ +virt_arch_dump (stream, vm, indent); +} +#endif /* SELFTEST_KVM_UTIL_BASE_H */
tools/testing/selftests/kvm/lib/aarch64/processor.c +6 -6
@@ -74,7 +74,7 @@ static uint64_t __maybe_unused ptrs_per_pte(struct kvm_vm *vm)return 1 << (vm->page_shift -3 ); } -void virt_pgd_alloc (struct kvm_vm *vm) +void virt_arch_pgd_alloc (struct kvm_vm *vm) {if (!vm->pgd_created) { vm_paddr_t paddr = vm_phy_pages_alloc(vm,
@@ -131,14 +131,14 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, *ptep |= (attr_idx <<2 ) | (1 <<10 )/* Access Flag */ ; } -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) +void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) {uint64_t attr_idx =4 ;/* NORMAL (See DEFAULT_MAIR_EL1) */ _virt_pg_map (vm, vaddr, paddr, attr_idx); } -vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) +vm_paddr_t addr_arch_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) {uint64_t *ptep;
@@ -195,7 +195,7 @@ static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t p#endif } -void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) +void virt_arch_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) {int level =4 - (vm->pgtable_levels -1 );uint64_t pgd, *ptep;
@@ -303,7 +303,7 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_initset_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TPIDR_EL1 ), vcpuid); } -void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) +void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) {uint64_t pstate, pc;
@@ -330,7 +330,7 @@ void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid,set_reg (vm, vcpuid,ARM64_CORE_REG (regs.pc), (uint64_t )guest_code); } -void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) {aarch64_vcpu_add_default (vm, vcpuid,NULL , guest_code); }
tools/testing/selftests/kvm/lib/riscv/processor.c +6 -6
@@ -53,7 +53,7 @@ static uint64_t pte_index(struct kvm_vm *vm, vm_vaddr_t gva, int level)return (gva & pte_index_mask[level]) >> pte_index_shift[level]; } -void virt_pgd_alloc (struct kvm_vm *vm) +void virt_arch_pgd_alloc (struct kvm_vm *vm) {if (!vm->pgd_created) { vm_paddr_t paddr = vm_phy_pages_alloc(vm,
@@ -64,7 +64,7 @@ void virt_pgd_alloc(struct kvm_vm *vm) } } -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) +void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) {uint64_t *ptep, next_ppn;int level = vm->pgtable_levels -1 ;
@@ -108,7 +108,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)PGTBL_PTE_PERM_MASK |PGTBL_PTE_VALID_MASK ; } -vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) +vm_paddr_t addr_arch_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) {uint64_t *ptep;int level = vm->pgtable_levels -1 ;
@@ -159,7 +159,7 @@ static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent,#endif } -void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) +void virt_arch_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) {int level = vm->pgtable_levels -1 ;uint64_t pgd, *ptep;
@@ -201,7 +201,7 @@ void riscv_vcpu_mmu_setup(struct kvm_vm *vm, int vcpuid)set_reg (vm, vcpuid,RISCV_CSR_REG (satp), satp); } -void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) +void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) {struct kvm_riscv_core core;
@@ -274,7 +274,7 @@ static void __aligned(16) guest_unexp_trap(void) 0, 0, 0, 0, 0, 0); } -void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) {int r; size_t stack_size = vm->page_size == 4096 ?
tools/testing/selftests/kvm/lib/s390x/processor.c +6 -6
@@ -10,7 +10,7 @@#define PAGES_PER_REGION 4 -void virt_pgd_alloc (struct kvm_vm *vm) +void virt_arch_pgd_alloc (struct kvm_vm *vm) {vm_paddr_t paddr;
@@ -46,7 +46,7 @@ static uint64_t virt_alloc_region(struct kvm_vm *vm, int ri) | ((ri < 4 ? (PAGES_PER_REGION - 1) : 0) & REGION_ENTRY_LENGTH); } -void virt_pg_map (struct kvm_vm *vm,uint64_t gva,uint64_t gpa) +void virt_arch_pg_map (struct kvm_vm *vm,uint64_t gva,uint64_t gpa) {int ri, idx;uint64_t *entry;
@@ -85,7 +85,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t gva, uint64_t gpa) entry[idx] = gpa; } -vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) +vm_paddr_t addr_arch_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) {int ri, idx;uint64_t *entry;
@@ -146,7 +146,7 @@ static void virt_dump_region(FILE *stream, struct kvm_vm *vm, uint8_t indent, } } -void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) +void virt_arch_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) {if (!vm->pgd_created)return ;
@@ -154,7 +154,7 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)virt_dump_region (stream, vm, indent, vm->pgd); } -void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) {size_t stack_size =DEFAULT_STACK_PGS *getpagesize ();uint64_t stack_vaddr;
@@ -205,7 +205,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...)va_end (ap); } -void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) +void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) {struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);
tools/testing/selftests/kvm/lib/x86_64/processor.c +6 -6
@@ -109,7 +109,7 @@ static void sregs_dump(FILE *stream, struct kvm_sregs *sregs, uint8_t indent) } } -void virt_pgd_alloc (struct kvm_vm *vm) +void virt_arch_pgd_alloc (struct kvm_vm *vm) {TEST_ASSERT (vm->mode ==VM_MODE_PXXV48_4K ,"Attempt to use " "unknown or unsupported guest mode, mode: 0x%x" , vm->mode);
@@ -208,7 +208,7 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, *pte =PTE_PRESENT_MASK |PTE_WRITABLE_MASK | (paddr &PHYSICAL_PAGE_MASK ); } -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) +void virt_arch_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) {__virt_pg_map (vm, vaddr, paddr,X86_PAGE_SIZE_4K ); }
@@ -303,7 +303,7 @@ void vm_set_page_table_entry(struct kvm_vm *vm, int vcpuid, uint64_t vaddr, *(uint64_t *)new_pte = pte; } -void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) +void virt_arch_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) {uint64_t *pml4e, *pml4e_start;uint64_t *pdpe, *pdpe_start;
@@ -484,7 +484,7 @@ static void kvm_seg_set_kernel_data_64bit(struct kvm_vm *vm, uint16_t selector,kvm_seg_fill_gdt_64bit (vm, segp); } -vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) +vm_paddr_t addr_arch_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) {uint16_t index[4 ];uint64_t *pml4e, *pdpe, *pde;
@@ -633,7 +633,7 @@ void vm_xsave_req_perm(int bit) bitmask); } -void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) {struct kvm_mp_state mp_state;struct kvm_regs regs;
@@ -874,7 +874,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...)va_end (ap); } -void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) +void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) {struct kvm_regs regs;struct kvm_sregs sregs;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 101/144 KVM: selftests: Return created vcpu from vm_vcpu_add_default()
In reply to Sean ChristophersonReturn the created 'struct kvm_vcpu' object from vm_vcpu_add_default(), which cleans up a few tests and will eventually allow removing vcpu_get() entirely.
Opportunistically rename @vcpuid to @vcpu_id to follow preferred kernel style.
--- .../selftests/kvm/include/aarch64/processor.h | 5 +++-- .../selftests/kvm/include/kvm_util_base.h | 10 ++++++---- .../selftests/kvm/lib/aarch64/processor.c | 20 +++++++++++-------- .../selftests/kvm/lib/riscv/processor.c | 20 +++++++++++-------- .../selftests/kvm/lib/s390x/processor.c | 18 ++++++++++------- .../selftests/kvm/lib/x86_64/processor.c | 20 +++++++++++-------- .../kvm/x86_64/pmu_event_filter_test.c | 4 +--- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 3 +-- 8 files changed, 58 insertions(+), 42 deletions(-)
tools/testing/selftests/kvm/include/aarch64/processor.h +3 -2
@@ -64,8 +64,9 @@ static inline void set_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, uint }void aarch64_vcpu_setup (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_vcpu_init *init); -void aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_vcpu_init *init,void *guest_code); +struct kvm_vcpu *aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpu_id, +struct kvm_vcpu_init *init, +void *guest_code);struct ex_regs {u64 regs[31 ];
tools/testing/selftests/kvm/include/kvm_util_base.h +6 -4
@@ -656,12 +656,14 @@ static inline void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid,* vcpuid - The id of the VCPU to add to the VM. * guest_code - The vCPU's entry point */ -void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code); +struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code); -static inline void vm_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid, -void *guest_code) +static inline struct kvm_vcpu *vm_vcpu_add_default (struct kvm_vm *vm, +uint32_t vcpu_id, +void *guest_code) { -vm_arch_vcpu_add (vm, vcpuid, guest_code); +return vm_arch_vcpu_add (vm, vcpu_id, guest_code); }void virt_arch_pgd_alloc (struct kvm_vm *vm);
tools/testing/selftests/kvm/lib/aarch64/processor.c +12 -8
@@ -314,25 +314,29 @@ void vcpu_arch_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t in indent, "", pstate, pc); } -void aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_vcpu_init *init,void *guest_code) +struct kvm_vcpu *aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpu_id, +struct kvm_vcpu_init *init, +void *guest_code) {size_t stack_size = vm->page_size ==4096 ?DEFAULT_STACK_PGS * vm->page_size : vm->page_size;uint64_t stack_vaddr =vm_vaddr_alloc (vm, stack_size,DEFAULT_ARM64_GUEST_STACK_VADDR_MIN ); +struct kvm_vcpu *vcpu =vm_vcpu_add (vm, vcpu_id); -vm_vcpu_add (vm, vcpuid); -aarch64_vcpu_setup (vm, vcpuid, init); +aarch64_vcpu_setup (vm, vcpu_id, init); -set_reg (vm, vcpuid,ARM64_CORE_REG (sp_el1), stack_vaddr + stack_size); -set_reg (vm, vcpuid,ARM64_CORE_REG (regs.pc), (uint64_t )guest_code); +set_reg (vm, vcpu_id,ARM64_CORE_REG (sp_el1), stack_vaddr + stack_size); +set_reg (vm, vcpu_id,ARM64_CORE_REG (regs.pc), (uint64_t )guest_code); + +return vcpu; } -void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code) { -aarch64_vcpu_add_default (vm, vcpuid,NULL , guest_code); +return aarch64_vcpu_add_default (vm, vcpu_id,NULL , guest_code); }void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...)
tools/testing/selftests/kvm/lib/riscv/processor.c +12 -8
@@ -274,7 +274,8 @@ static void __aligned(16) guest_unexp_trap(void) 0, 0, 0, 0, 0, 0); } -void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code) {int r; size_t stack_size = vm->page_size == 4096 ?
@@ -284,9 +285,10 @@ void vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) DEFAULT_RISCV_GUEST_STACK_VADDR_MIN);unsigned long current_gp =0 ;struct kvm_mp_state mps; +struct kvm_vcpu *vcpu; -vm_vcpu_add (vm, vcpuid); -riscv_vcpu_mmu_setup (vm, vcpuid); + vcpu =vm_vcpu_add (vm, vcpu_id); +riscv_vcpu_mmu_setup (vm, vcpu_id);/* * With SBI HSM support in KVM RISC-V, all secondary VCPUs are
@@ -294,23 +296,25 @@ void vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)* are powered-on using KVM_SET_MP_STATE ioctl(). */ mps.mp_state =KVM_MP_STATE_RUNNABLE ; - r =__vcpu_ioctl (vm, vcpuid,KVM_SET_MP_STATE , &mps); + r =__vcpu_ioctl (vm, vcpu_id,KVM_SET_MP_STATE , &mps);TEST_ASSERT (!r,"IOCTL KVM_SET_MP_STATE failed (error %d)" , r);/* Setup global pointer of guest to be same as the host */ asmvolatile ("add %0, gp, zero" :"=r" (current_gp) : :"memory" ); -set_reg (vm, vcpuid,RISCV_CORE_REG (regs.gp), current_gp); +set_reg (vm, vcpu_id,RISCV_CORE_REG (regs.gp), current_gp);/* Setup stack pointer and program counter of guest */ -set_reg (vm, vcpuid,RISCV_CORE_REG (regs.sp), +set_reg (vm, vcpu_id,RISCV_CORE_REG (regs.sp), stack_vaddr + stack_size); -set_reg (vm, vcpuid,RISCV_CORE_REG (regs.pc), +set_reg (vm, vcpu_id,RISCV_CORE_REG (regs.pc), (unsigned long )guest_code);/* Setup default exception vector of guest */ -set_reg (vm, vcpuid,RISCV_CSR_REG (stvec), +set_reg (vm, vcpu_id,RISCV_CSR_REG (stvec), (unsigned long )guest_unexp_trap); + +return vcpu; }void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...)
tools/testing/selftests/kvm/lib/s390x/processor.c +11 -7
@@ -154,12 +154,14 @@ void virt_arch_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)virt_dump_region (stream, vm, indent, vm->pgd); } -void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code) {size_t stack_size =DEFAULT_STACK_PGS *getpagesize ();uint64_t stack_vaddr;struct kvm_regs regs;struct kvm_sregs sregs; +struct kvm_vcpu *vcpu;struct kvm_run *run; TEST_ASSERT(vm->page_size == 4096, "Unsupported page size: 0x%x",
@@ -168,21 +170,23 @@ void vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) stack_vaddr =vm_vaddr_alloc (vm, stack_size,DEFAULT_GUEST_STACK_VADDR_MIN ); -vm_vcpu_add (vm, vcpuid); + vcpu =vm_vcpu_add (vm, vcpu_id);/* Setup guest registers */ -vcpu_regs_get (vm, vcpuid, ®s); +vcpu_regs_get (vm, vcpu_id, ®s); regs.gprs[15 ] = stack_vaddr + (DEFAULT_STACK_PGS *getpagesize ()) -160 ; -vcpu_regs_set (vm, vcpuid, ®s); +vcpu_regs_set (vm, vcpu_id, ®s); -vcpu_sregs_get (vm, vcpuid, &sregs); +vcpu_sregs_get (vm, vcpu_id, &sregs); sregs.crs[0 ] |=0x00040000 ;/* Enable floating point regs */ sregs.crs[1 ] = vm->pgd |0xf ;/* Primary region table */ -vcpu_sregs_set (vm, vcpuid, &sregs); +vcpu_sregs_set (vm, vcpu_id, &sregs); - run =vcpu_state (vm, vcpuid); + run =vcpu_state (vm, vcpu_id); run->psw_mask =0x0400000180000000ULL ;/* DAT enabled + 64 bit mode */ run->psw_addr = (uintptr_t )guest_code; + +return vcpu; }void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...)
tools/testing/selftests/kvm/lib/x86_64/processor.c +12 -8
@@ -633,29 +633,33 @@ void vm_xsave_req_perm(int bit) bitmask); } -void vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid,void *guest_code) +struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code) {struct kvm_mp_state mp_state;struct kvm_regs regs;vm_vaddr_t stack_vaddr; +struct kvm_vcpu *vcpu; + stack_vaddr =vm_vaddr_alloc (vm,DEFAULT_STACK_PGS *getpagesize (),DEFAULT_GUEST_STACK_VADDR_MIN ); -/* Create VCPU */ -vm_vcpu_add (vm, vcpuid); -vcpu_set_cpuid (vm, vcpuid,kvm_get_supported_cpuid ()); -vcpu_setup (vm, vcpuid); + vcpu =vm_vcpu_add (vm, vcpu_id); +vcpu_set_cpuid (vm, vcpu_id,kvm_get_supported_cpuid ()); +vcpu_setup (vm, vcpu_id);/* Setup guest general purpose registers */ -vcpu_regs_get (vm, vcpuid, ®s); +vcpu_regs_get (vm, vcpu_id, ®s); regs.rflags = regs.rflags |0x2 ; regs.rsp = stack_vaddr + (DEFAULT_STACK_PGS *getpagesize ()); regs.rip = (unsigned long ) guest_code; -vcpu_regs_set (vm, vcpuid, ®s); +vcpu_regs_set (vm, vcpu_id, ®s);/* Setup the MP state */ mp_state.mp_state =0 ; -vcpu_mp_state_set (vm, vcpuid, &mp_state); +vcpu_mp_state_set (vm, vcpu_id, &mp_state); + +return vcpu; }/*
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -3
@@ -343,10 +343,8 @@ static void test_pmu_config_disable(void (*guest_code)(void))vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE ); -vm_vcpu_add_default (vm,0 , guest_code); + vcpu =vm_vcpu_add_default (vm,0 , guest_code);vm_init_descriptor_tables (vm); - - vcpu =vcpu_get (vm,0 );vcpu_init_descriptor_tables (vm, vcpu->id); TEST_ASSERT(!sanity_check_pmu(vcpu),
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -2
@@ -54,8 +54,7 @@ static void *run_vcpu(void *_cpu_nr)/* The kernel is fine, but vm_vcpu_add_default() needs locking */ pthread_spin_lock (&create_lock); -vm_vcpu_add_default (vm, vcpu_id, guest_code); - vcpu =vcpu_get (vm, vcpu_id); + vcpu =vm_vcpu_add_default (vm, vcpu_id, guest_code);if (!first_cpu_done) { first_cpu_done = true;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 102/144 KVM: selftests: Rename vm_vcpu_add* helpers to better show relationships
In reply to Sean ChristophersonRename vm_vcpu_add() to __vm_vcpu_add(), and vm_vcpu_add_default() to vm_vcpu_add() to show the relationship between the newly minted vm_vcpu_add() and __vm_vcpu_add().
--- tools/testing/selftests/kvm/aarch64/get-reg-list.c | 2 +- tools/testing/selftests/kvm/aarch64/psci_test.c | 4 ++-- .../testing/selftests/kvm/aarch64/vcpu_width_config.c | 8 ++++---- tools/testing/selftests/kvm/aarch64/vgic_init.c | 10 +++++----- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/hardware_disable_test.c | 2 +- .../testing/selftests/kvm/include/aarch64/processor.h | 5 ++--- tools/testing/selftests/kvm/include/kvm_util_base.h | 7 +++---- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 2 +- tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 +- tools/testing/selftests/kvm/lib/aarch64/processor.c | 9 ++++----- tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++--- tools/testing/selftests/kvm/lib/riscv/processor.c | 2 +- tools/testing/selftests/kvm/lib/s390x/processor.c | 2 +- tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- tools/testing/selftests/kvm/set_memory_region_test.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 2 +- .../selftests/kvm/x86_64/pmu_event_filter_test.c | 2 +- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 4 ++-- tools/testing/selftests/kvm/x86_64/set_sregs_test.c | 2 +- tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c | 8 ++++---- tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c | 4 ++-- tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 23 files changed, 44 insertions(+), 47 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -418,7 +418,7 @@ static void run_test(struct vcpu_config *c) vm =vm_create_barebones ();prepare_vcpu_init (c, &init); -aarch64_vcpu_add_default (vm,0 , &init,NULL ); +aarch64_vcpu_add (vm,0 , &init,NULL );finalize_vcpu (vm,0 , c); reg_list =vcpu_get_reg_list (vm,0 );
tools/testing/selftests/kvm/aarch64/psci_test.c +2 -2
@@ -84,8 +84,8 @@ static struct kvm_vm *setup_vm(void *guest_code)vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init); init.features[0 ] |= (1 <<KVM_ARM_VCPU_PSCI_0_2 ); -aarch64_vcpu_add_default (vm,VCPU_ID_SOURCE , &init, guest_code); -aarch64_vcpu_add_default (vm,VCPU_ID_TARGET , &init, guest_code); +aarch64_vcpu_add (vm,VCPU_ID_SOURCE , &init, guest_code); +aarch64_vcpu_add (vm,VCPU_ID_TARGET , &init, guest_code);return vm; }
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +4 -4
@@ -26,12 +26,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, vm =vm_create_barebones (); -vm_vcpu_add (vm,0 ); +__vm_vcpu_add (vm,0 ); ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);if (ret) goto free_exit; -vm_vcpu_add (vm,1 ); +__vm_vcpu_add (vm,1 ); ret =__vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); free_exit:
@@ -51,8 +51,8 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1, vm =vm_create_barebones (); -vm_vcpu_add (vm,0 ); -vm_vcpu_add (vm,1 ); +__vm_vcpu_add (vm,0 ); +__vm_vcpu_add (vm,1 ); ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);if (ret)
tools/testing/selftests/kvm/aarch64/vgic_init.c +5 -5
@@ -314,7 +314,7 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add_default (v.vm, i, guest_code); +vm_vcpu_add (v.vm, i, guest_code); ret =run_vcpu (v.vm,3 );TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" );
@@ -402,17 +402,17 @@ static void test_v3_typer_accesses(void) v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); -vm_vcpu_add_default (v.vm,3 , guest_code); +vm_vcpu_add (v.vm,3 , guest_code); ret =v3_redist_reg_get (v.gic_fd,1 ,GICR_TYPER , &val);TEST_ASSERT (ret && errno ==EINVAL ,"attempting to read GICR_TYPER of non created vcpu" ); -vm_vcpu_add_default (v.vm,1 , guest_code); +vm_vcpu_add (v.vm,1 , guest_code); ret =v3_redist_reg_get (v.gic_fd,1 ,GICR_TYPER , &val);TEST_ASSERT (ret && errno ==EBUSY ,"read GICR_TYPER before GIC initialized" ); -vm_vcpu_add_default (v.vm,2 , guest_code); +vm_vcpu_add (v.vm,2 , guest_code);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
@@ -576,7 +576,7 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add_default (v.vm, i, guest_code); +vm_vcpu_add (v.vm, i, guest_code);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -676,7 +676,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid, vm =__vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);log_mode_create_vm_done (vm); -vm_vcpu_add_default (vm, vcpuid, guest_code); +vm_vcpu_add (vm, vcpuid, guest_code);return vm; }
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -108,7 +108,7 @@ static void run_test(uint32_t run)pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) { -vm_vcpu_add_default (vm, i, guest_code); +vm_vcpu_add (vm, i, guest_code); payloads[i].vm = vm; payloads[i].index = i;
tools/testing/selftests/kvm/include/aarch64/processor.h +2 -3
@@ -64,9 +64,8 @@ static inline void set_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, uint }void aarch64_vcpu_setup (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_vcpu_init *init); -struct kvm_vcpu *aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpu_id, -struct kvm_vcpu_init *init, -void *guest_code); +struct kvm_vcpu *aarch64_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +struct kvm_vcpu_init *init,void *guest_code);struct ex_regs {u64 regs[31 ];
tools/testing/selftests/kvm/include/kvm_util_base.h +3 -4
@@ -288,7 +288,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,void vm_mem_region_set_flags (struct kvm_vm *vm,uint32_t slot,uint32_t flags);void vm_mem_region_move (struct kvm_vm *vm,uint32_t slot,uint64_t new_gpa);void vm_mem_region_delete (struct kvm_vm *vm,uint32_t slot); -struct kvm_vcpu *vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid); +struct kvm_vcpu *__vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid);vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min);vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages);vm_vaddr_t vm_vaddr_alloc_page (struct kvm_vm *vm);
@@ -659,9 +659,8 @@ static inline void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid,struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id,void *guest_code); -static inline struct kvm_vcpu *vm_vcpu_add_default (struct kvm_vm *vm, -uint32_t vcpu_id, -void *guest_code) +static inline struct kvm_vcpu *vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +void *guest_code) {return vm_arch_vcpu_add (vm, vcpu_id, guest_code); }
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])for (i =0 ; i < max_vm; ++i) { vms[i] =vm_create_barebones ();for (j =0 ; j < max_vcpu; ++j) -vm_vcpu_add (vms[i], j); +__vm_vcpu_add (vms[i], j); }/* Check stats read for every VM and VCPU */
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +1 -1
@@ -32,7 +32,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus)for (i = first_vcpu_id; i < first_vcpu_id + num_vcpus; i++)/* This asserts that the vCPU was created. */ -vm_vcpu_add (vm, i); +__vm_vcpu_add (vm, i);kvm_vm_free (vm); }
tools/testing/selftests/kvm/lib/aarch64/processor.c +4 -5
@@ -314,16 +314,15 @@ void vcpu_arch_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t in indent, "", pstate, pc); } -struct kvm_vcpu *aarch64_vcpu_add_default (struct kvm_vm *vm,uint32_t vcpu_id, -struct kvm_vcpu_init *init, -void *guest_code) +struct kvm_vcpu *aarch64_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id, +struct kvm_vcpu_init *init,void *guest_code) {size_t stack_size = vm->page_size ==4096 ?DEFAULT_STACK_PGS * vm->page_size : vm->page_size;uint64_t stack_vaddr =vm_vaddr_alloc (vm, stack_size,DEFAULT_ARM64_GUEST_STACK_VADDR_MIN ); -struct kvm_vcpu *vcpu =vm_vcpu_add (vm, vcpu_id); +struct kvm_vcpu *vcpu =__vm_vcpu_add (vm, vcpu_id);aarch64_vcpu_setup (vm, vcpu_id, init);
@@ -336,7 +335,7 @@ struct kvm_vcpu *aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpu_id,struct kvm_vcpu *vm_arch_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id,void *guest_code) { -return aarch64_vcpu_add_default (vm, vcpu_id,NULL , guest_code); +return aarch64_vcpu_add (vm, vcpu_id,NULL , guest_code); }void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...)
tools/testing/selftests/kvm/lib/kvm_util.c +3 -3
@@ -328,7 +328,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,for (i =0 ; i < nr_vcpus; ++i) {uint32_t vcpuid = vcpuids ? vcpuids[i] : i; -vm_vcpu_add_default (vm, vcpuid, guest_code); +vm_vcpu_add (vm, vcpuid, guest_code); }return vm;
@@ -397,7 +397,7 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm) {kvm_vm_restart (vm); -return vm_vcpu_add (vm,0 ); +return __vm_vcpu_add (vm,0 ); }/*
@@ -1065,7 +1065,7 @@ static int vcpu_mmap_sz(void)* Adds a virtual CPU to the VM specified by vm with the ID given by vcpu_id. * No additional vCPU setup is done. Returns the vCPU. */ -struct kvm_vcpu *vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id) +struct kvm_vcpu *__vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id) {struct kvm_vcpu *vcpu;
tools/testing/selftests/kvm/lib/riscv/processor.c +1 -1
@@ -287,7 +287,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id,struct kvm_mp_state mps;struct kvm_vcpu *vcpu; - vcpu =vm_vcpu_add (vm, vcpu_id); + vcpu =__vm_vcpu_add (vm, vcpu_id);riscv_vcpu_mmu_setup (vm, vcpu_id);/*
tools/testing/selftests/kvm/lib/s390x/processor.c +1 -1
@@ -170,7 +170,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, stack_vaddr =vm_vaddr_alloc (vm, stack_size,DEFAULT_GUEST_STACK_VADDR_MIN ); - vcpu =vm_vcpu_add (vm, vcpu_id); + vcpu =__vm_vcpu_add (vm, vcpu_id);/* Setup guest registers */ vcpu_regs_get (vm, vcpu_id, ®s);
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
@@ -644,7 +644,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, stack_vaddr =vm_vaddr_alloc (vm,DEFAULT_STACK_PGS *getpagesize (),DEFAULT_GUEST_STACK_VADDR_MIN ); - vcpu =vm_vcpu_add (vm, vcpu_id); + vcpu =__vm_vcpu_add (vm, vcpu_id);vcpu_set_cpuid (vm, vcpu_id,kvm_get_supported_cpuid ());vcpu_setup (vm, vcpu_id);
tools/testing/selftests/kvm/set_memory_region_test.c +1 -1
@@ -315,7 +315,7 @@ static void test_zero_memory_regions(void)pr_info ("Testing KVM_RUN with zero added memory regions\n" ); vm =vm_create_barebones (); - vcpu =vm_vcpu_add (vm,0 ); + vcpu =__vm_vcpu_add (vm,0 );vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul );vcpu_run (vm, vcpu->id);
tools/testing/selftests/kvm/steal_time.c +1 -1
@@ -275,7 +275,7 @@ int main(int ac, char **av)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add_default (vm, i, guest_code); +vm_vcpu_add (vm, i, guest_code);steal_time_init (vm);
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -343,7 +343,7 @@ static void test_pmu_config_disable(void (*guest_code)(void))vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE ); - vcpu =vm_vcpu_add_default (vm,0 , guest_code); + vcpu =vm_vcpu_add (vm,0 , guest_code);vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vm, vcpu->id);
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +2 -2
@@ -92,9 +92,9 @@ static struct kvm_vm *create_vm(void)static void add_x86_vcpu (struct kvm_vm *vm,uint32_t vcpuid,bool bsp_code) {if (bsp_code) -vm_vcpu_add_default (vm, vcpuid, guest_bsp_vcpu); +vm_vcpu_add (vm, vcpuid, guest_bsp_vcpu);else -vm_vcpu_add_default (vm, vcpuid, guest_not_bsp_vcpu); +vm_vcpu_add (vm, vcpuid, guest_not_bsp_vcpu); }static void run_vm_bsp (uint32_t bsp_vcpu)
tools/testing/selftests/kvm/x86_64/set_sregs_test.c +1 -1
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])* the vCPU model, i.e. without doing KVM_SET_CPUID2. */ vm =vm_create_barebones (); - vcpu =vm_vcpu_add (vm,0 ); + vcpu =__vm_vcpu_add (vm,0 );vcpu_sregs_get (vm, vcpu->id, &sregs);
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +4 -4
@@ -56,7 +56,7 @@ static struct kvm_vm *sev_vm_create(bool es) vm =vm_create_barebones ();sev_ioctl (vm->fd, es ?KVM_SEV_ES_INIT :KVM_SEV_INIT ,NULL );for (i =0 ; i <NR_MIGRATE_TEST_VCPUS ; ++i) -vm_vcpu_add (vm, i); +__vm_vcpu_add (vm, i);if (es) start.policy |=SEV_POLICY_ES ;sev_ioctl (vm->fd,KVM_SEV_LAUNCH_START , &start);
@@ -75,7 +75,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)return vm;for (i =0 ; i <NR_MIGRATE_TEST_VCPUS ; ++i) -vm_vcpu_add (vm, i); +__vm_vcpu_add (vm, i);return vm; }
@@ -182,7 +182,7 @@ static void test_sev_migrate_parameters(void) sev_es_vm =sev_vm_create (/* es= */ true); sev_es_vm_no_vmsa =vm_create_barebones ();sev_ioctl (sev_es_vm_no_vmsa->fd,KVM_SEV_ES_INIT ,NULL ); -vm_vcpu_add (sev_es_vm_no_vmsa,1 ); +__vm_vcpu_add (sev_es_vm_no_vmsa,1 ); ret =__sev_migrate_from (sev_vm, sev_es_vm); TEST_ASSERT(
@@ -278,7 +278,7 @@ static void test_sev_mirror(bool es)/* Check that we can complete creation of the mirror VM. */ for (i =0 ; i <NR_MIGRATE_TEST_VCPUS ; ++i) -vm_vcpu_add (dst_vm, i); +__vm_vcpu_add (dst_vm, i);if (es)sev_ioctl (dst_vm->fd,KVM_SEV_LAUNCH_UPDATE_VMSA ,NULL );
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +2 -2
@@ -51,10 +51,10 @@ static void *run_vcpu(void *_cpu_nr)static bool first_cpu_done;struct kvm_vcpu *vcpu; -/* The kernel is fine, but vm_vcpu_add_default() needs locking */ +/* The kernel is fine, but vm_vcpu_add() needs locking */ pthread_spin_lock (&create_lock); - vcpu =vm_vcpu_add_default (vm, vcpu_id, guest_code); + vcpu =vm_vcpu_add (vm, vcpu_id, guest_code);if (!first_cpu_done) { first_cpu_done = true;
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -1
@@ -425,7 +425,7 @@ int main(int argc, char *argv[])virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ); -vm_vcpu_add_default (vm,SENDER_VCPU_ID , sender_guest_code); +vm_vcpu_add (vm,SENDER_VCPU_ID , sender_guest_code); test_data_page_vaddr =vm_vaddr_alloc_page (vm); data =
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 103/144 KVM: selftests: Convert set_boot_cpu_id away from global VCPU_IDs
In reply to Sean ChristophersonRework set_boot_cpu_id to pass around 'struct kvm_vcpu' objects instead of relying on global VCPU_IDs. The test is still ugly, but that's unavoidable since the point of the test is to verify that KVM correctly assigns VCPU_ID==0 to be the BSP by default. This is literally one of two KVM selftests that legitimately needs to care about the exact vCPU IDs of the vCPUs it creates.
--- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 86 ++++++++----------- 1 file changed, 36 insertions(+), 50 deletions(-)
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +36 -50
@@ -16,10 +16,6 @@#include "processor.h" #include "apic.h" -#define N_VCPU 2 -#define VCPU_ID0 0 -#define VCPU_ID1 1 -static void guest_bsp_vcpu (void *arg) {GUEST_SYNC (1 );
@@ -38,31 +34,30 @@ static void guest_not_bsp_vcpu(void *arg)GUEST_DONE (); } -static void test_set_boot_busy (struct kvm_vm *vm) +static void test_set_bsp_busy (struct kvm_vcpu *vcpu,const char *msg) { -int res; +int r =__vm_ioctl (vcpu->vm,KVM_SET_BOOT_CPU_ID , + (void *)(unsigned long )vcpu->id); - res =__vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)VCPU_ID0 ); -TEST_ASSERT (res ==-1 && errno ==EBUSY , -"KVM_SET_BOOT_CPU_ID set while running vm" ); +TEST_ASSERT (r ==-1 && errno ==EBUSY ,"KVM_SET_BOOT_CPU_ID set %s" , msg); } -static void run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) +static void run_vcpu (struct kvm_vcpu *vcpu) {struct ucall uc;int stage;for (stage =0 ; stage <2 ; stage++) { -vcpu_run (vm, vcpuid); +vcpu_run (vcpu->vm, vcpu->id); -switch (get_ucall (vm, vcpuid, &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :TEST_ASSERT (!strcmp ((const char *)uc.args[0 ],"hello" ) && uc.args[1 ] == stage +1 ,"Stage %d: Unexpected register values vmexit, got %lx" , stage +1 , (ulong )uc.args[1 ]); -test_set_boot_busy (vm); +test_set_bsp_busy (vcpu,"while running vm" );break ;case UCALL_DONE : TEST_ASSERT(stage == 1,
@@ -75,65 +70,56 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid) uc.args[1], uc.args[2], uc.args[3]);default :TEST_ASSERT (false,"Unexpected exit: %s" , -exit_reason_str (vcpu_state (vm, vcpuid)->exit_reason)); +exit_reason_str (vcpu->run->exit_reason)); } } } -static struct kvm_vm *create_vm (void ) +static struct kvm_vm *create_vm (uint32_t nr_vcpus,uint32_t bsp_vcpu_id, +struct kvm_vcpu *vcpus[]) { -uint64_t vcpu_pages = (DEFAULT_STACK_PGS ) *2 ; -uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE *N_VCPU ; +uint64_t vcpu_pages = (DEFAULT_STACK_PGS ) * nr_vcpus; +uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE * nr_vcpus;uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; +struct kvm_vm *vm; +uint32_t i; -return vm_create (pages); -} + vm =vm_create (pages); -static void add_x86_vcpu (struct kvm_vm *vm,uint32_t vcpuid,bool bsp_code) -{ -if (bsp_code) -vm_vcpu_add (vm, vcpuid, guest_bsp_vcpu); -else -vm_vcpu_add (vm, vcpuid, guest_not_bsp_vcpu); +vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)(unsigned long )bsp_vcpu_id); + +for (i =0 ; i < nr_vcpus; i++) + vcpus[i] =vm_vcpu_add (vm, i, i == bsp_vcpu_id ? guest_bsp_vcpu : + guest_not_bsp_vcpu); +return vm; } -static void run_vm_bsp (uint32_t bsp_vcpu) +static void run_vm_bsp (uint32_t bsp_vcpu_id) { +struct kvm_vcpu *vcpus[2 ];struct kvm_vm *vm; -bool is_bsp_vcpu1 = bsp_vcpu ==VCPU_ID1 ; - - vm =create_vm (); - -if (is_bsp_vcpu1) -vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)VCPU_ID1 ); -add_x86_vcpu (vm,VCPU_ID0 , !is_bsp_vcpu1); -add_x86_vcpu (vm,VCPU_ID1 , is_bsp_vcpu1); + vm =create_vm (ARRAY_SIZE (vcpus), bsp_vcpu_id, vcpus); -run_vcpu (vm,VCPU_ID0 ); -run_vcpu (vm,VCPU_ID1 ); +run_vcpu (vcpus[0 ]); +run_vcpu (vcpus[1 ]);kvm_vm_free (vm); }static void check_set_bsp_busy (void ) { +struct kvm_vcpu *vcpus[2 ];struct kvm_vm *vm; -int res; - vm =create_vm (); + vm =create_vm (ARRAY_SIZE (vcpus),0 , vcpus); -add_x86_vcpu (vm,VCPU_ID0 , true); -add_x86_vcpu (vm,VCPU_ID1 , false); +test_set_bsp_busy (vcpus[1 ],"after adding vcpu" ); - res =__vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)VCPU_ID1 ); -TEST_ASSERT (res ==-1 && errno ==EBUSY ,"KVM_SET_BOOT_CPU_ID set after adding vcpu" ); +run_vcpu (vcpus[0 ]); +run_vcpu (vcpus[1 ]); -run_vcpu (vm,VCPU_ID0 ); -run_vcpu (vm,VCPU_ID1 ); - - res =__vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)VCPU_ID1 ); -TEST_ASSERT (res ==-1 && errno ==EBUSY ,"KVM_SET_BOOT_CPU_ID set to a terminated vcpu" ); +test_set_bsp_busy (vcpus[1 ],"to a terminated vcpu" );kvm_vm_free (vm); }
@@ -145,9 +131,9 @@ int main(int argc, char *argv[])return 0 ; } -run_vm_bsp (VCPU_ID0 ); -run_vm_bsp (VCPU_ID1 ); -run_vm_bsp (VCPU_ID0 ); +run_vm_bsp (0 ); +run_vm_bsp (1 ); +run_vm_bsp (0 );check_set_bsp_busy (); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 104/144 KVM: selftests: Convert psci_test away from VCPU_ID
In reply to Sean ChristophersonPass around 'struct kvm_vcpu' objects in psci_test instead of relying on global VCPU_IDs. Ideally, the test wouldn't have to manually create vCPUs and thus care about vCPU IDs, but it's not the end of the world and avoiding that behavior isn't guaranteed to be a net positive (an attempt at macro shenanigans did not go very well).
--- .../testing/selftests/kvm/aarch64/psci_test.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +25 -25
@@ -17,9 +17,6 @@#include "processor.h" #include "test_util.h" -#define VCPU_ID_SOURCE 0 -#define VCPU_ID_TARGET 1 -#define CPU_ON_ENTRY_ADDR 0xfeedf00dul#define CPU_ON_CONTEXT_ID 0xdeadc0deul
@@ -64,16 +61,17 @@ static uint64_t psci_features(uint32_t func_id)return res.a0; } -static void vcpu_power_off (struct kvm_vm *vm,uint32_t vcpuid) +static void vcpu_power_off (struct kvm_vcpu *vcpu) {struct kvm_mp_state mp_state = { .mp_state =KVM_MP_STATE_STOPPED , }; -vcpu_mp_state_set (vm, vcpuid, &mp_state); +vcpu_mp_state_set (vcpu->vm, vcpu->id, &mp_state); } -static struct kvm_vm *setup_vm (void *guest_code) +static struct kvm_vm *setup_vm (void *guest_code,struct kvm_vcpu **source, +struct kvm_vcpu **target) {struct kvm_vcpu_init init;struct kvm_vm *vm;
@@ -84,28 +82,28 @@ static struct kvm_vm *setup_vm(void *guest_code)vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init); init.features[0 ] |= (1 <<KVM_ARM_VCPU_PSCI_0_2 ); -aarch64_vcpu_add (vm,VCPU_ID_SOURCE , &init, guest_code); -aarch64_vcpu_add (vm,VCPU_ID_TARGET , &init, guest_code); + *source =aarch64_vcpu_add (vm,0 , &init, guest_code); + *target =aarch64_vcpu_add (vm,1 , &init, guest_code);return vm; } -static void enter_guest (struct kvm_vm *vm,uint32_t vcpuid) +static void enter_guest (struct kvm_vcpu *vcpu) {struct ucall uc; -vcpu_run (vm, vcpuid); -if (get_ucall (vm, vcpuid, &uc) ==UCALL_ABORT ) +vcpu_run (vcpu->vm, vcpu->id); +if (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_ABORT )TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]); } -static void assert_vcpu_reset (struct kvm_vm *vm,uint32_t vcpuid) +static void assert_vcpu_reset (struct kvm_vcpu *vcpu) {uint64_t obs_pc, obs_x0; -get_reg (vm, vcpuid,ARM64_CORE_REG (regs.pc), &obs_pc); -get_reg (vm, vcpuid,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); +get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.pc), &obs_pc); +get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, "unexpected target cpu pc: %lx (expected: %lx)",
@@ -133,25 +131,26 @@ static void guest_test_cpu_on(uint64_t target_cpu)static void host_test_cpu_on (void ) { +struct kvm_vcpu *source, *target;uint64_t target_mpidr;struct kvm_vm *vm;struct ucall uc; - vm =setup_vm (guest_test_cpu_on); + vm =setup_vm (guest_test_cpu_on, &source, &target);/* * make sure the target is already off when executing the test. */ -vcpu_power_off (vm,VCPU_ID_TARGET ); +vcpu_power_off (target); -get_reg (vm,VCPU_ID_TARGET ,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); -vcpu_args_set (vm,VCPU_ID_SOURCE ,1 , target_mpidr &MPIDR_HWID_BITMASK ); -enter_guest (vm,VCPU_ID_SOURCE ); +get_reg (vm, target->id,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); +vcpu_args_set (vm, source->id,1 , target_mpidr &MPIDR_HWID_BITMASK ); +enter_guest (source); -if (get_ucall (vm,VCPU_ID_SOURCE , &uc) !=UCALL_DONE ) +if (get_ucall (vm, source->id, &uc) !=UCALL_DONE )TEST_FAIL ("Unhandled ucall: %lu" , uc.cmd); -assert_vcpu_reset (vm,VCPU_ID_TARGET ); +assert_vcpu_reset (target);kvm_vm_free (vm); }
@@ -169,16 +168,17 @@ static void guest_test_system_suspend(void)static void host_test_system_suspend (void ) { +struct kvm_vcpu *source, *target;struct kvm_run *run;struct kvm_vm *vm; - vm =setup_vm (guest_test_system_suspend); + vm =setup_vm (guest_test_system_suspend, &source, &target);vm_enable_cap (vm,KVM_CAP_ARM_SYSTEM_SUSPEND ,0 ); -vcpu_power_off (vm,VCPU_ID_TARGET ); - run =vcpu_state (vm,VCPU_ID_SOURCE ); +vcpu_power_off (target); + run = source->run; -enter_guest (vm,VCPU_ID_SOURCE ); +enter_guest (source); TEST_ASSERT(run->exit_reason == KVM_EXIT_SYSTEM_EVENT, "Unhandled exit reason: %u (%s)",
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 105/144 KVM: selftests: Convert hardware_disable_test to pass around vCPU objects
In reply to Sean ChristophersonPass around 'struct kvm_vcpu' objects in hardware_disable_test instead of the VM+vcpu_id (called "index" by the test).
--- .../selftests/kvm/hardware_disable_test.c | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/hardware_disable_test.c +8 -17
@@ -27,12 +27,6 @@sem_t *sem; -/* Arguments for the pthreads */ -struct payload { -struct kvm_vm *vm; -uint32_t index; -}; -static void guest_code (void ) {for (;;)
@@ -42,14 +36,14 @@ static void guest_code(void)static void *run_vcpu (void *arg) { -struct payload *payload = (struct payload *)arg; -struct kvm_run *state =vcpu_state (payload->vm, payload->index); +struct kvm_vcpu *vcpu = arg; +struct kvm_run *run = vcpu->run; -vcpu_run (payload->vm, payload->index); +vcpu_run (vcpu->vm, vcpu->id);TEST_ASSERT (false,"%s: exited with reason %d: %s\n" , - __func__, state->exit_reason, -exit_reason_str (state->exit_reason)); + __func__, run->exit_reason, +exit_reason_str (run->exit_reason));pthread_exit (NULL ); }
@@ -92,11 +86,11 @@ static inline void check_join(pthread_t thread, void **retval)static void run_test (uint32_t run) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;cpu_set_t cpu_set;pthread_t threads[VCPU_NUM ];pthread_t throw_away; -struct payload payloads[VCPU_NUM ];void *b;uint32_t i, j;
@@ -108,12 +102,9 @@ static void run_test(uint32_t run)pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) { -vm_vcpu_add (vm, i, guest_code); - payloads[i].vm = vm; - payloads[i].index = i; + vcpu =vm_vcpu_add (vm, i, guest_code); -check_create_thread (&threads[i],NULL , run_vcpu, - (void *)&payloads[i]); +check_create_thread (&threads[i],NULL , run_vcpu, vcpu);check_set_affinity (threads[i], &cpu_set);for (j =0 ; j <SLEEPING_THREAD_NUM ; ++j) {
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 106/144 KVM: selftests: Add VM creation helper that "returns" vCPUs
In reply to Sean ChristophersonAdd a VM creator that "returns" the created vCPUs by filling the provided array. This will allow converting multi-vCPU tests away from hardcoded vCPU IDs.
--- .../selftests/kvm/include/kvm_util_base.h | 17 +++++++++++++---- .../testing/selftests/kvm/kvm_page_table_test.c | 4 ++-- tools/testing/selftests/kvm/lib/kvm_util.c | 17 ++++++++++------- .../testing/selftests/kvm/lib/perf_test_util.c | 4 ++-- 4 files changed, 27 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +13 -4
@@ -563,10 +563,19 @@ struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_me uint32_t vcpuids[]);/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */ -struct kvm_vm *vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t slot0_mem_pages,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[]); +struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, +uint64_t slot0_mem_pages,uint64_t extra_mem_pages, +uint32_t num_percpu_pages,void *guest_code, +uint32_t vcpuids[],struct kvm_vcpu *vcpus[]); + +static inline struct kvm_vm *vm_create_with_vcpus (uint32_t nr_vcpus, +void *guest_code, +struct kvm_vcpu *vcpus[]) +{ +return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus, +DEFAULT_GUEST_PHY_PAGES ,0 ,0 , + guest_code,NULL , vcpus); +}/* * Create a VM with a single vCPU with reasonable defaults and @extra_mem_pages
tools/testing/selftests/kvm/kvm_page_table_test.c +2 -2
@@ -268,8 +268,8 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Create a VM with enough guest pages */ guest_num_pages = test_mem_size / guest_page_size; - vm =vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code,NULL ); + vm =__vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , + guest_num_pages,0 , guest_code,NULL ,NULL );/* Align down GPA of the testing memslot */ if (!p->phys_offset)
tools/testing/selftests/kvm/lib/kvm_util.c +10 -7
@@ -296,12 +296,13 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)* extra_mem_pages is only used to calculate the maximum page table size, * no real memory allocation for non-slot0 memory in this function. */ -struct kvm_vm *vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t slot0_mem_pages,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[]) +struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, +uint64_t slot0_mem_pages,uint64_t extra_mem_pages, +uint32_t num_percpu_pages,void *guest_code, +uint32_t vcpuids[],struct kvm_vcpu *vcpus[]) {uint64_t vcpu_pages, extra_pg_pages, pages; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;int i;
@@ -328,7 +329,9 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,for (i =0 ; i < nr_vcpus; ++i) {uint32_t vcpuid = vcpuids ? vcpuids[i] : i; -vm_vcpu_add (vm, vcpuid, guest_code); + vcpu =vm_vcpu_add (vm, vcpuid, guest_code); +if (vcpus) + vcpus[i] = vcpu; }return vm;
@@ -338,8 +341,8 @@ struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_me uint32_t num_percpu_pages, void *guest_code, uint32_t vcpuids[]) { - return vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, DEFAULT_GUEST_PHY_PAGES, -extra_mem_pages ,num_percpu_pages ,guest_code ,vcpuids ); + return __vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, DEFAULT_GUEST_PHY_PAGES, +extra_mem_pages ,num_percpu_pages ,guest_code ,vcpuids ,NULL ); } struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,
tools/testing/selftests/kvm/lib/perf_test_util.c +2 -2
@@ -139,8 +139,8 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,* The memory is also added to memslot 0, but that's a benign side * effect as KVM allows aliasing HVAs in meslots. */ - vm =vm_create_with_vcpus (mode, vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code,NULL ); + vm =__vm_create_with_vcpus (mode, vcpus,DEFAULT_GUEST_PHY_PAGES , + guest_num_pages,0 , guest_code,NULL ,NULL ); pta->vm = vm;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 107/144 KVM: selftests: Convert steal_time away from VCPU_ID
In reply to Sean ChristophersonConvert steal_time to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of requiring that the index into the array of vCPUs for a given vCPU is also the ID of the vCPU.
--- tools/testing/selftests/kvm/steal_time.c | 123 ++++++++++++----------- 1 file changed, 62 insertions(+), 61 deletions(-)
tools/testing/selftests/kvm/steal_time.c +62 -61
@@ -58,36 +58,34 @@ static void guest_code(int cpu)GUEST_DONE (); } -static void steal_time_init (struct kvm_vm *vm) +static bool is_steal_time_supported (struct kvm_vcpu *vcpu) { -int i; +struct kvm_cpuid_entry2 *cpuid =kvm_get_supported_cpuid_entry (KVM_CPUID_FEATURES ); -if (!(kvm_get_supported_cpuid_entry (KVM_CPUID_FEATURES )->eax & -KVM_FEATURE_STEAL_TIME )) { -print_skip ("steal-time not supported" ); -exit (KSFT_SKIP ); - } +return cpuid && (cpuid->eax &KVM_FEATURE_STEAL_TIME ); +} -for (i =0 ; i <NR_VCPUS ; ++i) { -int ret; +static void steal_time_init (struct kvm_vcpu *vcpu,uint32_t i) +{ +int ret; -/* ST_GPA_BASE is identity mapped */ - st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE ); -sync_global_to_guest (vm, st_gva[i]); +/* ST_GPA_BASE is identity mapped */ + st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE ); +sync_global_to_guest (vcpu->vm, st_gva[i]); - ret =_vcpu_set_msr (vm, i,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_STEAL_RESERVED_MASK ); -TEST_ASSERT (ret ==0 ,"Bad GPA didn't fail" ); + ret =_vcpu_set_msr (vcpu->vm, vcpu->id,MSR_KVM_STEAL_TIME , + (ulong )st_gva[i] |KVM_STEAL_RESERVED_MASK ); +TEST_ASSERT (ret ==0 ,"Bad GPA didn't fail" ); -vcpu_set_msr (vm, i,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_MSR_ENABLED ); - } +vcpu_set_msr (vcpu->vm, vcpu->id,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_MSR_ENABLED ); } -static void steal_time_dump (struct kvm_vm *vm,uint32_t vcpuid) +static void steal_time_dump (struct kvm_vm *vm,uint32_t vcpu_idx) { -struct kvm_steal_time *st =addr_gva2hva (vm, (ulong )st_gva[vcpuid]); +struct kvm_steal_time *st =addr_gva2hva (vm, (ulong )st_gva[vcpu_idx]);int i; -pr_info ("VCPU%d:\n" , vcpuid); +pr_info ("VCPU%d:\n" , vcpu_idx);pr_info (" steal: %lld\n" , st->steal);pr_info (" version: %d\n" , st->version);pr_info (" flags: %d\n" , st->flags);
@@ -158,49 +156,50 @@ static void guest_code(int cpu)GUEST_DONE (); } -static void steal_time_init (struct kvm_vm *vm) +static bool is_steal_time_supported (struct kvm_vcpu *vcpu) {struct kvm_device_attr dev = { .group =KVM_ARM_VCPU_PVTIME_CTRL , .attr =KVM_ARM_VCPU_PVTIME_IPA , }; -int i, ret; - ret =__vcpu_ioctl (vm,0 ,KVM_HAS_DEVICE_ATTR , &dev); -if (ret !=0 && errno ==ENXIO ) { -print_skip ("steal-time not supported" ); -exit (KSFT_SKIP ); - } - -for (i =0 ; i <NR_VCPUS ; ++i) { -uint64_t st_ipa; +return !__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_HAS_DEVICE_ATTR , &dev); +} -vcpu_ioctl (vm, i,KVM_HAS_DEVICE_ATTR , &dev); +static void steal_time_init (struct kvm_vcpu *vcpu,uint32_t i) +{ +struct kvm_vm *vm = vcpu->vm; +uint64_t st_ipa; +int ret; - dev.addr = (uint64_t )&st_ipa; +struct kvm_device_attr dev = { + .group =KVM_ARM_VCPU_PVTIME_CTRL , + .attr =KVM_ARM_VCPU_PVTIME_IPA , + .addr = (uint64_t )&st_ipa, + }; -/* ST_GPA_BASE is identity mapped */ - st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE ); -sync_global_to_guest (vm, st_gva[i]); +vcpu_ioctl (vm, vcpu->id,KVM_HAS_DEVICE_ATTR , &dev); - st_ipa = (ulong )st_gva[i] |1 ; - ret =__vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev); -TEST_ASSERT (ret ==-1 && errno ==EINVAL ,"Bad IPA didn't report EINVAL" ); +/* ST_GPA_BASE is identity mapped */ + st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE ); +sync_global_to_guest (vm, st_gva[i]); - st_ipa = (ulong )st_gva[i]; -vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev); + st_ipa = (ulong )st_gva[i] |1 ; + ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); +TEST_ASSERT (ret ==-1 && errno ==EINVAL ,"Bad IPA didn't report EINVAL" ); - ret =__vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev); -TEST_ASSERT (ret ==-1 && errno ==EEXIST ,"Set IPA twice without EEXIST" ); + st_ipa = (ulong )st_gva[i]; +vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); - } + ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); +TEST_ASSERT (ret ==-1 && errno ==EEXIST ,"Set IPA twice without EEXIST" ); } -static void steal_time_dump (struct kvm_vm *vm,uint32_t vcpuid) +static void steal_time_dump (struct kvm_vm *vm,uint32_t vcpu_idx) { -struct st_time *st =addr_gva2hva (vm, (ulong )st_gva[vcpuid]); +struct st_time *st =addr_gva2hva (vm, (ulong )st_gva[vcpu_idx]); -pr_info ("VCPU%d:\n" , vcpuid); +pr_info ("VCPU%d:\n" , vcpu_idx);pr_info (" rev: %d\n" , st->rev);pr_info (" attr: %d\n" , st->attr);pr_info (" st_time: %ld\n" , st->st_time);
@@ -224,15 +223,13 @@ static void *do_steal_time(void *arg)return NULL ; } -static void run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) +static void run_vcpu (struct kvm_vcpu *vcpu) {struct ucall uc; -vcpu_args_set (vm, vcpuid,1 , vcpuid); +vcpu_run (vcpu->vm, vcpu->id); -vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); - -switch (get_ucall (vm, vcpuid, &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :case UCALL_DONE :break ;
@@ -241,12 +238,13 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid) __FILE__, uc.args[1]);default :TEST_ASSERT (false,"Unexpected exit: %s" , -exit_reason_str (vcpu_state (vm, vcpuid)->exit_reason)); +exit_reason_str (vcpu->run->exit_reason)); } }int main (int ac,char **av) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct kvm_vm *vm;pthread_attr_t attr;pthread_t thread;
@@ -266,26 +264,29 @@ int main(int ac, char **av)pthread_attr_setaffinity_np (&attr,sizeof (cpu_set_t), &cpuset);pthread_setaffinity_np (pthread_self (),sizeof (cpu_set_t), &cpuset); -/* Create a one VCPU guest and an identity mapped memslot for the steal time structure */ - vm =vm_create_default (0 ,0 , guest_code); +/* Create a VM and an identity mapped memslot for the steal time structure */ + vm =vm_create_with_vcpus (NR_VCPUS , guest_code, vcpus); gpages =vm_calc_num_guest_pages (VM_MODE_DEFAULT ,STEAL_TIME_SIZE *NR_VCPUS );vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,ST_GPA_BASE ,1 , gpages,0 );virt_map (vm,ST_GPA_BASE ,ST_GPA_BASE , gpages);ucall_init (vm,NULL ); -/* Add the rest of the VCPUs */ -for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add (vm, i, guest_code); - -steal_time_init (vm); +if (!is_steal_time_supported (vcpus[0 ])) { +print_skip ("steal-time not supported" ); +exit (KSFT_SKIP ); + }/* Run test on each VCPU */ for (i =0 ; i <NR_VCPUS ; ++i) { +steal_time_init (vcpus[i], i); + +vcpu_args_set (vm, vcpus[i]->id,1 , i); +/* First VCPU run initializes steal-time */ -run_vcpu (vm, i); +run_vcpu (vcpus[i]);/* Second VCPU run, expect guest stolen time to be <= run_delay */ -run_vcpu (vm, i); +run_vcpu (vcpus[i]);sync_global_from_guest (vm, guest_stolen_time[i]); stolen_time = guest_stolen_time[i]; run_delay =get_run_delay ();
@@ -306,7 +307,7 @@ int main(int ac, char **av) MIN_RUN_DELAY_NS, run_delay);/* Run VCPU again to confirm stolen time is consistent with run_delay */ -run_vcpu (vm, i); +run_vcpu (vcpus[i]);sync_global_from_guest (vm, guest_stolen_time[i]); stolen_time = guest_stolen_time[i] - stolen_time; TEST_ASSERT(stolen_time >= run_delay,
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 108/144 KVM: selftests: Convert arch_timer away from VCPU_ID
In reply to Sean ChristophersonConvert arch_timer to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of requiring that the index into the array of vCPUs for a given vCPU is also the ID of the vCPU
--- .../selftests/kvm/aarch64/arch_timer.c | 62 ++++++++----------- 1 file changed, 27 insertions(+), 35 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +27 -35
@@ -76,13 +76,8 @@ struct test_vcpu_shared_data {uint64_t xcnt; }; -struct test_vcpu { -uint32_t vcpuid; -pthread_t pt_vcpu_run; -struct kvm_vm *vm; -}; - -static struct test_vcpu test_vcpu[KVM_MAX_VCPUS ]; +static struct kvm_vcpu *vcpus[KVM_MAX_VCPUS ]; +static pthread_t pt_vcpu_run[KVM_MAX_VCPUS ];static struct test_vcpu_shared_data vcpu_shared_data[KVM_MAX_VCPUS ];static int vtimer_irq, ptimer_irq;
@@ -217,20 +212,20 @@ static void guest_code(void)static void *test_vcpu_run (void *arg) { +unsigned int vcpu_idx = (unsigned long )arg;struct ucall uc; -struct test_vcpu *vcpu = arg; +struct kvm_vcpu *vcpu = vcpus[vcpu_idx];struct kvm_vm *vm = vcpu->vm; -uint32_t vcpuid = vcpu->vcpuid; -struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpuid]; +struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpu_idx]; -vcpu_run (vm, vcpuid); +vcpu_run (vm, vcpu->id);/* Currently, any exit from guest is an indication of completion */ pthread_mutex_lock (&vcpu_done_map_lock); -set_bit (vcpuid, vcpu_done_map); +set_bit (vcpu_idx, vcpu_done_map);pthread_mutex_unlock (&vcpu_done_map_lock); -switch (get_ucall (vm, vcpuid, &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_SYNC :case UCALL_DONE :break ;
@@ -238,7 +233,7 @@ static void *test_vcpu_run(void *arg)sync_global_from_guest (vm, *shared_data);TEST_FAIL ("%s at %s:%ld\n\tvalues: %lu, %lu; %lu, vcpu: %u; stage: %u; iter: %u" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ], - uc.args[2 ], uc.args[3 ], uc.args[4 ], vcpuid, + uc.args[2 ], uc.args[3 ], uc.args[4 ], vcpu_idx, shared_data->guest_stage, shared_data->nr_iter);break ;default :
@@ -265,7 +260,7 @@ static uint32_t test_get_pcpu(void)return pcpu; } -static int test_migrate_vcpu (struct test_vcpu *vcpu) +static int test_migrate_vcpu (unsigned int vcpu_idx) {int ret;cpu_set_t cpuset;
@@ -274,15 +269,15 @@ static int test_migrate_vcpu(struct test_vcpu *vcpu)CPU_ZERO (&cpuset);CPU_SET (new_pcpu, &cpuset); -pr_debug ("Migrating vCPU: %u to pCPU: %u\n" , vcpu->vcpuid, new_pcpu); +pr_debug ("Migrating vCPU: %u to pCPU: %u\n" , vcpu_idx, new_pcpu); - ret =pthread_setaffinity_np (vcpu->pt_vcpu_run, -sizeof (cpuset), &cpuset); + ret =pthread_setaffinity_np (pt_vcpu_run[vcpu_idx], +sizeof (cpuset), &cpuset);/* Allow the error where the vCPU thread is already finished */ TEST_ASSERT (ret ==0 || ret ==ESRCH , -"Failed to migrate the vCPU:%u to pCPU: %u; ret: %d\n" , - vcpu->vcpuid, new_pcpu, ret); +"Failed to migrate the vCPU:%u to pCPU: %u; ret: %d\n" , + vcpu_idx, new_pcpu, ret);return ret; }
@@ -305,7 +300,7 @@ static void *test_vcpu_migration(void *arg)continue ; } -test_migrate_vcpu (&test_vcpu[i]); +test_migrate_vcpu (i); } }while (test_args.nr_vcpus != n_done);
@@ -314,16 +309,17 @@ static void *test_vcpu_migration(void *arg)static void test_run (struct kvm_vm *vm) { -int i, ret;pthread_t pt_vcpu_migration; +unsigned int i; +int ret;pthread_mutex_init (&vcpu_done_map_lock,NULL ); vcpu_done_map =bitmap_zalloc (test_args.nr_vcpus);TEST_ASSERT (vcpu_done_map,"Failed to allocate vcpu done bitmap\n" ); -for (i =0 ; i < test_args.nr_vcpus; i++) { - ret =pthread_create (&test_vcpu[i].pt_vcpu_run,NULL , - test_vcpu_run, &test_vcpu[i]); +for (i =0 ; i < (unsigned long )test_args.nr_vcpus; i++) { + ret =pthread_create (&pt_vcpu_run[i],NULL , test_vcpu_run, + (void *)(unsigned long )i);TEST_ASSERT (!ret,"Failed to create vCPU-%d pthread\n" , i); }
@@ -338,7 +334,7 @@ static void test_run(struct kvm_vm *vm)for (i =0 ; i < test_args.nr_vcpus; i++) -pthread_join (test_vcpu[i].pt_vcpu_run,NULL ); +pthread_join (pt_vcpu_run[i],NULL );if (test_args.migration_freq_ms)pthread_join (pt_vcpu_migration,NULL );
@@ -349,9 +345,9 @@ static void test_run(struct kvm_vm *vm)static void test_init_timer_irq (struct kvm_vm *vm) {/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */ -vcpu_device_attr_get (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +vcpu_device_attr_get (vm, vcpus[0 ]->id,KVM_ARM_VCPU_TIMER_CTRL ,KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq); -vcpu_device_attr_get (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +vcpu_device_attr_get (vm, vcpus[0 ]->id,KVM_ARM_VCPU_TIMER_CTRL ,KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq);sync_global_to_guest (vm, ptimer_irq);
@@ -368,17 +364,13 @@ static struct kvm_vm *test_vm_create(void)unsigned int i;int nr_vcpus = test_args.nr_vcpus; - vm =vm_create_default_with_vcpus (nr_vcpus,0 ,0 , guest_code,NULL ); + vm =vm_create_with_vcpus (nr_vcpus, guest_code, vcpus);vm_init_descriptor_tables (vm);vm_install_exception_handler (vm,VECTOR_IRQ_CURRENT , guest_irq_handler); -for (i =0 ; i < nr_vcpus; i++) { -vcpu_init_descriptor_tables (vm, i); - - test_vcpu[i].vcpuid = i; - test_vcpu[i].vm = vm; - } +for (i =0 ; i < nr_vcpus; i++) +vcpu_init_descriptor_tables (vm, vcpus[i]->id);ucall_init (vm,NULL );test_init_timer_irq (vm);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 109/144 KVM: selftests: Convert svm_nested_soft_inject_test away from VCPU_ID
In reply to Sean ChristophersonConvert svm_nested_soft_inject_test to use vm_create_with_one_vcpu() and pull the vCPU's ID from 'struct kvm_vcpu'.
--- .../kvm/x86_64/svm_nested_soft_inject_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +8 -8
@@ -18,7 +18,6 @@#include "svm_util.h" #include "test_util.h" -#define VCPU_ID 0#define INT_NR 0x20#define X86_FEATURE_NRIPS BIT(3)
@@ -135,6 +134,7 @@ static void l1_guest_code(struct svm_test_data *svm, uint64_t is_nmi, uint64_t istatic void run_test (bool is_nmi) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;vm_vaddr_t svm_gva;vm_vaddr_t idt_alt_vm;
@@ -142,10 +142,10 @@ static void run_test(bool is_nmi)pr_info ("Running %s test\n" , is_nmi ?"NMI" :"soft int" ); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,NMI_VECTOR , guest_nmi_handler);vm_install_exception_handler (vm,BP_VECTOR , guest_bp_handler);
@@ -163,23 +163,23 @@ static void run_test(bool is_nmi) }else { idt_alt_vm =0 ; } -vcpu_args_set (vm,VCPU_ID ,3 , svm_gva, (uint64_t )is_nmi, (uint64_t )idt_alt_vm); +vcpu_args_set (vm, vcpu->id,3 , svm_gva, (uint64_t )is_nmi, (uint64_t )idt_alt_vm);memset (&debug,0 ,sizeof (debug)); -vcpu_guest_debug_set (vm,VCPU_ID , &debug); +vcpu_guest_debug_set (vm, vcpu->id, &debug); -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc;alarm (2 ); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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)); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld, vals = 0x%lx 0x%lx 0x%lx" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ], uc.args[2 ], uc.args[3 ], uc.args[4 ]);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 110/144 KVM: selftests: Convert triple_fault_event_test away from VCPU_ID
In reply to Sean ChristophersonConvert triple_fault_event_test to use vm_create_with_one_vcpu() and pull the vCPU's ID from 'struct kvm_vcpu'.
--- .../kvm/x86_64/triple_fault_event_test.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +11 -11
@@ -9,7 +9,6 @@#include "kselftest.h" -#define VCPU_ID 0#define ARBITRARY_IO_PORT 0x2000/* The virtual machine object. */
@@ -41,6 +40,7 @@ void l1_guest_code(struct vmx_pages *vmx)int main (void ) { +struct kvm_vcpu *vcpu;struct kvm_run *run;struct kvm_vcpu_events events;vm_vaddr_t vmx_pages_gva;
@@ -56,13 +56,13 @@ int main(void)exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);vm_enable_cap (vm,KVM_CAP_X86_TRIPLE_FAULT_EVENT ,1 ); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); -vcpu_run (vm,VCPU_ID ); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva); +vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Expected KVM_EXIT_IO, got: %u (%s)\n",
@@ -70,21 +70,21 @@ int main(void)TEST_ASSERT (run->io.port ==ARBITRARY_IO_PORT ,"Expected IN from port %d from L2, got port %d" ,ARBITRARY_IO_PORT , run->io.port); -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vm, vcpu->id, &events); events.flags |=KVM_VCPUEVENT_VALID_TRIPLE_FAULT ; events.triple_fault.pending = true; -vcpu_events_set (vm,VCPU_ID , &events); +vcpu_events_set (vm, vcpu->id, &events); run->immediate_exit = true; -vcpu_run_complete_io (vm,VCPU_ID ); +vcpu_run_complete_io (vm, vcpu->id); -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vm, vcpu->id, &events);TEST_ASSERT (events.flags &KVM_VCPUEVENT_VALID_TRIPLE_FAULT ,"Triple fault event invalid" );TEST_ASSERT (events.triple_fault.pending,"No triple fault pending" ); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_DONE :break ;case UCALL_ABORT :
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 111/144 KVM: selftests: Convert vgic_init away from vm_create_default_with_vcpus()
In reply to Sean ChristophersonUse a combination of vm_create(), vm_create_with_vcpus(), and vm_vcpu_add() to convert vgic_init from vm_create_default_with_vcpus(), and away from referncing vCPUs by ID.
Thus continues the march toward total annihilation of "default" helpers.
--- .../testing/selftests/kvm/aarch64/vgic_init.c | 79 ++++++++++++------- 1 file changed, 49 insertions(+), 30 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +49 -30
@@ -49,19 +49,21 @@ static void guest_code(void) }/* we don't want to assert on run execution, hence that helper */ -static int run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) +static int run_vcpu (struct kvm_vcpu *vcpu) { -ucall_init (vm,NULL ); +ucall_init (vcpu->vm,NULL ); -return __vcpu_run (vm, vcpuid) ? -errno :0 ; +return __vcpu_run (vcpu->vm, vcpu->id) ? -errno :0 ; } -static struct vm_gic vm_gic_create_with_vcpus (uint32_t gic_dev_type,uint32_t nr_vcpus) +static struct vm_gic vm_gic_create_with_vcpus (uint32_t gic_dev_type, +uint32_t nr_vcpus, +struct kvm_vcpu *vcpus[]) {struct vm_gic v; v.gic_dev_type = gic_dev_type; - v.vm =vm_create_default_with_vcpus (nr_vcpus,0 ,0 , guest_code,NULL ); + v.vm =vm_create_with_vcpus (nr_vcpus, guest_code, vcpus); v.gic_fd =kvm_create_device (v.vm, gic_dev_type);return v;
@@ -305,10 +307,11 @@ static void subtest_v3_redist_regions(struct vm_gic *v)*/ static void test_vgic_then_vcpus (uint32_t gic_dev_type) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;int ret, i; - v =vm_gic_create_with_vcpus (gic_dev_type,1 ); + v =vm_gic_create_with_vcpus (gic_dev_type,1 , vcpus);subtest_dist_rdist (&v);
@@ -316,7 +319,7 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)for (i =1 ; i <NR_VCPUS ; ++i)vm_vcpu_add (v.vm, i, guest_code); - ret =run_vcpu (v.vm,3 ); + ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" );vm_gic_destroy (&v);
@@ -325,14 +328,15 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)/* All the VCPUs are created before the VGIC KVM device gets initialized */ static void test_vcpus_then_vgic (uint32_t gic_dev_type) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;int ret; - v =vm_gic_create_with_vcpus (gic_dev_type,NR_VCPUS ); + v =vm_gic_create_with_vcpus (gic_dev_type,NR_VCPUS , vcpus);subtest_dist_rdist (&v); - ret =run_vcpu (v.vm,3 ); + ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" );vm_gic_destroy (&v);
@@ -340,37 +344,38 @@ static void test_vcpus_then_vgic(uint32_t gic_dev_type)static void test_v3_new_redist_regions (void ) { +struct kvm_vcpu *vcpus[NR_VCPUS ];void *dummy =NULL ;struct vm_gic v;uint64_t addr;int ret; - v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS ); + v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS , vcpus);subtest_v3_redist_regions (&v);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL ); - ret =run_vcpu (v.vm,3 ); + ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -ENXIO ,"running without sufficient number of rdists" );vm_gic_destroy (&v);/* step2 */ - v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS ); + v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS , vcpus);subtest_v3_redist_regions (&v); addr =REDIST_REGION_ATTR_ADDR (1 ,0x280000 ,0 ,2 );kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr); - ret =run_vcpu (v.vm,3 ); + ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -EBUSY ,"running without vgic explicit init" );vm_gic_destroy (&v);/* step 3 */ - v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS ); + v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS , vcpus);subtest_v3_redist_regions (&v); ret = __kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
@@ -385,7 +390,7 @@ static void test_v3_new_redist_regions(void)kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL ); - ret =run_vcpu (v.vm,3 ); + ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (!ret,"vcpu run" );vm_gic_destroy (&v);
@@ -398,21 +403,22 @@ static void test_v3_typer_accesses(void)uint32_t val;int ret, i; - v.vm =vm_create_default (0 ,0 , guest_code); + v.vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + (void )vm_vcpu_add (v.vm,0 , guest_code); v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); -vm_vcpu_add (v.vm,3 , guest_code); + (void )vm_vcpu_add (v.vm,3 , guest_code); ret =v3_redist_reg_get (v.gic_fd,1 ,GICR_TYPER , &val);TEST_ASSERT (ret && errno ==EINVAL ,"attempting to read GICR_TYPER of non created vcpu" ); -vm_vcpu_add (v.vm,1 , guest_code); + (void )vm_vcpu_add (v.vm,1 , guest_code); ret =v3_redist_reg_get (v.gic_fd,1 ,GICR_TYPER , &val);TEST_ASSERT (ret && errno ==EBUSY ,"read GICR_TYPER before GIC initialized" ); -vm_vcpu_add (v.vm,2 , guest_code); + (void )vm_vcpu_add (v.vm,2 , guest_code);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
@@ -460,6 +466,21 @@ static void test_v3_typer_accesses(void)vm_gic_destroy (&v); } +static struct vm_gic vm_gic_v3_create_with_vcpuids (int nr_vcpus, +uint32_t vcpuids[]) +{ +struct vm_gic v; +int i; + + v.vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); +for (i =0 ; i < nr_vcpus; i++) +vm_vcpu_add (v.vm, vcpuids[i], guest_code); + + v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); + +return v; +} +/** * Test GICR_TYPER last bit with new redist regions * rdist regions #1 and #2 are contiguous
@@ -478,9 +499,7 @@ static void test_v3_last_bit_redist_regions(void)uint32_t val;int ret; - v.vm =vm_create_default_with_vcpus (6 ,0 ,0 , guest_code, vcpuids); - - v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); + v =vm_gic_v3_create_with_vcpuids (ARRAY_SIZE (vcpuids), vcpuids);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
@@ -527,9 +546,7 @@ static void test_v3_last_bit_single_rdist(void)uint32_t val;int ret; - v.vm =vm_create_default_with_vcpus (6 ,0 ,0 , guest_code, vcpuids); - - v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); + v =vm_gic_v3_create_with_vcpuids (ARRAY_SIZE (vcpuids), vcpuids);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
@@ -559,11 +576,12 @@ static void test_v3_last_bit_single_rdist(void)/* Uses the legacy REDIST region API. */ static void test_v3_redist_ipa_range_check_at_vcpu_run (void ) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;int ret, i;uint64_t addr; - v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,1 ); + v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,1 , vcpus);/* Set space for 3 redists, we have 1 vcpu, so this succeeds. */ addr = max_phys_size - (3 *2 *0x10000 );
@@ -576,13 +594,13 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add (v.vm, i, guest_code); + vcpus[i] =vm_vcpu_add (v.vm, i, guest_code);kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );/* Attempt to run a vcpu without enough redist space. */ - ret =run_vcpu (v.vm,2 ); + ret =run_vcpu (vcpus[2 ]);TEST_ASSERT (ret && errno ==EINVAL ,"redist base+size above PA range detected on 1st vcpu run" );
@@ -591,11 +609,12 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)static void test_v3_its_region (void ) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;uint64_t addr;int its_fd, ret; - v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS ); + v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS , vcpus); its_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_ITS ); addr =0x401000 ;
@@ -639,7 +658,7 @@ int test_kvm_device(uint32_t gic_dev_type)uint32_t other;int ret; - v.vm =vm_create_default_with_vcpus (NR_VCPUS ,0 ,0 , guest_code,NULL ); + v.vm =vm_create_with_vcpus (NR_VCPUS , guest_code,NULL );/* try to create a non existing KVM device */ ret =__kvm_test_create_device (v.vm,0 );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 112/144 KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers
In reply to Sean ChristophersonRework vcpu_{g,s}et_reg() to provide the APIs that tests actually want to use, and drop the three "one-off" implementations that cropped up due to the poor API.
Ignore the handful of direct KVM_{G,S}ET_ONE_REG calls that don't fit the APIs for one reason or another.
No functional change intended.
--- .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../selftests/kvm/aarch64/hypercalls.c | 32 ++----- .../testing/selftests/kvm/aarch64/psci_test.c | 6 +- .../selftests/kvm/include/aarch64/processor.h | 18 +--- .../selftests/kvm/include/kvm_util_base.h | 28 ++++++- .../selftests/kvm/include/riscv/processor.h | 20 ----- .../selftests/kvm/lib/aarch64/processor.c | 28 +++---- .../selftests/kvm/lib/riscv/processor.c | 84 +++++++++---------- tools/testing/selftests/kvm/s390x/resets.c | 5 +- 10 files changed, 93 insertions(+), 132 deletions(-)
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +1 -1
@@ -242,7 +242,7 @@ static int debug_version(struct kvm_vcpu *vcpu) {uint64_t id_aa64dfr0; -get_reg (vcpu->vm, vcpu->id,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0); +vcpu_get_reg (vcpu->vm, vcpu->id,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0);return id_aa64dfr0 &0xf ; }
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -457,7 +457,7 @@ static void run_test(struct vcpu_config *c)bool reject_reg = false;int ret; - ret =__vcpu_ioctl (vm,0 ,KVM_GET_ONE_REG , ®); + ret =__vcpu_get_reg (vm,0 , reg_list->reg[i], &addr);if (ret) {printf ("%s: Failed to get " ,config_name (c));print_reg (c, reg.id);
tools/testing/selftests/kvm/aarch64/hypercalls.c +6 -26
@@ -141,26 +141,6 @@ static void guest_code(void)GUEST_DONE (); } -static int set_fw_reg (struct kvm_vm *vm,uint64_t id,uint64_t val) -{ -struct kvm_one_reg reg = { - .id = id, - .addr = (uint64_t )&val, - }; - -return __vcpu_ioctl (vm,0 ,KVM_SET_ONE_REG , ®); -} - -static void get_fw_reg (struct kvm_vm *vm,uint64_t id,uint64_t *addr) -{ -struct kvm_one_reg reg = { - .id = id, - .addr = (uint64_t )addr, - }; - -vcpu_ioctl (vm,0 ,KVM_GET_ONE_REG , ®); -} -struct st_time {uint32_t rev;uint32_t attr;
@@ -196,18 +176,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm)const struct kvm_fw_reg_info *reg_info = &fw_reg_info[i];/* First 'read' should be an upper limit of the features supported */ -get_fw_reg (vm, reg_info->reg, &val); +vcpu_get_reg (vm,0 , reg_info->reg, &val);TEST_ASSERT (val ==FW_REG_ULIMIT_VAL (reg_info->max_feat_bit),"Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx\n" , reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit), val);/* Test a 'write' by disabling all the features of the register map */ - ret =set_fw_reg (vm, reg_info->reg,0 ); + ret =__vcpu_set_reg (vm,0 , reg_info->reg,0 );TEST_ASSERT (ret ==0 ,"Failed to clear all the features of reg: 0x%lx; ret: %d\n" , reg_info->reg, errno); -get_fw_reg (vm, reg_info->reg, &val); +vcpu_get_reg (vm,0 , reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -216,7 +196,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm)* Avoid this check if all the bits are occupied. */ if (reg_info->max_feat_bit <63 ) { - ret =set_fw_reg (vm, reg_info->reg,BIT (reg_info->max_feat_bit +1 )); + ret =__vcpu_set_reg (vm,0 , reg_info->reg,BIT (reg_info->max_feat_bit +1 ));TEST_ASSERT (ret !=0 && errno ==EINVAL ,"Unexpected behavior or return value (%d) while setting an unsupported feature for reg: 0x%lx\n" , errno, reg_info->reg);
@@ -237,7 +217,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm)* Before starting the VM, the test clears all the bits. * Check if that's still the case. */ -get_fw_reg (vm, reg_info->reg, &val); +vcpu_get_reg (vm,0 , reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -247,7 +227,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm)* the registers and should return EBUSY. Set the registers and check for * the expected errno. */ - ret =set_fw_reg (vm, reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit)); + ret =__vcpu_set_reg (vm,0 , reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit));TEST_ASSERT (ret !=0 && errno ==EBUSY ,"Unexpected behavior or return value (%d) while setting a feature while VM is running for reg: 0x%lx\n" , errno, reg_info->reg);
tools/testing/selftests/kvm/aarch64/psci_test.c +3 -3
@@ -102,8 +102,8 @@ static void assert_vcpu_reset(struct kvm_vcpu *vcpu) {uint64_t obs_pc, obs_x0; -get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.pc), &obs_pc); -get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); +vcpu_get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.pc), &obs_pc); +vcpu_get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, "unexpected target cpu pc: %lx (expected: %lx)",
@@ -143,7 +143,7 @@ static void host_test_cpu_on(void)*/ vcpu_power_off (target); -get_reg (vm, target->id,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); +vcpu_get_reg (vm, target->id,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr);vcpu_args_set (vm, source->id,1 , target_mpidr &MPIDR_HWID_BITMASK );enter_guest (source);
tools/testing/selftests/kvm/include/aarch64/processor.h +1 -17
@@ -19,7 +19,7 @@/* * KVM_ARM64_SYS_REG(sys_reg_id): Helper macro to convert * SYS_* register definitions in asm/sysreg.h to use in KVM -* calls such as get_reg() and set_reg(). +* calls such as vcpu_get_reg() and vcpu_set_reg(). */ #define KVM_ARM64_SYS_REG (sys_reg_id) \ ARM64_SYS_REG(sys_reg_Op0(sys_reg_id), \
@@ -47,22 +47,6 @@#define MPIDR_HWID_BITMASK (0xff00fffffful) -static inline void get_reg (struct kvm_vm *vm,uint32_t vcpuid,uint64_t id,uint64_t *addr) -{ -struct kvm_one_reg reg; - reg.id = id; - reg.addr = (uint64_t )addr; -vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , ®); -} - -static inline void set_reg (struct kvm_vm *vm,uint32_t vcpuid,uint64_t id,uint64_t val) -{ -struct kvm_one_reg reg; - reg.id = id; - reg.addr = (uint64_t )&val; -vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , ®); -} -void aarch64_vcpu_setup (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_vcpu_init *init);struct kvm_vcpu *aarch64_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id,struct kvm_vcpu_init *init,void *guest_code);
tools/testing/selftests/kvm/include/kvm_util_base.h +24 -4
@@ -374,16 +374,36 @@ static inline void vcpu_fpu_set(struct kvm_vm *vm, uint32_t vcpuid, {vcpu_ioctl (vm, vcpuid,KVM_SET_FPU , fpu); } + +static inline int __vcpu_get_reg (struct kvm_vm *vm,uint32_t vcpuid, +uint64_t reg_id,void *addr) +{ +struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t )addr }; + +return __vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , ®); +} +static inline int __vcpu_set_reg (struct kvm_vm *vm,uint32_t vcpuid, +uint64_t reg_id,uint64_t val) +{ +struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t )&val }; + +return __vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , ®); +}static inline void vcpu_get_reg (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_one_reg *reg) +uint64_t reg_id,void *addr) { -vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , reg); +struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t )addr }; + +vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , ®); }static inline void vcpu_set_reg (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_one_reg *reg) +uint64_t reg_id,uint64_t val) { -vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , reg); +struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t )&val }; + +vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , ®); } +#ifdef __KVM_HAVE_VCPU_EVENTSstatic inline void vcpu_events_get (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_vcpu_events *events)
tools/testing/selftests/kvm/include/riscv/processor.h +0 -20
@@ -38,26 +38,6 @@ static inline uint64_t __kvm_reg_id(uint64_t type, uint64_t idx, KVM_REG_RISCV_TIMER_REG(name), \ KVM_REG_SIZE_U64) -static inline void get_reg (struct kvm_vm *vm,uint32_t vcpuid,uint64_t id, -unsigned long *addr) -{ -struct kvm_one_reg reg; - - reg.id = id; - reg.addr = (unsigned long )addr; -vcpu_get_reg (vm, vcpuid, ®); -} - -static inline void set_reg (struct kvm_vm *vm,uint32_t vcpuid,uint64_t id, -unsigned long val) -{ -struct kvm_one_reg reg; - - reg.id = id; - reg.addr = (unsigned long )&val; -vcpu_set_reg (vm, vcpuid, ®); -} -/* L3 index Bit[47:39] */ #define PGTBL_L3_INDEX_MASK 0x0000FF8000000000ULL#define PGTBL_L3_INDEX_SHIFT 39
tools/testing/selftests/kvm/lib/aarch64/processor.c +14 -14
@@ -232,10 +232,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_init* Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 * registers, which the variable argument list macros do. */ -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_CPACR_EL1 ),3 <<20 ); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_CPACR_EL1 ),3 <<20 ); -get_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_SCTLR_EL1 ), &sctlr_el1); -get_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TCR_EL1 ), &tcr_el1); +vcpu_get_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_SCTLR_EL1 ), &sctlr_el1); +vcpu_get_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TCR_EL1 ), &tcr_el1);/* Configure base granule size */ switch (vm->mode) {
@@ -296,19 +296,19 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_init tcr_el1 |= (1 <<8 ) | (1 <<10 ) | (3 <<12 ); tcr_el1 |= (64 - vm->va_bits)/* T0SZ */ ; -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_SCTLR_EL1 ), sctlr_el1); -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TCR_EL1 ), tcr_el1); -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_MAIR_EL1 ),DEFAULT_MAIR_EL1 ); -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TTBR0_EL1 ), vm->pgd); -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TPIDR_EL1 ), vcpuid); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_SCTLR_EL1 ), sctlr_el1); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TCR_EL1 ), tcr_el1); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_MAIR_EL1 ),DEFAULT_MAIR_EL1 ); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TTBR0_EL1 ), vm->pgd); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_TPIDR_EL1 ), vcpuid); }void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) {uint64_t pstate, pc; -get_reg (vm, vcpuid,ARM64_CORE_REG (regs.pstate), &pstate); -get_reg (vm, vcpuid,ARM64_CORE_REG (regs.pc), &pc); +vcpu_get_reg (vm, vcpuid,ARM64_CORE_REG (regs.pstate), &pstate); +vcpu_get_reg (vm, vcpuid,ARM64_CORE_REG (regs.pc), &pc);fprintf (stream,"%*spstate: 0x%.16lx pc: 0x%.16lx\n" , indent,"" , pstate, pc);
@@ -326,8 +326,8 @@ struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id,aarch64_vcpu_setup (vm, vcpu_id, init); -set_reg (vm, vcpu_id,ARM64_CORE_REG (sp_el1), stack_vaddr + stack_size); -set_reg (vm, vcpu_id,ARM64_CORE_REG (regs.pc), (uint64_t )guest_code); +vcpu_set_reg (vm, vcpu_id,ARM64_CORE_REG (sp_el1), stack_vaddr + stack_size); +vcpu_set_reg (vm, vcpu_id,ARM64_CORE_REG (regs.pc), (uint64_t )guest_code);return vcpu; }
@@ -349,7 +349,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...)va_start (ap, num);for (i =0 ; i < num; i++) { -set_reg (vm, vcpuid,ARM64_CORE_REG (regs.regs[i]), +vcpu_set_reg (vm, vcpuid,ARM64_CORE_REG (regs.regs[i]),va_arg (ap, uint64_t)); }
@@ -389,7 +389,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) {extern char vectors; -set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_VBAR_EL1 ), (uint64_t )&vectors); +vcpu_set_reg (vm, vcpuid,KVM_ARM64_SYS_REG (SYS_VBAR_EL1 ), (uint64_t )&vectors); }void route_exception (struct ex_regs *regs,int vector)
tools/testing/selftests/kvm/lib/riscv/processor.c +42 -42
112 lines not on this page · raw message
tools/testing/selftests/kvm/s390x/resets.c +1 -4
@@ -60,12 +60,9 @@ static void guest_code_initial(void)static void test_one_reg (uint64_t id,uint64_t value) { -struct kvm_one_reg reg;uint64_t eval_reg; - reg.addr = (uintptr_t )&eval_reg; - reg.id = id; -vcpu_get_reg (vm,VCPU_ID , ®); +vcpu_get_reg (vm,VCPU_ID , id, &eval_reg);TEST_ASSERT (eval_reg == value,"value == 0x%lx" , value); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 113/144 KVM: selftests: Sync stage before VM is freed in hypercalls test
In reply to Sean ChristophersonSync the next stage using the VM before said VM is potentially freed by the TEST_STAGE_HVC_IFACE_FEAT_DISABLED stage.
Opportunistically take a double pointer in anticipation of also having to set the new vCPU pointer once the test stops hardcoding '0' everywhere.
--- .../selftests/kvm/aarch64/hypercalls.c | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/aarch64/hypercalls.c +13 -14
@@ -246,32 +246,31 @@ static struct kvm_vm *test_vm_create(void)return vm; } -static struct kvm_vm *test_guest_stage (struct kvm_vm *vm) +static void test_guest_stage (struct kvm_vm **vm) { -struct kvm_vm *ret_vm = vm; +int prev_stage = stage; -pr_debug ("Stage: %d\n" , stage); +pr_debug ("Stage: %d\n" , prev_stage); -switch (stage) { +/* Sync the stage early, the VM might be freed below. */ + stage++; +sync_global_to_guest (*vm, stage); + +switch (prev_stage) {case TEST_STAGE_REG_IFACE : -test_fw_regs_after_vm_start (vm); +test_fw_regs_after_vm_start (*vm);break ;case TEST_STAGE_HVC_IFACE_FEAT_DISABLED :/* Start a new VM so that all the features are now enabled by default */ -kvm_vm_free (vm); - ret_vm =test_vm_create (); +kvm_vm_free (*vm); + *vm =test_vm_create ();break ;case TEST_STAGE_HVC_IFACE_FEAT_ENABLED :case TEST_STAGE_HVC_IFACE_FALSE_INFO :break ;default : -TEST_FAIL ("Unknown test stage: %d\n" , stage); +TEST_FAIL ("Unknown test stage: %d\n" , prev_stage); } - - stage++; -sync_global_to_guest (vm, stage); - -return ret_vm; }static void test_run (void )
@@ -289,7 +288,7 @@ static void test_run(void)switch (get_ucall (vm,0 , &uc)) {case UCALL_SYNC : - vm =test_guest_stage (vm); +test_guest_stage (&vm);break ;case UCALL_DONE : guest_done = true;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 114/144 KVM: selftests: Convert hypercalls test away from vm_create_default()
In reply to Sean ChristophersonUse a combination of vm_create(), vm_create_with_vcpus(), and
vm_vcpu_add() to convert vgic_init from vm_create_default_with_vcpus(), and away from referncing vCPUs by ID.
Thus continues the march toward total annihilation of "default" helpers.
--- .../selftests/kvm/aarch64/hypercalls.c | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-)
tools/testing/selftests/kvm/aarch64/hypercalls.c +24 -27
@@ -150,23 +150,19 @@ struct st_time {#define STEAL_TIME_SIZE ((sizeof(struct st_time) + 63) & ~63)#define ST_GPA_BASE (1 << 30) -static void steal_time_init (struct kvm_vm *vm) +static void steal_time_init (struct kvm_vcpu *vcpu) {uint64_t st_ipa = (ulong )ST_GPA_BASE ;unsigned int gpages; -struct kvm_device_attr dev = { - .group =KVM_ARM_VCPU_PVTIME_CTRL , - .attr =KVM_ARM_VCPU_PVTIME_IPA , - .addr = (uint64_t )&st_ipa, - }; gpages =vm_calc_num_guest_pages (VM_MODE_DEFAULT ,STEAL_TIME_SIZE ); -vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,ST_GPA_BASE ,1 , gpages,0 ); +vm_userspace_mem_region_add (vcpu->vm,VM_MEM_SRC_ANONYMOUS ,ST_GPA_BASE ,1 , gpages,0 ); -vcpu_ioctl (vm,0 ,KVM_SET_DEVICE_ATTR , &dev); +vcpu_device_attr_set (vcpu->vm, vcpu->id,KVM_ARM_VCPU_PVTIME_CTRL , +KVM_ARM_VCPU_PVTIME_IPA , &st_ipa); } -static void test_fw_regs_before_vm_start (struct kvm_vm *vm) +static void test_fw_regs_before_vm_start (struct kvm_vcpu *vcpu) {uint64_t val;unsigned int i;
@@ -176,18 +172,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm)const struct kvm_fw_reg_info *reg_info = &fw_reg_info[i];/* First 'read' should be an upper limit of the features supported */ -vcpu_get_reg (vm,0 , reg_info->reg, &val); +vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val);TEST_ASSERT (val ==FW_REG_ULIMIT_VAL (reg_info->max_feat_bit),"Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx\n" , reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit), val);/* Test a 'write' by disabling all the features of the register map */ - ret =__vcpu_set_reg (vm,0 , reg_info->reg,0 ); + ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,0 );TEST_ASSERT (ret ==0 ,"Failed to clear all the features of reg: 0x%lx; ret: %d\n" , reg_info->reg, errno); -vcpu_get_reg (vm,0 , reg_info->reg, &val); +vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -196,7 +192,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm)* Avoid this check if all the bits are occupied. */ if (reg_info->max_feat_bit <63 ) { - ret =__vcpu_set_reg (vm,0 , reg_info->reg,BIT (reg_info->max_feat_bit +1 )); + ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,BIT (reg_info->max_feat_bit +1 ));TEST_ASSERT (ret !=0 && errno ==EINVAL ,"Unexpected behavior or return value (%d) while setting an unsupported feature for reg: 0x%lx\n" , errno, reg_info->reg);
@@ -204,7 +200,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm) } } -static void test_fw_regs_after_vm_start (struct kvm_vm *vm) +static void test_fw_regs_after_vm_start (struct kvm_vcpu *vcpu) {uint64_t val;unsigned int i;
@@ -217,7 +213,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm)* Before starting the VM, the test clears all the bits. * Check if that's still the case. */ -vcpu_get_reg (vm,0 , reg_info->reg, &val); +vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -227,26 +223,26 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm)* the registers and should return EBUSY. Set the registers and check for * the expected errno. */ - ret =__vcpu_set_reg (vm,0 , reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit)); + ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit));TEST_ASSERT (ret !=0 && errno ==EBUSY ,"Unexpected behavior or return value (%d) while setting a feature while VM is running for reg: 0x%lx\n" , errno, reg_info->reg); } } -static struct kvm_vm *test_vm_create (void ) +static struct kvm_vm *test_vm_create (struct kvm_vcpu **vcpu) {struct kvm_vm *vm; - vm =vm_create_default (0 ,0 , guest_code); + vm =vm_create_with_one_vcpu (vcpu, guest_code);ucall_init (vm,NULL ); -steal_time_init (vm); +steal_time_init (*vcpu);return vm; } -static void test_guest_stage (struct kvm_vm **vm) +static void test_guest_stage (struct kvm_vm **vm,struct kvm_vcpu **vcpu) {int prev_stage = stage;
@@ -258,12 +254,12 @@ static void test_guest_stage(struct kvm_vm **vm)switch (prev_stage) {case TEST_STAGE_REG_IFACE : -test_fw_regs_after_vm_start (*vm); +test_fw_regs_after_vm_start (*vcpu);break ;case TEST_STAGE_HVC_IFACE_FEAT_DISABLED :/* Start a new VM so that all the features are now enabled by default */ kvm_vm_free (*vm); - *vm =test_vm_create (); + *vm =test_vm_create (vcpu);break ;case TEST_STAGE_HVC_IFACE_FEAT_ENABLED :case TEST_STAGE_HVC_IFACE_FALSE_INFO :
@@ -275,20 +271,21 @@ static void test_guest_stage(struct kvm_vm **vm)static void test_run (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct ucall uc;bool guest_done = false; - vm =test_vm_create (); + vm =test_vm_create (&vcpu); -test_fw_regs_before_vm_start (vm); +test_fw_regs_before_vm_start (vcpu);while (!guest_done) { -vcpu_run (vm,0 ); +vcpu_run (vcpu->vm, vcpu->id); -switch (get_ucall (vm,0 , &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC : -test_guest_stage (&vm); +test_guest_stage (&vm, &vcpu);break ;case UCALL_DONE : guest_done = true;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 115/144 KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID
In reply to Sean ChristophersonConvert vm_create_with_one_vcpu to use vm_create_with_vcpus() and pass around 'struct kvm_vcpu' objects instead of passing around vCPU IDs. Don't bother with macros for the HALTER versus SENDER indices, the vast majority of references don't differentiate between the vCPU roles, and the code that does either has a comment or an explicit reference to the role, e.g. to halter_guest_code() or sender_guest_code().
--- .../selftests/kvm/x86_64/xapic_ipi_test.c | 48 ++++++++----------- 1 file changed, 20 insertions(+), 28 deletions(-)
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +20 -28
@@ -39,9 +39,6 @@/* Default delay between migrate_pages calls (microseconds) */ #define DEFAULT_DELAY_USECS 500000 -#define HALTER_VCPU_ID 0 -#define SENDER_VCPU_ID 1 -/* * Vector for IPI from sender vCPU to halting vCPU. * Value is arbitrary and was chosen for the alternating bit pattern. Any
@@ -79,8 +76,7 @@ struct test_data_page {struct thread_params {struct test_data_page *data; -struct kvm_vm *vm; -uint32_t vcpu_id; +struct kvm_vcpu *vcpu;uint64_t *pipis_rcvd;/* host address of ipis_rcvd global */ };
@@ -198,6 +194,7 @@ static void sender_guest_code(struct test_data_page *data)static void *vcpu_thread (void *arg) {struct thread_params *params = (struct thread_params *)arg; +struct kvm_vcpu *vcpu = params->vcpu;struct ucall uc;int old;int r;
@@ -206,17 +203,17 @@ static void *vcpu_thread(void *arg) r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old);TEST_ASSERT (r ==0 ,"pthread_setcanceltype failed on vcpu_id=%u with errno=%d" , - params->vcpu_id, r); + vcpu->id, r); -fprintf (stderr,"vCPU thread running vCPU %u\n" , params->vcpu_id); -vcpu_run (params->vm, params->vcpu_id); - exit_reason =vcpu_state (params->vm, params->vcpu_id)->exit_reason; +fprintf (stderr,"vCPU thread running vCPU %u\n" , vcpu->id); +vcpu_run (vcpu->vm, vcpu->id); + 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" , - params->vcpu_id, exit_reason,exit_reason_str (exit_reason)); + vcpu->id, exit_reason,exit_reason_str (exit_reason)); -if (get_ucall (params->vm, params->vcpu_id, &uc) ==UCALL_ABORT ) { +if (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_ABORT ) {TEST_ASSERT (false,"vCPU %u exited with error: %s.\n" "Sending vCPU sent %lu IPIs to halting vCPU\n"
@@ -224,7 +221,7 @@ static void *vcpu_thread(void *arg)"Halter TPR=%#x PPR=%#x LVR=%#x\n" "Migrations attempted: %lu\n" "Migrations completed: %lu\n" , - params->vcpu_id, (const char *)uc.args[0 ], + vcpu->id, (const char *)uc.args[0 ], params->data->ipis_sent, params->data->hlt_count, params->data->wake_count, *params->pipis_rcvd, params->data->halter_tpr,
@@ -236,7 +233,7 @@ static void *vcpu_thread(void *arg)return NULL ; } -static void cancel_join_vcpu_thread (pthread_t thread,uint32_t vcpu_id) +static void cancel_join_vcpu_thread (pthread_t thread,struct kvm_vcpu *vcpu) {void *retval;int r;
@@ -244,12 +241,12 @@ static void cancel_join_vcpu_thread(pthread_t thread, uint32_t vcpu_id) r =pthread_cancel (thread);TEST_ASSERT (r ==0 ,"pthread_cancel on vcpu_id=%d failed with errno=%d" , - vcpu_id, r); + vcpu->id, r); r =pthread_join (thread, &retval);TEST_ASSERT (r ==0 ,"pthread_join on vcpu_id=%d failed with errno=%d" , - vcpu_id, r); + vcpu->id, r);TEST_ASSERT (retval ==PTHREAD_CANCELED ,"expected retval=%p, got %p" ,PTHREAD_CANCELED , retval);
@@ -415,34 +412,30 @@ int main(int argc, char *argv[])if (delay_usecs <=0 ) delay_usecs =DEFAULT_DELAY_USECS ; - vm =vm_create_default (HALTER_VCPU_ID ,0 , halter_guest_code); - params[0 ].vm = vm; - params[1 ].vm = vm; + vm =vm_create_with_one_vcpu (¶ms[0 ].vcpu, halter_guest_code);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,HALTER_VCPU_ID ); +vcpu_init_descriptor_tables (vm, params[0 ].vcpu->id);vm_install_exception_handler (vm,IPI_VECTOR , guest_ipi_handler);virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ); -vm_vcpu_add (vm,SENDER_VCPU_ID , sender_guest_code); + params[1 ].vcpu =vm_vcpu_add (vm,1 , sender_guest_code); test_data_page_vaddr =vm_vaddr_alloc_page (vm); - data = - (struct test_data_page *)addr_gva2hva (vm, test_data_page_vaddr); + data =addr_gva2hva (vm, test_data_page_vaddr);memset (data,0 ,sizeof (*data)); params[0 ].data = data; params[1 ].data = data; -vcpu_args_set (vm,HALTER_VCPU_ID ,1 , test_data_page_vaddr); -vcpu_args_set (vm,SENDER_VCPU_ID ,1 , test_data_page_vaddr); +vcpu_args_set (vm, params[0 ].vcpu->id,1 , test_data_page_vaddr); +vcpu_args_set (vm, params[1 ].vcpu->id,1 , test_data_page_vaddr); pipis_rcvd = (uint64_t *)addr_gva2hva (vm, (uint64_t )&ipis_rcvd); params[0 ].pipis_rcvd = pipis_rcvd; params[1 ].pipis_rcvd = pipis_rcvd;/* Start halter vCPU thread and wait for it to execute first HLT. */ - params[0 ].vcpu_id =HALTER_VCPU_ID ; r =pthread_create (&threads[0 ],NULL , vcpu_thread, ¶ms[0 ]);TEST_ASSERT (r ==0 ,"pthread_create halter failed errno=%d" , errno);
@@ -462,7 +455,6 @@ int main(int argc, char *argv[])"Halter vCPU thread reported its APIC ID: %u after %d seconds.\n" , data->halter_apic_id, wait_secs); - params[1 ].vcpu_id =SENDER_VCPU_ID ; r =pthread_create (&threads[1 ],NULL , vcpu_thread, ¶ms[1 ]);TEST_ASSERT (r ==0 ,"pthread_create sender failed errno=%d" , errno);
@@ -478,8 +470,8 @@ int main(int argc, char *argv[])/* * Cancel threads and wait for them to stop. */ -cancel_join_vcpu_thread (threads[0 ],HALTER_VCPU_ID ); -cancel_join_vcpu_thread (threads[1 ],SENDER_VCPU_ID ); +cancel_join_vcpu_thread (threads[0 ], params[0 ].vcpu); +cancel_join_vcpu_thread (threads[1 ], params[1 ].vcpu);fprintf (stderr, "Test successful after running for %d seconds.\n"
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 116/144 KVM: selftests: Convert sync_regs_test away from VCPU_ID
In reply to Sean ChristophersonConvert sync_regs_test to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of passing around vCPU IDs. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/s390x/sync_regs_test.c | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/s390x/sync_regs_test.c +18 -19
@@ -22,8 +22,6 @@#include "kvm_util.h" #include "diag318_test_handler.h" -#define VCPU_ID 5 -static void guest_code (void ) {/*
@@ -76,6 +74,7 @@ static void compare_sregs(struct kvm_sregs *left, struct kvm_sync_regs *right)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct kvm_regs regs;
@@ -92,43 +91,43 @@ int main(int argc, char *argv[]) }/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;/* Request reading invalid register set from VCPU. */ run->kvm_valid_regs =INVALID_SYNC_FIELD ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , rv); -vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + run->kvm_valid_regs =0 ; run->kvm_valid_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , rv); -vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + run->kvm_valid_regs =0 ;/* Request setting invalid register set into VCPU. */ run->kvm_dirty_regs =INVALID_SYNC_FIELD ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , rv); -vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; + run->kvm_dirty_regs =0 ; run->kvm_dirty_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , rv); -vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; + run->kvm_dirty_regs =0 ;/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);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",
@@ -141,10 +140,10 @@ int main(int argc, char *argv[]) run->s390_sieic.icptcode, run->s390_sieic.ipa, run->s390_sieic.ipb); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);compare_regs (®s, &run->s.regs); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs);compare_sregs (&sregs, &run->s.regs);/* Set and verify various register values */
@@ -159,7 +158,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs |=KVM_SYNC_DIAG318 ; } - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);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",
@@ -175,10 +174,10 @@ int main(int argc, char *argv[])"diag318 sync regs value incorrect 0x%llx." , run->s.regs.diag318); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);compare_regs (®s, &run->s.regs); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs);compare_sregs (&sregs, &run->s.regs);/* Clear kvm_dirty_regs bits, verify new s.regs values are
@@ -188,7 +187,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =0 ; run->s.regs.gprs[11 ] =0xDEADBEEF ; run->s.regs.diag318 =0x4B1D ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);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",
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 117/144 KVM: selftests: Convert s390's "resets" test away from VCPU_ID
In reply to Sean ChristophersonPass around a 'struct kvm_vcpu' object in the "resets" test instead of referencing the vCPU by the global VCPU_ID. Rename the #define for the vCPU's ID to ARBITRARY_NON_ZERO_VCPU_ID to make it more obvious that (a) the value matters but (b) is otherwise arbitrary.
--- tools/testing/selftests/kvm/s390x/resets.c | 137 ++++++++++++--------- 1 file changed, 77 insertions(+), 60 deletions(-)
tools/testing/selftests/kvm/s390x/resets.c +77 -60
@@ -13,14 +13,12 @@#include "test_util.h" #include "kvm_util.h" -#define VCPU_ID 3#define LOCAL_IRQS 32 -struct kvm_s390_irq buf[VCPU_ID +LOCAL_IRQS ]; +#define ARBITRARY_NON_ZERO_VCPU_ID 3 + +struct kvm_s390_irq buf[ARBITRARY_NON_ZERO_VCPU_ID +LOCAL_IRQS ]; -struct kvm_vm *vm; -struct kvm_run *run; -struct kvm_sync_regs *sync_regs;static uint8_t regs_null[512 ];static void guest_code_initial (void )
@@ -58,22 +56,22 @@ static void guest_code_initial(void) ); } -static void test_one_reg (uint64_t id,uint64_t value) +static void test_one_reg (struct kvm_vcpu *vcpu,uint64_t id,uint64_t value) {uint64_t eval_reg; -vcpu_get_reg (vm,VCPU_ID , id, &eval_reg); +vcpu_get_reg (vcpu->vm, vcpu->id, id, &eval_reg);TEST_ASSERT (eval_reg == value,"value == 0x%lx" , value); } -static void assert_noirq (void ) +static void assert_noirq (struct kvm_vcpu *vcpu) {struct kvm_s390_irq_state irq_state;int irqs; irq_state.len =sizeof (buf); irq_state.buf = (unsigned long )buf; - irqs =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_GET_IRQ_STATE , &irq_state); + irqs =__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_GET_IRQ_STATE , &irq_state);/* * irqs contains the number of retrieved interrupts. Any interrupt * (notably, the emergency call interrupt we have injected) should
@@ -83,19 +81,20 @@ static void assert_noirq(void)TEST_ASSERT (!irqs,"IRQ pending" ); } -static void assert_clear (void ) +static void assert_clear (struct kvm_vcpu *vcpu) { +struct kvm_sync_regs *sync_regs = &vcpu->run->s.regs;struct kvm_sregs sregs;struct kvm_regs regs;struct kvm_fpu fpu; -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vcpu->vm, vcpu->id, ®s);TEST_ASSERT (!memcmp (®s.gprs, regs_null,sizeof (regs.gprs)),"grs == 0" ); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs);TEST_ASSERT (!memcmp (&sregs.acrs, regs_null,sizeof (sregs.acrs)),"acrs == 0" ); -vcpu_fpu_get (vm,VCPU_ID , &fpu); +vcpu_fpu_get (vcpu->vm, vcpu->id, &fpu);TEST_ASSERT (!memcmp (&fpu.fprs, regs_null,sizeof (fpu.fprs)),"fprs == 0" );/* sync regs */
@@ -109,8 +108,10 @@ static void assert_clear(void) "vrs0-15 == 0 (sync_regs)"); } -static void assert_initial_noclear (void ) +static void assert_initial_noclear (struct kvm_vcpu *vcpu) { +struct kvm_sync_regs *sync_regs = &vcpu->run->s.regs; +TEST_ASSERT (sync_regs->gprs[0 ] ==0xffff000000000000UL ,"gpr0 == 0xffff000000000000 (sync_regs)" ); TEST_ASSERT(sync_regs->gprs[1] == 0x0000555500000000UL,
@@ -124,13 +125,14 @@ static void assert_initial_noclear(void)TEST_ASSERT (sync_regs->acrs[9 ] ==1 ,"ar9 == 1 (sync_regs)" ); } -static void assert_initial (void ) +static void assert_initial (struct kvm_vcpu *vcpu) { +struct kvm_sync_regs *sync_regs = &vcpu->run->s.regs;struct kvm_sregs sregs;struct kvm_fpu fpu;/* KVM_GET_SREGS */ -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs);TEST_ASSERT (sregs.crs[0 ] ==0xE0UL ,"cr0 == 0xE0 (KVM_GET_SREGS)" );TEST_ASSERT (sregs.crs[14 ] ==0xC2000000UL ,"cr14 == 0xC2000000 (KVM_GET_SREGS)" );
@@ -153,36 +155,38 @@ static void assert_initial(void)TEST_ASSERT (sync_regs->gbea ==1 ,"gbea == 1 (sync_regs)" );/* kvm_run */ -TEST_ASSERT (run->psw_addr ==0 ,"psw_addr == 0 (kvm_run)" ); -TEST_ASSERT (run->psw_mask ==0 ,"psw_mask == 0 (kvm_run)" ); +TEST_ASSERT (vcpu->run->psw_addr ==0 ,"psw_addr == 0 (kvm_run)" ); +TEST_ASSERT (vcpu->run->psw_mask ==0 ,"psw_mask == 0 (kvm_run)" ); -vcpu_fpu_get (vm,VCPU_ID , &fpu); +vcpu_fpu_get (vcpu->vm, vcpu->id, &fpu);TEST_ASSERT (!fpu.fpc,"fpc == 0" ); -test_one_reg (KVM_REG_S390_GBEA ,1 ); -test_one_reg (KVM_REG_S390_PP ,0 ); -test_one_reg (KVM_REG_S390_TODPR ,0 ); -test_one_reg (KVM_REG_S390_CPU_TIMER ,0 ); -test_one_reg (KVM_REG_S390_CLOCK_COMP ,0 ); +test_one_reg (vcpu,KVM_REG_S390_GBEA ,1 ); +test_one_reg (vcpu,KVM_REG_S390_PP ,0 ); +test_one_reg (vcpu,KVM_REG_S390_TODPR ,0 ); +test_one_reg (vcpu,KVM_REG_S390_CPU_TIMER ,0 ); +test_one_reg (vcpu,KVM_REG_S390_CLOCK_COMP ,0 ); } -static void assert_normal_noclear (void ) +static void assert_normal_noclear (struct kvm_vcpu *vcpu) { +struct kvm_sync_regs *sync_regs = &vcpu->run->s.regs; +TEST_ASSERT (sync_regs->crs[2 ] ==0x10 ,"cr2 == 10 (sync_regs)" );TEST_ASSERT (sync_regs->crs[8 ] ==1 ,"cr10 == 1 (sync_regs)" );TEST_ASSERT (sync_regs->crs[10 ] ==1 ,"cr10 == 1 (sync_regs)" );TEST_ASSERT (sync_regs->crs[11 ] ==-1 ,"cr11 == -1 (sync_regs)" ); } -static void assert_normal (void ) +static void assert_normal (struct kvm_vcpu *vcpu) { -test_one_reg (KVM_REG_S390_PFTOKEN ,KVM_S390_PFAULT_TOKEN_INVALID ); -TEST_ASSERT (sync_regs->pft ==KVM_S390_PFAULT_TOKEN_INVALID , +test_one_reg (vcpu,KVM_REG_S390_PFTOKEN ,KVM_S390_PFAULT_TOKEN_INVALID ); +TEST_ASSERT (vcpu->run->s.regs.pft ==KVM_S390_PFAULT_TOKEN_INVALID ,"pft == 0xff..... (sync_regs)" ); -assert_noirq (); +assert_noirq (vcpu); } -static void inject_irq (int cpu_id) +static void inject_irq (struct kvm_vcpu *vcpu) {struct kvm_s390_irq_state irq_state;struct kvm_s390_irq *irq = &buf[0 ];
@@ -192,73 +196,86 @@ static void inject_irq(int cpu_id) irq_state.len =sizeof (struct kvm_s390_irq ); irq_state.buf = (unsigned long )buf; irq->type =KVM_S390_INT_EMERGENCY ; - irq->u.emerg.code = cpu_id; - irqs =__vcpu_ioctl (vm, cpu_id,KVM_S390_SET_IRQ_STATE , &irq_state); + irq->u.emerg.code = vcpu->id; + irqs =__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_SET_IRQ_STATE , &irq_state);TEST_ASSERT (irqs >=0 ,"Error injecting EMERGENCY IRQ errno %d\n" , errno); } +static struct kvm_vm *create_vm (struct kvm_vcpu **vcpu) +{ +struct kvm_vm *vm; + + vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + + *vcpu =vm_vcpu_add (vm,ARBITRARY_NON_ZERO_VCPU_ID , guest_code_initial); + +return vm; +} +static void test_normal (void ) { +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +pr_info ("Testing normal reset\n" ); -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); - run =vcpu_state (vm,VCPU_ID ); - sync_regs = &run->s.regs; + vm =create_vm (&vcpu); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -inject_irq (VCPU_ID ); +inject_irq (vcpu); -vcpu_ioctl (vm,VCPU_ID ,KVM_S390_NORMAL_RESET ,0 ); +vcpu_ioctl (vm, vcpu->id,KVM_S390_NORMAL_RESET ,0 );/* must clears */ -assert_normal (); +assert_normal (vcpu);/* must not clears */ -assert_normal_noclear (); -assert_initial_noclear (); +assert_normal_noclear (vcpu); +assert_initial_noclear (vcpu);kvm_vm_free (vm); }static void test_initial (void ) { +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +pr_info ("Testing initial reset\n" ); - vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); - run =vcpu_state (vm,VCPU_ID ); - sync_regs = &run->s.regs; + vm =create_vm (&vcpu); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -inject_irq (VCPU_ID ); +inject_irq (vcpu); -vcpu_ioctl (vm,VCPU_ID ,KVM_S390_INITIAL_RESET ,0 ); +vcpu_ioctl (vm, vcpu->id,KVM_S390_INITIAL_RESET ,0 );/* must clears */ -assert_normal (); -assert_initial (); +assert_normal (vcpu); +assert_initial (vcpu);/* must not clears */ -assert_initial_noclear (); +assert_initial_noclear (vcpu);kvm_vm_free (vm); }static void test_clear (void ) { +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +pr_info ("Testing clear reset\n" ); - vm =vm_create_default (VCPU_ID ,0 , guest_code_initial); - run =vcpu_state (vm,VCPU_ID ); - sync_regs = &run->s.regs; + vm =create_vm (&vcpu); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -inject_irq (VCPU_ID ); +inject_irq (vcpu); -vcpu_ioctl (vm,VCPU_ID ,KVM_S390_CLEAR_RESET ,0 ); +vcpu_ioctl (vm, vcpu->id,KVM_S390_CLEAR_RESET ,0 );/* must clears */ -assert_normal (); -assert_initial (); -assert_clear (); +assert_normal (vcpu); +assert_initial (vcpu); +assert_clear (vcpu);kvm_vm_free (vm); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 118/144 KVM: selftests: Convert memop away from VCPU_ID
In reply to Sean ChristophersonPass around a 'struct kvm_vcpu' object instead of a vCPU ID in s390's memop test. Pass NULL for the vCPU instead of a magic '-1' ID to indicate that an ioctl/test should be done at VM scope.
Rename "struct test_vcpu vcpu" to "struct test_info info" in order to avoid naming collisions (this is the bulk of the diff :-( ).
--- tools/testing/selftests/kvm/s390x/memop.c | 82 ++++++++++++----------- 1 file changed, 42 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/s390x/memop.c +42 -40
@@ -98,21 +98,18 @@ static struct kvm_s390_mem_op ksmo_from_desc(struct mop_desc desc)return ksmo; } -/* vcpu dummy id signifying that vm instead of vcpu ioctl is to occur */ -const uint32_t VM_VCPU_ID = (uint32_t )-1 ; - -struct test_vcpu { +struct test_info {struct kvm_vm *vm; -uint32_t id; +struct kvm_vcpu *vcpu; };#define PRINT_MEMOP false -static void print_memop (uint32_t vcpu_id,const struct kvm_s390_mem_op *ksmo) +static void print_memop (struct kvm_vcpu *vcpu,const struct kvm_s390_mem_op *ksmo) {if (!PRINT_MEMOP )return ; -if (vcpu_id ==VM_VCPU_ID ) +if (!vcpu)printf ("vm memop(" );else printf ("vcpu memop(" );
@@ -147,25 +144,29 @@ static void print_memop(uint32_t vcpu_id, const struct kvm_s390_mem_op *ksmo)puts (")" ); } -static void memop_ioctl (struct test_vcpu vcpu,struct kvm_s390_mem_op *ksmo) +static void memop_ioctl (struct test_info info,struct kvm_s390_mem_op *ksmo) { -if (vcpu.id ==VM_VCPU_ID ) -vm_ioctl (vcpu.vm,KVM_S390_MEM_OP , ksmo); +struct kvm_vcpu *vcpu = info.vcpu; + +if (!vcpu) +vm_ioctl (info.vm,KVM_S390_MEM_OP , ksmo);else -vcpu_ioctl (vcpu.vm, vcpu.id,KVM_S390_MEM_OP , ksmo); +vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_MEM_OP , ksmo); } -static int err_memop_ioctl (struct test_vcpu vcpu,struct kvm_s390_mem_op *ksmo) +static int err_memop_ioctl (struct test_info info,struct kvm_s390_mem_op *ksmo) { -if (vcpu.id ==VM_VCPU_ID ) -return __vm_ioctl (vcpu.vm,KVM_S390_MEM_OP , ksmo); +struct kvm_vcpu *vcpu = info.vcpu; + +if (!vcpu) +return __vm_ioctl (info.vm,KVM_S390_MEM_OP , ksmo);else -return __vcpu_ioctl (vcpu.vm, vcpu.id,KVM_S390_MEM_OP , ksmo); +return __vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_MEM_OP , ksmo); } -#define MEMOP (err, vcpu_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \ +#define MEMOP (err, info_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \ ({ \ - struct test_vcpu __vcpu = (vcpu_p); \ + struct test_info __info = (info_p); \ struct mop_desc __desc = { \ .target = (mop_target_p), \ .mode = (access_mode_p), \
@@ -177,13 +178,13 @@ static int err_memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo) \if (__desc._gaddr_v) { \if (__desc.target ==ABSOLUTE ) \ - __desc.gaddr =addr_gva2gpa (__vcpu.vm, __desc.gaddr_v); \ + __desc.gaddr =addr_gva2gpa (__info.vm, __desc.gaddr_v); \else \ __desc.gaddr = __desc.gaddr_v; \ } \ __ksmo =ksmo_from_desc (__desc); \ -print_memop (__vcpu.id, &__ksmo); \ - err##memop_ioctl(__vcpu, &__ksmo); \ +print_memop (__info.vcpu, &__ksmo); \ + err##memop_ioctl(__info, &__ksmo); \ })#define MOP (...) MEMOP(, __VA_ARGS__)
@@ -200,7 +201,6 @@ static int err_memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo)#define CHECK_N_DO (f, ...) ({ f(__VA_ARGS__, CHECK_ONLY); f(__VA_ARGS__); }) -#define VCPU_ID 1#define PAGE_SHIFT 12#define PAGE_SIZE (1ULL << PAGE_SHIFT)#define PAGE_MASK (~(PAGE_SIZE - 1))
@@ -212,21 +212,22 @@ static uint8_t mem2[65536];struct test_default {struct kvm_vm *kvm_vm; -struct test_vcpu vm; -struct test_vcpu vcpu; +struct test_info vm; +struct test_info vcpu;struct kvm_run *run;int size; };static struct test_default test_default_init (void *guest_code) { +struct kvm_vcpu *vcpu;struct test_default t; t.size =min ((size_t )kvm_check_cap (KVM_CAP_S390_MEM_OP ),sizeof (mem1)); - t.kvm_vm =vm_create_default (VCPU_ID ,0 , guest_code); - t.vm = (struct test_vcpu ) { t.kvm_vm,VM_VCPU_ID }; - t.vcpu = (struct test_vcpu ) { t.kvm_vm,VCPU_ID }; - t.run =vcpu_state (t.kvm_vm,VCPU_ID ); + t.kvm_vm =vm_create_with_one_vcpu (&vcpu, guest_code); + t.vm = (struct test_info ) { t.kvm_vm,NULL }; + t.vcpu = (struct test_info ) { t.kvm_vm, vcpu }; + t.run = vcpu->run;return t; }
@@ -241,14 +242,15 @@ enum stage { STAGE_COPIED, }; -#define HOST_SYNC (vcpu_p, stage) \ +#define HOST_SYNC (info_p, stage) \ ({ \ - struct test_vcpu __vcpu = (vcpu_p); \ + struct test_info __info = (info_p); \ + struct kvm_vcpu *__vcpu = __info.vcpu; \ struct ucall uc; \ int __stage = (stage); \ \ - vcpu_run(__vcpu.vm, __vcpu.id); \ - get_ucall(__vcpu.vm, __vcpu.id, &uc); \ + vcpu_run(__vcpu->vm, __vcpu->id); \ + get_ucall(__vcpu->vm, __vcpu->id, &uc); \ ASSERT_EQ(uc.cmd, UCALL_SYNC); \ ASSERT_EQ(uc.args[1], __stage); \ }) \
@@ -267,7 +269,7 @@ static void prepare_mem12(void)#define DEFAULT_WRITE_READ (copy_cpu, mop_cpu, mop_target_p, size, ...) \ ({ \ - struct test_vcpu __copy_cpu = (copy_cpu), __mop_cpu = (mop_cpu); \ + struct test_info __copy_cpu = (copy_cpu), __mop_cpu = (mop_cpu); \ enum mop_target __target = (mop_target_p); \ uint32_t __size = (size); \ \
@@ -282,7 +284,7 @@ static void prepare_mem12(void)#define DEFAULT_READ (copy_cpu, mop_cpu, mop_target_p, size, ...) \ ({ \ - struct test_vcpu __copy_cpu = (copy_cpu), __mop_cpu = (mop_cpu); \ + struct test_info __copy_cpu = (copy_cpu), __mop_cpu = (mop_cpu); \ enum mop_target __target = (mop_target_p); \ uint32_t __size = (size); \ \
@@ -623,34 +625,34 @@ static void guest_idle(void)GUEST_SYNC (STAGE_IDLED ); } -static void _test_errors_common (struct test_vcpu vcpu,enum mop_target target,int size) +static void _test_errors_common (struct test_info info,enum mop_target target,int size) {int rv;/* Bad size: */ - rv =ERR_MOP (vcpu, target,WRITE , mem1,-1 ,GADDR_V (mem1)); + rv =ERR_MOP (info, target,WRITE , mem1,-1 ,GADDR_V (mem1));TEST_ASSERT (rv ==-1 && errno ==E2BIG ,"ioctl allows insane sizes" );/* Zero size: */ - rv =ERR_MOP (vcpu, target,WRITE , mem1,0 ,GADDR_V (mem1)); + rv =ERR_MOP (info, target,WRITE , mem1,0 ,GADDR_V (mem1));TEST_ASSERT (rv ==-1 && (errno ==EINVAL || errno ==ENOMEM ),"ioctl allows 0 as size" );/* Bad flags: */ - rv =ERR_MOP (vcpu, target,WRITE , mem1, size,GADDR_V (mem1),SET_FLAGS (-1 )); + rv =ERR_MOP (info, target,WRITE , mem1, size,GADDR_V (mem1),SET_FLAGS (-1 ));TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows all flags" );/* Bad guest address: */ - rv =ERR_MOP (vcpu, target,WRITE , mem1, size,GADDR ((void *)~0xfffUL ),CHECK_ONLY ); + rv =ERR_MOP (info, target,WRITE , mem1, size,GADDR ((void *)~0xfffUL ),CHECK_ONLY );TEST_ASSERT (rv >0 ,"ioctl does not report bad guest memory access" );/* Bad host address: */ - rv =ERR_MOP (vcpu, target,WRITE ,0 , size,GADDR_V (mem1)); + rv =ERR_MOP (info, target,WRITE ,0 , size,GADDR_V (mem1));TEST_ASSERT (rv ==-1 && errno ==EFAULT ,"ioctl does not report bad host memory address" );/* Bad key: */ - rv =ERR_MOP (vcpu, target,WRITE , mem1, size,GADDR_V (mem1),KEY (17 )); + rv =ERR_MOP (info, target,WRITE , mem1, size,GADDR_V (mem1),KEY (17 ));TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows invalid key" ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 119/144 KVM: selftests: Convert s390x/diag318_test_handler away from VCPU_ID
In reply to Sean ChristophersonConvert diag318_test_handler to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of passing around vCPU IDs. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==6. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/lib/s390x/diag318_test_handler.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +4 -5
@@ -8,8 +8,6 @@#include "test_util.h" #include "kvm_util.h" -#define VCPU_ID 6 -#define ICPT_INSTRUCTION 0x04#define IPA0_DIAG 0x8300
@@ -27,14 +25,15 @@ static void guest_code(void)*/ static uint64_t diag318_handler (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;uint64_t reg;uint64_t diag318_info; - vm =vm_create_default (VCPU_ID ,0 , guest_code); -vcpu_run (vm,VCPU_ID ); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); +vcpu_run (vm, vcpu->id); + run = vcpu->run;TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC ,"DIAGNOSE 0x0318 instruction was not intercepted" );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 120/144 KVM: selftests: Convert tprot away from VCPU_ID
In reply to Sean ChristophersonConvert tprot to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of passing around vCPU IDs. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- tools/testing/selftests/kvm/s390x/tprot.c | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/s390x/tprot.c +12 -13
@@ -14,8 +14,6 @@#define CR0_FETCH_PROTECTION_OVERRIDE (1UL << (63 - 38))#define CR0_STORAGE_PROTECTION_OVERRIDE (1UL << (63 - 39)) -#define VCPU_ID 1 -static __aligned(PAGE_SIZE) uint8_t pages[2 ][PAGE_SIZE ];static uint8_t *const page_store_prot = pages[0 ];static uint8_t *const page_fetch_prot = pages[1 ];
@@ -182,14 +180,14 @@ static void guest_code(void)GUEST_SYNC (perform_next_stage (&i, mapped_0)); } -#define HOST_SYNC (vmp, stage) \ +#define HOST_SYNC (vcpup, stage) \ ({ \ - struct kvm_vm *__vm = (vmp); \ + struct kvm_vcpu *__vcpu = (vcpup); \ struct ucall uc; \ int __stage = (stage); \ \ - vcpu_run(__vm, VCPU_ID); \ - get_ucall(__vm, VCPU_ID, &uc); \ + vcpu_run(__vcpu->vm, __vcpu->id); \ + get_ucall(__vcpu->vm, __vcpu->id, &uc); \ if (uc.cmd == UCALL_ABORT) { \ TEST_FAIL("line %lu: %s, hints: %lu, %lu", uc.args[1], \ (const char *)uc.args[0], uc.args[2], uc.args[3]); \
@@ -200,28 +198,29 @@ static void guest_code(void)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;vm_vaddr_t guest_0_page; - vm =vm_create_default (VCPU_ID ,0 , guest_code); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); + run = vcpu->run; -HOST_SYNC (vm,STAGE_INIT_SIMPLE ); +HOST_SYNC (vcpu,STAGE_INIT_SIMPLE );mprotect (addr_gva2hva (vm, (vm_vaddr_t )pages),PAGE_SIZE *2 ,PROT_READ ); -HOST_SYNC (vm,TEST_SIMPLE ); +HOST_SYNC (vcpu,TEST_SIMPLE ); guest_0_page =vm_vaddr_alloc (vm,PAGE_SIZE ,0 );if (guest_0_page !=0 )print_skip ("Did not allocate page at 0 for fetch protection override tests" ); -HOST_SYNC (vm,STAGE_INIT_FETCH_PROT_OVERRIDE ); +HOST_SYNC (vcpu,STAGE_INIT_FETCH_PROT_OVERRIDE );if (guest_0_page ==0 )mprotect (addr_gva2hva (vm, (vm_vaddr_t )0 ),PAGE_SIZE ,PROT_READ ); run->s.regs.crs[0 ] |=CR0_FETCH_PROTECTION_OVERRIDE ; run->kvm_dirty_regs =KVM_SYNC_CRS ; -HOST_SYNC (vm,TEST_FETCH_PROT_OVERRIDE ); +HOST_SYNC (vcpu,TEST_FETCH_PROT_OVERRIDE ); run->s.regs.crs[0 ] |=CR0_STORAGE_PROTECTION_OVERRIDE ; run->kvm_dirty_regs =KVM_SYNC_CRS ; -HOST_SYNC (vm,TEST_STORAGE_PROT_OVERRIDE ); +HOST_SYNC (vcpu,TEST_STORAGE_PROT_OVERRIDE ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 121/144 KVM: selftests: Use vm_create() in tsc_scaling_sync
In reply to Sean ChristophersonUse vm_create() instead of vm_create_default_with_vcpus() in tsc_scaling_sync. The existing call doesn't create any vCPUs, and the guest_code() entry point is set when vm_vcpu_add_default() is invoked.
--- tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -1
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create_default_with_vcpus (0 ,DEFAULT_STACK_PGS *NR_TEST_VCPUS ,0 , guest_code,NULL ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES +DEFAULT_STACK_PGS *NR_TEST_VCPUS );vm_ioctl (vm,KVM_SET_TSC_KHZ , (void *)TEST_TSC_KHZ );pthread_spin_init (&create_lock,PTHREAD_PROCESS_PRIVATE );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 122/144 KVM: selftests: Use vm_create_with_vcpus() in max_guest_memory_test
In reply to Sean ChristophersonUse vm_create_with_vcpus() in max_guest_memory_test and reference vCPUs by their 'struct kvm_vcpu' object instead of their ID.
--- .../selftests/kvm/max_guest_memory_test.c | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/max_guest_memory_test.c +16 -10
@@ -28,8 +28,7 @@ static void guest_code(uint64_t start_gpa, uint64_t end_gpa, uint64_t stride) }struct vcpu_info { -struct kvm_vm *vm; -uint32_t id; +struct kvm_vcpu *vcpu;uint64_t start_gpa;uint64_t end_gpa; };
@@ -60,12 +59,13 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpu_id)static void *vcpu_worker (void *data) { -struct vcpu_info *vcpu = data; +struct vcpu_info *info = data; +struct kvm_vcpu *vcpu = info->vcpu;struct kvm_vm *vm = vcpu->vm;struct kvm_sregs sregs;struct kvm_regs regs; -vcpu_args_set (vm, vcpu->id,3 , vcpu->start_gpa, vcpu->end_gpa, +vcpu_args_set (vm, vcpu->id,3 , info->start_gpa, info->end_gpa,vm_get_page_size (vm));/* Snapshot regs before the first run. */
@@ -89,8 +89,8 @@ static void *vcpu_worker(void *data)return NULL ; } -static pthread_t *spawn_workers (struct kvm_vm *vm,uint64_t start_gpa, -uint64_t end_gpa) +static pthread_t *spawn_workers (struct kvm_vm *vm,struct kvm_vcpu **vcpus, +uint64_t start_gpa,uint64_t end_gpa) {struct vcpu_info *info;uint64_t gpa, nr_bytes;
@@ -108,8 +108,7 @@ static pthread_t *spawn_workers(struct kvm_vm *vm, uint64_t start_gpa,TEST_ASSERT (nr_bytes,"C'mon, no way you have %d CPUs" , nr_vcpus);for (i =0 , gpa = start_gpa; i < nr_vcpus; i++, gpa += nr_bytes) { - info[i].vm = vm; - info[i].id = i; + info[i].vcpu = vcpus[i]; info[i].start_gpa = gpa; info[i].end_gpa = gpa + nr_bytes;pthread_create (&threads[i],NULL , vcpu_worker, &info[i]);
@@ -172,6 +171,7 @@ int main(int argc, char *argv[])uint64_t max_gpa, gpa, slot_size, max_mem, i;int max_slots, slot, opt, fd;bool hugepages = false; +struct kvm_vcpu **vcpus;pthread_t *threads;struct kvm_vm *vm;void *mem;
@@ -215,7 +215,10 @@ int main(int argc, char *argv[]) } } - vm =vm_create_default_with_vcpus (nr_vcpus,0 ,0 , guest_code,NULL ); + vcpus =malloc (nr_vcpus *sizeof (*vcpus)); +TEST_ASSERT (vcpus,"Failed to allocate vCPU array" ); + + vm =vm_create_with_vcpus (nr_vcpus, guest_code, vcpus); max_gpa =vm_get_max_gfn (vm) <<vm_get_page_shift (vm);TEST_ASSERT (max_gpa > (4 * slot_size),"MAXPHYADDR <4gb " );
@@ -252,7 +255,10 @@ int main(int argc, char *argv[]) }atomic_set (&rendezvous, nr_vcpus +1 ); - threads =spawn_workers (vm, start_gpa, gpa); + threads =spawn_workers (vm, vcpus, start_gpa, gpa); + +free (vcpus); + vcpus =NULL ;pr_info ("Running with %lugb of guest memory and %u vCPUs\n" , (gpa - start_gpa) / size_1gb, nr_vcpus);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 123/144 KVM: selftests: Drop vm_create_default* helpers
In reply to Sean ChristophersonDrop all vm_create_default*() helpers, the "default" naming turned out to terrible as wasn't extensible (hard to have multiple defaults), was a lie (half the settings were default, half weren't), and failed to capture relationships between helpers, e.g. compared with the kernel's standard underscores pattern.
--- .../selftests/kvm/include/kvm_util_base.h | 23 ------------------- tools/testing/selftests/kvm/lib/kvm_util.c | 23 +++++-------------- 2 files changed, 6 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -23
@@ -559,29 +559,6 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages)return __vm_create (VM_MODE_DEFAULT , nr_pages); } -/* -* Create a VM with reasonable defaults -* -* Input Args: -* vcpuid - The id of the single VCPU to add to the VM. -* extra_mem_pages - The number of extra pages to add (this will -* decide how much extra space we will need to -* setup the page tables using memslot 0) -* guest_code - The vCPU's entry point -* -* Output Args: None -* -* Return: -* Pointer to opaque structure that describes the created VM. -*/ -struct kvm_vm *vm_create_default (uint32_t vcpuid,uint64_t extra_mem_pages, -void *guest_code); - -/* Same as vm_create_default, but can be used for more than one vcpu */ -struct kvm_vm *vm_create_default_with_vcpus (uint32_t nr_vcpus,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[]); -/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, uint64_t slot0_mem_pages, uint64_t extra_mem_pages,
tools/testing/selftests/kvm/lib/kvm_util.c +6 -17
@@ -337,28 +337,17 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpusreturn vm; } -struct kvm_vm *vm_create_default_with_vcpus (uint32_t nr_vcpus,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[]) -{ -return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - extra_mem_pages, num_percpu_pages, guest_code, vcpuids,NULL ); -} - -struct kvm_vm *vm_create_default (uint32_t vcpuid,uint64_t extra_mem_pages, -void *guest_code) -{ -return vm_create_default_with_vcpus (1 , extra_mem_pages,0 , guest_code, - (uint32_t []){ vcpuid }); -} -struct kvm_vm *__vm_create_with_one_vcpu (struct kvm_vcpu **vcpu,uint64_t extra_mem_pages,void *guest_code) { -struct kvm_vm *vm =vm_create_default (0 , extra_mem_pages, guest_code); +struct kvm_vcpu *vcpus[1 ]; +struct kvm_vm *vm; - *vcpu =vcpu_get (vm,0 ); + vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 ,DEFAULT_GUEST_PHY_PAGES , + extra_mem_pages,0 , guest_code,NULL , vcpus); + + *vcpu = vcpus[0 ];return vm; }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 124/144 KVM: selftests: Drop @vcpuids param from VM creators
In reply to Sean ChristophersonDrop the @vcpuids parameter from VM creators now that there are no users. Allowing tests to specify IDs was a gigantic mistake as it resulted in tests with arbitrary and ultimately meaningless IDs that differed only because the author used test X intead of test Y as the source for copy+paste (the de facto standard way to create a KVM selftest).
Except for literally two tests, x86's set_boot_cpu_id and s390's resets, tests do not and should not care about the vCPU ID.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 4 ++-- tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 8 +++----- tools/testing/selftests/kvm/lib/perf_test_util.c | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -2
@@ -563,7 +563,7 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages)struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus,uint64_t slot0_mem_pages,uint64_t extra_mem_pages,uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[],struct kvm_vcpu *vcpus[]); +struct kvm_vcpu *vcpus[]); static inline struct kvm_vm *vm_create_with_vcpus(uint32_t nr_vcpus, void *guest_code,
@@ -571,7 +571,7 @@ static inline struct kvm_vm *vm_create_with_vcpus(uint32_t nr_vcpus, {return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus,DEFAULT_GUEST_PHY_PAGES ,0 ,0 , - guest_code,NULL , vcpus); + guest_code, vcpus); }/*
tools/testing/selftests/kvm/kvm_page_table_test.c +1 -1
@@ -269,7 +269,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Create a VM with enough guest pages */ guest_num_pages = test_mem_size / guest_page_size; vm =__vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code,NULL ,NULL ); + guest_num_pages,0 , guest_code,NULL );/* Align down GPA of the testing memslot */ if (!p->phys_offset)
tools/testing/selftests/kvm/lib/kvm_util.c +3 -5
@@ -299,7 +299,7 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus,uint64_t slot0_mem_pages,uint64_t extra_mem_pages,uint32_t num_percpu_pages,void *guest_code, -uint32_t vcpuids[],struct kvm_vcpu *vcpus[]) +struct kvm_vcpu *vcpus[]) {uint64_t vcpu_pages, extra_pg_pages, pages;struct kvm_vcpu *vcpu;
@@ -327,9 +327,7 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus vm =__vm_create (mode, pages);for (i =0 ; i < nr_vcpus; ++i) { -uint32_t vcpuid = vcpuids ? vcpuids[i] : i; - - vcpu =vm_vcpu_add (vm, vcpuid, guest_code); + vcpu =vm_vcpu_add (vm, i, guest_code);if (vcpus) vcpus[i] = vcpu; }
@@ -345,7 +343,7 @@ struct kvm_vm *__vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vm *vm; vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 ,DEFAULT_GUEST_PHY_PAGES , - extra_mem_pages,0 , guest_code,NULL , vcpus); + extra_mem_pages,0 , guest_code, vcpus); *vcpu = vcpus[0 ];return vm;
tools/testing/selftests/kvm/lib/perf_test_util.c +1 -1
@@ -140,7 +140,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,* effect as KVM allows aliasing HVAs in meslots. */ vm =__vm_create_with_vcpus (mode, vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code,NULL ,NULL ); + guest_num_pages,0 , guest_code,NULL ); pta->vm = vm;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 125/144 KVM: selftests: Convert kvm_page_table_test away from reliance on vcpu_id
In reply to Sean ChristophersonReference vCPUs by their 'struct kvm_vcpu' object in kvm_page_table_test instead of by their ID. This moves selftests one step closer towards taking a 'struct kvm_vcpu *' instead of VM+vcpu_id for vCPU helpers.
--- .../selftests/kvm/kvm_page_table_test.c | 62 +++++++------------ 1 file changed, 21 insertions(+), 41 deletions(-)
tools/testing/selftests/kvm/kvm_page_table_test.c +21 -41
@@ -46,11 +46,6 @@ static const char * const test_stage_string[] = { "KVM_ADJUST_MAPPINGS", }; -struct vcpu_args { -int vcpu_id; -bool vcpu_write; -}; -struct test_args {struct kvm_vm *vm;uint64_t guest_test_virt_mem;
@@ -60,7 +55,7 @@ struct test_args {uint64_t large_num_pages;uint64_t host_pages_per_lpage;enum vm_mem_backing_src_type src_type; -struct vcpu_args vcpu_args[KVM_MAX_VCPUS ]; +struct kvm_vcpu *vcpus[KVM_MAX_VCPUS ]; };/*
@@ -92,17 +87,13 @@ static uint64_t guest_test_phys_mem;*/ static uint64_t guest_test_virt_mem =DEFAULT_GUEST_TEST_MEM ; -static void guest_code (int vcpu_id) +static void guest_code (bool do_write) {struct test_args *p = &test_args; -struct vcpu_args *vcpu_args = &p->vcpu_args[vcpu_id];enum test_stage *current_stage = &guest_test_stage;uint64_t addr;int i, j; -/* Make sure vCPU args data structure is not corrupt */ -GUEST_ASSERT (vcpu_args->vcpu_id == vcpu_id); -while (true) { addr = p->guest_test_virt_mem;
@@ -123,7 +114,7 @@ static void guest_code(int vcpu_id)*/ case KVM_CREATE_MAPPINGS :for (i =0 ; i < p->large_num_pages; i++) { -if (vcpu_args->vcpu_write) +if (do_write) *(uint64_t *)addr =0x0123456789ABCDEF ;else READ_ONCE (*(uint64_t *)addr);
@@ -193,17 +184,15 @@ static void guest_code(int vcpu_id)static void *vcpu_worker (void *data) { -int ret; -struct vcpu_args *vcpu_args = data;struct kvm_vm *vm = test_args.vm; -int vcpu_id = vcpu_args->vcpu_id; -struct kvm_run *run; +struct kvm_vcpu *vcpu = data; +bool do_write = !(vcpu->id %2 );struct timespec start;struct timespec ts_diff;enum test_stage stage; +int ret; -vcpu_args_set (vm, vcpu_id,1 , vcpu_id); - run =vcpu_state (vm, vcpu_id); +vcpu_args_set (vm, vcpu->id,1 , do_write);while (!READ_ONCE (host_quit)) { ret =sem_wait (&test_stage_updated);
@@ -213,15 +202,15 @@ static void *vcpu_worker(void *data)return NULL ;clock_gettime (CLOCK_MONOTONIC_RAW , &start); - ret =_vcpu_run (vm, vcpu_id); + ret =_vcpu_run (vm, vcpu->id); ts_diff =timespec_elapsed (start);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -TEST_ASSERT (get_ucall (vm, vcpu_id,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" , -exit_reason_str (run->exit_reason)); +exit_reason_str (vcpu->run->exit_reason)); -pr_debug ("Got sync event from vCPU %d\n" , vcpu_id); +pr_debug ("Got sync event from vCPU %d\n" , vcpu->id); stage =READ_ONCE (*current_stage);/*
@@ -230,7 +219,7 @@ static void *vcpu_worker(void *data)*/ pr_debug ("vCPU %d has completed stage %s\n" "execution time is: %ld.%.9lds\n\n" , - vcpu_id, test_stage_string[stage], + vcpu->id, test_stage_string[stage], ts_diff.tv_sec, ts_diff.tv_nsec); ret =sem_post (&test_stage_completed);
@@ -250,7 +239,6 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg) {int ret;struct test_params *p = arg; -struct vcpu_args *vcpu_args;enum vm_mem_backing_src_type src_type = p->src_type;uint64_t large_page_size =get_backing_src_pagesz (src_type);uint64_t guest_page_size = vm_guest_mode_params[mode].page_size;
@@ -260,7 +248,6 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)uint64_t alignment;void *host_test_mem;struct kvm_vm *vm; -int vcpu_id;/* Align up the test memory size */ alignment =max (large_page_size, guest_page_size);
@@ -269,7 +256,8 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Create a VM with enough guest pages */ guest_num_pages = test_mem_size / guest_page_size; vm =__vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code,NULL ); + guest_num_pages,0 , guest_code, + test_args.vcpus);/* Align down GPA of the testing memslot */ if (!p->phys_offset)
@@ -292,12 +280,6 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg) test_args.host_pages_per_lpage = large_page_size / host_page_size; test_args.src_type = src_type; -for (vcpu_id =0 ; vcpu_id <KVM_MAX_VCPUS ; vcpu_id++) { - vcpu_args = &test_args.vcpu_args[vcpu_id]; - vcpu_args->vcpu_id = vcpu_id; - vcpu_args->vcpu_write = !(vcpu_id %2 ); - } -/* Add an extra memory slot with specified backing src type */ vm_userspace_mem_region_add (vm, src_type, guest_test_phys_mem,TEST_MEM_SLOT_INDEX , guest_num_pages,0 );
@@ -363,12 +345,11 @@ static void vcpus_complete_new_stage(enum test_stage stage)static void run_test (enum vm_guest_mode mode,void *arg) { -int ret;pthread_t *vcpu_threads;struct kvm_vm *vm; -int vcpu_id;struct timespec start;struct timespec ts_diff; +int ret, i;/* Create VM with vCPUs and make some pre-initialization */ vm =pre_init_before_test (mode, arg);
@@ -379,10 +360,9 @@ static void run_test(enum vm_guest_mode mode, void *arg) host_quit = false; *current_stage =KVM_BEFORE_MAPPINGS ; -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { -pthread_create (&vcpu_threads[vcpu_id],NULL , vcpu_worker, - &test_args.vcpu_args[vcpu_id]); - } +for (i =0 ; i < nr_vcpus; i++) +pthread_create (&vcpu_threads[i],NULL , vcpu_worker, + test_args.vcpus[i]);vcpus_complete_new_stage (*current_stage);pr_info ("Started all vCPUs successfully\n" );
@@ -424,13 +404,13 @@ static void run_test(enum vm_guest_mode mode, void *arg)/* Tell the vcpu thread to quit */ host_quit = true; -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { +for (i =0 ; i < nr_vcpus; i++) { ret =sem_post (&test_stage_updated);TEST_ASSERT (ret ==0 ,"Error in sem_post" ); } -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) -pthread_join (vcpu_threads[vcpu_id],NULL ); +for (i =0 ; i < nr_vcpus; i++) +pthread_join (vcpu_threads[i],NULL ); ret =sem_destroy (&test_stage_updated);TEST_ASSERT (ret ==0 ,"Error in sem_destroy" );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 126/144 KVM: selftests: Convert kvm_binary_stats_test away from vCPU IDs
In reply to Sean ChristophersonTrack vCPUs by their 'struct kvm_vcpu' object in kvm_binary_stats_test, not by their ID. The per-vCPU helpers will soon take a vCPU instead of a VM+vcpu_id pair.
--- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/kvm_binary_stats_test.c +9 -4
@@ -172,9 +172,9 @@ static void vm_stats_test(struct kvm_vm *vm)TEST_ASSERT (fcntl (stats_fd,F_GETFD ) ==-1 ,"Stats fd not freed" ); } -static void vcpu_stats_test (struct kvm_vm *vm,int vcpu_id) +static void vcpu_stats_test (struct kvm_vcpu *vcpu) { -int stats_fd =vcpu_get_stats_fd (vm, vcpu_id); +int stats_fd =vcpu_get_stats_fd (vcpu->vm, vcpu->id);stats_test (stats_fd);close (stats_fd);
@@ -195,6 +195,7 @@ static void vcpu_stats_test(struct kvm_vm *vm, int vcpu_id)int main (int argc,char *argv[]) {int i, j; +struct kvm_vcpu **vcpus;struct kvm_vm **vms;int max_vm =DEFAULT_NUM_VM ;int max_vcpu =DEFAULT_NUM_VCPU ;
@@ -220,17 +221,21 @@ int main(int argc, char *argv[])/* Create VMs and VCPUs */ vms =malloc (sizeof (vms[0 ]) * max_vm);TEST_ASSERT (vms,"Allocate memory for storing VM pointers" ); + + vcpus =malloc (sizeof (struct kvm_vcpu *) * max_vm * max_vcpu); +TEST_ASSERT (vcpus,"Allocate memory for storing vCPU pointers" ); +for (i =0 ; i < max_vm; ++i) { vms[i] =vm_create_barebones ();for (j =0 ; j < max_vcpu; ++j) -__vm_vcpu_add (vms[i], j); + vcpus[j * max_vcpu + i] =__vm_vcpu_add (vms[i], j); }/* Check stats read for every VM and VCPU */ for (i =0 ; i < max_vm; ++i) {vm_stats_test (vms[i]);for (j =0 ; j < max_vcpu; ++j) -vcpu_stats_test (vms[i], j); +vcpu_stats_test (vcpus[j * max_vcpu + i]); }for (i =0 ; i < max_vm; ++i)
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 126/144] KVM: selftests: Convert kvm_binary_stats_test away from vCPU IDs
Quoted 36 lines · Sean Christopherson
Track vCPUs by their 'struct
kvm_vcpu' object inkvm_binary_stats_test, not by their ID. The per-vCPU helpers will soon take a vCPU instead of a VM+vcpu_id pair.Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)tools/testing/selftests/kvm/kvm_binary_stats_test.c +3
-2@@ -172,9 +172,9 @@ static void vm_stats_test(struct kvm_vm *vm)TEST_ASSERT (fcntl (stats_fd,F_GETFD ) ==-1 ,"Stats fd not freed" ); } -static void vcpu_stats_test (struct kvm_vm *vm,int vcpu_id) +static void vcpu_stats_test (struct kvm_vcpu *vcpu) { -int stats_fd =vcpu_get_stats_fd (vm, vcpu_id); +int stats_fd =vcpu_get_stats_fd (vcpu->vm, vcpu->id);stats_test (stats_fd);close (stats_fd);@@ -195,6 +195,7 @@ static void vcpu_stats_test(struct kvm_vm *vm, int vcpu_id)int main (int argc,char *argv[]) {int i, j; +struct kvm_vcpu **vcpus;struct kvm_vm **vms;int max_vm =DEFAULT_NUM_VM ;int max_vcpu =DEFAULT_NUM_VCPU ;@@ -220,17 +221,21 @@ int main(int argc, char *argv[])/* Create VMs and VCPUs */ vms =malloc (sizeof (vms[0 ]) * max_vm);
tools/testing/selftests/kvm/kvm_binary_stats_test.c int main(int argc, char *argv[]) · line 231
Quoted 10 lines
tools/testing/selftests/kvm/kvm_binary_stats_test.c +5
-1TEST_ASSERT (vms,"Allocate memory for storing VM pointers" ); + + vcpus =malloc (sizeof (struct kvm_vcpu *) * max_vm * max_vcpu); +TEST_ASSERT (vcpus,"Allocate memory for storing vCPU pointers" ); +for (i =0 ; i < max_vm; ++i) { vms[i] =vm_create_barebones ();for (j =0 ; j < max_vcpu; ++j) -__vm_vcpu_add (vms[i], j); + vcpus[j * max_vcpu + i] =__vm_vcpu_add (vms[i], j);
The expression for the index should be 'i * max_vcpu + j'. The swapped i,j usage isn't causing problems now becauseDEFAULT_NUM_VM == DEFAULT_NUM_VCPU, but that could change.
tools/testing/selftests/kvm/kvm_binary_stats_test.c int main(int argc, char *argv[]) · line 238
Quoted 8 lines
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1
-1}/* Check stats read for every VM and VCPU */ for (i =0 ; i < max_vm; ++i) {vm_stats_test (vms[i]);for (j =0 ; j < max_vcpu; ++j) -vcpu_stats_test (vms[i], j); +vcpu_stats_test (vcpus[j * max_vcpu + i]);
Same comment as above.
Thanks,
drew
Quoted 6 lines
tools/testing/selftests/kvm/kvm_binary_stats_test.c +0
-0}for (i =0 ; i < max_vm; ++i)Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerRe: [PATCH v2 126/144] KVM: selftests: Convert kvm_binary_stats_test away from vCPU IDs
Quoted 10 lines · Andrew Jones
Quoted 9 lines · Sean Christopherson
tools/testing/selftests/kvm/kvm_binary_stats_test.c +4
-0@@ -220,17 +221,21 @@ int main(int argc, char *argv[])/* Create VMs and VCPUs */ vms =malloc (sizeof (vms[0 ]) * max_vm);TEST_ASSERT (vms,"Allocate memory for storing VM pointers" ); + + vcpus =malloc (sizeof (struct kvm_vcpu *) * max_vm * max_vcpu); +TEST_ASSERT (vcpus,"Allocate memory for storing vCPU pointers" ); +for (i =0 ; i < max_vm; ++i) {
Quoted 8 lines
tools/testing/selftests/kvm/kvm_binary_stats_test.c int main(int argc, char *argv[]) · line 231
Quoted 4 lines
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1
-1vms[i] =vm_create_barebones ();for (j =0 ; j < max_vcpu; ++j) -__vm_vcpu_add (vms[i], j); + vcpus[j * max_vcpu + i] =__vm_vcpu_add (vms[i], j);The expression for the index should be 'i *
max_vcpu+ j'. The swapped i,j usage isn't causing problems now becauseDEFAULT_NUM_VM==DEFAULT_NUM_VCPU, but that could change.
It's better to be lucky than good?
Thanks much, I appreciate the reviews!
Sean Christopherson
reviewerPATCH v2 127/144 KVM: selftests: Convert get-reg-list away from its "VCPU_ID"
In reply to Sean ChristophersonTrack the vCPU's 'struct kvm_vcpu' object in get-reg-list instead of hardcoding '0' everywhere.
--- tools/testing/selftests/kvm/aarch64/get-reg-list.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +7 -6
@@ -411,6 +411,7 @@ static void run_test(struct vcpu_config *c)struct kvm_vcpu_init init = { .target =-1 , };int new_regs =0 , missing_regs =0 , i, n;int failed_get =0 , failed_set =0 , failed_reject =0 ; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct reg_sublist *s;
@@ -418,10 +419,10 @@ static void run_test(struct vcpu_config *c) vm =vm_create_barebones ();prepare_vcpu_init (c, &init); -aarch64_vcpu_add (vm,0 , &init,NULL ); -finalize_vcpu (vm,0 , c); + vcpu =aarch64_vcpu_add (vm,0 , &init,NULL ); +finalize_vcpu (vm, vcpu->id, c); - reg_list =vcpu_get_reg_list (vm,0 ); + reg_list =vcpu_get_reg_list (vm, vcpu->id);if (fixup_core_regs)core_reg_fixup ();
@@ -457,7 +458,7 @@ static void run_test(struct vcpu_config *c)bool reject_reg = false;int ret; - ret =__vcpu_get_reg (vm,0 , reg_list->reg[i], &addr); + ret =__vcpu_get_reg (vm, vcpu->id, reg_list->reg[i], &addr);if (ret) {printf ("%s: Failed to get " ,config_name (c));print_reg (c, reg.id);
@@ -469,7 +470,7 @@ static void run_test(struct vcpu_config *c)for_each_sublist (c, s) {if (s->rejects_set &&find_reg (s->rejects_set, s->rejects_set_n, reg.id)) { reject_reg = true; - ret =__vcpu_ioctl (vm,0 ,KVM_SET_ONE_REG , ®); + ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_ONE_REG , ®);if (ret !=-1 || errno !=EPERM ) {printf ("%s: Failed to reject (ret=%d, errno=%d) " ,config_name (c), ret, errno);print_reg (c, reg.id);
@@ -481,7 +482,7 @@ static void run_test(struct vcpu_config *c) }if (!reject_reg) { - ret =__vcpu_ioctl (vm,0 ,KVM_SET_ONE_REG , ®); + ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_ONE_REG , ®);if (ret) {printf ("%s: Failed to set " ,config_name (c));print_reg (c, reg.id);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 128/144 KVM: selftests: Stop hardcoding vCPU IDs in vcpu_width_config
In reply to Sean ChristophersonIn preparation for taking a vCPU pointer in vCPU-scoped functions, grab the vCPU(s) created by __vm_vcpu_add() and use the ID from the vCPU object instead of hardcoding the ID in ioctl() invocations.
Rename init1/init2 => init0/init1 to avoid having odd/confusing code where vcpu0 consumes init1 and vcpu1 consumes init2.
Note, this change could easily be done when the functions are converted in the future, and/or the vcpu{0,1} vs. init{1,2} discrepancy could be ignored, but then there would be no opportunity to poke fun at the 1-based counting scheme.
--- .../selftests/kvm/aarch64/vcpu_width_config.c | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-)
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +31 -29
@@ -15,24 +15,25 @@/* -* Add a vCPU, run KVM_ARM_VCPU_INIT with @init1, and then -* add another vCPU, and run KVM_ARM_VCPU_INIT with @init2. +* Add a vCPU, run KVM_ARM_VCPU_INIT with @init0, and then +* add another vCPU, and run KVM_ARM_VCPU_INIT with @init1. */ -static int add_init_2vcpus (struct kvm_vcpu_init *init1, -struct kvm_vcpu_init *init2) +static int add_init_2vcpus (struct kvm_vcpu_init *init0, +struct kvm_vcpu_init *init1) { +struct kvm_vcpu *vcpu0, *vcpu1;struct kvm_vm *vm;int ret; vm =vm_create_barebones (); -__vm_vcpu_add (vm,0 ); - ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1); + vcpu0 =__vm_vcpu_add (vm,0 ); + ret =__vcpu_ioctl (vm, vcpu0->id,KVM_ARM_VCPU_INIT , init0);if (ret) goto free_exit; -__vm_vcpu_add (vm,1 ); - ret =__vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); + vcpu1 =__vm_vcpu_add (vm,1 ); + ret =__vcpu_ioctl (vm, vcpu1->id,KVM_ARM_VCPU_INIT , init1); free_exit:kvm_vm_free (vm);
@@ -40,25 +41,26 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, }/* -* Add two vCPUs, then run KVM_ARM_VCPU_INIT for one vCPU with @init1, -* and run KVM_ARM_VCPU_INIT for another vCPU with @init2. +* Add two vCPUs, then run KVM_ARM_VCPU_INIT for one vCPU with @init0, +* and run KVM_ARM_VCPU_INIT for another vCPU with @init1. */ -static int add_2vcpus_init_2vcpus (struct kvm_vcpu_init *init1, -struct kvm_vcpu_init *init2) +static int add_2vcpus_init_2vcpus (struct kvm_vcpu_init *init0, +struct kvm_vcpu_init *init1) { +struct kvm_vcpu *vcpu0, *vcpu1;struct kvm_vm *vm;int ret; vm =vm_create_barebones (); -__vm_vcpu_add (vm,0 ); -__vm_vcpu_add (vm,1 ); + vcpu0 =__vm_vcpu_add (vm,0 ); + vcpu1 =__vm_vcpu_add (vm,1 ); - ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1); + ret =__vcpu_ioctl (vm, vcpu0->id,KVM_ARM_VCPU_INIT , init0);if (ret) goto free_exit; - ret =__vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); + ret =__vcpu_ioctl (vm, vcpu1->id,KVM_ARM_VCPU_INIT , init1); free_exit:kvm_vm_free (vm);
@@ -76,7 +78,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,*/ int main (void ) { -struct kvm_vcpu_init init1, init2; +struct kvm_vcpu_init init0, init1;struct kvm_vm *vm;int ret;
@@ -85,36 +87,36 @@ int main(void)exit (KSFT_SKIP ); } -/* Get the preferred target type and copy that to init2 for later use */ +/* Get the preferred target type and copy that to init1 for later use */ vm =vm_create_barebones (); -vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init1); +vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init0);kvm_vm_free (vm); - init2 = init1; + init1 = init0;/* Test with 64bit vCPUs */ - ret =add_init_2vcpus (&init1, &init1); + ret =add_init_2vcpus (&init0, &init0);TEST_ASSERT (ret ==0 ,"Configuring 64bit EL1 vCPUs failed unexpectedly" ); - ret =add_2vcpus_init_2vcpus (&init1, &init1); + ret =add_2vcpus_init_2vcpus (&init0, &init0);TEST_ASSERT (ret ==0 ,"Configuring 64bit EL1 vCPUs failed unexpectedly" );/* Test with 32bit vCPUs */ - init1.features[0 ] = (1 <<KVM_ARM_VCPU_EL1_32BIT ); - ret =add_init_2vcpus (&init1, &init1); + init0.features[0 ] = (1 <<KVM_ARM_VCPU_EL1_32BIT ); + ret =add_init_2vcpus (&init0, &init0);TEST_ASSERT (ret ==0 ,"Configuring 32bit EL1 vCPUs failed unexpectedly" ); - ret =add_2vcpus_init_2vcpus (&init1, &init1); + ret =add_2vcpus_init_2vcpus (&init0, &init0);TEST_ASSERT (ret ==0 ,"Configuring 32bit EL1 vCPUs failed unexpectedly" );/* Test with mixed-width vCPUs */ - init1.features[0 ] =0 ; - init2.features[0 ] = (1 <<KVM_ARM_VCPU_EL1_32BIT ); - ret =add_init_2vcpus (&init1, &init2); + init0.features[0 ] =0 ; + init1.features[0 ] = (1 <<KVM_ARM_VCPU_EL1_32BIT ); + ret =add_init_2vcpus (&init0, &init1);TEST_ASSERT (ret !=0 ,"Configuring mixed-width vCPUs worked unexpectedly" ); - ret =add_2vcpus_init_2vcpus (&init1, &init2); + ret =add_2vcpus_init_2vcpus (&init0, &init1);TEST_ASSERT (ret !=0 ,"Configuring mixed-width vCPUs worked unexpectedly" );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 129/144 KVM: selftests: Stop conflating vCPU index and ID in perf tests
In reply to Sean ChristophersonTrack vCPUs by their 'struct kvm_vcpu' object, and stop assuming that a vCPU's ID is the same as its index when referencing a vCPU's metadata.
--- .../selftests/kvm/access_tracking_perf_test.c | 81 ++++++++++--------- .../selftests/kvm/demand_paging_test.c | 36 ++++----- .../selftests/kvm/dirty_log_perf_test.c | 39 ++++----- .../selftests/kvm/include/perf_test_util.h | 5 +- .../selftests/kvm/lib/perf_test_util.c | 79 +++++++++--------- .../kvm/memslot_modification_stress_test.c | 10 +-- 6 files changed, 129 insertions(+), 121 deletions(-)
tools/testing/selftests/kvm/access_tracking_perf_test.c +41 -40
@@ -74,7 +74,7 @@ struct test_params {uint64_t vcpu_memory_bytes;/* The number of vCPUs to create in the VM. */ -int vcpus; +int nr_vcpus; };static uint64_t pread_uint64 (int fd,const char *filename,uint64_t index)
@@ -127,10 +127,12 @@ static void mark_page_idle(int page_idle_fd, uint64_t pfn) "Set page_idle bits for PFN 0x%" PRIx64, pfn); } -static void mark_vcpu_memory_idle (struct kvm_vm *vm,int vcpu_id) +static void mark_vcpu_memory_idle (struct kvm_vm *vm, +struct perf_test_vcpu_args *vcpu_args) { -uint64_t base_gva = perf_test_args.vcpu_args[vcpu_id].gva; -uint64_t pages = perf_test_args.vcpu_args[vcpu_id].pages; +int vcpu_idx = vcpu_args->vcpu_idx; +uint64_t base_gva = vcpu_args->gva; +uint64_t pages = vcpu_args->pages;uint64_t page;uint64_t still_idle =0 ;uint64_t no_pfn =0 ;
@@ -138,7 +140,7 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm, int vcpu_id)int pagemap_fd;/* If vCPUs are using an overlapping region, let vCPU 0 mark it idle. */ -if (overlap_memory_access && vcpu_id) +if (overlap_memory_access && vcpu_idx)return ; page_idle_fd =open ("/sys/kernel/mm/page_idle/bitmap" ,O_RDWR );
@@ -170,7 +172,7 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm, int vcpu_id)*/ TEST_ASSERT (no_pfn < pages /100 ,"vCPU %d: No PFN for %" PRIu64" out of %" PRIu64" pages." , - vcpu_id, no_pfn, pages); + vcpu_idx, no_pfn, pages);/* * Test that at least 90% of memory has been marked idle (the rest might
@@ -183,17 +185,16 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm, int vcpu_id)TEST_ASSERT (still_idle < pages /10 ,"vCPU%d: Too many pages still idle (%" PRIu64" out of %" PRIu64").\n" , - vcpu_id, still_idle, pages); + vcpu_idx, still_idle, pages);close (page_idle_fd);close (pagemap_fd); } -static void assert_ucall (struct kvm_vm *vm,uint32_t vcpu_id, -uint64_t expected_ucall) +static void assert_ucall (struct kvm_vcpu *vcpu,uint64_t expected_ucall) {struct ucall uc; -uint64_t actual_ucall =get_ucall (vm, vcpu_id, &uc); +uint64_t actual_ucall =get_ucall (vcpu->vm, vcpu->id, &uc);TEST_ASSERT (expected_ucall == actual_ucall, "Guest exited unexpectedly (expected ucall %" PRIu64
@@ -217,28 +218,29 @@ static bool spin_wait_for_next_iteration(int *current_iteration)static void vcpu_thread_main (struct perf_test_vcpu_args *vcpu_args) { +struct kvm_vcpu *vcpu = vcpu_args->vcpu;struct kvm_vm *vm = perf_test_args.vm; -int vcpu_id = vcpu_args->vcpu_id; +int vcpu_idx = vcpu_args->vcpu_idx;int current_iteration =0 ;while (spin_wait_for_next_iteration (¤t_iteration)) {switch (READ_ONCE (iteration_work)) {case ITERATION_ACCESS_MEMORY : -vcpu_run (vm, vcpu_id); -assert_ucall (vm, vcpu_id,UCALL_SYNC ); +vcpu_run (vm, vcpu->id); +assert_ucall (vcpu,UCALL_SYNC );break ;case ITERATION_MARK_IDLE : -mark_vcpu_memory_idle (vm, vcpu_id); +mark_vcpu_memory_idle (vm, vcpu_args);break ; }; - vcpu_last_completed_iteration[vcpu_id] = current_iteration; + vcpu_last_completed_iteration[vcpu_idx] = current_iteration; } } -static void spin_wait_for_vcpu (int vcpu_id,int target_iteration) +static void spin_wait_for_vcpu (int vcpu_idx,int target_iteration) { -while (READ_ONCE (vcpu_last_completed_iteration[vcpu_id]) != +while (READ_ONCE (vcpu_last_completed_iteration[vcpu_idx]) != target_iteration) {continue ; }
@@ -250,12 +252,11 @@ enum access_type { ACCESS_WRITE, }; -static void run_iteration (struct kvm_vm *vm,int vcpus,const char *description) +static void run_iteration (struct kvm_vm *vm,int nr_vcpus,const char *description) {struct timespec ts_start;struct timespec ts_elapsed; -int next_iteration; -int vcpu_id; +int next_iteration, i;/* Kick off the vCPUs by incrementing iteration. */ next_iteration = ++iteration;
@@ -263,23 +264,23 @@ static void run_iteration(struct kvm_vm *vm, int vcpus, const char *description)clock_gettime (CLOCK_MONOTONIC , &ts_start);/* Wait for all vCPUs to finish the iteration. */ -for (vcpu_id =0 ; vcpu_id < vcpus; vcpu_id++) -spin_wait_for_vcpu (vcpu_id, next_iteration); +for (i =0 ; i < nr_vcpus; i++) +spin_wait_for_vcpu (i, next_iteration); ts_elapsed =timespec_elapsed (ts_start);pr_info ("%-30s: %ld.%09lds\n" , description, ts_elapsed.tv_sec, ts_elapsed.tv_nsec); } -static void access_memory (struct kvm_vm *vm,int vcpus,enum access_type access, -const char *description) +static void access_memory (struct kvm_vm *vm,int nr_vcpus, +enum access_type access,const char *description) {perf_test_set_wr_fract (vm, (access ==ACCESS_READ ) ?INT_MAX :1 ); iteration_work =ITERATION_ACCESS_MEMORY ; -run_iteration (vm, vcpus, description); +run_iteration (vm, nr_vcpus, description); } -static void mark_memory_idle (struct kvm_vm *vm,int vcpus) +static void mark_memory_idle (struct kvm_vm *vm,int nr_vcpus) {/* * Even though this parallelizes the work across vCPUs, this is still a
@@ -289,37 +290,37 @@ static void mark_memory_idle(struct kvm_vm *vm, int vcpus)*/ pr_debug ("Marking VM memory idle (slow)...\n" ); iteration_work =ITERATION_MARK_IDLE ; -run_iteration (vm, vcpus,"Mark memory idle" ); +run_iteration (vm, nr_vcpus,"Mark memory idle" ); }static void run_test (enum vm_guest_mode mode,void *arg) {struct test_params *params = arg;struct kvm_vm *vm; -int vcpus = params->vcpus; +int nr_vcpus = params->nr_vcpus; - vm =perf_test_create_vm (mode, vcpus, params->vcpu_memory_bytes,1 , + vm =perf_test_create_vm (mode, nr_vcpus, params->vcpu_memory_bytes,1 , params->backing_src, !overlap_memory_access); -perf_test_start_vcpu_threads (vcpus, vcpu_thread_main); +perf_test_start_vcpu_threads (nr_vcpus, vcpu_thread_main);pr_info ("\n" ); -access_memory (vm, vcpus,ACCESS_WRITE ,"Populating memory" ); +access_memory (vm, nr_vcpus,ACCESS_WRITE ,"Populating memory" );/* As a control, read and write to the populated memory first. */ -access_memory (vm, vcpus,ACCESS_WRITE ,"Writing to populated memory" ); -access_memory (vm, vcpus,ACCESS_READ ,"Reading from populated memory" ); +access_memory (vm, nr_vcpus,ACCESS_WRITE ,"Writing to populated memory" ); +access_memory (vm, nr_vcpus,ACCESS_READ ,"Reading from populated memory" );/* Repeat on memory that has been marked as idle. */ -mark_memory_idle (vm, vcpus); -access_memory (vm, vcpus,ACCESS_WRITE ,"Writing to idle memory" ); -mark_memory_idle (vm, vcpus); -access_memory (vm, vcpus,ACCESS_READ ,"Reading from idle memory" ); +mark_memory_idle (vm, nr_vcpus); +access_memory (vm, nr_vcpus,ACCESS_WRITE ,"Writing to idle memory" ); +mark_memory_idle (vm, nr_vcpus); +access_memory (vm, nr_vcpus,ACCESS_READ ,"Reading from idle memory" );/* Set done to signal the vCPU threads to exit */ done = true; -perf_test_join_vcpu_threads (vcpus); +perf_test_join_vcpu_threads (nr_vcpus);perf_test_destroy_vm (vm); }
@@ -347,7 +348,7 @@ int main(int argc, char *argv[])struct test_params params = { .backing_src =DEFAULT_VM_MEM_SRC , .vcpu_memory_bytes =DEFAULT_PER_VCPU_MEM_SIZE , - .vcpus =1 , + .nr_vcpus =1 , };int page_idle_fd;int opt;
@@ -363,7 +364,7 @@ int main(int argc, char *argv[]) params.vcpu_memory_bytes =parse_size (optarg);break ;case 'v' : - params.vcpus =atoi (optarg); + params.nr_vcpus =atoi (optarg);break ;case 'o' : overlap_memory_access = true;
tools/testing/selftests/kvm/demand_paging_test.c +17 -19
@@ -44,28 +44,27 @@ static char *guest_data_prototype;static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) { -int ret; -int vcpu_id = vcpu_args->vcpu_id; +struct kvm_vcpu *vcpu = vcpu_args->vcpu;struct kvm_vm *vm = perf_test_args.vm; -struct kvm_run *run; +int vcpu_idx = vcpu_args->vcpu_idx; +struct kvm_run *run = vcpu->run;struct timespec start;struct timespec ts_diff; - - run =vcpu_state (vm, vcpu_id); +int ret;clock_gettime (CLOCK_MONOTONIC , &start);/* Let the guest access its memory */ - ret =_vcpu_run (vm, vcpu_id); + ret =_vcpu_run (vm, vcpu->id);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -if (get_ucall (vm, vcpu_id,NULL ) !=UCALL_SYNC ) { +if (get_ucall (vm, vcpu->id,NULL ) !=UCALL_SYNC ) {TEST_ASSERT (false,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason)); } ts_diff =timespec_elapsed (start); -PER_VCPU_DEBUG ("vCPU %d execution time: %ld.%.9lds\n" , vcpu_id, +PER_VCPU_DEBUG ("vCPU %d execution time: %ld.%.9lds\n" , vcpu_idx, ts_diff.tv_sec, ts_diff.tv_nsec); }
@@ -285,8 +284,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)struct timespec ts_diff;int *pipefds =NULL ;struct kvm_vm *vm; -int vcpu_id; -int r; +int r, i; vm =perf_test_create_vm (mode, nr_vcpus, guest_percpu_mem_size,1 , p->src_type, p->partition_vcpu_memory_access);
@@ -309,12 +307,12 @@ static void run_test(enum vm_guest_mode mode, void *arg) pipefds =malloc (sizeof (int ) * nr_vcpus *2 );TEST_ASSERT (pipefds,"Unable to allocate memory for pipefd" ); -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { +for (i =0 ; i < nr_vcpus; i++) {struct perf_test_vcpu_args *vcpu_args;void *vcpu_hva;void *vcpu_alias; - vcpu_args = &perf_test_args.vcpu_args[vcpu_id]; + vcpu_args = &perf_test_args.vcpu_args[i];/* Cache the host addresses of the region */ vcpu_hva =addr_gpa2hva (vm, vcpu_args->gpa);
@@ -324,13 +322,13 @@ static void run_test(enum vm_guest_mode mode, void *arg)* Set up user fault fd to handle demand paging * requests. */ - r =pipe2 (&pipefds[vcpu_id *2 ], + r =pipe2 (&pipefds[i *2 ],O_CLOEXEC |O_NONBLOCK );TEST_ASSERT (!r,"Failed to set up pipefd" ); -setup_demand_paging (vm, &uffd_handler_threads[vcpu_id], - pipefds[vcpu_id *2 ], p->uffd_mode, - p->uffd_delay, &uffd_args[vcpu_id], +setup_demand_paging (vm, &uffd_handler_threads[i], + pipefds[i *2 ], p->uffd_mode, + p->uffd_delay, &uffd_args[i], vcpu_hva, vcpu_alias, vcpu_args->pages * perf_test_args.guest_page_size); }
@@ -350,11 +348,11 @@ static void run_test(enum vm_guest_mode mode, void *arg)char c;/* Tell the user fault fd handler threads to quit */ -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { - r =write (pipefds[vcpu_id *2 +1 ], &c,1 ); +for (i =0 ; i < nr_vcpus; i++) { + r =write (pipefds[i *2 +1 ], &c,1 );TEST_ASSERT (r ==1 ,"Unable to write to pipefd" ); -pthread_join (uffd_handler_threads[vcpu_id],NULL ); +pthread_join (uffd_handler_threads[i],NULL ); } }
tools/testing/selftests/kvm/dirty_log_perf_test.c +20 -19
@@ -68,44 +68,45 @@ static int vcpu_last_completed_iteration[KVM_MAX_VCPUS];static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) { -int ret; +struct kvm_vcpu *vcpu = vcpu_args->vcpu;struct kvm_vm *vm = perf_test_args.vm; +int vcpu_idx = vcpu_args->vcpu_idx;uint64_t pages_count =0 ;struct kvm_run *run;struct timespec start;struct timespec ts_diff;struct timespec total = (struct timespec ){0 };struct timespec avg; -int vcpu_id = vcpu_args->vcpu_id; +int ret; - run =vcpu_state (vm, vcpu_id); + run = vcpu->run;while (!READ_ONCE (host_quit)) {int current_iteration =READ_ONCE (iteration);clock_gettime (CLOCK_MONOTONIC , &start); - ret =_vcpu_run (vm, vcpu_id); + ret =_vcpu_run (vm, vcpu->id); ts_diff =timespec_elapsed (start);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -TEST_ASSERT (get_ucall (vm, vcpu_id,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason)); -pr_debug ("Got sync event from vCPU %d\n" , vcpu_id); - vcpu_last_completed_iteration[vcpu_id] = current_iteration; +pr_debug ("Got sync event from vCPU %d\n" , vcpu_idx); + vcpu_last_completed_iteration[vcpu_idx] = current_iteration;pr_debug ("vCPU %d updated last completed iteration to %d\n" , - vcpu_id, vcpu_last_completed_iteration[vcpu_id]); + vcpu->id, vcpu_last_completed_iteration[vcpu_idx]);if (current_iteration) { pages_count += vcpu_args->pages; total =timespec_add (total, ts_diff);pr_debug ("vCPU %d iteration %d dirty memory time: %ld.%.9lds\n" , - vcpu_id, current_iteration, ts_diff.tv_sec, + vcpu_idx, current_iteration, ts_diff.tv_sec, ts_diff.tv_nsec); }else {pr_debug ("vCPU %d iteration %d populate memory time: %ld.%.9lds\n" , - vcpu_id, current_iteration, ts_diff.tv_sec, + vcpu_idx, current_iteration, ts_diff.tv_sec, ts_diff.tv_nsec); }
@@ -113,9 +114,9 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args) !READ_ONCE(host_quit)) {} } - avg =timespec_div (total, vcpu_last_completed_iteration[vcpu_id]); + avg =timespec_div (total, vcpu_last_completed_iteration[vcpu_idx]);pr_debug ("\nvCPU %d dirtied 0x%lx pages over %d iterations in %ld.%.9lds. (Avg %ld.%.9lds/iteration)\n" , - vcpu_id, pages_count, vcpu_last_completed_iteration[vcpu_id], + vcpu_idx, pages_count, vcpu_last_completed_iteration[vcpu_idx], total.tv_sec, total.tv_nsec, avg.tv_sec, avg.tv_nsec); }
@@ -207,13 +208,13 @@ static void run_test(enum vm_guest_mode mode, void *arg)uint64_t guest_num_pages;uint64_t host_num_pages;uint64_t pages_per_slot; -int vcpu_id;struct timespec start;struct timespec ts_diff;struct timespec get_dirty_log_total = (struct timespec ){0 };struct timespec vcpu_dirty_total = (struct timespec ){0 };struct timespec avg;struct timespec clear_dirty_log_total = (struct timespec ){0 }; +int i; vm = perf_test_create_vm(mode, nr_vcpus, guest_percpu_mem_size, p->slots, p->backing_src,
@@ -239,15 +240,15 @@ static void run_test(enum vm_guest_mode mode, void *arg) host_quit = false;clock_gettime (CLOCK_MONOTONIC , &start); -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) - vcpu_last_completed_iteration[vcpu_id] =-1 ; +for (i =0 ; i < nr_vcpus; i++) + vcpu_last_completed_iteration[i] =-1 ;perf_test_start_vcpu_threads (nr_vcpus, vcpu_worker);/* Allow the vCPUs to populate memory */ pr_debug ("Starting iteration %d - Populating\n" , iteration); -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { -while (READ_ONCE (vcpu_last_completed_iteration[vcpu_id]) != +for (i =0 ; i < nr_vcpus; i++) { +while (READ_ONCE (vcpu_last_completed_iteration[i]) != iteration) ; }
@@ -272,8 +273,8 @@ static void run_test(enum vm_guest_mode mode, void *arg) iteration++;pr_debug ("Starting iteration %d\n" , iteration); -for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { -while (READ_ONCE (vcpu_last_completed_iteration[vcpu_id]) +for (i =0 ; i < nr_vcpus; i++) { +while (READ_ONCE (vcpu_last_completed_iteration[i]) != iteration) ; }
tools/testing/selftests/kvm/include/perf_test_util.h +3 -2
@@ -25,7 +25,8 @@ struct perf_test_vcpu_args {uint64_t pages;/* Only used by the host userspace part of the vCPU thread */ -int vcpu_id; +struct kvm_vcpu *vcpu; +int vcpu_idx; };struct perf_test_args {
@@ -39,7 +40,7 @@ struct perf_test_args {extern struct perf_test_args perf_test_args; -struct kvm_vm *perf_test_create_vm (enum vm_guest_mode mode,int vcpus, +struct kvm_vm *perf_test_create_vm (enum vm_guest_mode mode,int nr_vcpus,uint64_t vcpu_memory_bytes,int slots,enum vm_mem_backing_src_type backing_src,bool partition_vcpu_memory_access);
tools/testing/selftests/kvm/lib/perf_test_util.c +43 -36
184 lines not on this page · raw message
tools/testing/selftests/kvm/memslot_modification_stress_test.c +5 -5
@@ -38,19 +38,19 @@ static bool run_vcpus = true;static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) { -int ret; -int vcpu_id = vcpu_args->vcpu_id; +struct kvm_vcpu *vcpu = vcpu_args->vcpu;struct kvm_vm *vm = perf_test_args.vm;struct kvm_run *run; +int ret; - run =vcpu_state (vm, vcpu_id); + run = vcpu->run;/* Let the guest access its memory until a stop signal is received */ while (READ_ONCE (run_vcpus)) { - ret =_vcpu_run (vm, vcpu_id); + ret =_vcpu_run (vm, vcpu->id);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -if (get_ucall (vm, vcpu_id,NULL ) ==UCALL_SYNC ) +if (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC )continue ; TEST_ASSERT(false,
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 130/144 KVM: selftests: Remove vcpu_get() usage from dirty_log_test
In reply to Sean ChristophersonGrab the vCPU from vm_vcpu_add() directly instead of doing vcpu_get() after the fact. This will allow removing vcpu_get() entirely.
--- tools/testing/selftests/kvm/dirty_log_test.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +4 -6
@@ -665,7 +665,7 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap) } } -static struct kvm_vm *create_vm (enum vm_guest_mode mode,uint32_t vcpuid, +static struct kvm_vm *create_vm (enum vm_guest_mode mode,struct kvm_vcpu **vcpu,uint64_t extra_mem_pages,void *guest_code) {struct kvm_vm *vm;
@@ -676,7 +676,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid, vm =__vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);log_mode_create_vm_done (vm); -vm_vcpu_add (vm, vcpuid, guest_code); + *vcpu =vm_vcpu_add (vm,0 , guest_code);return vm; }
@@ -710,10 +710,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)* (e.g., 64K page size guest will need even less memory for * page tables). */ - vm =create_vm (mode,0 , -2ul << (DIRTY_MEM_BITS -PAGE_SHIFT_4K ), - guest_code); - vcpu =vcpu_get (vm,0 ); + vm =create_vm (mode, &vcpu, +2ul << (DIRTY_MEM_BITS -PAGE_SHIFT_4K ), guest_code); guest_page_size =vm_get_page_size (vm);/*
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 131/144 KVM: selftests: Require vCPU output array when creating VM with vCPUs
In reply to Sean ChristophersonRequire the caller of __vm_create_with_vcpus() to provide a non-NULL array of vCPUs now that all callers do so. It's extremely unlikely a test will have a legitimate use case for creating a VM with vCPUs without wanting to do something with those vCPUs, and if there is such a use case, requiring that one-off test to provide a dummy array is a minor annoyance.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +4 -6
@@ -302,10 +302,11 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus struct kvm_vcpu *vcpus[]) {uint64_t vcpu_pages, extra_pg_pages, pages; -struct kvm_vcpu *vcpu;struct kvm_vm *vm;int i; +TEST_ASSERT (!nr_vcpus || vcpus,"Must provide vCPU array" ); +/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */ if (slot0_mem_pages <DEFAULT_GUEST_PHY_PAGES ) slot0_mem_pages =DEFAULT_GUEST_PHY_PAGES ;
@@ -326,11 +327,8 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus vm =__vm_create (mode, pages); -for (i =0 ; i < nr_vcpus; ++i) { - vcpu =vm_vcpu_add (vm, i, guest_code); -if (vcpus) - vcpus[i] = vcpu; - } +for (i =0 ; i < nr_vcpus; ++i) + vcpus[i] =vm_vcpu_add (vm, i, guest_code);return vm; }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 132/144 KVM: selftests: Purge vm+vcpu_id == vcpu silliness
In reply to Sean ChristophersonTake a vCPU directly instead of a VM+vcpu pair in all vCPU-scoped helpers and ioctls.
--- .../selftests/kvm/aarch64/arch_timer.c | 10 +- .../selftests/kvm/aarch64/debug-exceptions.c | 8 +- .../selftests/kvm/aarch64/get-reg-list.c | 14 +- .../selftests/kvm/aarch64/hypercalls.c | 18 +- .../testing/selftests/kvm/aarch64/psci_test.c | 16 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 8 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_irq.c | 8 +- .../selftests/kvm/access_tracking_perf_test.c | 4 +- .../selftests/kvm/demand_paging_test.c | 5 +- .../selftests/kvm/dirty_log_perf_test.c | 7 +- tools/testing/selftests/kvm/dirty_log_test.c | 10 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../selftests/kvm/include/aarch64/processor.h | 4 +- .../selftests/kvm/include/kvm_util_base.h | 216 +++++++++--------- .../selftests/kvm/include/ucall_common.h | 2 +- .../selftests/kvm/include/x86_64/evmcs.h | 2 +- .../selftests/kvm/include/x86_64/processor.h | 77 +++---- .../selftests/kvm/kvm_binary_stats_test.c | 2 +- .../selftests/kvm/kvm_page_table_test.c | 7 +- .../selftests/kvm/lib/aarch64/processor.c | 47 ++-- .../testing/selftests/kvm/lib/aarch64/ucall.c | 8 +- tools/testing/selftests/kvm/lib/kvm_util.c | 162 ++++--------- .../selftests/kvm/lib/perf_test_util.c | 2 +- .../selftests/kvm/lib/riscv/processor.c | 94 ++++---- tools/testing/selftests/kvm/lib/riscv/ucall.c | 13 +- .../kvm/lib/s390x/diag318_test_handler.c | 2 +- .../selftests/kvm/lib/s390x/processor.c | 22 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 143 ++++++------ .../testing/selftests/kvm/lib/x86_64/ucall.c | 10 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 4 +- .../selftests/kvm/max_guest_memory_test.c | 20 +- .../kvm/memslot_modification_stress_test.c | 5 +- .../testing/selftests/kvm/memslot_perf_test.c | 4 +- tools/testing/selftests/kvm/rseq_test.c | 4 +- tools/testing/selftests/kvm/s390x/memop.c | 8 +- tools/testing/selftests/kvm/s390x/resets.c | 28 +-- .../selftests/kvm/s390x/sync_regs_test.c | 22 +- tools/testing/selftests/kvm/s390x/tprot.c | 4 +- .../selftests/kvm/set_memory_region_test.c | 8 +- tools/testing/selftests/kvm/steal_time.c | 20 +- .../kvm/system_counter_offset_test.c | 13 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 22 +- .../testing/selftests/kvm/x86_64/cpuid_test.c | 14 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 8 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 30 +-- .../kvm/x86_64/emulator_error_test.c | 20 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 28 +-- .../selftests/kvm/x86_64/fix_hypercall_test.c | 6 +- .../selftests/kvm/x86_64/hyperv_clock.c | 14 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 8 +- .../selftests/kvm/x86_64/hyperv_features.c | 28 +-- .../selftests/kvm/x86_64/hyperv_svm_test.c | 8 +- .../selftests/kvm/x86_64/kvm_clock_test.c | 6 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 10 +- .../selftests/kvm/x86_64/mmu_role_test.c | 10 +- .../selftests/kvm/x86_64/platform_info_test.c | 14 +- .../kvm/x86_64/pmu_event_filter_test.c | 8 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 4 +- .../selftests/kvm/x86_64/set_sregs_test.c | 16 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 18 +- .../testing/selftests/kvm/x86_64/state_test.c | 18 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 8 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 10 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 6 +- .../selftests/kvm/x86_64/sync_regs_test.c | 36 +-- .../kvm/x86_64/triple_fault_event_test.c | 16 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 14 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 6 +- .../selftests/kvm/x86_64/userspace_io_test.c | 8 +- .../kvm/x86_64/userspace_msr_exit_test.c | 22 +- .../kvm/x86_64/vmx_apic_access_test.c | 6 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 6 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 6 +- .../vmx_exception_with_invalid_guest_state.c | 10 +- .../x86_64/vmx_invalid_nested_guest_state.c | 12 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 11 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 20 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 18 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 12 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 6 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 10 +- .../selftests/kvm/x86_64/xapic_state_test.c | 42 ++-- .../selftests/kvm/x86_64/xen_shinfo_test.c | 38 +-- .../selftests/kvm/x86_64/xen_vmcall_test.c | 6 +- .../selftests/kvm/x86_64/xss_msr_test.c | 6 +- 87 files changed, 790 insertions(+), 908 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +5 -5
@@ -218,14 +218,14 @@ static void *test_vcpu_run(void *arg)struct kvm_vm *vm = vcpu->vm;struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpu_idx]; -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);/* Currently, any exit from guest is an indication of completion */ pthread_mutex_lock (&vcpu_done_map_lock);set_bit (vcpu_idx, vcpu_done_map);pthread_mutex_unlock (&vcpu_done_map_lock); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :case UCALL_DONE :break ;
@@ -345,9 +345,9 @@ static void test_run(struct kvm_vm *vm)static void test_init_timer_irq (struct kvm_vm *vm) {/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */ -vcpu_device_attr_get (vm, vcpus[0 ]->id,KVM_ARM_VCPU_TIMER_CTRL , +vcpu_device_attr_get (vcpus[0 ],KVM_ARM_VCPU_TIMER_CTRL ,KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq); -vcpu_device_attr_get (vm, vcpus[0 ]->id,KVM_ARM_VCPU_TIMER_CTRL , +vcpu_device_attr_get (vcpus[0 ],KVM_ARM_VCPU_TIMER_CTRL ,KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq);sync_global_to_guest (vm, ptimer_irq);
@@ -370,7 +370,7 @@ static struct kvm_vm *test_vm_create(void)vm_install_exception_handler (vm,VECTOR_IRQ_CURRENT , guest_irq_handler);for (i =0 ; i < nr_vcpus; i++) -vcpu_init_descriptor_tables (vm, vcpus[i]->id); +vcpu_init_descriptor_tables (vcpus[i]);ucall_init (vm,NULL );test_init_timer_irq (vm);
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +4 -4
@@ -242,7 +242,7 @@ static int debug_version(struct kvm_vcpu *vcpu) {uint64_t id_aa64dfr0; -vcpu_get_reg (vcpu->vm, vcpu->id,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0); +vcpu_get_reg (vcpu,KVM_ARM64_SYS_REG (SYS_ID_AA64DFR0_EL1 ), &id_aa64dfr0);return id_aa64dfr0 &0xf ; }
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])ucall_init (vm,NULL );vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);if (debug_version (vcpu) <6 ) {print_skip ("Armv8 debug architecture not supported." );
@@ -277,9 +277,9 @@ int main(int argc, char *argv[]) ESR_EC_SVC64, guest_svc_handler);for (stage =0 ; stage <11 ; stage++) { -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == stage, "Stage %d: Unexpected sync ucall, got %lx",
tools/testing/selftests/kvm/aarch64/get-reg-list.c +7 -7
@@ -377,7 +377,7 @@ static void prepare_vcpu_init(struct vcpu_config *c, struct kvm_vcpu_init *init) init->features[s->feature /32 ] |=1 << (s->feature %32 ); } -static void finalize_vcpu (struct kvm_vm *vm,uint32_t vcpuid,struct vcpu_config *c) +static void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_config *c) {struct reg_sublist *s;int feature;
@@ -385,7 +385,7 @@ static void finalize_vcpu(struct kvm_vm *vm, uint32_t vcpuid, struct vcpu_configfor_each_sublist (c, s) {if (s->finalize) { feature = s->feature; -vcpu_ioctl (vm, vcpuid,KVM_ARM_VCPU_FINALIZE , &feature); +vcpu_ioctl (vcpu,KVM_ARM_VCPU_FINALIZE , &feature); } } }
@@ -420,9 +420,9 @@ static void run_test(struct vcpu_config *c) vm =vm_create_barebones ();prepare_vcpu_init (c, &init); vcpu =aarch64_vcpu_add (vm,0 , &init,NULL ); -finalize_vcpu (vm, vcpu->id, c); +finalize_vcpu (vcpu, c); - reg_list =vcpu_get_reg_list (vm, vcpu->id); + reg_list =vcpu_get_reg_list (vcpu);if (fixup_core_regs)core_reg_fixup ();
@@ -458,7 +458,7 @@ static void run_test(struct vcpu_config *c)bool reject_reg = false;int ret; - ret =__vcpu_get_reg (vm, vcpu->id, reg_list->reg[i], &addr); + ret =__vcpu_get_reg (vcpu, reg_list->reg[i], &addr);if (ret) {printf ("%s: Failed to get " ,config_name (c));print_reg (c, reg.id);
@@ -470,7 +470,7 @@ static void run_test(struct vcpu_config *c)for_each_sublist (c, s) {if (s->rejects_set &&find_reg (s->rejects_set, s->rejects_set_n, reg.id)) { reject_reg = true; - ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_ONE_REG , ®); + ret =__vcpu_ioctl (vcpu,KVM_SET_ONE_REG , ®);if (ret !=-1 || errno !=EPERM ) {printf ("%s: Failed to reject (ret=%d, errno=%d) " ,config_name (c), ret, errno);print_reg (c, reg.id);
@@ -482,7 +482,7 @@ static void run_test(struct vcpu_config *c) }if (!reject_reg) { - ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_ONE_REG , ®); + ret =__vcpu_ioctl (vcpu,KVM_SET_ONE_REG , ®);if (ret) {printf ("%s: Failed to set " ,config_name (c));print_reg (c, reg.id);
tools/testing/selftests/kvm/aarch64/hypercalls.c +9 -9
@@ -158,7 +158,7 @@ static void steal_time_init(struct kvm_vcpu *vcpu) gpages =vm_calc_num_guest_pages (VM_MODE_DEFAULT ,STEAL_TIME_SIZE );vm_userspace_mem_region_add (vcpu->vm,VM_MEM_SRC_ANONYMOUS ,ST_GPA_BASE ,1 , gpages,0 ); -vcpu_device_attr_set (vcpu->vm, vcpu->id,KVM_ARM_VCPU_PVTIME_CTRL , +vcpu_device_attr_set (vcpu,KVM_ARM_VCPU_PVTIME_CTRL ,KVM_ARM_VCPU_PVTIME_IPA , &st_ipa); }
@@ -172,18 +172,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu)const struct kvm_fw_reg_info *reg_info = &fw_reg_info[i];/* First 'read' should be an upper limit of the features supported */ -vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val); +vcpu_get_reg (vcpu, reg_info->reg, &val);TEST_ASSERT (val ==FW_REG_ULIMIT_VAL (reg_info->max_feat_bit),"Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx\n" , reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit), val);/* Test a 'write' by disabling all the features of the register map */ - ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,0 ); + ret =__vcpu_set_reg (vcpu, reg_info->reg,0 );TEST_ASSERT (ret ==0 ,"Failed to clear all the features of reg: 0x%lx; ret: %d\n" , reg_info->reg, errno); -vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val); +vcpu_get_reg (vcpu, reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -192,7 +192,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu)* Avoid this check if all the bits are occupied. */ if (reg_info->max_feat_bit <63 ) { - ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,BIT (reg_info->max_feat_bit +1 )); + ret =__vcpu_set_reg (vcpu, reg_info->reg,BIT (reg_info->max_feat_bit +1 ));TEST_ASSERT (ret !=0 && errno ==EINVAL ,"Unexpected behavior or return value (%d) while setting an unsupported feature for reg: 0x%lx\n" , errno, reg_info->reg);
@@ -213,7 +213,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu)* Before starting the VM, the test clears all the bits. * Check if that's still the case. */ -vcpu_get_reg (vcpu->vm, vcpu->id, reg_info->reg, &val); +vcpu_get_reg (vcpu, reg_info->reg, &val);TEST_ASSERT (val ==0 ,"Expected all the features to be cleared for reg: 0x%lx\n" , reg_info->reg);
@@ -223,7 +223,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu)* the registers and should return EBUSY. Set the registers and check for * the expected errno. */ - ret =__vcpu_set_reg (vcpu->vm, vcpu->id, reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit)); + ret =__vcpu_set_reg (vcpu, reg_info->reg,FW_REG_ULIMIT_VAL (reg_info->max_feat_bit));TEST_ASSERT (ret !=0 && errno ==EBUSY ,"Unexpected behavior or return value (%d) while setting a feature while VM is running for reg: 0x%lx\n" , errno, reg_info->reg);
@@ -281,9 +281,9 @@ static void test_run(void)test_fw_regs_before_vm_start (vcpu);while (!guest_done) { -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :test_guest_stage (&vm, &vcpu);break ;
tools/testing/selftests/kvm/aarch64/psci_test.c +8 -8
@@ -67,7 +67,7 @@ static void vcpu_power_off(struct kvm_vcpu *vcpu) .mp_state = KVM_MP_STATE_STOPPED, }; -vcpu_mp_state_set (vcpu->vm, vcpu->id, &mp_state); +vcpu_mp_state_set (vcpu, &mp_state); } static struct kvm_vm *setup_vm(void *guest_code, struct kvm_vcpu **source,
@@ -92,8 +92,8 @@ static void enter_guest(struct kvm_vcpu *vcpu) {struct ucall uc; -vcpu_run (vcpu->vm, vcpu->id); -if (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_ABORT ) +vcpu_run (vcpu); +if (get_ucall (vcpu, &uc) ==UCALL_ABORT )TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]); }
@@ -102,8 +102,8 @@ static void assert_vcpu_reset(struct kvm_vcpu *vcpu) {uint64_t obs_pc, obs_x0; -vcpu_get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.pc), &obs_pc); -vcpu_get_reg (vcpu->vm, vcpu->id,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); +vcpu_get_reg (vcpu,ARM64_CORE_REG (regs.pc), &obs_pc); +vcpu_get_reg (vcpu,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, "unexpected target cpu pc: %lx (expected: %lx)",
@@ -143,11 +143,11 @@ static void host_test_cpu_on(void)*/ vcpu_power_off (target); -vcpu_get_reg (vm, target->id,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); -vcpu_args_set (vm, source->id,1 , target_mpidr &MPIDR_HWID_BITMASK ); +vcpu_get_reg (target,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); +vcpu_args_set (source,1 , target_mpidr &MPIDR_HWID_BITMASK );enter_guest (source); -if (get_ucall (vm, source->id, &uc) !=UCALL_DONE ) +if (get_ucall (source, &uc) !=UCALL_DONE )TEST_FAIL ("Unhandled ucall: %lu" , uc.cmd);assert_vcpu_reset (target);
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +4 -4
@@ -28,12 +28,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init0, vm =vm_create_barebones (); vcpu0 =__vm_vcpu_add (vm,0 ); - ret =__vcpu_ioctl (vm, vcpu0->id,KVM_ARM_VCPU_INIT , init0); + ret =__vcpu_ioctl (vcpu0,KVM_ARM_VCPU_INIT , init0);if (ret) goto free_exit; vcpu1 =__vm_vcpu_add (vm,1 ); - ret =__vcpu_ioctl (vm, vcpu1->id,KVM_ARM_VCPU_INIT , init1); + ret =__vcpu_ioctl (vcpu1,KVM_ARM_VCPU_INIT , init1); free_exit:kvm_vm_free (vm);
@@ -56,11 +56,11 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init0, vcpu0 =__vm_vcpu_add (vm,0 ); vcpu1 =__vm_vcpu_add (vm,1 ); - ret =__vcpu_ioctl (vm, vcpu0->id,KVM_ARM_VCPU_INIT , init0); + ret =__vcpu_ioctl (vcpu0,KVM_ARM_VCPU_INIT , init0);if (ret) goto free_exit; - ret =__vcpu_ioctl (vm, vcpu1->id,KVM_ARM_VCPU_INIT , init1); + ret =__vcpu_ioctl (vcpu1,KVM_ARM_VCPU_INIT , init1); free_exit:kvm_vm_free (vm);
tools/testing/selftests/kvm/aarch64/vgic_init.c +1 -1
@@ -53,7 +53,7 @@ static int run_vcpu(struct kvm_vcpu *vcpu) {ucall_init (vcpu->vm,NULL ); -return __vcpu_run (vcpu->vm, vcpu->id) ? -errno :0 ; +return __vcpu_run (vcpu) ? -errno :0 ; } static struct vm_gic vm_gic_create_with_vcpus(uint32_t gic_dev_type,
tools/testing/selftests/kvm/aarch64/vgic_irq.c +4 -4
@@ -759,12 +759,12 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split)ucall_init (vm,NULL );vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);/* Setup the guest args page (so it gets the args). */ args_gva =vm_vaddr_alloc_page (vm);memcpy (addr_gva2hva (vm, args_gva), &args,sizeof (args)); -vcpu_args_set (vm, vcpu->id,1 , args_gva); +vcpu_args_set (vcpu,1 , args_gva); gic_fd =vgic_v3_setup (vm,1 , nr_irqs,GICD_BASE_GPA ,GICR_BASE_GPA );
@@ -777,9 +777,9 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) guest_irq_handlers[args.eoi_split][args.level_sensitive]);while (1 ) { -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :kvm_inject_get_call (vm, &uc, &inject_args);run_guest_cmd (vcpu, gic_fd, &inject_args, &args);
tools/testing/selftests/kvm/access_tracking_perf_test.c +2 -2
@@ -194,7 +194,7 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm,static void assert_ucall (struct kvm_vcpu *vcpu,uint64_t expected_ucall) {struct ucall uc; -uint64_t actual_ucall =get_ucall (vcpu->vm, vcpu->id, &uc); +uint64_t actual_ucall =get_ucall (vcpu, &uc);TEST_ASSERT (expected_ucall == actual_ucall, "Guest exited unexpectedly (expected ucall %" PRIu64
@@ -226,7 +226,7 @@ static void vcpu_thread_main(struct perf_test_vcpu_args *vcpu_args)while (spin_wait_for_next_iteration (¤t_iteration)) {switch (READ_ONCE (iteration_work)) {case ITERATION_ACCESS_MEMORY : -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);assert_ucall (vcpu,UCALL_SYNC );break ;case ITERATION_MARK_IDLE :
tools/testing/selftests/kvm/demand_paging_test.c +2 -3
@@ -45,7 +45,6 @@ static char *guest_data_prototype;static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) {struct kvm_vcpu *vcpu = vcpu_args->vcpu; -struct kvm_vm *vm = perf_test_args.vm;int vcpu_idx = vcpu_args->vcpu_idx;struct kvm_run *run = vcpu->run;struct timespec start;
@@ -55,9 +54,9 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args)clock_gettime (CLOCK_MONOTONIC , &start);/* Let the guest access its memory */ - ret =_vcpu_run (vm, vcpu->id); + ret =_vcpu_run (vcpu);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -if (get_ucall (vm, vcpu->id,NULL ) !=UCALL_SYNC ) { +if (get_ucall (vcpu,NULL ) !=UCALL_SYNC ) {TEST_ASSERT (false,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason));
tools/testing/selftests/kvm/dirty_log_perf_test.c +3 -4
@@ -69,7 +69,6 @@ static int vcpu_last_completed_iteration[KVM_MAX_VCPUS];static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) {struct kvm_vcpu *vcpu = vcpu_args->vcpu; -struct kvm_vm *vm = perf_test_args.vm;int vcpu_idx = vcpu_args->vcpu_idx;uint64_t pages_count =0 ;struct kvm_run *run;
@@ -85,18 +84,18 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args)int current_iteration =READ_ONCE (iteration);clock_gettime (CLOCK_MONOTONIC , &start); - ret =_vcpu_run (vm, vcpu->id); + ret =_vcpu_run (vcpu); ts_diff =timespec_elapsed (start);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vcpu,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason));pr_debug ("Got sync event from vCPU %d\n" , vcpu_idx); vcpu_last_completed_iteration[vcpu_idx] = current_iteration;pr_debug ("vCPU %d updated last completed iteration to %d\n" , - vcpu->id, vcpu_last_completed_iteration[vcpu_idx]); + vcpu_idx, vcpu_last_completed_iteration[vcpu_idx]);if (current_iteration) { pages_count += vcpu_args->pages;
tools/testing/selftests/kvm/dirty_log_test.c +5 -5
@@ -255,7 +255,7 @@ static void default_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)TEST_ASSERT (ret ==0 || (ret ==-1 && err ==EINTR ),"vcpu run failed: errno=%d" , err); -TEST_ASSERT (get_ucall (vcpu->vm, vcpu->id,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vcpu,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason));
@@ -346,7 +346,7 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot, }/* Only have one vcpu */ - count =dirty_ring_collect_one (vcpu_map_dirty_ring (vcpu->vm, vcpu->id), + count =dirty_ring_collect_one (vcpu_map_dirty_ring (vcpu), slot, bitmap, num_pages, &fetch_index); cleared =kvm_vm_reset_dirty_ring (vcpu->vm);
@@ -369,7 +369,7 @@ static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)struct kvm_run *run = vcpu->run;/* A ucall-sync or ring-full event is allowed */ -if (get_ucall (vcpu->vm, vcpu->id,NULL ) ==UCALL_SYNC ) { +if (get_ucall (vcpu,NULL ) ==UCALL_SYNC ) {/* We should allow this to continue */ ; } else if (run->exit_reason == KVM_EXIT_DIRTY_RING_FULL ||
@@ -521,7 +521,7 @@ static void *vcpu_worker(void *data) sigmask->len =8 ;pthread_sigmask (0 ,NULL , sigset);sigdelset (sigset,SIG_IPI ); -vcpu_ioctl (vm, vcpu->id,KVM_SET_SIGNAL_MASK , sigmask); +vcpu_ioctl (vcpu,KVM_SET_SIGNAL_MASK , sigmask);sigemptyset (sigset);sigaddset (sigset,SIG_IPI );
@@ -533,7 +533,7 @@ static void *vcpu_worker(void *data)generate_random_array (guest_array,TEST_PAGES_PER_LOOP ); pages_count +=TEST_PAGES_PER_LOOP ;/* Let the guest dirty the random pages */ - ret =__vcpu_run (vm, vcpu->id); + ret =__vcpu_run (vcpu);if (ret ==-1 && errno ==EINTR ) {int sig =-1 ;sigwait (sigset, &sig);
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -39,7 +39,7 @@ static void *run_vcpu(void *arg)struct kvm_vcpu *vcpu = arg;struct kvm_run *run = vcpu->run; -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu); TEST_ASSERT(false, "%s: exited with reason %d: %s\n", __func__, run->exit_reason,
tools/testing/selftests/kvm/include/aarch64/processor.h +2 -2
@@ -47,7 +47,7 @@#define MPIDR_HWID_BITMASK (0xff00fffffful) -void aarch64_vcpu_setup (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_vcpu_init *init); +void aarch64_vcpu_setup (struct kvm_vcpu *vcpu,struct kvm_vcpu_init *init);struct kvm_vcpu *aarch64_vcpu_add (struct kvm_vm *vm,uint32_t vcpu_id,struct kvm_vcpu_init *init,void *guest_code);
@@ -101,7 +101,7 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, bool *ps4k, bool *ps16k, bool *ps64k);void vm_init_descriptor_tables (struct kvm_vm *vm); -void vcpu_init_descriptor_tables (struct kvm_vm *vm,uint32_t vcpuid); +void vcpu_init_descriptor_tables (struct kvm_vcpu *vcpu);typedef void (*handler_fn )(struct ex_regs *); void vm_install_exception_handler(struct kvm_vm *vm,
tools/testing/selftests/kvm/include/kvm_util_base.h +102 -114
361 lines not on this page · raw message
tools/testing/selftests/kvm/include/ucall_common.h +1 -1
@@ -26,7 +26,7 @@ struct ucall {void ucall_init (struct kvm_vm *vm,void *arg);void ucall_uninit (struct kvm_vm *vm);void ucall (uint64_t cmd,int nargs, ...); -uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc); +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc);#define GUEST_SYNC_ARGS (stage, arg1, arg2, arg3, arg4) \ ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)
tools/testing/selftests/kvm/include/x86_64/evmcs.h +1 -1
@@ -241,7 +241,7 @@ struct hv_enlightened_vmcs {extern struct hv_enlightened_vmcs *current_evmcs;extern struct hv_vp_assist_page *current_vp_assist; -int vcpu_enable_evmcs (struct kvm_vm *vm,int vcpu_id); +int vcpu_enable_evmcs (struct kvm_vcpu *vcpu);static inline int enable_vp_assist (uint64_t vp_assist_pa,void *vp_assist) {
tools/testing/selftests/kvm/include/x86_64/processor.h +37 -40
154 lines not on this page · raw message
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -174,7 +174,7 @@ static void vm_stats_test(struct kvm_vm *vm)static void vcpu_stats_test (struct kvm_vcpu *vcpu) { -int stats_fd =vcpu_get_stats_fd (vcpu->vm, vcpu->id); +int stats_fd =vcpu_get_stats_fd (vcpu);stats_test (stats_fd);close (stats_fd);
tools/testing/selftests/kvm/kvm_page_table_test.c +3 -4
@@ -184,7 +184,6 @@ static void guest_code(bool do_write)static void *vcpu_worker (void *data) { -struct kvm_vm *vm = test_args.vm;struct kvm_vcpu *vcpu = data;bool do_write = !(vcpu->id %2 );struct timespec start;
@@ -192,7 +191,7 @@ static void *vcpu_worker(void *data)enum test_stage stage;int ret; -vcpu_args_set (vm, vcpu->id,1 , do_write); +vcpu_args_set (vcpu,1 , do_write);while (!READ_ONCE (host_quit)) { ret =sem_wait (&test_stage_updated);
@@ -202,11 +201,11 @@ static void *vcpu_worker(void *data)return NULL ;clock_gettime (CLOCK_MONOTONIC_RAW , &start); - ret =_vcpu_run (vm, vcpu->id); + ret =_vcpu_run (vcpu); ts_diff =timespec_elapsed (start);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vcpu,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (vcpu->run->exit_reason));
tools/testing/selftests/kvm/lib/aarch64/processor.c +24 -23
115 lines not on this page · raw message
tools/testing/selftests/kvm/lib/aarch64/ucall.c +4 -4
@@ -88,9 +88,9 @@ void ucall(uint64_t cmd, int nargs, ...) *ucall_exit_mmio_addr = (vm_vaddr_t)&uc; } -uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc) +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) { -struct kvm_run *run =vcpu_state (vm, vcpu_id); +struct kvm_run *run = vcpu->run;struct ucall ucall = {};if (uc)
@@ -103,9 +103,9 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc)TEST_ASSERT (run->mmio.is_write && run->mmio.len ==8 ,"Unexpected ucall exit mmio address access" );memcpy (&gva, run->mmio.data,sizeof (gva)); -memcpy (&ucall,addr_gva2hva (vm, gva),sizeof (ucall)); +memcpy (&ucall,addr_gva2hva (vcpu->vm, gva),sizeof (ucall)); -vcpu_run_complete_io (vm, vcpu_id); +vcpu_run_complete_io (vcpu);if (uc)memcpy (uc, &ucall,sizeof (ucall)); }
tools/testing/selftests/kvm/lib/kvm_util.c +39 -123
244 lines not on this page · raw message
tools/testing/selftests/kvm/lib/perf_test_util.c +1 -1
@@ -98,7 +98,7 @@ void perf_test_setup_vcpus(struct kvm_vm *vm, int nr_vcpus, vcpu_args->gpa = pta->gpa; } -vcpu_args_set (vm, vcpus[i]->id,1 , i); +vcpu_args_set (vcpus[i],1 , i); pr_debug("Added VCPU %d with test mem gpa [%lx, %lx)\n", i, vcpu_args->gpa, vcpu_args->gpa +
tools/testing/selftests/kvm/lib/riscv/processor.c +46 -48
147 lines not on this page · raw message
tools/testing/selftests/kvm/lib/riscv/ucall.c +7 -6
@@ -64,9 +64,9 @@ void ucall(uint64_t cmd, int nargs, ...) (vm_vaddr_t)&uc, 0, 0, 0, 0, 0); } -uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc) +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) { -struct kvm_run *run =vcpu_state (vm, vcpu_id); +struct kvm_run *run = vcpu->run;struct ucall ucall = {};if (uc)
@@ -76,16 +76,17 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc) run->riscv_sbi.extension_id == KVM_RISCV_SELFTESTS_SBI_EXT) {switch (run->riscv_sbi.function_id) {case KVM_RISCV_SELFTESTS_SBI_UCALL : -memcpy (&ucall,addr_gva2hva (vm, - run->riscv_sbi.args[0 ]),sizeof (ucall)); +memcpy (&ucall, +addr_gva2hva (vcpu->vm, run->riscv_sbi.args[0 ]), +sizeof (ucall)); -vcpu_run_complete_io (vm, vcpu_id); +vcpu_run_complete_io (vcpu);if (uc)memcpy (uc, &ucall,sizeof (ucall));break ;case KVM_RISCV_SELFTESTS_SBI_UNEXP : -vcpu_dump (stderr, vm, vcpu_id,2 ); +vcpu_dump (stderr, vcpu,2 );TEST_ASSERT (0 ,"Unexpected trap taken by guest" );break ;default :
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +1 -1
@@ -32,7 +32,7 @@ static uint64_t diag318_handler(void)uint64_t diag318_info; vm =vm_create_with_one_vcpu (&vcpu, guest_code); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu); run = vcpu->run; TEST_ASSERT(run->exit_reason == KVM_EXIT_S390_SIEIC,
tools/testing/selftests/kvm/lib/s390x/processor.c +10 -12
@@ -173,23 +173,23 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, vcpu =__vm_vcpu_add (vm, vcpu_id);/* Setup guest registers */ -vcpu_regs_get (vm, vcpu_id, ®s); +vcpu_regs_get (vcpu, ®s); regs.gprs[15 ] = stack_vaddr + (DEFAULT_STACK_PGS *getpagesize ()) -160 ; -vcpu_regs_set (vm, vcpu_id, ®s); +vcpu_regs_set (vcpu, ®s); -vcpu_sregs_get (vm, vcpu_id, &sregs); +vcpu_sregs_get (vcpu, &sregs); sregs.crs[0 ] |=0x00040000 ;/* Enable floating point regs */ sregs.crs[1 ] = vm->pgd |0xf ;/* Primary region table */ -vcpu_sregs_set (vm, vcpu_id, &sregs); +vcpu_sregs_set (vcpu, &sregs); - run =vcpu_state (vm, vcpu_id); + run = vcpu->run; run->psw_mask =0x0400000180000000ULL ;/* DAT enabled + 64 bit mode */ run->psw_addr = (uintptr_t )guest_code;return vcpu; } -void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...) +void vcpu_args_set (struct kvm_vcpu *vcpu,unsigned int num, ...) {va_list ap;struct kvm_regs regs;
@@ -200,23 +200,21 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...) num);va_start (ap, num); -vcpu_regs_get (vm, vcpuid, ®s); +vcpu_regs_get (vcpu, ®s);for (i =0 ; i < num; i++) regs.gprs[i +2 ] =va_arg (ap, uint64_t); -vcpu_regs_set (vm, vcpuid, ®s); +vcpu_regs_set (vcpu, ®s);va_end (ap); } -void vcpu_arch_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) +void vcpu_arch_dump (FILE *stream,struct kvm_vcpu *vcpu,uint8_t indent) { -struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid); -fprintf (stream,"%*spstate: psw: 0x%.16llx:0x%.16llx\n" , indent,"" , vcpu->run->psw_mask, vcpu->run->psw_addr); } -void assert_on_unhandled_exception (struct kvm_vm *vm,uint32_t vcpuid) +void assert_on_unhandled_exception (struct kvm_vcpu *vcpu) { }
tools/testing/selftests/kvm/lib/s390x/ucall.c +4 -4
@@ -33,9 +33,9 @@ void ucall(uint64_t cmd, int nargs, ...) asmvolatile ("diag 0,%0,0x501" : :"a" (&uc) :"memory" ); } -uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc) +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) { -struct kvm_run *run =vcpu_state (vm, vcpu_id); +struct kvm_run *run = vcpu->run;struct ucall ucall = {};if (uc)
@@ -47,10 +47,10 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc) (run->s390_sieic.ipb >> 16) == 0x501) {int reg = run->s390_sieic.ipa &0xf ; -memcpy (&ucall,addr_gva2hva (vm, run->s.regs.gprs[reg]), +memcpy (&ucall,addr_gva2hva (vcpu->vm, run->s.regs.gprs[reg]),sizeof (ucall)); -vcpu_run_complete_io (vm, vcpu_id); +vcpu_run_complete_io (vcpu);if (uc)memcpy (uc, &ucall,sizeof (ucall)); }
tools/testing/selftests/kvm/lib/x86_64/processor.c +66 -77
348 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/ucall.c +5 -5
@@ -35,9 +35,9 @@ void ucall(uint64_t cmd, int nargs, ...) : : [port] "d" (UCALL_PIO_PORT), "D" (&uc) : "rax", "memory"); } -uint64_t get_ucall (struct kvm_vm *vm,uint32_t vcpu_id,struct ucall *uc) +uint64_t get_ucall (struct kvm_vcpu *vcpu,struct ucall *uc) { -struct kvm_run *run =vcpu_state (vm, vcpu_id); +struct kvm_run *run = vcpu->run;struct ucall ucall = {};if (uc)
@@ -46,11 +46,11 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc)if (run->exit_reason ==KVM_EXIT_IO && run->io.port ==UCALL_PIO_PORT ) {struct kvm_regs regs; -vcpu_regs_get (vm, vcpu_id, ®s); -memcpy (&ucall,addr_gva2hva (vm, (vm_vaddr_t )regs.rdi), +vcpu_regs_get (vcpu, ®s); +memcpy (&ucall,addr_gva2hva (vcpu->vm, (vm_vaddr_t )regs.rdi),sizeof (ucall)); -vcpu_run_complete_io (vm, vcpu_id); +vcpu_run_complete_io (vcpu);if (uc)memcpy (uc, &ucall,sizeof (ucall)); }
tools/testing/selftests/kvm/lib/x86_64/vmx.c +2 -2
@@ -42,11 +42,11 @@ struct eptPageTablePointer { uint64_t address:40; uint64_t reserved_63_52:12; }; -int vcpu_enable_evmcs (struct kvm_vm *vm,int vcpu_id) +int vcpu_enable_evmcs (struct kvm_vcpu *vcpu) {uint16_t evmcs_ver; -vcpu_enable_cap (vm, vcpu_id,KVM_CAP_HYPERV_ENLIGHTENED_VMCS , +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENLIGHTENED_VMCS , (unsigned long )&evmcs_ver);/* KVM should return supported EVMCS version range */
tools/testing/selftests/kvm/max_guest_memory_test.c +10 -10
@@ -51,10 +51,10 @@ static void rendezvous_with_boss(void) } } -static void run_vcpu (struct kvm_vm *vm,uint32_t vcpu_id) +static void run_vcpu (struct kvm_vcpu *vcpu) { -vcpu_run (vm, vcpu_id); -ASSERT_EQ (get_ucall (vm, vcpu_id,NULL ),UCALL_DONE ); +vcpu_run (vcpu); +ASSERT_EQ (get_ucall (vcpu,NULL ),UCALL_DONE ); }static void *vcpu_worker (void *data)
@@ -65,25 +65,25 @@ static void *vcpu_worker(void *data)struct kvm_sregs sregs;struct kvm_regs regs; -vcpu_args_set (vm, vcpu->id,3 , info->start_gpa, info->end_gpa, +vcpu_args_set (vcpu,3 , info->start_gpa, info->end_gpa,vm_get_page_size (vm));/* Snapshot regs before the first run. */ -vcpu_regs_get (vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s);rendezvous_with_boss (); -run_vcpu (vm, vcpu->id); +run_vcpu (vcpu);rendezvous_with_boss (); -vcpu_regs_set (vm, vcpu->id, ®s); -vcpu_sregs_get (vm, vcpu->id, &sregs); +vcpu_regs_set (vcpu, ®s); +vcpu_sregs_get (vcpu, &sregs);#ifdef __x86_64__/* Toggle CR0.WP to trigger a MMU context reset. */ sregs.cr0 ^=X86_CR0_WP ;#endif -vcpu_sregs_set (vm, vcpu->id, &sregs); +vcpu_sregs_set (vcpu, &sregs);rendezvous_with_boss (); -run_vcpu (vm, vcpu->id); +run_vcpu (vcpu);rendezvous_with_boss ();return NULL ;
tools/testing/selftests/kvm/memslot_modification_stress_test.c +2 -3
@@ -39,7 +39,6 @@ static bool run_vcpus = true;static void vcpu_worker (struct perf_test_vcpu_args *vcpu_args) {struct kvm_vcpu *vcpu = vcpu_args->vcpu; -struct kvm_vm *vm = perf_test_args.vm;struct kvm_run *run;int ret;
@@ -47,10 +46,10 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args)/* Let the guest access its memory until a stop signal is received */ while (READ_ONCE (run_vcpus)) { - ret =_vcpu_run (vm, vcpu->id); + ret =_vcpu_run (vcpu);TEST_ASSERT (ret ==0 ,"vcpu_run failed: %d\n" , ret); -if (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC ) +if (get_ucall (vcpu,NULL ) ==UCALL_SYNC )continue ; TEST_ASSERT(false,
tools/testing/selftests/kvm/memslot_perf_test.c +2 -2
@@ -146,9 +146,9 @@ static void *vcpu_worker(void *__data)struct ucall uc;while (1 ) { -vcpu_run (data->vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (data->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected sync ucall, got %lx",
tools/testing/selftests/kvm/rseq_test.c +2 -2
@@ -233,8 +233,8 @@ int main(int argc, char *argv[])pthread_create (&migration_thread,NULL , migration_worker,0 );for (i =0 ; !done; i++) { -vcpu_run (vm, vcpu->id); -TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC , +vcpu_run (vcpu); +TEST_ASSERT (get_ucall (vcpu,NULL ) ==UCALL_SYNC ,"Guest failed?" );/*
tools/testing/selftests/kvm/s390x/memop.c +4 -4
@@ -151,7 +151,7 @@ static void memop_ioctl(struct test_info info, struct kvm_s390_mem_op *ksmo)if (!vcpu)vm_ioctl (info.vm,KVM_S390_MEM_OP , ksmo);else -vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_MEM_OP , ksmo); +vcpu_ioctl (vcpu,KVM_S390_MEM_OP , ksmo); }static int err_memop_ioctl (struct test_info info,struct kvm_s390_mem_op *ksmo)
@@ -161,7 +161,7 @@ static int err_memop_ioctl(struct test_info info, struct kvm_s390_mem_op *ksmo)if (!vcpu)return __vm_ioctl (info.vm,KVM_S390_MEM_OP , ksmo);else -return __vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_MEM_OP , ksmo); +return __vcpu_ioctl (vcpu,KVM_S390_MEM_OP , ksmo); }#define MEMOP (err, info_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \
@@ -249,8 +249,8 @@ enum stage {struct ucall uc; \int __stage = (stage); \ \ -vcpu_run (__vcpu->vm, __vcpu->id); \ -get_ucall (__vcpu->vm, __vcpu->id, &uc); \ +vcpu_run (__vcpu); \ +get_ucall (__vcpu, &uc); \ASSERT_EQ (uc.cmd,UCALL_SYNC ); \ASSERT_EQ (uc.args[1 ], __stage); \ }) \
tools/testing/selftests/kvm/s390x/resets.c +14 -14
@@ -60,7 +60,7 @@ static void test_one_reg(struct kvm_vcpu *vcpu, uint64_t id, uint64_t value) {uint64_t eval_reg; -vcpu_get_reg (vcpu->vm, vcpu->id, id, &eval_reg); +vcpu_get_reg (vcpu, id, &eval_reg);TEST_ASSERT (eval_reg == value,"value == 0x%lx" , value); }
@@ -71,7 +71,7 @@ static void assert_noirq(struct kvm_vcpu *vcpu) irq_state.len =sizeof (buf); irq_state.buf = (unsigned long )buf; - irqs =__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_GET_IRQ_STATE , &irq_state); + irqs =__vcpu_ioctl (vcpu,KVM_S390_GET_IRQ_STATE , &irq_state);/* * irqs contains the number of retrieved interrupts. Any interrupt * (notably, the emergency call interrupt we have injected) should
@@ -88,13 +88,13 @@ static void assert_clear(struct kvm_vcpu *vcpu)struct kvm_regs regs;struct kvm_fpu fpu; -vcpu_regs_get (vcpu->vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s);TEST_ASSERT (!memcmp (®s.gprs, regs_null,sizeof (regs.gprs)),"grs == 0" ); -vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs); +vcpu_sregs_get (vcpu, &sregs);TEST_ASSERT (!memcmp (&sregs.acrs, regs_null,sizeof (sregs.acrs)),"acrs == 0" ); -vcpu_fpu_get (vcpu->vm, vcpu->id, &fpu); +vcpu_fpu_get (vcpu, &fpu);TEST_ASSERT (!memcmp (&fpu.fprs, regs_null,sizeof (fpu.fprs)),"fprs == 0" );/* sync regs */
@@ -132,7 +132,7 @@ static void assert_initial(struct kvm_vcpu *vcpu)struct kvm_fpu fpu;/* KVM_GET_SREGS */ -vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs); +vcpu_sregs_get (vcpu, &sregs);TEST_ASSERT (sregs.crs[0 ] ==0xE0UL ,"cr0 == 0xE0 (KVM_GET_SREGS)" );TEST_ASSERT (sregs.crs[14 ] ==0xC2000000UL ,"cr14 == 0xC2000000 (KVM_GET_SREGS)" );
@@ -158,7 +158,7 @@ static void assert_initial(struct kvm_vcpu *vcpu)TEST_ASSERT (vcpu->run->psw_addr ==0 ,"psw_addr == 0 (kvm_run)" );TEST_ASSERT (vcpu->run->psw_mask ==0 ,"psw_mask == 0 (kvm_run)" ); -vcpu_fpu_get (vcpu->vm, vcpu->id, &fpu); +vcpu_fpu_get (vcpu, &fpu);TEST_ASSERT (!fpu.fpc,"fpc == 0" );test_one_reg (vcpu,KVM_REG_S390_GBEA ,1 );
@@ -197,7 +197,7 @@ static void inject_irq(struct kvm_vcpu *vcpu) irq_state.buf = (unsigned long )buf; irq->type =KVM_S390_INT_EMERGENCY ; irq->u.emerg.code = vcpu->id; - irqs =__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_S390_SET_IRQ_STATE , &irq_state); + irqs =__vcpu_ioctl (vcpu,KVM_S390_SET_IRQ_STATE , &irq_state);TEST_ASSERT (irqs >=0 ,"Error injecting EMERGENCY IRQ errno %d\n" , errno); }
@@ -220,11 +220,11 @@ static void test_normal(void)pr_info ("Testing normal reset\n" ); vm =create_vm (&vcpu); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);inject_irq (vcpu); -vcpu_ioctl (vm, vcpu->id,KVM_S390_NORMAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_NORMAL_RESET ,0 );/* must clears */ assert_normal (vcpu);
@@ -243,11 +243,11 @@ static void test_initial(void)pr_info ("Testing initial reset\n" ); vm =create_vm (&vcpu); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);inject_irq (vcpu); -vcpu_ioctl (vm, vcpu->id,KVM_S390_INITIAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_INITIAL_RESET ,0 );/* must clears */ assert_normal (vcpu);
@@ -266,11 +266,11 @@ static void test_clear(void)pr_info ("Testing clear reset\n" ); vm =create_vm (&vcpu); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);inject_irq (vcpu); -vcpu_ioctl (vm, vcpu->id,KVM_S390_CLEAR_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_CLEAR_RESET ,0 );/* must clears */ assert_normal (vcpu);
tools/testing/selftests/kvm/s390x/sync_regs_test.c +11 -11
@@ -97,14 +97,14 @@ int main(int argc, char *argv[])/* Request reading invalid register set from VCPU. */ run->kvm_valid_regs =INVALID_SYNC_FIELD ; - rv =_vcpu_run (vm, vcpu->id); + rv =_vcpu_run (vcpu);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , rv); run->kvm_valid_regs =0 ; run->kvm_valid_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm, vcpu->id); + rv =_vcpu_run (vcpu);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , rv);
@@ -112,14 +112,14 @@ int main(int argc, char *argv[])/* Request setting invalid register set into VCPU. */ run->kvm_dirty_regs =INVALID_SYNC_FIELD ; - rv =_vcpu_run (vm, vcpu->id); + rv =_vcpu_run (vcpu);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , rv); run->kvm_dirty_regs =0 ; run->kvm_dirty_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm, vcpu->id); + rv =_vcpu_run (vcpu);TEST_ASSERT (rv <0 && errno ==EINVAL ,"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , rv);
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm, vcpu->id); + 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",
@@ -140,10 +140,10 @@ int main(int argc, char *argv[]) run->s390_sieic.icptcode, run->s390_sieic.ipa, run->s390_sieic.ipb); -vcpu_regs_get (vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s);compare_regs (®s, &run->s.regs); -vcpu_sregs_get (vm, vcpu->id, &sregs); +vcpu_sregs_get (vcpu, &sregs);compare_sregs (&sregs, &run->s.regs);/* Set and verify various register values */
@@ -158,7 +158,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs |=KVM_SYNC_DIAG318 ; } - rv =_vcpu_run (vm, vcpu->id); + 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",
@@ -174,10 +174,10 @@ int main(int argc, char *argv[])"diag318 sync regs value incorrect 0x%llx." , run->s.regs.diag318); -vcpu_regs_get (vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s);compare_regs (®s, &run->s.regs); -vcpu_sregs_get (vm, vcpu->id, &sregs); +vcpu_sregs_get (vcpu, &sregs);compare_sregs (&sregs, &run->s.regs);/* Clear kvm_dirty_regs bits, verify new s.regs values are
@@ -187,7 +187,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =0 ; run->s.regs.gprs[11 ] =0xDEADBEEF ; run->s.regs.diag318 =0x4B1D ; - rv =_vcpu_run (vm, vcpu->id); + 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",
tools/testing/selftests/kvm/s390x/tprot.c +2 -2
@@ -186,8 +186,8 @@ static void guest_code(void)struct ucall uc; \int __stage = (stage); \ \ -vcpu_run (__vcpu->vm, __vcpu->id); \ -get_ucall (__vcpu->vm, __vcpu->id, &uc); \ +vcpu_run (__vcpu); \ +get_ucall (__vcpu, &uc); \if (uc.cmd ==UCALL_ABORT ) { \TEST_FAIL ("line %lu: %s, hints: %lu, %lu" , uc.args[1 ], \ (const char *)uc.args[0 ], uc.args[2 ], uc.args[3 ]); \
tools/testing/selftests/kvm/set_memory_region_test.c +4 -4
@@ -63,10 +63,10 @@ static void *vcpu_worker(void *data)* has been deleted or while it is being moved . */ while (1 ) { -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu);if (run->exit_reason ==KVM_EXIT_IO ) { - cmd =get_ucall (vcpu->vm, vcpu->id, &uc); + cmd =get_ucall (vcpu, &uc);if (cmd !=UCALL_SYNC )break ;
@@ -291,7 +291,7 @@ static void test_delete_memory_region(void) run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , "Unexpected exit reason = %d", run->exit_reason); -vcpu_regs_get (vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s);/* * On AMD, after KVM_EXIT_SHUTDOWN the VMCB has been reinitialized already,
@@ -318,7 +318,7 @@ static void test_zero_memory_regions(void) vcpu =__vm_vcpu_add (vm,0 );vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul ); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu); run = vcpu->run; TEST_ASSERT(run->exit_reason == KVM_EXIT_INTERNAL_ERROR,
tools/testing/selftests/kvm/steal_time.c +10 -10
@@ -73,11 +73,11 @@ static void steal_time_init(struct kvm_vcpu *vcpu, uint32_t i) st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE );sync_global_to_guest (vcpu->vm, st_gva[i]); - ret =_vcpu_set_msr (vcpu->vm, vcpu->id,MSR_KVM_STEAL_TIME , + ret =_vcpu_set_msr (vcpu,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_STEAL_RESERVED_MASK );TEST_ASSERT (ret ==0 ,"Bad GPA didn't fail" ); -vcpu_set_msr (vcpu->vm, vcpu->id,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_MSR_ENABLED ); +vcpu_set_msr (vcpu,MSR_KVM_STEAL_TIME , (ulong )st_gva[i] |KVM_MSR_ENABLED ); }static void steal_time_dump (struct kvm_vm *vm,uint32_t vcpu_idx)
@@ -163,7 +163,7 @@ static bool is_steal_time_supported(struct kvm_vcpu *vcpu) .attr = KVM_ARM_VCPU_PVTIME_IPA, }; -return !__vcpu_ioctl (vcpu->vm, vcpu->id,KVM_HAS_DEVICE_ATTR , &dev); +return !__vcpu_ioctl (vcpu,KVM_HAS_DEVICE_ATTR , &dev); }static void steal_time_init (struct kvm_vcpu *vcpu,uint32_t i)
@@ -178,20 +178,20 @@ static void steal_time_init(struct kvm_vcpu *vcpu, uint32_t i) .addr = (uint64_t)&st_ipa, }; -vcpu_ioctl (vm, vcpu->id,KVM_HAS_DEVICE_ATTR , &dev); +vcpu_ioctl (vcpu,KVM_HAS_DEVICE_ATTR , &dev);/* ST_GPA_BASE is identity mapped */ st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE );sync_global_to_guest (vm, st_gva[i]); st_ipa = (ulong )st_gva[i] |1 ; - ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); + ret =__vcpu_ioctl (vcpu,KVM_SET_DEVICE_ATTR , &dev);TEST_ASSERT (ret ==-1 && errno ==EINVAL ,"Bad IPA didn't report EINVAL" ); st_ipa = (ulong )st_gva[i]; -vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); +vcpu_ioctl (vcpu,KVM_SET_DEVICE_ATTR , &dev); - ret =__vcpu_ioctl (vm, vcpu->id,KVM_SET_DEVICE_ATTR , &dev); + ret =__vcpu_ioctl (vcpu,KVM_SET_DEVICE_ATTR , &dev);TEST_ASSERT (ret ==-1 && errno ==EEXIST ,"Set IPA twice without EEXIST" ); }
@@ -227,9 +227,9 @@ static void run_vcpu(struct kvm_vcpu *vcpu) {struct ucall uc; -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :case UCALL_DONE :break ;
@@ -280,7 +280,7 @@ int main(int ac, char **av)for (i =0 ; i <NR_VCPUS ; ++i) {steal_time_init (vcpus[i], i); -vcpu_args_set (vm, vcpus[i]->id,1 , i); +vcpu_args_set (vcpus[i],1 , i);/* First VCPU run initializes steal-time */ run_vcpu (vcpus[i]);
tools/testing/selftests/kvm/system_counter_offset_test.c +6 -7
@@ -28,8 +28,7 @@ static struct test_case test_cases[] = {static void check_preconditions (struct kvm_vcpu *vcpu) { -if (!__vcpu_has_device_attr (vcpu->vm, vcpu->id,KVM_VCPU_TSC_CTRL , -KVM_VCPU_TSC_OFFSET )) +if (!__vcpu_has_device_attr (vcpu,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET ))return ;print_skip ("KVM_VCPU_TSC_OFFSET not supported; skipping test" );
@@ -38,8 +37,8 @@ static void check_preconditions(struct kvm_vcpu *vcpu)static void setup_system_counter (struct kvm_vcpu *vcpu,struct test_case *test) { -vcpu_device_attr_set (vcpu->vm, vcpu->id,KVM_VCPU_TSC_CTRL , -KVM_VCPU_TSC_OFFSET , &test->tsc_offset); +vcpu_device_attr_set (vcpu,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET , + &test->tsc_offset); }static uint64_t guest_read_system_counter (struct test_case *test)
@@ -101,10 +100,10 @@ static void enter_guest(struct kvm_vcpu *vcpu)setup_system_counter (vcpu, test); start =host_read_guest_system_counter (test); -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu); end =host_read_guest_system_counter (test); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :handle_sync (&uc, start, end);break ;
@@ -113,7 +112,7 @@ static void enter_guest(struct kvm_vcpu *vcpu)return ;default :TEST_ASSERT (0 ,"unhandled ucall %ld\n" , -get_ucall (vcpu->vm, vcpu->id, &uc)); +get_ucall (vcpu, &uc)); } } }
tools/testing/selftests/kvm/x86_64/amx_test.c +11 -11
@@ -351,11 +351,11 @@ int main(int argc, char *argv[]) } run = vcpu->run; -vcpu_regs_get (vm, vcpu->id, ®s1); +vcpu_regs_get (vcpu, ®s1);/* Register #NM handler */ vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);vm_install_exception_handler (vm,NM_VECTOR , guest_nm_handler);/* amx cfg for guest_code */
@@ -369,16 +369,16 @@ int main(int argc, char *argv[])/* xsave data for guest_code */ xsavedata =vm_vaddr_alloc_pages (vm,3 );memset (addr_gva2hva (vm, xsavedata),0 ,3 *getpagesize ()); -vcpu_args_set (vm, vcpu->id,3 , amx_cfg, tiledata, xsavedata); +vcpu_args_set (vcpu,3 , amx_cfg, tiledata, xsavedata);for (stage =1 ; ; stage++) { -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
@@ -403,7 +403,7 @@ int main(int argc, char *argv[])* size subtract 8K amx size. */ amx_offset = xsave_restore_size -NUM_TILES *TILE_SIZE ; - state =vcpu_save_state (vm, vcpu->id); + state =vcpu_save_state (vcpu);void *amx_start = (void *)state->xsave + amx_offset;void *tiles_data = (void *)addr_gva2hva (vm, tiledata);/* Only check TMM0 register, 1 tile */
@@ -424,21 +424,21 @@ int main(int argc, char *argv[])TEST_FAIL ("Unknown ucall %lu" , uc.cmd); } - state =vcpu_save_state (vm, vcpu->id); + state =vcpu_save_state (vcpu);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm, vcpu->id, ®s1); +vcpu_regs_get (vcpu, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm); -vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ()); -vcpu_load_state (vm, vcpu->id, state); +vcpu_set_cpuid (vcpu,kvm_get_supported_cpuid ()); +vcpu_load_state (vcpu, state); run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm, vcpu->id, ®s2); +vcpu_regs_get (vcpu, ®s2);TEST_ASSERT (!memcmp (®s1, ®s2,sizeof (regs2)),"Unexpected register values after vcpu_load_state; rdi: %lx rsi: %lx" , (ulong ) regs2.rdi, (ulong ) regs2.rsi);
tools/testing/selftests/kvm/x86_64/cpuid_test.c +7 -7
@@ -120,9 +120,9 @@ static void run_vcpu(struct kvm_vcpu *vcpu, int stage) {struct ucall uc; -vcpu_run (vcpu->vm, vcpu->id); +vcpu_run (vcpu); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC : TEST_ASSERT(!strcmp((const char *)uc.args[0], "hello") && uc.args[1] == stage + 1,
@@ -159,14 +159,14 @@ static void set_cpuid_after_run(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid)u32 eax, ebx, x;/* Setting unmodified CPUID is allowed */ - rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); + rc =__vcpu_set_cpuid (vcpu, cpuid);TEST_ASSERT (!rc,"Setting unmodified CPUID after KVM_RUN failed: %d" , rc);/* Changing CPU features is forbidden */ ent =get_cpuid (cpuid,0x7 ,0 ); ebx = ent->ebx; ent->ebx--; - rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); + rc =__vcpu_set_cpuid (vcpu, cpuid);TEST_ASSERT (rc,"Changing CPU features should fail" ); ent->ebx = ebx;
@@ -175,7 +175,7 @@ static void set_cpuid_after_run(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid) eax = ent->eax; x = eax &0xff ; ent->eax = (eax & ~0xffu ) | (x -1 ); - rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); + rc =__vcpu_set_cpuid (vcpu, cpuid);TEST_ASSERT (rc,"Changing MAXPHYADDR should fail" ); ent->eax = eax; }
@@ -191,13 +191,13 @@ int main(void) vm =vm_create_with_one_vcpu (&vcpu, guest_main); supp_cpuid =kvm_get_supported_cpuid (); - cpuid2 =vcpu_get_cpuid (vm, vcpu->id); + cpuid2 =vcpu_get_cpuid (vcpu);compare_cpuids (supp_cpuid, cpuid2);vcpu_alloc_cpuid (vm, &cpuid_gva, cpuid2); -vcpu_args_set (vm, vcpu->id,1 , cpuid_gva); +vcpu_args_set (vcpu,1 , cpuid_gva);for (stage =0 ; stage <3 ; stage++)run_vcpu (vcpu, stage);
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +4 -4
@@ -82,19 +82,19 @@ int main(int argc, char *argv[]) run = vcpu->run;while (1 ) { -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :/* emulate hypervisor clearing CR4.OSXSAVE */ -vcpu_sregs_get (vm, vcpu->id, &sregs); +vcpu_sregs_get (vcpu, &sregs); sregs.cr4 &= ~X86_CR4_OSXSAVE ; -vcpu_sregs_set (vm, vcpu->id, &sregs); +vcpu_sregs_set (vcpu, &sregs);break ;case UCALL_ABORT :TEST_FAIL ("Guest CR4 bit (OSXSAVE) unsynchronized with CPUID bit." );
tools/testing/selftests/kvm/x86_64/debug_regs.c +15 -15
@@ -70,9 +70,9 @@ static void vcpu_skip_insn(struct kvm_vcpu *vcpu, int insn_len) {struct kvm_regs regs; -vcpu_regs_get (vcpu->vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s); regs.rip += insn_len; -vcpu_regs_set (vcpu->vm, vcpu->id, ®s); +vcpu_regs_set (vcpu, ®s); }int main (void )
@@ -106,8 +106,8 @@ int main(void)/* Test software BPs - int3 */ memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_SW_BP ; -vcpu_guest_debug_set (vm, vcpu->id, &debug); -vcpu_run (vm, vcpu->id); +vcpu_guest_debug_set (vcpu, &debug); +vcpu_run (vcpu); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == BP_VECTOR && run->debug.arch.pc == CAST_TO_RIP(sw_bp),
@@ -122,8 +122,8 @@ int main(void) debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_HW_BP ; debug.arch.debugreg[i] =CAST_TO_RIP (hw_bp); debug.arch.debugreg[7 ] =0x400 | (1UL << (2 *i+1 )); -vcpu_guest_debug_set (vm, vcpu->id, &debug); -vcpu_run (vm, vcpu->id); +vcpu_guest_debug_set (vcpu, &debug); +vcpu_run (vcpu); target_dr6 =0xffff0ff0 | (1UL << i); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -145,8 +145,8 @@ int main(void) debug.arch.debugreg[i] =CAST_TO_RIP (guest_value); debug.arch.debugreg[7 ] =0x00000400 | (1UL << (2 *i+1 )) | (0x000d0000UL << (4 *i)); -vcpu_guest_debug_set (vm, vcpu->id, &debug); -vcpu_run (vm, vcpu->id); +vcpu_guest_debug_set (vcpu, &debug); +vcpu_run (vcpu); target_dr6 =0xffff0ff0 | (1UL << i); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -172,8 +172,8 @@ int main(void) debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_SINGLESTEP |KVM_GUESTDBG_BLOCKIRQ ; debug.arch.debugreg[7 ] =0x00000400 ; -vcpu_guest_debug_set (vm, vcpu->id, &debug); -vcpu_run (vm, vcpu->id); +vcpu_guest_debug_set (vcpu, &debug); +vcpu_run (vcpu); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR && run->debug.arch.pc == target_rip &&
@@ -189,8 +189,8 @@ int main(void)memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_HW_BP ; debug.arch.debugreg[7 ] =0x400 |DR7_GD ; -vcpu_guest_debug_set (vm, vcpu->id, &debug); -vcpu_run (vm, vcpu->id); +vcpu_guest_debug_set (vcpu, &debug); +vcpu_run (vcpu); target_dr6 =0xffff0ff0 |DR6_BD ; TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -204,11 +204,11 @@ int main(void)/* Disable all debug controls, run to the end */ memset (&debug,0 ,sizeof (debug)); -vcpu_guest_debug_set (vm, vcpu->id, &debug); +vcpu_guest_debug_set (vcpu, &debug); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"KVM_EXIT_IO" ); - cmd =get_ucall (vm, vcpu->id, &uc); + cmd =get_ucall (vcpu, &uc);TEST_ASSERT (cmd ==UCALL_DONE ,"UCALL_DONE" );kvm_vm_free (vm);
tools/testing/selftests/kvm/x86_64/emulator_error_test.c +10 -10
@@ -83,9 +83,9 @@ static void process_exit_on_emulation_error(struct kvm_vcpu *vcpu)* contained an flds instruction that is 2-bytes in * length (ie: no prefix, no SIB, no displacement). */ -vcpu_regs_get (vcpu->vm, vcpu->id, ®s); +vcpu_regs_get (vcpu, ®s); regs.rip +=2 ; -vcpu_regs_set (vcpu->vm, vcpu->id, ®s); +vcpu_regs_set (vcpu, ®s); } } }
@@ -101,7 +101,7 @@ static void check_for_guest_assert(struct kvm_vcpu *vcpu)struct ucall uc;if (vcpu->run->exit_reason ==KVM_EXIT_IO && -get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_ABORT ) { +get_ucall (vcpu, &uc) ==UCALL_ABORT ) {do_guest_assert (&uc); } }
@@ -118,7 +118,7 @@ static void process_ucall_done(struct kvm_vcpu *vcpu) run->exit_reason, exit_reason_str(run->exit_reason)); -TEST_ASSERT (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_DONE , +TEST_ASSERT (get_ucall (vcpu, &uc) ==UCALL_DONE ,"Unexpected ucall command: %lu, expected UCALL_DONE (%d)" , uc.cmd,UCALL_DONE ); }
@@ -133,7 +133,7 @@ static uint64_t process_ucall(struct kvm_vcpu *vcpu) run->exit_reason, exit_reason_str(run->exit_reason)); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :break ;case UCALL_ABORT :
@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) entry->eax = (entry->eax &0xffffff00 ) |MAXPHYADDR ;set_cpuid (cpuid, entry); -vcpu_set_cpuid (vm, vcpu->id, cpuid); +vcpu_set_cpuid (vcpu, cpuid); rc =kvm_check_cap (KVM_CAP_EXIT_ON_EMULATION_FAILURE );TEST_ASSERT (rc,"KVM_CAP_EXIT_ON_EMULATION_FAILURE is unavailable" );
@@ -190,12 +190,12 @@ int main(int argc, char *argv[])virt_map (vm,MEM_REGION_GVA ,MEM_REGION_GPA ,1 ); hva =addr_gpa2hva (vm,MEM_REGION_GPA );memset (hva,0 ,PAGE_SIZE ); - pte =vm_get_page_table_entry (vm, vcpu->id,MEM_REGION_GVA ); -vm_set_page_table_entry (vm, vcpu->id,MEM_REGION_GVA , pte | (1ull <<36 )); + pte =vm_get_page_table_entry (vm, vcpu,MEM_REGION_GVA ); +vm_set_page_table_entry (vm, vcpu,MEM_REGION_GVA , pte | (1ull <<36 )); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);process_exit_on_emulation_error (vcpu); -vcpu_run (vm, vcpu->id); +vcpu_run (vcpu);TEST_ASSERT (process_ucall (vcpu) ==UCALL_DONE ,"Expected UCALL_DONE" );
tools/testing/selftests/kvm/x86_64/evmcs_test.c +14 -14
@@ -161,12 +161,12 @@ void inject_nmi(struct kvm_vcpu *vcpu) {struct kvm_vcpu_events events; -vcpu_events_get (vcpu->vm, vcpu->id, &events); +vcpu_events_get (vcpu, &events); events.nmi.pending =1 ; events.flags |=KVM_VCPUEVENT_VALID_NMI_PENDING ; -vcpu_events_set (vcpu->vm, vcpu->id, &events); +vcpu_events_set (vcpu, &events); } static struct kvm_vcpu *save_restore_vm(struct kvm_vm *vm,
@@ -175,21 +175,21 @@ static struct kvm_vcpu *save_restore_vm(struct kvm_vm *vm,struct kvm_regs regs1, regs2;struct kvm_x86_state *state; - state =vcpu_save_state (vm, vcpu->id); + state =vcpu_save_state (vcpu);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm, vcpu->id, ®s1); +vcpu_regs_get (vcpu, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm); -vcpu_set_hv_cpuid (vm, vcpu->id); -vcpu_enable_evmcs (vm, vcpu->id); -vcpu_load_state (vm, vcpu->id, state); +vcpu_set_hv_cpuid (vcpu); +vcpu_enable_evmcs (vcpu); +vcpu_load_state (vcpu, state);kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm, vcpu->id, ®s2); +vcpu_regs_get (vcpu, ®s2);TEST_ASSERT (!memcmp (®s1, ®s2,sizeof (regs2)),"Unexpected register values after vcpu_load_state; rdi: %lx rsi: %lx" , (ulong ) regs2.rdi, (ulong ) regs2.rsi);
@@ -215,14 +215,14 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } -vcpu_set_hv_cpuid (vm, vcpu->id); -vcpu_enable_evmcs (vm, vcpu->id); +vcpu_set_hv_cpuid (vcpu); +vcpu_enable_evmcs (vcpu);vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva); +vcpu_args_set (vcpu,1 , vmx_pages_gva);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);vm_install_exception_handler (vm,NMI_VECTOR , guest_nmi_handler);
@@ -231,13 +231,13 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) { run = vcpu->run; -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +3 -3
@@ -95,7 +95,7 @@ static void guest_main(void)static void setup_ud_vector (struct kvm_vcpu *vcpu) {vm_init_descriptor_tables (vcpu->vm); -vcpu_init_descriptor_tables (vcpu->vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);vm_install_exception_handler (vcpu->vm,UD_VECTOR , guest_ud_handler); }
@@ -104,8 +104,8 @@ static void enter_guest(struct kvm_vcpu *vcpu)struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vcpu->vm, vcpu->id); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +vcpu_run (vcpu); +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :pr_info ("%s: %016lx\n" , (const char *)uc.args[2 ], uc.args[3 ]);break ;
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +7 -7
@@ -176,15 +176,15 @@ static void host_check_tsc_msr_rdtsc(struct kvm_vcpu *vcpu)u64 tsc_freq, r1, r2, t1, t2;s64 delta_ns; - tsc_freq =vcpu_get_msr (vcpu->vm, vcpu->id,HV_X64_MSR_TSC_FREQUENCY ); + tsc_freq =vcpu_get_msr (vcpu,HV_X64_MSR_TSC_FREQUENCY );TEST_ASSERT (tsc_freq >0 ,"TSC frequency must be nonzero" );/* First, check MSR-based clocksource */ r1 =rdtsc (); - t1 =vcpu_get_msr (vcpu->vm, vcpu->id,HV_X64_MSR_TIME_REF_COUNT ); + t1 =vcpu_get_msr (vcpu,HV_X64_MSR_TIME_REF_COUNT );nop_loop (); r2 =rdtsc (); - t2 =vcpu_get_msr (vcpu->vm, vcpu->id,HV_X64_MSR_TIME_REF_COUNT ); + t2 =vcpu_get_msr (vcpu,HV_X64_MSR_TIME_REF_COUNT );TEST_ASSERT (t2 > t1,"Time reference MSR is not monotonic (%ld <= %ld)" , t1, t2);
@@ -211,24 +211,24 @@ int main(void) vm =vm_create_with_one_vcpu (&vcpu, guest_main); run = vcpu->run; -vcpu_set_hv_cpuid (vm, vcpu->id); +vcpu_set_hv_cpuid (vcpu); tsc_page_gva =vm_vaddr_alloc_page (vm);memset (addr_gva2hva (vm, tsc_page_gva),0x0 ,getpagesize ());TEST_ASSERT ((addr_gva2gpa (vm, tsc_page_gva) & (getpagesize () -1 )) ==0 ,"TSC page has to be page aligned\n" ); -vcpu_args_set (vm, vcpu->id,2 , tsc_page_gva,addr_gva2gpa (vm, tsc_page_gva)); +vcpu_args_set (vcpu,2 , tsc_page_gva,addr_gva2gpa (vm, tsc_page_gva));host_check_tsc_msr_rdtsc (vcpu);for (stage =1 ;; stage++) { -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +4 -4
@@ -119,7 +119,7 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, struct kvm_vcpu *vcpu)int ret;if (vcpu) - ret =__vcpu_ioctl (vm, vcpu->id,KVM_GET_SUPPORTED_HV_CPUID , &cpuid); + ret =__vcpu_ioctl (vcpu,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);else ret =__kvm_ioctl (vm_get_kvm_fd (vm),KVM_GET_SUPPORTED_HV_CPUID , &cpuid);
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])/* Test vCPU ioctl version */ test_hv_cpuid_e2big (vm, vcpu); - hv_cpuid_entries =vcpu_get_supported_hv_cpuid (vm, vcpu->id); + hv_cpuid_entries =vcpu_get_supported_hv_cpuid (vcpu);test_hv_cpuid (hv_cpuid_entries, false);free (hv_cpuid_entries);
@@ -156,8 +156,8 @@ int main(int argc, char *argv[])print_skip ("Enlightened VMCS is unsupported" ); goto do_sys; } -vcpu_enable_evmcs (vm, vcpu->id); - hv_cpuid_entries =vcpu_get_supported_hv_cpuid (vm, vcpu->id); +vcpu_enable_evmcs (vcpu); + hv_cpuid_entries =vcpu_get_supported_hv_cpuid (vcpu);test_hv_cpuid (hv_cpuid_entries, true);free (hv_cpuid_entries);
tools/testing/selftests/kvm/x86_64/hyperv_features.c +14 -14
@@ -161,7 +161,7 @@ static void hv_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, "failed to set HYPERV_CPUID_ENLIGHTMENT_INFO leaf");TEST_ASSERT (set_cpuid (cpuid, dbg),"failed to set HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES leaf" ); -vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); +vcpu_set_cpuid (vcpu, cpuid); }static void guest_test_msrs_access (void )
@@ -191,15 +191,15 @@ static void guest_test_msrs_access(void)memset (addr_gva2hva (vm, msr_gva),0x0 ,getpagesize ()); msr =addr_gva2hva (vm, msr_gva); -vcpu_args_set (vm, vcpu->id,1 , msr_gva); -vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); +vcpu_args_set (vcpu,1 , msr_gva); +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); -vcpu_set_hv_cpuid (vm, vcpu->id); +vcpu_set_hv_cpuid (vcpu); best =kvm_get_supported_hv_cpuid ();vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);vm_install_exception_handler (vm,GP_VECTOR , guest_gp_handler); run = vcpu->run;
@@ -333,7 +333,7 @@ static void guest_test_msrs_access(void)* Remains unavailable even with KVM_CAP_HYPERV_SYNIC2 * capability enabled and guest visible CPUID bit unset. */ -vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_SYNIC2 ,0 ); +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_SYNIC2 ,0 );break ;case 22 : feat.eax |=HV_MSR_SYNIC_AVAILABLE ;
@@ -471,12 +471,12 @@ static void guest_test_msrs_access(void)else pr_debug ("Stage %d: finish\n" , stage); -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected stage: %ld (0 expected)\n",
@@ -520,7 +520,7 @@ static void guest_test_hcalls_access(void) vm =vm_create_with_one_vcpu (&vcpu, guest_hcall);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm, vcpu->id); +vcpu_init_descriptor_tables (vcpu);vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);/* Hypercall input/output */
@@ -531,10 +531,10 @@ static void guest_test_hcalls_access(void) hcall_params =vm_vaddr_alloc_page (vm);memset (addr_gva2hva (vm, hcall_params),0x0 ,getpagesize ()); -vcpu_args_set (vm, vcpu->id,2 ,addr_gva2gpa (vm, hcall_page), hcall_params); -vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); +vcpu_args_set (vcpu,2 ,addr_gva2gpa (vm, hcall_page), hcall_params); +vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); -vcpu_set_hv_cpuid (vm, vcpu->id); +vcpu_set_hv_cpuid (vcpu); best =kvm_get_supported_hv_cpuid ();
@@ -641,12 +641,12 @@ static void guest_test_hcalls_access(void)else pr_debug ("Stage %d: finish\n" , stage); -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected stage: %ld (0 expected)\n",
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +4 -4
@@ -133,19 +133,19 @@ int main(int argc, char *argv[]) }/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); -vcpu_set_hv_cpuid (vm, vcpu->id); +vcpu_set_hv_cpuid (vcpu); run = vcpu->run;vcpu_alloc_svm (vm, &nested_gva); -vcpu_args_set (vm, vcpu->id,1 , nested_gva); +vcpu_args_set (vcpu,1 , nested_gva);for (stage =1 ;; stage++) { -vcpu_run (vm, vcpu->id); +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)); -switch (get_ucall (vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +3 -3
@@ -116,14 +116,14 @@ static void enter_guest(struct kvm_vcpu *vcpu)vm_ioctl (vm,KVM_GET_CLOCK , &start); -vcpu_run (vcpu->vm, vcpu->id); +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)); -switch (get_ucall (vcpu->vm, vcpu->id, &uc)) { +switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :handle_sync (&uc, &start, &end);break ;
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +5 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/mmu_role_test.c +5 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/platform_info_test.c +7 -7
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +4 -4
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +2 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/set_sregs_test.c +8 -8
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/smm_test.c +9 -9
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/state_test.c +9 -9
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c +4 -4
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +5 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/sync_regs_test.c +18 -18
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +8 -8
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c +7 -7
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/userspace_io_test.c +4 -4
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +11 -11
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +5 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c +6 -6
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +5 -6
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +10 -10
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +9 -9
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +6 -6
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +5 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/xapic_state_test.c +21 -21
42 lines not on this page · raw message
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +19 -19
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +3 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +3 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Part of the diff is not shown here. View the raw message.
Re: [PATCH v2 132/144] KVM: selftests: Purge vm+vcpu_id == vcpu silliness
...
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +0
-6@@ -1485,73 +1446,57 @@ void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid) }/* -* VM VCPU Get Reg List -* -* Input Args: -* vm - Virtual Machine -* vcpuid - VCPU ID -*
tools/testing/selftests/kvm/lib/kvm_util.c void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid) · line 1451
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +2
-7-* Output Args: -* None -* -* Return: -* A pointer to an allocated struct kvm_reg_list -* * Get the list of guest registers which are supported for -* KVM_GET_ONE_REG/KVM_SET_ONE_REG calls +* KVM_GET_ONE_REG/KVM_SET_ONE_REG ioctls. Returns a kvm_reg_list pointer, +* it is the callers responsibility to free the list.
nit: caller's or callers'
Thanks,
drew
Sean Christopherson
reviewerPATCH v2 133/144 KVM: selftests: Drop vcpu_get(), rename vcpu_find() => vcpu_exists()
In reply to Sean ChristophersonDrop vcpu_get() and rename vcpu_find() to vcpu_exists() to make it that much harder for a test to give meaning to a vCPU ID. I.e. force tests to capture a vCPU when the vCPU is created.
--- .../selftests/kvm/include/kvm_util_base.h | 2 -- tools/testing/selftests/kvm/lib/kvm_util.c | 34 +++++++------------ 2 files changed, 13 insertions(+), 23 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -2
@@ -93,8 +93,6 @@ struct kvm_vm {continue ; \ else -struct kvm_vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpu_id); - struct userspace_mem_region *memslot2region (struct kvm_vm *vm,uint32_t memslot);
tools/testing/selftests/kvm/lib/kvm_util.c +13 -21
@@ -459,26 +459,6 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,return ®ion->region; } -static struct kvm_vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpu_id) -{ -struct kvm_vcpu *vcpu; - -list_for_each_entry (vcpu, &vm->vcpus, list) { -if (vcpu->id == vcpu_id) -return vcpu; - } - -return NULL ; -} - -struct kvm_vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpu_id) -{ -struct kvm_vcpu *vcpu =vcpu_find (vm, vcpu_id); - -TEST_ASSERT (vcpu,"vCPU %d does not exist" , vcpu_id); -return vcpu; -} -/* * VM VCPU Remove *
@@ -1049,6 +1029,18 @@ static int vcpu_mmap_sz(void)return ret; } +static bool vcpu_exists (struct kvm_vm *vm,uint32_t vcpu_id) +{ +struct kvm_vcpu *vcpu; + +list_for_each_entry (vcpu, &vm->vcpus, list) { +if (vcpu->id == vcpu_id) +return true; + } + +return false; +} +/* * Adds a virtual CPU to the VM specified by vm with the ID given by vcpu_id. * No additional vCPU setup is done. Returns the vCPU.
@@ -1058,7 +1050,7 @@ struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id)struct kvm_vcpu *vcpu;/* Confirm a vcpu with the specified id doesn't already exist. */ -TEST_ASSERT (!vcpu_find (vm, vcpu_id),"vCPU%d already exists\n" , vcpu_id); +TEST_ASSERT (!vcpu_exists (vm, vcpu_id),"vCPU%d already exists\n" , vcpu_id);/* Allocate and initialize new vcpu structure. */ vcpu =calloc (1 ,sizeof (*vcpu));
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 134/144 KVM: selftests: Remove vcpu_state() helper
In reply to Sean ChristophersonDrop vcpu_state() now that all tests reference vcpu->run directly.
--- .../selftests/kvm/include/kvm_util_base.h | 1 - tools/testing/selftests/kvm/lib/kvm_util.c | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -1
@@ -298,7 +298,6 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva);vm_paddr_t addr_hva2gpa (struct kvm_vm *vm,void *hva);void *addr_gpa2alias (struct kvm_vm *vm,vm_paddr_t gpa); -struct kvm_run *vcpu_state (struct kvm_vcpu *vcpu);void vcpu_run (struct kvm_vcpu *vcpu);int _vcpu_run (struct kvm_vcpu *vcpu);
tools/testing/selftests/kvm/lib/kvm_util.c +1 -18
@@ -1001,19 +1001,7 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot)__vm_mem_region_delete (vm,memslot2region (vm, slot), true); } -/* -* VCPU mmap Size -* -* Input Args: None -* -* Output Args: None -* -* Return: -* Size of VCPU state -* -* Returns the size of the structure pointed to by the return value -* of vcpu_state(). -*/ +/* Returns the size of a vCPU's kvm_run structure. */ static int vcpu_mmap_sz (void ) {int dev_fd, ret;
@@ -1394,11 +1382,6 @@ void vm_create_irqchip(struct kvm_vm *vm) vm->has_irqchip = true; } -struct kvm_run *vcpu_state (struct kvm_vcpu *vcpu) -{ -return vcpu->run; -} -int _vcpu_run (struct kvm_vcpu *vcpu) {
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 135/144 KVM: selftests: Open code and drop 'struct kvm_vm' accessors
In reply to Sean ChristophersonDrop a variety of 'struct kvm_vm' accessors that wrap a single variable now that tests can simply reference the variable directly.
--- .../selftests/kvm/dirty_log_perf_test.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 9 +++---- .../selftests/kvm/include/kvm_util_base.h | 6 ----- .../selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 25 ------------------- .../selftests/kvm/lib/perf_test_util.c | 7 +++--- .../selftests/kvm/max_guest_memory_test.c | 11 ++++---- .../kvm/memslot_modification_stress_test.c | 2 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 2 +- 9 files changed, 16 insertions(+), 50 deletions(-)
tools/testing/selftests/kvm/dirty_log_perf_test.c +1 -1
@@ -221,7 +221,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)perf_test_set_wr_fract (vm, p->wr_fract); - guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >>vm_get_page_shift (vm); + guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >> vm->page_shift; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); host_num_pages =vm_num_host_pages (mode, guest_num_pages); pages_per_slot = host_num_pages / p->slots;
tools/testing/selftests/kvm/dirty_log_test.c +4 -5
@@ -713,21 +713,20 @@ static void run_test(enum vm_guest_mode mode, void *arg) vm =create_vm (mode, &vcpu,2ul << (DIRTY_MEM_BITS -PAGE_SHIFT_4K ), guest_code); - guest_page_size =vm_get_page_size (vm); + guest_page_size = vm->page_size;/* * A little more than 1G of guest page sized pages. Cover the * case where the size is not aligned to 64 pages. */ - guest_num_pages = (1ul << (DIRTY_MEM_BITS - -vm_get_page_shift (vm))) +3 ; + guest_num_pages = (1ul << (DIRTY_MEM_BITS - vm->page_shift)) +3 ; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); host_page_size =getpagesize (); host_num_pages =vm_num_host_pages (mode, guest_num_pages);if (!p->phys_offset) { - guest_test_phys_mem = (vm_get_max_gfn (vm) - - guest_num_pages) * guest_page_size; + guest_test_phys_mem = (vm->max_gfn - guest_num_pages) * + guest_page_size; guest_test_phys_mem =align_down (guest_test_phys_mem, host_page_size); }else { guest_test_phys_mem = p->phys_offset;
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -6
@@ -592,13 +592,7 @@ static inline struct kvm_vm *vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm); -unsigned int vm_get_page_size (struct kvm_vm *vm); -unsigned int vm_get_page_shift (struct kvm_vm *vm);unsigned long vm_compute_max_gfn (struct kvm_vm *vm); -uint64_t vm_get_max_gfn (struct kvm_vm *vm); -int vm_get_kvm_fd (struct kvm_vm *vm); -int vm_get_fd (struct kvm_vm *vm); -unsigned int vm_calc_num_guest_pages (enum vm_guest_mode mode,size_t size);unsigned int vm_num_host_pages (enum vm_guest_mode mode,unsigned int num_guest_pages);unsigned int vm_num_guest_pages (enum vm_guest_mode mode,unsigned int num_host_pages);
tools/testing/selftests/kvm/kvm_page_table_test.c +1 -1
@@ -260,7 +260,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Align down GPA of the testing memslot */ if (!p->phys_offset) - guest_test_phys_mem = (vm_get_max_gfn (vm) - guest_num_pages) * + guest_test_phys_mem = (vm->max_gfn - guest_num_pages) * guest_page_size;else guest_test_phys_mem = p->phys_offset;
tools/testing/selftests/kvm/lib/kvm_util.c +0 -25
@@ -1827,36 +1827,11 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva)return addr_gpa2hva (vm,addr_gva2gpa (vm, gva)); } -unsigned int vm_get_page_size (struct kvm_vm *vm) -{ -return vm->page_size; -} - -unsigned int vm_get_page_shift (struct kvm_vm *vm) -{ -return vm->page_shift; -} -unsigned long __attribute__((weak))vm_compute_max_gfn (struct kvm_vm *vm) {return ((1ULL << vm->pa_bits) >> vm->page_shift) -1 ; } -uint64_t vm_get_max_gfn (struct kvm_vm *vm) -{ -return vm->max_gfn; -} - -int vm_get_kvm_fd (struct kvm_vm *vm) -{ -return vm->kvm_fd; -} - -int vm_get_fd (struct kvm_vm *vm) -{ -return vm->fd; -} - static unsigned int vm_calc_num_pages(unsigned int num_pages, unsigned int page_shift, unsigned int new_page_shift,
tools/testing/selftests/kvm/lib/perf_test_util.c +3 -4
@@ -153,14 +153,13 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,* If there should be more memory in the guest test region than there * can be pages in the guest, it will definitely cause problems. */ -TEST_ASSERT (guest_num_pages <vm_get_max_gfn (vm), +TEST_ASSERT (guest_num_pages < vm->max_gfn,"Requested more guest memory than address space allows.\n" " guest pages: %" PRIx64" max gfn: %" PRIx64" nr_vcpus: %d wss: %" PRIx64"]\n" , - guest_num_pages,vm_get_max_gfn (vm), nr_vcpus, - vcpu_memory_bytes); + guest_num_pages, vm->max_gfn, nr_vcpus, vcpu_memory_bytes); - pta->gpa = (vm_get_max_gfn (vm) - guest_num_pages) * pta->guest_page_size; + pta->gpa = (vm->max_gfn - guest_num_pages) * pta->guest_page_size; pta->gpa =align_down (pta->gpa, backing_src_pagesz);#ifdef __s390x__/* Align to 1M (segment size) */
tools/testing/selftests/kvm/max_guest_memory_test.c +5 -6
@@ -65,8 +65,7 @@ static void *vcpu_worker(void *data)struct kvm_sregs sregs;struct kvm_regs regs; -vcpu_args_set (vcpu,3 , info->start_gpa, info->end_gpa, -vm_get_page_size (vm)); +vcpu_args_set (vcpu,3 , info->start_gpa, info->end_gpa, vm->page_size);/* Snapshot regs before the first run. */ vcpu_regs_get (vcpu, ®s);
@@ -104,7 +103,7 @@ static pthread_t *spawn_workers(struct kvm_vm *vm, struct kvm_vcpu **vcpus,TEST_ASSERT (info,"Failed to allocate vCPU gpa ranges" ); nr_bytes = ((end_gpa - start_gpa) / nr_vcpus) & - ~((uint64_t )vm_get_page_size (vm) -1 ); + ~((uint64_t )vm->page_size -1 );TEST_ASSERT (nr_bytes,"C'mon, no way you have %d CPUs" , nr_vcpus);for (i =0 , gpa = start_gpa; i < nr_vcpus; i++, gpa += nr_bytes) {
@@ -220,7 +219,7 @@ int main(int argc, char *argv[]) vm =vm_create_with_vcpus (nr_vcpus, guest_code, vcpus); - max_gpa =vm_get_max_gfn (vm) <<vm_get_page_shift (vm); + max_gpa = vm->max_gfn << vm->page_shift;TEST_ASSERT (max_gpa > (4 * slot_size),"MAXPHYADDR <4gb " ); fd =kvm_memfd_alloc (slot_size, hugepages);
@@ -230,7 +229,7 @@ int main(int argc, char *argv[])TEST_ASSERT (!madvise (mem, slot_size,MADV_NOHUGEPAGE ),"madvise() failed" );/* Pre-fault the memory to avoid taking mmap_sem on guest page faults. */ -for (i =0 ; i < slot_size; i +=vm_get_page_size (vm)) +for (i =0 ; i < slot_size; i += vm->page_size) ((uint8_t *)mem)[i] =0xaa ; gpa =0 ;
@@ -249,7 +248,7 @@ int main(int argc, char *argv[])for (i =0 ; i < slot_size; i += size_1gb)__virt_pg_map (vm, gpa + i, gpa + i,X86_PAGE_SIZE_1G );#else -for (i =0 ; i < slot_size; i +=vm_get_page_size (vm)) +for (i =0 ; i < slot_size; i += vm->page_size)virt_pg_map (vm, gpa + i, gpa + i);#endif }
tools/testing/selftests/kvm/memslot_modification_stress_test.c +1 -1
@@ -75,7 +75,7 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay,* Add the dummy memslot just below the perf_test_util memslot, which is * at the top of the guest physical address space. */ - gpa = perf_test_args.gpa - pages *vm_get_page_size (vm); + gpa = perf_test_args.gpa - pages * vm->page_size;for (i =0 ; i < nr_modifications; i++) {usleep (delay);
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +1 -1
@@ -121,7 +121,7 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, struct kvm_vcpu *vcpu)if (vcpu) ret =__vcpu_ioctl (vcpu,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);else - ret =__kvm_ioctl (vm_get_kvm_fd (vm),KVM_GET_SUPPORTED_HV_CPUID , &cpuid); + ret =__kvm_ioctl (vm->kvm_fd,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);TEST_ASSERT (ret ==-1 && errno ==E2BIG , "%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when"
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 136/144 KVM: selftests: Drop @slot0_mem_pages from __vm_create_with_vcpus()
In reply to Sean ChristophersonAll callers of __vm_create_with_vcpus() pass DEFAULT_GUEST_PHY_PAGES for @slot_mem_pages; drop the param and just hardcode the "default" as the base number of pages for slot0.
--- .../selftests/kvm/include/kvm_util_base.h | 9 +++----- .../selftests/kvm/kvm_page_table_test.c | 5 ++--- tools/testing/selftests/kvm/lib/kvm_util.c | 21 +++++++------------ .../selftests/kvm/lib/perf_test_util.c | 4 ++-- 4 files changed, 14 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +3 -6
@@ -561,18 +561,15 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages)return __vm_create (VM_MODE_DEFAULT , nr_pages); } -/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */ struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t slot0_mem_pages,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -struct kvm_vcpu *vcpus[]); +uint64_t extra_mem_pages,uint32_t num_percpu_pages, +void *guest_code,struct kvm_vcpu *vcpus[]);static inline struct kvm_vm *vm_create_with_vcpus (uint32_t nr_vcpus,void *guest_code,struct kvm_vcpu *vcpus[]) { -return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus, -DEFAULT_GUEST_PHY_PAGES ,0 ,0 , +return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus,0 ,0 , guest_code, vcpus); }
tools/testing/selftests/kvm/kvm_page_table_test.c +2 -3
@@ -254,9 +254,8 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Create a VM with enough guest pages */ guest_num_pages = test_mem_size / guest_page_size; - vm =__vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code, - test_args.vcpus); + vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages,0 , + guest_code, test_args.vcpus);/* Align down GPA of the testing memslot */ if (!p->phys_offset)
tools/testing/selftests/kvm/lib/kvm_util.c +7 -14
@@ -280,7 +280,6 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)* Input Args: * mode - VM Mode (e.g. VM_MODE_P52V48_4K) * nr_vcpus - VCPU count -* slot0_mem_pages - Slot0 physical memory size * extra_mem_pages - Non-slot0 physical memory total size * num_percpu_pages - Per-cpu physical memory pages * guest_code - Guest entry point
@@ -291,15 +290,13 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)* Return: * Pointer to opaque structure that describes the created VM. * -* Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K), -* with customized slot0 memory size, at least 512 pages currently. +* Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K). * extra_mem_pages is only used to calculate the maximum page table size, * no real memory allocation for non-slot0 memory in this function. */ struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t slot0_mem_pages,uint64_t extra_mem_pages, -uint32_t num_percpu_pages,void *guest_code, -struct kvm_vcpu *vcpus[]) +uint64_t extra_mem_pages,uint32_t num_percpu_pages, +void *guest_code,struct kvm_vcpu *vcpus[]) {uint64_t vcpu_pages, extra_pg_pages, pages;struct kvm_vm *vm;
@@ -307,10 +304,6 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpusTEST_ASSERT (!nr_vcpus || vcpus,"Must provide vCPU array" ); -/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */ -if (slot0_mem_pages <DEFAULT_GUEST_PHY_PAGES ) - slot0_mem_pages =DEFAULT_GUEST_PHY_PAGES ; -/* The maximum page table size for a memory region will be when the * smallest pages are used. Considering each page contains x page * table descriptors, the total extra size for page tables (for extra
@@ -318,8 +311,8 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus* than N/x*2. */ vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus; - extra_pg_pages = (slot0_mem_pages + extra_mem_pages + vcpu_pages) /PTES_PER_MIN_PAGE *2 ; - pages = slot0_mem_pages + vcpu_pages + extra_pg_pages; + extra_pg_pages = (DEFAULT_GUEST_PHY_PAGES + extra_mem_pages + vcpu_pages) /PTES_PER_MIN_PAGE *2 ; + pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; TEST_ASSERT(nr_vcpus <= kvm_check_cap(KVM_CAP_MAX_VCPUS), "nr_vcpus = %d too large for host, max-vcpus = %d",
@@ -340,8 +333,8 @@ struct kvm_vm *__vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vcpu *vcpus[1 ];struct kvm_vm *vm; - vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 ,DEFAULT_GUEST_PHY_PAGES , - extra_mem_pages,0 , guest_code, vcpus); + vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 , extra_mem_pages,0 , + guest_code, vcpus); *vcpu = vcpus[0 ];return vm;
tools/testing/selftests/kvm/lib/perf_test_util.c +2 -2
@@ -144,8 +144,8 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,* The memory is also added to memslot 0, but that's a benign side * effect as KVM allows aliasing HVAs in meslots. */ - vm =__vm_create_with_vcpus (mode, nr_vcpus,DEFAULT_GUEST_PHY_PAGES , - guest_num_pages,0 , guest_code, vcpus); + vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages,0 , + guest_code, vcpus); pta->vm = vm;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 137/144 KVM: selftests: Drop @num_percpu_pages from __vm_create_with_vcpus()
In reply to Sean ChristophersonDrop @num_percpu_pages from __vm_create_with_vcpus(), all callers pass '0' and there's unlikely to be a test that allocates just enough memory that it needs a per-CPU allocation, but not so much that it won't just do its own memory management.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 4 ++-- tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 7 +++---- tools/testing/selftests/kvm/lib/perf_test_util.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -2
@@ -562,14 +562,14 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages) }struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t extra_mem_pages,uint32_t num_percpu_pages, +uint64_t extra_mem_pages,void *guest_code,struct kvm_vcpu *vcpus[]);static inline struct kvm_vm *vm_create_with_vcpus (uint32_t nr_vcpus,void *guest_code,struct kvm_vcpu *vcpus[]) { -return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus,0 ,0 , +return __vm_create_with_vcpus (VM_MODE_DEFAULT , nr_vcpus,0 , guest_code, vcpus); }
tools/testing/selftests/kvm/kvm_page_table_test.c +1 -1
@@ -254,7 +254,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)/* Create a VM with enough guest pages */ guest_num_pages = test_mem_size / guest_page_size; - vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages,0 , + vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages, guest_code, test_args.vcpus);/* Align down GPA of the testing memslot */
tools/testing/selftests/kvm/lib/kvm_util.c +3 -4
@@ -281,7 +281,6 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)* mode - VM Mode (e.g. VM_MODE_P52V48_4K) * nr_vcpus - VCPU count * extra_mem_pages - Non-slot0 physical memory total size -* num_percpu_pages - Per-cpu physical memory pages * guest_code - Guest entry point * vcpuids - VCPU IDs *
@@ -295,7 +294,7 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)* no real memory allocation for non-slot0 memory in this function. */ struct kvm_vm *__vm_create_with_vcpus (enum vm_guest_mode mode,uint32_t nr_vcpus, -uint64_t extra_mem_pages,uint32_t num_percpu_pages, +uint64_t extra_mem_pages,void *guest_code,struct kvm_vcpu *vcpus[]) {uint64_t vcpu_pages, extra_pg_pages, pages;
@@ -310,7 +309,7 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus* N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller * than N/x*2. */ - vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus; + vcpu_pages = nr_vcpus *DEFAULT_STACK_PGS ; extra_pg_pages = (DEFAULT_GUEST_PHY_PAGES + extra_mem_pages + vcpu_pages) /PTES_PER_MIN_PAGE *2 ; pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;
@@ -333,7 +332,7 @@ struct kvm_vm *__vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,struct kvm_vcpu *vcpus[1 ];struct kvm_vm *vm; - vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 , extra_mem_pages,0 , + vm =__vm_create_with_vcpus (VM_MODE_DEFAULT ,1 , extra_mem_pages, guest_code, vcpus); *vcpu = vcpus[0 ];
tools/testing/selftests/kvm/lib/perf_test_util.c +1 -1
@@ -144,7 +144,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,* The memory is also added to memslot 0, but that's a benign side * effect as KVM allows aliasing HVAs in meslots. */ - vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages,0 , + vm =__vm_create_with_vcpus (mode, nr_vcpus, guest_num_pages, guest_code, vcpus); pta->vm = vm;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 138/144 KVM: selftests: Move per-VM/per-vCPU nr pages calculation to __vm_create()
In reply to Sean ChristophersonHandle all memslot0 size adjustments in __vm_create(). Currently, the adjustments reside in __vm_create_with_vcpus(), which means tests that call vm_create() or __vm_create() directly are left to their own devices. Some tests just pass DEFAULT_GUEST_PHY_PAGES and don't bother with any adjustments, while others mimic the per-vCPU calculations.
For vm_create(), and thus __vm_create(), take the number of vCPUs that will be runnable to calculate that number of per-vCPU pages needed for memslot0. To give readers a hint that neither vm_create() nor __vm_create() create vCPUs, name the parameter @nr_runnable_vcpus instead of @nr_vcpus. That also gives readers a hint as to why tests that create larger numbers of vCPUs but never actually run those vCPUs can skip straight to the vm_create_barebones() variant.
--- .../testing/selftests/kvm/aarch64/psci_test.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 4 +- tools/testing/selftests/kvm/dirty_log_test.c | 3 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../selftests/kvm/include/kvm_util_base.h | 9 ++- tools/testing/selftests/kvm/lib/kvm_util.c | 56 ++++++++++++------- tools/testing/selftests/kvm/s390x/resets.c | 2 +- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 5 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 2 +- 10 files changed, 52 insertions(+), 35 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -1
@@ -76,7 +76,7 @@ static struct kvm_vm *setup_vm(void *guest_code, struct kvm_vcpu **source,struct kvm_vcpu_init init;struct kvm_vm *vm; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (2 );ucall_init (vm,NULL );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init);
tools/testing/selftests/kvm/aarch64/vgic_init.c +2 -2
@@ -403,7 +403,7 @@ static void test_v3_typer_accesses(void)uint32_t val;int ret, i; - v.vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + v.vm =vm_create (NR_VCPUS ); (void )vm_vcpu_add (v.vm,0 , guest_code); v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 );
@@ -472,7 +472,7 @@ static struct vm_gic vm_gic_v3_create_with_vcpuids(int nr_vcpus,struct vm_gic v;int i; - v.vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + v.vm =vm_create (nr_vcpus);for (i =0 ; i < nr_vcpus; i++)vm_vcpu_add (v.vm, vcpuids[i], guest_code);
tools/testing/selftests/kvm/dirty_log_test.c +1 -2
@@ -669,11 +669,10 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, struct kvm_vcpu **vcpu, uint64_t extra_mem_pages, void *guest_code) { struct kvm_vm *vm; -uint64_t extra_pg_pages = extra_mem_pages /512 *2 ;pr_info ("Testing guest mode: %s\n" ,vm_guest_mode_string (mode)); - vm =__vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages); + vm =__vm_create (mode,1 , extra_mem_pages);log_mode_create_vm_done (vm); *vcpu =vm_vcpu_add (vm,0 , guest_code);
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -98,7 +98,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set); - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (VCPU_NUM );pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) {
tools/testing/selftests/kvm/include/kvm_util_base.h +6 -3
@@ -547,18 +547,21 @@ vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm);/* * ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also * loads the test binary into guest memory and creates an IRQ chip (x86 only). +* __vm_create() does NOT create vCPUs, @nr_runnable_vcpus is used purely to +* calculate the amount of memory needed for per-vCPU data, e.g. stacks. */ struct kvm_vm *____vm_create (enum vm_guest_mode mode,uint64_t nr_pages); -struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint32_t nr_runnable_vcpus, +uint64_t nr_extra_pages);static inline struct kvm_vm *vm_create_barebones (void ) {return ____vm_create (VM_MODE_DEFAULT ,0 ); } -static inline struct kvm_vm *vm_create (uint64_t nr_pages) +static inline struct kvm_vm *vm_create (uint32_t nr_runnable_vcpus) { -return __vm_create (VM_MODE_DEFAULT , nr_pages); +return __vm_create (VM_MODE_DEFAULT , nr_runnable_vcpus,0 ); } struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
tools/testing/selftests/kvm/lib/kvm_util.c +37 -19
76 lines not on this page · raw message
tools/testing/selftests/kvm/s390x/resets.c +1 -1
@@ -205,7 +205,7 @@ static struct kvm_vm *create_vm(struct kvm_vcpu **vcpu) {struct kvm_vm *vm; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (1 ); *vcpu =vm_vcpu_add (vm,ARBITRARY_NON_ZERO_VCPU_ID , guest_code_initial);
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -339,7 +339,7 @@ static void test_pmu_config_disable(void (*guest_code)(void))if (!(r &KVM_PMU_CAP_DISABLE ))return ; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (1 );vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE );
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -4
@@ -78,13 +78,10 @@ static void run_vcpu(struct kvm_vcpu *vcpu)static struct kvm_vm *create_vm (uint32_t nr_vcpus,uint32_t bsp_vcpu_id,struct kvm_vcpu *vcpus[]) { -uint64_t vcpu_pages = (DEFAULT_STACK_PGS ) * nr_vcpus; -uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE * nr_vcpus; -uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;struct kvm_vm *vm;uint32_t i; - vm =vm_create (pages); + vm =vm_create (nr_vcpus);vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)(unsigned long )bsp_vcpu_id);
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -1
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create (DEFAULT_GUEST_PHY_PAGES +DEFAULT_STACK_PGS *NR_TEST_VCPUS ); + vm =vm_create (NR_TEST_VCPUS );vm_ioctl (vm,KVM_SET_TSC_KHZ , (void *)TEST_TSC_KHZ );pthread_spin_init (&create_lock,PTHREAD_PROCESS_PRIVATE );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 138/144] KVM: selftests: Move per-VM/per-vCPU nr pages calculation to __vm_create()
On Fri, Jun 03, 2022 at 12:43:25AM +0000, Sean Christopherson wrote:
...
Quoted 27 lines
tools/testing/selftests/kvm/lib/kvm_util.c +17
-1@@ -258,12 +258,45 @@ struct kvm_vm *____vm_create(enum vm_guest_mode mode, uint64_t nr_pages)return vm; } -struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages) +static uint64_t vm_nr_pages_required (uint32_t nr_runnable_vcpus, +uint64_t extra_mem_pages) { +uint64_t nr_pages; + +TEST_ASSERT (nr_runnable_vcpus, +"Use vm_create_barebones() for VMs that _never_ have vCPUs\n" ); + +TEST_ASSERT (nr_runnable_vcpus <=kvm_check_cap (KVM_CAP_MAX_VCPUS ), +"nr_vcpus = %d too large for host, max-vcpus = %d" , + nr_runnable_vcpus,kvm_check_cap (KVM_CAP_MAX_VCPUS )); + + nr_pages =DEFAULT_GUEST_PHY_PAGES ; + nr_pages += nr_runnable_vcpus *DEFAULT_STACK_PGS ; + +/* +* Account for the number of pages needed for the page tables. The +* maximum page table size for a memory region will be when the
tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *____vm_create(enum vm_guest_mode mode, uint64_t nr_pages) · line 288
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +10
-0+* smallest page size is used. Considering each page contains x page +* table descriptors, the total extra size for page tables (for extra +* N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller +* than N/x*2. +*/ + nr_pages += (nr_pages + extra_mem_pages) /PTES_PER_MIN_PAGE *2 ; + +TEST_ASSERT (nr_runnable_vcpus <=kvm_check_cap (KVM_CAP_MAX_VCPUS ), +"Host doesn't support %d vCPUs, max-vcpus = %d" , + nr_runnable_vcpus,kvm_check_cap (KVM_CAP_MAX_VCPUS ));
This assert is a repeat of the second assert above.
tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *____vm_create(enum vm_guest_mode mode, uint64_t nr_pages) · line 290
Quoted 2 lines
tools/testing/selftests/kvm/lib/kvm_util.c +2
-0+ +return vm_adjust_num_guest_pages (VM_MODE_DEFAULT , nr_pages);
We should use 'mode' here which means we need to pass it to this helper from __vm_create.
Quoted 104 lines
tools/testing/selftests/kvm/lib/kvm_util.c +8
-18+} + +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint32_t nr_runnable_vcpus, +uint64_t nr_extra_pages) +{ +uint64_t nr_pages =vm_nr_pages_required (nr_runnable_vcpus, + nr_extra_pages);struct kvm_vm *vm; - nr_pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , nr_pages); - vm =____vm_create (mode, nr_pages);kvm_vm_elf_load (vm, program_invocation_name);@@ -297,27 +330,12 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpusuint64_t extra_mem_pages, void *guest_code, struct kvm_vcpu *vcpus[]) { - uint64_t vcpu_pages, extra_pg_pages, pages; struct kvm_vm *vm;int i;TEST_ASSERT (!nr_vcpus || vcpus,"Must provide vCPU array" ); -/* The maximum page table size for a memory region will be when the -* smallest pages are used. Considering each page contains x page -* table descriptors, the total extra size for page tables (for extra -* N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller -* than N/x*2. -*/ - vcpu_pages = nr_vcpus *DEFAULT_STACK_PGS ; - extra_pg_pages = (DEFAULT_GUEST_PHY_PAGES + extra_mem_pages + vcpu_pages) /PTES_PER_MIN_PAGE *2 ; - pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; - -TEST_ASSERT (nr_vcpus <=kvm_check_cap (KVM_CAP_MAX_VCPUS ), -"nr_vcpus = %d too large for host, max-vcpus = %d" , - nr_vcpus,kvm_check_cap (KVM_CAP_MAX_VCPUS )); - - vm =__vm_create (mode, pages); + vm =__vm_create (mode, nr_vcpus, extra_mem_pages);for (i =0 ; i < nr_vcpus; ++i) vcpus[i] =vm_vcpu_add (vm, i, guest_code);tools/testing/selftests/kvm/s390x/resets.c +1
-1@@ -205,7 +205,7 @@ static struct kvm_vm *create_vm(struct kvm_vcpu **vcpu) {struct kvm_vm *vm; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (1 ); *vcpu =vm_vcpu_add (vm,ARBITRARY_NON_ZERO_VCPU_ID , guest_code_initial);tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1
-1@@ -339,7 +339,7 @@ static void test_pmu_config_disable(void (*guest_code)(void))if (!(r &KVM_PMU_CAP_DISABLE ))return ; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (1 );vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE );tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1
-4@@ -78,13 +78,10 @@ static void run_vcpu(struct kvm_vcpu *vcpu)static struct kvm_vm *create_vm (uint32_t nr_vcpus,uint32_t bsp_vcpu_id,struct kvm_vcpu *vcpus[]) { -uint64_t vcpu_pages = (DEFAULT_STACK_PGS ) * nr_vcpus; -uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE * nr_vcpus; -uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;struct kvm_vm *vm;uint32_t i; - vm =vm_create (pages); + vm =vm_create (nr_vcpus);vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)(unsigned long )bsp_vcpu_id);tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1
-1@@ -98,7 +98,7 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create (DEFAULT_GUEST_PHY_PAGES +DEFAULT_STACK_PGS *NR_TEST_VCPUS ); + vm =vm_create (NR_TEST_VCPUS );vm_ioctl (vm,KVM_SET_TSC_KHZ , (void *)TEST_TSC_KHZ );pthread_spin_init (&create_lock,PTHREAD_PROCESS_PRIVATE );Signature · 1 line
2.36.1.255.ge46751e96f-goog
Thanks,
drew
Sean Christopherson
reviewerPATCH v2 139/144 KVM: selftests: Trust that MAXPHYADDR > memslot0 in vmx_apic_access_test
In reply to Sean ChristophersonUse vm->max_gfn to compute the highest gpa in vmx_apic_access_test, and blindly trust that the highest gfn/gpa will be well above the memory carved out for memslot0. The existing check is beyond paranoid; KVM doesn't support CPUs with host.MAXPHYADDR < 32, and the selftests are all kinds of hosed if memslot0 overlaps the local xAPIC, which resides above "lower" (below 4gb) DRAM.
--- .../testing/selftests/kvm/x86_64/vmx_apic_access_test.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +1 -8
@@ -72,8 +72,6 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa)int main (int argc,char *argv[]) {unsigned long apic_access_addr = ~0ul ; -unsigned int paddr_width; -unsigned int vaddr_width;vm_vaddr_t vmx_pages_gva;unsigned long high_gpa;struct vmx_pages *vmx;
@@ -86,12 +84,7 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code); -kvm_get_cpu_address_width (&paddr_width, &vaddr_width); - high_gpa = (1ul << paddr_width) -getpagesize (); -if ((unsigned long )DEFAULT_GUEST_PHY_PAGES *getpagesize () > high_gpa) { -print_skip ("No unbacked physical page available" ); -exit (KSFT_SKIP ); - } + high_gpa = (vm->max_gfn -1 ) << vm->page_shift; vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva);prepare_virtualize_apic_accesses (vmx, vm);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 140/144 KVM: selftests: Drop DEFAULT_GUEST_PHY_PAGES, open code the magic number
In reply to Sean ChristophersonRemove DEFAULT_GUEST_PHY_PAGES and open code the magic number (with a comment) in vm_nr_pages_required(). Exposing DEFAULT_GUEST_PHY_PAGES to tests was a symptom of the VM creation APIs not cleanly supporting tests that create runnable vCPUs, but can't do so immediately. Now that tests don't have to manually compute the amount of memory needed for basic operation, make it harder for tests to do things that should be handled by the framework, i.e. force developers to improve the framework instead of hacking around flaws in individual tests.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 1 - tools/testing/selftests/kvm/lib/kvm_util.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -1
@@ -100,7 +100,6 @@ memslot2region(struct kvm_vm *vm, uint32_t memslot);#define KVM_UTIL_MIN_VADDR 0x2000#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 -#define DEFAULT_GUEST_PHY_PAGES 512#define DEFAULT_GUEST_STACK_VADDR_MIN 0xab6000#define DEFAULT_STACK_PGS 5
tools/testing/selftests/kvm/lib/kvm_util.c +7 -1
@@ -270,7 +270,13 @@ static uint64_t vm_nr_pages_required(uint32_t nr_runnable_vcpus,"nr_vcpus = %d too large for host, max-vcpus = %d" , nr_runnable_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); - nr_pages =DEFAULT_GUEST_PHY_PAGES ; +/* +* Arbitrarily allocate 512 pages (2mb when page size is 4kb) for the +* test code and other per-VM assets that will be loaded into memslot0. +*/ + nr_pages =512 ; + +/* Account for the per-vCPU stacks on behalf of the test. */ nr_pages += nr_runnable_vcpus *DEFAULT_STACK_PGS ;/*
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 141/144 KVM: selftests: Return an 'unsigned int' from kvm_check_cap()
In reply to Sean ChristophersonReturn an 'unsigned int' instead of a signed 'int' from kvm_check_cap(), to make it more obvious that kvm_check_cap() can never return a negative value due to its assertion that the return is ">= 0".
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -167,7 +167,7 @@ extern const struct vm_guest_mode_params vm_guest_mode_params[];int open_path_or_exit (const char *path,int flags);int open_kvm_dev_path_or_exit (void ); -int kvm_check_cap (long cap); +unsigned int kvm_check_cap (long cap);#define __KVM_SYSCALL_ERROR (_name, _ret) \ "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -213,7 +213,7 @@ int main(int argc, char *argv[]) }/* Check the extension for binary stats */ -if (kvm_check_cap (KVM_CAP_BINARY_STATS_FD ) <=0 ) { +if (!kvm_check_cap (KVM_CAP_BINARY_STATS_FD )) {print_skip ("Binary form statistics interface is not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -69,7 +69,7 @@ int open_kvm_dev_path_or_exit(void)* Looks up and returns the value corresponding to the capability * (KVM_CAP_*) given by cap. */ -int kvm_check_cap (long cap) +unsigned int kvm_check_cap (long cap) {int ret;int kvm_fd;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 142/144 KVM: selftests: Add kvm_has_cap() to provide syntactic sugar
In reply to Sean ChristophersonAdd kvm_has_cap() to wrap kvm_check_cap() and return a bool for the use cases where the caller only wants check if a capability is supported, i.e. doesn't care about the value beyond whether or not it's non-zero. The "check" terminology is somewhat ambiguous as the non-boolean return suggests that '0' might mean "success", i.e. suggests that the ioctl uses the 0/-errno pattern. Provide a wrapper instead of trying to find a new name for the raw helper; the "check" terminology is derived from the name of the ioctl, so using e.g. "get" isn't a clear win.
--- tools/testing/selftests/kvm/aarch64/get-reg-list.c | 2 +- tools/testing/selftests/kvm/aarch64/vcpu_width_config.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 4 ++-- tools/testing/selftests/kvm/include/kvm_util_base.h | 5 +++++ tools/testing/selftests/kvm/kvm_binary_stats_test.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++-- .../testing/selftests/kvm/lib/s390x/diag318_test_handler.c | 2 +- tools/testing/selftests/kvm/x86_64/debug_regs.c | 2 +- tools/testing/selftests/kvm/x86_64/emulator_error_test.c | 2 +- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 4 ++-- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 6 +++--- tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 2 +- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c | 4 ++-- .../testing/selftests/kvm/x86_64/triple_fault_event_test.c | 2 +- tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c | 2 +- .../selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c | 2 +- .../selftests/kvm/x86_64/vmx_preemption_timer_test.c | 2 +- .../selftests/kvm/x86_64/vmx_set_nested_state_test.c | 2 +- 19 files changed, 29 insertions(+), 24 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -395,7 +395,7 @@ static void check_supported(struct vcpu_config *c)struct reg_sublist *s;for_each_sublist (c, s) { -if (s->capability && !kvm_check_cap (s->capability)) { +if (s->capability && !kvm_has_cap (s->capability)) {fprintf (stderr,"%s: %s not available, skipping tests\n" ,config_name (c), s->name);exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +1 -1
@@ -82,7 +82,7 @@ int main(void)struct kvm_vm *vm;int ret; -if (!kvm_check_cap (KVM_CAP_ARM_EL1_32BIT )) { +if (!kvm_has_cap (KVM_CAP_ARM_EL1_32BIT )) {print_skip ("KVM_CAP_ARM_EL1_32BIT is not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/dirty_log_test.c +2 -2
@@ -210,7 +210,7 @@ static void sem_wait_until(sem_t *sem)static bool clear_log_supported (void ) { -return kvm_check_cap (KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 ); +return kvm_has_cap (KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 ); }static void clear_log_create_vm_done (struct kvm_vm *vm)
@@ -264,7 +264,7 @@ static void default_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)static bool dirty_ring_supported (void ) { -return kvm_check_cap (KVM_CAP_DIRTY_LOG_RING ); +return kvm_has_cap (KVM_CAP_DIRTY_LOG_RING ); }static void dirty_ring_create_vm_done (struct kvm_vm *vm)
tools/testing/selftests/kvm/include/kvm_util_base.h +5 -0
@@ -169,6 +169,11 @@ int open_path_or_exit(const char *path, int flags);int open_kvm_dev_path_or_exit (void );unsigned int kvm_check_cap (long cap); +static inline bool kvm_has_cap (long cap) +{ +return kvm_check_cap (cap); +} +#define __KVM_SYSCALL_ERROR (_name, _ret) \ "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -213,7 +213,7 @@ int main(int argc, char *argv[]) }/* Check the extension for binary stats */ -if (!kvm_check_cap (KVM_CAP_BINARY_STATS_FD )) { +if (!kvm_has_cap (KVM_CAP_BINARY_STATS_FD )) {print_skip ("Binary form statistics interface is not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/lib/kvm_util.c +2 -2
@@ -80,7 +80,7 @@ unsigned int kvm_check_cap(long cap)close (kvm_fd); -return ret; +return (unsigned int )ret; }void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size)
@@ -93,7 +93,7 @@ static void vm_open(struct kvm_vm *vm) { vm->kvm_fd =_open_kvm_dev_path_or_exit (O_RDWR ); -if (!kvm_check_cap (KVM_CAP_IMMEDIATE_EXIT )) { +if (!kvm_has_cap (KVM_CAP_IMMEDIATE_EXIT )) {print_skip ("immediate_exit not available" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +1 -1
@@ -61,7 +61,7 @@ uint64_t get_diag318_info(void)* If KVM does not support diag318, then return 0 to * ensure tests do not break. */ -if (!kvm_check_cap (KVM_CAP_S390_DIAG318 )) { +if (!kvm_has_cap (KVM_CAP_S390_DIAG318 )) {if (!printed_skip) {fprintf (stdout,"KVM_CAP_S390_DIAG318 not supported. " "Skipping diag318 test.\n" );
tools/testing/selftests/kvm/x86_64/debug_regs.c +1 -1
@@ -95,7 +95,7 @@ int main(void) 1, /* cli */ }; -if (!kvm_check_cap (KVM_CAP_SET_GUEST_DEBUG )) { +if (!kvm_has_cap (KVM_CAP_SET_GUEST_DEBUG )) {print_skip ("KVM_CAP_SET_GUEST_DEBUG not supported" );return 0 ; }
tools/testing/selftests/kvm/x86_64/emulator_error_test.c +1 -1
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -if (!kvm_check_cap (KVM_CAP_SMALLER_MAXPHYADDR )) { +if (!kvm_has_cap (KVM_CAP_SMALLER_MAXPHYADDR )) {printf ("module parameter 'allow_smaller_maxphyaddr' is not set. Skipping test.\n" );return 0 ; }
tools/testing/selftests/kvm/x86_64/evmcs_test.c +2 -2
@@ -209,8 +209,8 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code);if (!nested_vmx_supported () || - !kvm_check_cap (KVM_CAP_NESTED_STATE ) || - !kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { + !kvm_has_cap (KVM_CAP_NESTED_STATE ) || + !kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) {print_skip ("Enlightened VMCS is unsupported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +3 -3
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -if (!kvm_check_cap (KVM_CAP_HYPERV_CPUID )) { +if (!kvm_has_cap (KVM_CAP_HYPERV_CPUID )) {print_skip ("KVM_CAP_HYPERV_CPUID not supported" );exit (KSFT_SKIP ); }
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])free (hv_cpuid_entries);if (!nested_vmx_supported () || - !kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { + !kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) {print_skip ("Enlightened VMCS is unsupported" ); goto do_sys; }
@@ -163,7 +163,7 @@ int main(int argc, char *argv[]) do_sys:/* Test system ioctl version */ -if (!kvm_check_cap (KVM_CAP_SYS_HYPERV_CPUID )) { +if (!kvm_has_cap (KVM_CAP_SYS_HYPERV_CPUID )) {print_skip ("KVM_CAP_SYS_HYPERV_CPUID not supported" ); goto out; }
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -1
@@ -204,7 +204,7 @@ int main(void)struct kvm_vcpu *vcpu;struct kvm_vm *vm; -if (!kvm_check_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )) { +if (!kvm_has_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )) {print_skip ("KVM_CAP_ENFORCE_PV_FEATURE_CPUID not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -123,7 +123,7 @@ static void check_set_bsp_busy(void)int main (int argc,char *argv[]) { -if (!kvm_check_cap (KVM_CAP_SET_BOOT_CPU_ID )) { +if (!kvm_has_cap (KVM_CAP_SET_BOOT_CPU_ID )) {print_skip ("set_boot_cpu_id not available" );return 0 ; }
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +2 -2
@@ -400,8 +400,8 @@ int main(int argc, char *argv[]) {struct kvm_cpuid_entry2 *cpuid; -if (!kvm_check_cap (KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM ) && - !kvm_check_cap (KVM_CAP_VM_COPY_ENC_CONTEXT_FROM )) { +if (!kvm_has_cap (KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM ) && + !kvm_has_cap (KVM_CAP_VM_COPY_ENC_CONTEXT_FROM )) {print_skip ("Capabilities not available" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +1 -1
@@ -51,7 +51,7 @@ int main(void)exit (KSFT_SKIP ); } -if (!kvm_check_cap (KVM_CAP_X86_TRIPLE_FAULT_EVENT )) { +if (!kvm_has_cap (KVM_CAP_X86_TRIPLE_FAULT_EVENT )) {print_skip ("KVM_CAP_X86_TRIPLE_FAULT_EVENT not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -1
@@ -93,7 +93,7 @@ static void *run_vcpu(void *_cpu_nr)int main (int argc,char *argv[]) { -if (!kvm_check_cap (KVM_CAP_VM_TSC_CONTROL )) { +if (!kvm_has_cap (KVM_CAP_VM_TSC_CONTROL )) {print_skip ("KVM_CAP_VM_TSC_CONTROL not available" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +1 -1
@@ -118,7 +118,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)static void tsc_scaling_check_supported (void ) { -if (!kvm_check_cap (KVM_CAP_TSC_CONTROL )) { +if (!kvm_has_cap (KVM_CAP_TSC_CONTROL )) {print_skip ("TSC scaling not supported by the HW" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +1 -1
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])*/ nested_vmx_check_supported (); -if (!kvm_check_cap (KVM_CAP_NESTED_STATE )) { +if (!kvm_has_cap (KVM_CAP_NESTED_STATE )) {print_skip ("KVM_CAP_NESTED_STATE not supported" );exit (KSFT_SKIP ); }
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +1 -1
@@ -267,7 +267,7 @@ int main(int argc, char *argv[]) have_evmcs =kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS ); -if (!kvm_check_cap (KVM_CAP_NESTED_STATE )) { +if (!kvm_has_cap (KVM_CAP_NESTED_STATE )) {print_skip ("KVM_CAP_NESTED_STATE not available" );exit (KSFT_SKIP ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 142/144] KVM: selftests: Add kvm_has_cap() to provide syntactic sugar
On Fri, Jun 03, 2022 at 12:43:29AM +0000, Sean Christopherson wrote:
...
tools/testing/selftests/kvm/lib/kvm_util.c unsigned int kvm_check_cap(long cap) · line 84
Quoted 11 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1
-1@@ -80,7 +80,7 @@ unsigned int kvm_check_cap(long cap)close (kvm_fd); -return ret; +return (unsigned int )ret; }
This belongs in the last patch.
Thanks,
drew
Sean Christopherson
reviewerPATCH v2 143/144 KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste
In reply to Sean ChristophersonAdd TEST_REQUIRE() and __TEST_REQUIRE() to replace the myriad open coded instances of selftests exiting with KSFT_SKIP after printing an informational message. In addition to reducing the amount of boilerplate code in selftests, the UPPERCASE macro names make it easier to visually identify a test's requirements.
Convert usage that erroneously uses something other than print_skip() and/or "exits" with '0' or some other non-KSFT_SKIP value.
Intentionally drop a kvm_vm_free() in aarch64/debug-exceptions.c as part of the conversion. All memory and file descriptors are freed on process exit, so the explicit free is superfluous.
--- .../selftests/kvm/aarch64/arch_timer.c | 11 +++----- .../selftests/kvm/aarch64/debug-exceptions.c | 7 ++---- .../selftests/kvm/aarch64/get-reg-list.c | 10 +++++--- .../testing/selftests/kvm/aarch64/psci_test.c | 5 +--- .../selftests/kvm/aarch64/vcpu_width_config.c | 5 +--- .../testing/selftests/kvm/aarch64/vgic_init.c | 10 +++----- .../testing/selftests/kvm/aarch64/vgic_irq.c | 5 +--- .../selftests/kvm/access_tracking_perf_test.c | 11 +++----- .../testing/selftests/kvm/include/test_util.h | 9 +++++++ .../selftests/kvm/kvm_binary_stats_test.c | 5 +--- .../selftests/kvm/kvm_create_max_vcpus.c | 6 ++--- tools/testing/selftests/kvm/lib/kvm_util.c | 10 ++------ .../selftests/kvm/lib/x86_64/processor.c | 8 +++--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 5 +--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 5 +--- tools/testing/selftests/kvm/rseq_test.c | 13 ++++------ tools/testing/selftests/kvm/s390x/memop.c | 11 ++------ .../selftests/kvm/s390x/sync_regs_test.c | 8 ++---- tools/testing/selftests/kvm/steal_time.c | 5 +--- .../kvm/system_counter_offset_test.c | 8 +++--- tools/testing/selftests/kvm/x86_64/amx_test.c | 23 ++++++----------- .../kvm/x86_64/cr4_cpuid_sync_test.c | 5 +--- .../testing/selftests/kvm/x86_64/debug_regs.c | 5 +--- .../kvm/x86_64/emulator_error_test.c | 5 +--- .../testing/selftests/kvm/x86_64/evmcs_test.c | 9 +++---- .../selftests/kvm/x86_64/fix_hypercall_test.c | 5 +--- .../kvm/x86_64/get_msr_index_features.c | 5 +--- .../selftests/kvm/x86_64/hyperv_cpuid.c | 5 +--- .../selftests/kvm/x86_64/hyperv_svm_test.c | 6 ++--- .../selftests/kvm/x86_64/kvm_clock_test.c | 6 +---- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +--- .../selftests/kvm/x86_64/mmio_warning_test.c | 10 ++------ .../selftests/kvm/x86_64/mmu_role_test.c | 10 ++------ .../selftests/kvm/x86_64/platform_info_test.c | 7 +----- .../kvm/x86_64/pmu_event_filter_test.c | 25 ++++--------------- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 5 +--- .../selftests/kvm/x86_64/sev_migrate_tests.c | 19 +++++--------- .../selftests/kvm/x86_64/sync_regs_test.c | 10 ++------ .../kvm/x86_64/triple_fault_event_test.c | 10 ++------ .../selftests/kvm/x86_64/tsc_scaling_sync.c | 5 +--- .../vmx_exception_with_invalid_guest_state.c | 6 ++--- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 10 +------- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 23 ++++++----------- .../kvm/x86_64/vmx_preemption_timer_test.c | 5 +--- .../kvm/x86_64/vmx_set_nested_state_test.c | 5 +--- .../selftests/kvm/x86_64/xen_shinfo_test.c | 5 +--- .../selftests/kvm/x86_64/xen_vmcall_test.c | 8 +++--- .../selftests/kvm/x86_64/xss_msr_test.c | 13 +++------- 48 files changed, 117 insertions(+), 295 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +3 -8
@@ -375,10 +375,7 @@ static struct kvm_vm *test_vm_create(void)ucall_init (vm,NULL );test_init_timer_irq (vm); gic_fd =vgic_v3_setup (vm, nr_vcpus,64 ,GICD_BASE_GPA ,GICR_BASE_GPA ); -if (gic_fd <0 ) { -print_skip ("Failed to create vgic-v3" ); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (gic_fd >=0 ,"Failed to create vgic-v3" );/* Make all the test's cmdline args visible to the guest */ sync_global_to_guest (vm, test_args);
@@ -468,10 +465,8 @@ int main(int argc, char *argv[])if (!parse_args (argc, argv))exit (KSFT_SKIP ); -if (test_args.migration_freq_ms &&get_nprocs () <2 ) { -print_skip ("At least two physical CPUs needed for vCPU migration" ); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (!test_args.migration_freq_ms ||get_nprocs () >=2 , +"At least two physical CPUs needed for vCPU migration" ); vm =test_vm_create ();test_run (vm);
tools/testing/selftests/kvm/aarch64/debug-exceptions.c +2 -5
@@ -259,11 +259,8 @@ int main(int argc, char *argv[])vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu); -if (debug_version (vcpu) <6 ) { -print_skip ("Armv8 debug architecture not supported." ); -kvm_vm_free (vm); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (debug_version (vcpu) >=6 , +"Armv8 debug architecture not supported." );vm_install_sync_handler (vm,VECTOR_SYNC_CURRENT ,ESR_EC_BRK_INS , guest_sw_bp_handler);
tools/testing/selftests/kvm/aarch64/get-reg-list.c +6 -4
@@ -395,10 +395,12 @@ static void check_supported(struct vcpu_config *c)struct reg_sublist *s;for_each_sublist (c, s) { -if (s->capability && !kvm_has_cap (s->capability)) { -fprintf (stderr,"%s: %s not available, skipping tests\n" ,config_name (c), s->name); -exit (KSFT_SKIP ); - } +if (!s->capability) +continue ; + +__TEST_REQUIRE (kvm_has_cap (s->capability), +"%s: %s not available, skipping tests\n" , +config_name (c), s->name); } }
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -4
@@ -192,10 +192,7 @@ static void host_test_system_suspend(void)int main (void ) { -if (!kvm_check_cap (KVM_CAP_ARM_SYSTEM_SUSPEND )) { -print_skip ("KVM_CAP_ARM_SYSTEM_SUSPEND not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_check_cap (KVM_CAP_ARM_SYSTEM_SUSPEND ));host_test_cpu_on ();host_test_system_suspend ();
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +1 -4
@@ -82,10 +82,7 @@ int main(void)struct kvm_vm *vm;int ret; -if (!kvm_has_cap (KVM_CAP_ARM_EL1_32BIT )) { -print_skip ("KVM_CAP_ARM_EL1_32BIT is not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_ARM_EL1_32BIT ));/* Get the preferred target type and copy that to init1 for later use */ vm =vm_create_barebones ();
tools/testing/selftests/kvm/aarch64/vgic_init.c +3 -7
@@ -719,13 +719,9 @@ int main(int ac, char **av) } ret =test_kvm_device (KVM_DEV_TYPE_ARM_VGIC_V2 ); -if (!ret) { -pr_info ("Running GIC_v2 tests.\n" ); -run_tests (KVM_DEV_TYPE_ARM_VGIC_V2 ); -return 0 ; - } +__TEST_REQUIRE (!ret,"No GICv2 nor GICv3 support" ); -print_skip ("No GICv2 nor GICv3 support" ); -exit (KSFT_SKIP ); +pr_info ("Running GIC_v2 tests.\n" ); +run_tests (KVM_DEV_TYPE_ARM_VGIC_V2 );return 0 ; }
tools/testing/selftests/kvm/aarch64/vgic_irq.c +1 -4
@@ -768,10 +768,7 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split) gic_fd =vgic_v3_setup (vm,1 , nr_irqs,GICD_BASE_GPA ,GICR_BASE_GPA ); -if (gic_fd <0 ) { -print_skip ("Failed to create vgic-v3, skipping" ); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (gic_fd >=0 ,"Failed to create vgic-v3, skipping" );vm_install_exception_handler (vm,VECTOR_IRQ_CURRENT , guest_irq_handlers[args.eoi_split][args.level_sensitive]);
tools/testing/selftests/kvm/access_tracking_perf_test.c +3 -8
@@ -104,10 +104,7 @@ static uint64_t lookup_pfn(int pagemap_fd, struct kvm_vm *vm, uint64_t gva)return 0 ; pfn = entry &PAGEMAP_PFN_MASK ; -if (!pfn) { -print_skip ("Looking up PFNs requires CAP_SYS_ADMIN" ); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (pfn,"Looking up PFNs requires CAP_SYS_ADMIN" );return pfn; }
@@ -380,10 +377,8 @@ int main(int argc, char *argv[]) } page_idle_fd =open ("/sys/kernel/mm/page_idle/bitmap" ,O_RDWR ); -if (page_idle_fd <0 ) { -print_skip ("CONFIG_IDLE_PAGE_TRACKING is not enabled" ); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (page_idle_fd >=0 , +"CONFIG_IDLE_PAGE_TRACKING is not enabled" );close (page_idle_fd);for_each_guest_mode (run_test, ¶ms);
tools/testing/selftests/kvm/include/test_util.h +9 -0
@@ -34,6 +34,15 @@ static inline int _no_printf(const char *format, ...) { return 0; }#endif void print_skip (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); +#define __TEST_REQUIRE (f, fmt, ...) \ +do { \ + if (!(f)) { \ + print_skip(fmt, ##__VA_ARGS__); \ + exit(KSFT_SKIP); \ + } \ +} while (0) + +#define TEST_REQUIRE (f) __TEST_REQUIRE(f, "Requirement not met: %s", #f)ssize_t test_write (int fd,const void *buf,size_t count);ssize_t test_read (int fd,void *buf,size_t count);
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -4
@@ -213,10 +213,7 @@ int main(int argc, char *argv[]) }/* Check the extension for binary stats */ -if (!kvm_has_cap (KVM_CAP_BINARY_STATS_FD )) { -print_skip ("Binary form statistics interface is not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_BINARY_STATS_FD ));/* Create VMs and VCPUs */ vms =malloc (sizeof (vms[0 ]) * max_vm);
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +2 -4
@@ -64,11 +64,9 @@ int main(int argc, char *argv[]) rl.rlim_max = nr_fds_wanted;int r =setrlimit (RLIMIT_NOFILE , &rl); -if (r <0 ) { -printf ("RLIMIT_NOFILE hard limit is too low (%d, wanted %d)\n" , +__TEST_REQUIRE (r >=0 , +"RLIMIT_NOFILE hard limit is too low (%d, wanted %d)\n" , old_rlim_max, nr_fds_wanted); -exit (KSFT_SKIP ); - } }else {TEST_ASSERT (!setrlimit (RLIMIT_NOFILE , &rl),"setrlimit() failed!" ); }
tools/testing/selftests/kvm/lib/kvm_util.c +2 -8
@@ -26,10 +26,7 @@ int open_path_or_exit(const char *path, int flags)int fd; fd =open (path, flags); -if (fd <0 ) { -print_skip ("%s not available (errno: %d)" , path, errno); -exit (KSFT_SKIP ); - } +__TEST_REQUIRE (fd >=0 ,"%s not available (errno: %d)" , path, errno);return fd; }
@@ -93,10 +90,7 @@ static void vm_open(struct kvm_vm *vm) { vm->kvm_fd =_open_kvm_dev_path_or_exit (O_RDWR ); -if (!kvm_has_cap (KVM_CAP_IMMEDIATE_EXIT )) { -print_skip ("immediate_exit not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_IMMEDIATE_EXIT )); vm->fd =__kvm_ioctl (vm->kvm_fd,KVM_CREATE_VM , vm->type);TEST_ASSERT (vm->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm->fd));
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -4
@@ -610,14 +610,14 @@ void vm_xsave_req_perm(int bit) kvm_fd =open_kvm_dev_path_or_exit (); rc =__kvm_ioctl (kvm_fd,KVM_GET_DEVICE_ATTR , &attr);close (kvm_fd); +if (rc ==-1 && (errno ==ENXIO || errno ==EINVAL ))exit (KSFT_SKIP );TEST_ASSERT (rc ==0 ,"KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld" , rc); -if (!(bitmask & (1ULL << bit))) -exit (KSFT_SKIP ); -if (!is_xfd_supported ()) -exit (KSFT_SKIP ); +TEST_REQUIRE (bitmask & (1ULL << bit)); + +TEST_REQUIRE (is_xfd_supported ()); rc =syscall (SYS_arch_prctl,ARCH_REQ_XCOMP_GUEST_PERM , bit);
tools/testing/selftests/kvm/lib/x86_64/svm.c +1 -4
@@ -174,10 +174,7 @@ bool nested_svm_supported(void)void nested_svm_check_supported (void ) { -if (!nested_svm_supported ()) { -print_skip ("nested SVM not enabled" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (nested_svm_supported ()); }/*
tools/testing/selftests/kvm/lib/x86_64/vmx.c +1 -4
@@ -381,10 +381,7 @@ bool nested_vmx_supported(void)void nested_vmx_check_supported (void ) { -if (!nested_vmx_supported ()) { -print_skip ("nested VMX not enabled" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (nested_vmx_supported ()); } void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,
tools/testing/selftests/kvm/rseq_test.c +5 -8
@@ -171,12 +171,11 @@ static void *migration_worker(void *ign)return NULL ; } -static int calc_min_max_cpu (void ) +static void calc_min_max_cpu (void ) {int i, cnt, nproc; -if (CPU_COUNT (&possible_mask) <2 ) -return -EINVAL ; +TEST_REQUIRE (CPU_COUNT (&possible_mask) >=2 );/* * CPU_SET doesn't provide a FOR_EACH helper, get the min/max CPU that
@@ -198,7 +197,8 @@ static int calc_min_max_cpu(void) cnt++; } -return (cnt <2 ) ? -EINVAL :0 ; +__TEST_REQUIRE (cnt >=2 , +"Only one usable CPU, task migration not possible" ); }int main (int argc,char *argv[])
@@ -215,10 +215,7 @@ int main(int argc, char *argv[])TEST_ASSERT (!r,"sched_getaffinity failed, errno = %d (%s)" , errno,strerror (errno)); -if (calc_min_max_cpu ()) { -print_skip ("Only one usable CPU, task migration not possible" ); -exit (KSFT_SKIP ); - } +calc_min_max_cpu ();sys_rseq (0 );
tools/testing/selftests/kvm/s390x/memop.c +2 -9
@@ -695,19 +695,12 @@ static void test_errors(void)int main (int argc,char *argv[]) { -int memop_cap, extension_cap; -setbuf (stdout,NULL );/* Tell stdout not to buffer its content */ - memop_cap =kvm_check_cap (KVM_CAP_S390_MEM_OP ); - extension_cap =kvm_check_cap (KVM_CAP_S390_MEM_OP_EXTENSION ); -if (!memop_cap) { -print_skip ("CAP_S390_MEM_OP not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_S390_MEM_OP ));test_copy (); -if (extension_cap >0 ) { +if (kvm_has_cap (KVM_CAP_S390_MEM_OP_EXTENSION )) {test_copy_key ();test_copy_key_storage_prot_override ();test_copy_key_fetch_prot ();
tools/testing/selftests/kvm/s390x/sync_regs_test.c +2 -6
@@ -79,16 +79,12 @@ int main(int argc, char *argv[])struct kvm_run *run;struct kvm_regs regs;struct kvm_sregs sregs; -int rv, cap; +int rv;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - cap =kvm_check_cap (KVM_CAP_SYNC_REGS ); -if (!cap) { -print_skip ("CAP_SYNC_REGS not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_check_cap (KVM_CAP_SYNC_REGS ));/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/steal_time.c +1 -4
@@ -271,10 +271,7 @@ int main(int ac, char **av)virt_map (vm,ST_GPA_BASE ,ST_GPA_BASE , gpages);ucall_init (vm,NULL ); -if (!is_steal_time_supported (vcpus[0 ])) { -print_skip ("steal-time not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (is_steal_time_supported (vcpus[0 ]));/* Run test on each VCPU */ for (i =0 ; i <NR_VCPUS ; ++i) {
tools/testing/selftests/kvm/system_counter_offset_test.c +3 -5
@@ -28,11 +28,9 @@ static struct test_case test_cases[] = {static void check_preconditions (struct kvm_vcpu *vcpu) { -if (!__vcpu_has_device_attr (vcpu,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET )) -return ; - -print_skip ("KVM_VCPU_TSC_OFFSET not supported; skipping test" ); -exit (KSFT_SKIP ); +__TEST_REQUIRE (!__vcpu_has_device_attr (vcpu,KVM_VCPU_TSC_CTRL , +KVM_VCPU_TSC_OFFSET ), +"KVM_VCPU_TSC_OFFSET not supported; skipping test" ); }static void setup_system_counter (struct kvm_vcpu *vcpu,struct test_case *test)
tools/testing/selftests/kvm/x86_64/amx_test.c +8 -15
@@ -317,7 +317,6 @@ int main(int argc, char *argv[]) {struct kvm_cpuid_entry2 *entry;struct kvm_regs regs1, regs2; -bool amx_supported = false;struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;
@@ -334,21 +333,15 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code); entry =kvm_get_supported_cpuid_entry (1 ); -if (!(entry->ecx &X86_FEATURE_XSAVE )) { -print_skip ("XSAVE feature not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (entry->ecx &X86_FEATURE_XSAVE ); -if (kvm_get_cpuid_max_basic () >=0xd ) { - entry =kvm_get_supported_cpuid_index (0xd ,0 ); - amx_supported = entry && !!(entry->eax &XFEATURE_MASK_XTILE ); -if (!amx_supported) { -print_skip ("AMX is not supported by the vCPU (eax=0x%x)" , entry->eax); -exit (KSFT_SKIP ); - } -/* Get xsave/restore max size */ - xsave_restore_size = entry->ecx; - } +TEST_REQUIRE (kvm_get_cpuid_max_basic () >=0xd ); + + entry =kvm_get_supported_cpuid_index (0xd ,0 ); +TEST_REQUIRE (entry->eax &XFEATURE_MASK_XTILE ); + +/* Get xsave/restore max size */ + xsave_restore_size = entry->ecx; run = vcpu->run;vcpu_regs_get (vcpu, ®s1);
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +1 -4
@@ -70,10 +70,7 @@ int main(int argc, char *argv[])struct ucall uc; entry =kvm_get_supported_cpuid_entry (1 ); -if (!(entry->ecx &X86_FEATURE_XSAVE )) { -print_skip ("XSAVE feature not supported" ); -return 0 ; - } +TEST_REQUIRE (entry->ecx &X86_FEATURE_XSAVE );/* Tell stdout not to buffer its content */ setbuf (stdout,NULL );
tools/testing/selftests/kvm/x86_64/debug_regs.c +1 -4
@@ -95,10 +95,7 @@ int main(void) 1, /* cli */ }; -if (!kvm_has_cap (KVM_CAP_SET_GUEST_DEBUG )) { -print_skip ("KVM_CAP_SET_GUEST_DEBUG not supported" ); -return 0 ; - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_SET_GUEST_DEBUG )); vm =vm_create_with_one_vcpu (&vcpu, guest_code); run = vcpu->run;
tools/testing/selftests/kvm/x86_64/emulator_error_test.c +1 -4
@@ -162,10 +162,7 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -if (!kvm_has_cap (KVM_CAP_SMALLER_MAXPHYADDR )) { -printf ("module parameter 'allow_smaller_maxphyaddr' is not set. Skipping test.\n" ); -return 0 ; - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_SMALLER_MAXPHYADDR )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/evmcs_test.c +3 -6
@@ -208,12 +208,9 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code); -if (!nested_vmx_supported () || - !kvm_has_cap (KVM_CAP_NESTED_STATE ) || - !kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS )) { -print_skip ("Enlightened VMCS is unsupported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (nested_vmx_supported ()); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE )); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS ));vcpu_set_hv_cpuid (vcpu);vcpu_enable_evmcs (vcpu);
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +1 -4
@@ -156,10 +156,7 @@ static void test_fix_hypercall_disabled(void)int main (void ) { -if (!(kvm_check_cap (KVM_CAP_DISABLE_QUIRKS2 ) &KVM_X86_QUIRK_FIX_HYPERCALL_INSN )) { -print_skip ("KVM_X86_QUIRK_HYPERCALL_INSN not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_check_cap (KVM_CAP_DISABLE_QUIRKS2 ) &KVM_X86_QUIRK_FIX_HYPERCALL_INSN );test_fix_hypercall ();test_fix_hypercall_disabled ();
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +1 -4
@@ -25,10 +25,7 @@ int main(int argc, char *argv[])* will cover the "regular" list of MSRs, the coverage here is purely * opportunistic and not interesting on its own. */ -if (!kvm_check_cap (KVM_CAP_GET_MSR_FEATURES )) { -print_skip ("KVM_CAP_GET_MSR_FEATURES not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_GET_MSR_FEATURES )); (void )kvm_get_msr_index_list ();
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +1 -4
@@ -137,10 +137,7 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -if (!kvm_has_cap (KVM_CAP_HYPERV_CPUID )) { -print_skip ("KVM_CAP_HYPERV_CPUID not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_HYPERV_CPUID )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +2 -4
@@ -127,10 +127,8 @@ int main(int argc, char *argv[])struct ucall uc;int stage; -if (!nested_svm_supported ()) { -print_skip ("Nested SVM not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (nested_svm_supported ()); +/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_set_hv_cpuid (vcpu);
tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +1 -5
@@ -181,11 +181,7 @@ int main(void)int flags; flags =kvm_check_cap (KVM_CAP_ADJUST_CLOCK ); -if (!(flags &KVM_CLOCK_REALTIME )) { -print_skip ("KVM_CLOCK_REALTIME not supported; flags: %x" , - flags); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (flags &KVM_CLOCK_REALTIME );check_clocksource ();
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -4
@@ -204,10 +204,7 @@ int main(void)struct kvm_vcpu *vcpu;struct kvm_vm *vm; -if (!kvm_has_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )) { -print_skip ("KVM_CAP_ENFORCE_PV_FEATURE_CPUID not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )); vm =vm_create_with_one_vcpu (&vcpu, guest_main);
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c +2 -8
@@ -93,15 +93,9 @@ int main(void) {int warnings_before, warnings_after; -if (!is_intel_cpu ()) { -print_skip ("Must be run on an Intel CPU" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (is_intel_cpu ()); -if (vm_is_unrestricted_guest (NULL )) { -print_skip ("Unrestricted guest must be disabled" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (!vm_is_unrestricted_guest (NULL )); warnings_before =get_warnings_count ();
tools/testing/selftests/kvm/x86_64/mmu_role_test.c +2 -8
@@ -117,16 +117,10 @@ int main(int argc, char *argv[]) } } -if (!do_gbpages && !do_maxphyaddr) { -print_skip ("No sub-tests selected" ); -return 0 ; - } +__TEST_REQUIRE (do_gbpages || do_maxphyaddr,"No sub-tests selected" ); entry =kvm_get_supported_cpuid_entry (0x80000001 ); -if (!(entry->edx &CPUID_GBPAGES )) { -print_skip ("1gb hugepages not supported" ); -return 0 ; - } +TEST_REQUIRE (entry->edx &CPUID_GBPAGES );if (do_gbpages) {pr_info ("Test MMIO after toggling CPUID.GBPAGES\n\n" );
tools/testing/selftests/kvm/x86_64/platform_info_test.c +1 -6
@@ -70,17 +70,12 @@ int main(int argc, char *argv[]) {struct kvm_vcpu *vcpu;struct kvm_vm *vm; -int rv;uint64_t msr_platform_info;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - rv =kvm_check_cap (KVM_CAP_MSR_PLATFORM_INFO ); -if (!rv) { -print_skip ("KVM_CAP_MSR_PLATFORM_INFO not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_MSR_PLATFORM_INFO )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +5 -20
@@ -417,39 +417,24 @@ static bool use_amd_pmu(void)int main (int argc,char *argv[]) { -void (*guest_code)(void ) =NULL ; +void (*guest_code)(void );struct kvm_vcpu *vcpu;struct kvm_vm *vm; -int r;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - r =kvm_check_cap (KVM_CAP_PMU_EVENT_FILTER ); -if (!r) { -print_skip ("KVM_CAP_PMU_EVENT_FILTER not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_check_cap (KVM_CAP_PMU_EVENT_FILTER )); -if (use_intel_pmu ()) - guest_code = intel_guest_code; -else if (use_amd_pmu ()) - guest_code = amd_guest_code; - -if (!guest_code) { -print_skip ("Don't know how to test this guest PMU" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (use_intel_pmu () ||use_amd_pmu ()); + guest_code =use_intel_pmu () ? intel_guest_code : amd_guest_code; vm =vm_create_with_one_vcpu (&vcpu, guest_code);vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu); -if (!sanity_check_pmu (vcpu)) { -print_skip ("Guest PMU is not functional" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (sanity_check_pmu (vcpu));test_without_filter (vcpu);test_member_deny_list (vcpu);
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -4
@@ -123,10 +123,7 @@ static void check_set_bsp_busy(void)int main (int argc,char *argv[]) { -if (!kvm_has_cap (KVM_CAP_SET_BOOT_CPU_ID )) { -print_skip ("set_boot_cpu_id not available" ); -return 0 ; - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_SET_BOOT_CPU_ID ));run_vm_bsp (0 );run_vm_bsp (1 );
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +6 -13
@@ -400,22 +400,15 @@ int main(int argc, char *argv[]) {struct kvm_cpuid_entry2 *cpuid; -if (!kvm_has_cap (KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM ) && - !kvm_has_cap (KVM_CAP_VM_COPY_ENC_CONTEXT_FROM )) { -print_skip ("Capabilities not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM )); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_VM_COPY_ENC_CONTEXT_FROM )); cpuid =kvm_get_supported_cpuid_entry (0x80000000 ); -if (cpuid->eax <0x8000001f ) { -print_skip ("AMD memory encryption not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (cpuid->eax >=0x8000001f ); + cpuid =kvm_get_supported_cpuid_entry (0x8000001f ); -if (!(cpuid->eax &X86_FEATURE_SEV )) { -print_skip ("AMD SEV not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (cpuid->eax &X86_FEATURE_SEV ); + have_sev_es = !!(cpuid->eax &X86_FEATURE_SEV_ES );if (kvm_check_cap (KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM )) {
tools/testing/selftests/kvm/x86_64/sync_regs_test.c +2 -8
@@ -94,14 +94,8 @@ int main(int argc, char *argv[])setbuf (stdout,NULL ); cap =kvm_check_cap (KVM_CAP_SYNC_REGS ); -if ((cap &TEST_SYNC_FIELDS ) !=TEST_SYNC_FIELDS ) { -print_skip ("KVM_CAP_SYNC_REGS not supported" ); -exit (KSFT_SKIP ); - } -if ((cap &INVALID_SYNC_FIELD ) !=0 ) { -print_skip ("The \"invalid\" field is not invalid" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE ((cap &TEST_SYNC_FIELDS ) ==TEST_SYNC_FIELDS ); +TEST_REQUIRE (!(cap &INVALID_SYNC_FIELD )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +2 -8
@@ -46,15 +46,9 @@ int main(void)vm_vaddr_t vmx_pages_gva;struct ucall uc; -if (!nested_vmx_supported ()) { -print_skip ("Nested VMX not supported" ); -exit (KSFT_SKIP ); - } +nested_vmx_check_supported (); -if (!kvm_has_cap (KVM_CAP_X86_TRIPLE_FAULT_EVENT )) { -print_skip ("KVM_CAP_X86_TRIPLE_FAULT_EVENT not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_X86_TRIPLE_FAULT_EVENT )); vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);vm_enable_cap (vm,KVM_CAP_X86_TRIPLE_FAULT_EVENT ,1 );
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -4
@@ -93,10 +93,7 @@ static void *run_vcpu(void *_cpu_nr)int main (int argc,char *argv[]) { -if (!kvm_has_cap (KVM_CAP_VM_TSC_CONTROL )) { -print_skip ("KVM_CAP_VM_TSC_CONTROL not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_VM_TSC_CONTROL )); vm =vm_create (NR_TEST_VCPUS );vm_ioctl (vm,KVM_SET_TSC_KHZ , (void *)TEST_TSC_KHZ );
tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +2 -4
@@ -111,10 +111,8 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_vm *vm; -if (!is_intel_cpu () ||vm_is_unrestricted_guest (NULL )) { -print_skip ("Must be run with kvm_intel.unrestricted_guest=0" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (is_intel_cpu ()); +TEST_REQUIRE (!vm_is_unrestricted_guest (NULL )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);get_set_sigalrm_vcpu (vcpu);
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +1 -9
@@ -116,14 +116,6 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_DONE (); } -static void tsc_scaling_check_supported (void ) -{ -if (!kvm_has_cap (KVM_CAP_TSC_CONTROL )) { -print_skip ("TSC scaling not supported by the HW" ); -exit (KSFT_SKIP ); - } -} -static void stable_tsc_check_supported (void ) {FILE *fp;
@@ -159,7 +151,7 @@ int main(int argc, char *argv[])uint64_t l2_tsc_freq =0 ;nested_vmx_check_supported (); -tsc_scaling_check_supported (); +TEST_REQUIRE (kvm_has_cap (KVM_CAP_TSC_CONTROL ));stable_tsc_check_supported ();/*
tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +8 -15
@@ -57,7 +57,6 @@ int main(int argc, char *argv[])struct kvm_cpuid2 *cpuid;struct kvm_cpuid_entry2 *entry_1_0;struct kvm_cpuid_entry2 *entry_a_0; -bool pdcm_supported = false;struct kvm_vm *vm;struct kvm_vcpu *vcpu;int ret;
@@ -71,20 +70,14 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code); cpuid =kvm_get_supported_cpuid (); -if (kvm_get_cpuid_max_basic () >=0xa ) { - entry_1_0 =kvm_get_supported_cpuid_index (1 ,0 ); - entry_a_0 =kvm_get_supported_cpuid_index (0xa ,0 ); - pdcm_supported = entry_1_0 && !!(entry_1_0->ecx &X86_FEATURE_PDCM ); - eax.full = entry_a_0->eax; - } -if (!pdcm_supported) { -print_skip ("MSR_IA32_PERF_CAPABILITIES is not supported by the vCPU" ); -exit (KSFT_SKIP ); - } -if (!eax.split.version_id) { -print_skip ("PMU is not supported by the vCPU" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_get_cpuid_max_basic () >=0xa ); + + entry_1_0 =kvm_get_supported_cpuid_index (1 ,0 ); + entry_a_0 =kvm_get_supported_cpuid_index (0xa ,0 ); +TEST_REQUIRE (entry_1_0->ecx &X86_FEATURE_PDCM ); + + eax.full = entry_a_0->eax; +__TEST_REQUIRE (eax.split.version_id,"PMU is not supported by the vCPU" );/* testcase 1, set capabilities when we have PDCM bit */ vcpu_set_cpuid (vcpu, cpuid);
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +1 -4
@@ -169,10 +169,7 @@ int main(int argc, char *argv[])*/ nested_vmx_check_supported (); -if (!kvm_has_cap (KVM_CAP_NESTED_STATE )) { -print_skip ("KVM_CAP_NESTED_STATE not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE ));/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +1 -4
@@ -267,10 +267,7 @@ int main(int argc, char *argv[]) have_evmcs =kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS ); -if (!kvm_has_cap (KVM_CAP_NESTED_STATE )) { -print_skip ("KVM_CAP_NESTED_STATE not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_NESTED_STATE ));/* * AMD currently does not implement set_nested_state, so for now we
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +1 -4
@@ -362,10 +362,7 @@ int main(int argc, char *argv[]) !strncmp(argv[1], "--verbose", 10));int xen_caps =kvm_check_cap (KVM_CAP_XEN_HVM ); -if (!(xen_caps &KVM_XEN_HVM_CONFIG_SHARED_INFO ) ) { -print_skip ("KVM_XEN_HVM_CONFIG_SHARED_INFO not available" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (xen_caps &KVM_XEN_HVM_CONFIG_SHARED_INFO );bool do_runstate_tests = !!(xen_caps &KVM_XEN_HVM_CONFIG_RUNSTATE );bool do_eventfd_tests = !!(xen_caps &KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL );
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +3 -5
@@ -80,14 +80,12 @@ static void guest_code(void)int main (int argc,char *argv[]) { +unsigned int xen_caps;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -if (!(kvm_check_cap (KVM_CAP_XEN_HVM ) & -KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL ) ) { -print_skip ("KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL not available" ); -exit (KSFT_SKIP ); - } + xen_caps =kvm_check_cap (KVM_CAP_XEN_HVM ); +TEST_REQUIRE (xen_caps &KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL ); vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_set_hv_cpuid (vcpu);
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +4 -9
@@ -19,7 +19,6 @@int main (int argc,char *argv[]) {struct kvm_cpuid_entry2 *entry; -bool xss_supported = false;bool xss_in_msr_list;struct kvm_vm *vm;struct kvm_vcpu *vcpu;
@@ -29,14 +28,10 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu,NULL ); -if (kvm_get_cpuid_max_basic () >=0xd ) { - entry =kvm_get_supported_cpuid_index (0xd ,1 ); - xss_supported = entry && !!(entry->eax &X86_FEATURE_XSAVES ); - } -if (!xss_supported) { -print_skip ("IA32_XSS is not supported by the vCPU" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_get_cpuid_max_basic () >=0xd ); + + entry =kvm_get_supported_cpuid_index (0xd ,1 ); +TEST_REQUIRE (entry->eax &X86_FEATURE_XSAVES ); xss_val =vcpu_get_msr (vcpu,MSR_IA32_XSS ); TEST_ASSERT(xss_val == 0,
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 143/144] KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste
On Fri, Jun 03, 2022 at 12:43:30AM +0000, Sean Christopherson wrote:
...
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c int main(int argc, char *argv[]) · line 28
Quoted 9 lines
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +0
-1@@ -25,10 +25,7 @@ int main(int argc, char *argv[])* will cover the "regular" list of MSRs, the coverage here is purely * opportunistic and not interesting on its own. */ -if (!kvm_check_cap (KVM_CAP_GET_MSR_FEATURES )) {
I guess this one was missed on the initial conversion of kvm_check_cap to kvm_has_cap, but it doesn't matter.
Quoted 7 lines
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +1
-3-print_skip ("KVM_CAP_GET_MSR_FEATURES not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_GET_MSR_FEATURES )); (void )kvm_get_msr_index_list ();
...
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c int main(int argc, char *argv[]) · line 79
Quoted 11 lines
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +0
-2@@ -70,17 +70,12 @@ int main(int argc, char *argv[]) {struct kvm_vcpu *vcpu;struct kvm_vm *vm; -int rv;uint64_t msr_platform_info;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - rv =kvm_check_cap (KVM_CAP_MSR_PLATFORM_INFO );
Also missed and also doesn't matter.
Quoted 16 lines
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +1
-4-if (!rv) { -print_skip ("KVM_CAP_MSR_PLATFORM_INFO not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_has_cap (KVM_CAP_MSR_PLATFORM_INFO )); vm =vm_create_with_one_vcpu (&vcpu, guest_code);tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +0
-0@@ -417,39 +417,24 @@ static bool use_amd_pmu(void)int main (int argc,char *argv[]) {
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c static bool use_amd_pmu(void) · line 428
Quoted 10 lines
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1
-3-void (*guest_code)(void ) =NULL ; +void (*guest_code)(void );struct kvm_vcpu *vcpu;struct kvm_vm *vm; -int r;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - r =kvm_check_cap (KVM_CAP_PMU_EVENT_FILTER );
Also missed and ...
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c static bool use_amd_pmu(void) · line 427
Quoted 5 lines
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1
-4-if (!r) { -print_skip ("KVM_CAP_PMU_EVENT_FILTER not supported" ); -exit (KSFT_SKIP ); - } +TEST_REQUIRE (kvm_check_cap (KVM_CAP_PMU_EVENT_FILTER ));
... got carried into the TEST_REQUIRE, so it sort of matters.
Thanks,
drew
Sean Christopherson
reviewerPATCH v2 144/144 KVM: selftests: Sanity check input to ioctls() at build time
In reply to Sean ChristophersonAdd a static assert to the KVM/VM/vCPU ioctl() helpers to verify that the size of the argument provided matches the expected size of the IOCTL. Because ioctl() ultimately takes a "void *", it's all too easy to pass in garbage and not detect the error until runtime. E.g. while working on a CPUID rework, selftests happily compiled when vcpu_set_cpuid() unintentionally passed the cpuid() function as the parameter to ioctl() (a local "cpuid" parameter was removed, but its use was not replaced with "vcpu->cpuid" as intended).
Tweak a variety of benign issues that aren't compatible with the sanity check, e.g. passing a non-pointer for ioctls().
Note, static_assert() requires a string on older versions of GCC. Feed it an empty string to make the compiler happy.
--- .../selftests/kvm/include/kvm_util_base.h | 61 +++++++++++++------ .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 29 +-------- tools/testing/selftests/kvm/s390x/resets.c | 6 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 6 +- 8 files changed, 56 insertions(+), 54 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +44 -17
@@ -180,29 +180,56 @@ static inline bool kvm_has_cap(long cap)#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret)#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) -#define __kvm_ioctl (kvm_fd, cmd, arg) \ - ioctl(kvm_fd, cmd, arg) +#define kvm_do_ioctl (fd, cmd, arg) \ +({ \ + static_assert(!_IOC_SIZE(cmd) || sizeof(*arg) == _IOC_SIZE(cmd), ""); \ + ioctl(fd, cmd, arg); \ +}) -static inline void _kvm_ioctl (int kvm_fd,unsigned long cmd,const char *name, -void *arg) -{ -int ret =__kvm_ioctl (kvm_fd, cmd, arg); +#define __kvm_ioctl (kvm_fd, cmd, arg) \ + kvm_do_ioctl(kvm_fd, cmd, arg) -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} + +#define _kvm_ioctl (kvm_fd, cmd, name, arg) \ +({ \ + int ret = __kvm_ioctl(kvm_fd, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +})#define kvm_ioctl (kvm_fd, cmd, arg) \ _kvm_ioctl(kvm_fd, cmd, #cmd, arg) -int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); -void _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,const char *name,void *arg); -#define vm_ioctl (vm, cmd, arg) _vm_ioctl(vm, cmd, #cmd, arg) - -int __vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd, -void *arg); -void _vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd, -const char *name,void *arg); -#define vcpu_ioctl (vcpu, cmd, arg) \ +#define __vm_ioctl (vm, cmd, arg) \ +({ \ + static_assert(sizeof(*(vm)) == sizeof(struct kvm_vm), ""); \ + kvm_do_ioctl((vm)->fd, cmd, arg); \ +}) + +#define _vm_ioctl (vcpu, cmd, name, arg) \ +({ \ + int ret = __vm_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +}) + +#define vm_ioctl (vm, cmd, arg) \ + _vm_ioctl(vm, cmd, #cmd, arg) + +#define __vcpu_ioctl (vcpu, cmd, arg) \ +({ \ + static_assert(sizeof(*(vcpu)) == sizeof(struct kvm_vcpu), ""); \ + kvm_do_ioctl((vcpu)->fd, cmd, arg); \ +}) + +#define _vcpu_ioctl (vcpu, cmd, name, arg) \ +({ \ + int ret = __vcpu_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +}) + +#define vcpu_ioctl (vcpu, cmd, arg) \ _vcpu_ioctl(vcpu, cmd, #cmd, arg)/*
tools/testing/selftests/kvm/lib/aarch64/processor.c +1 -1
@@ -472,7 +472,7 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, }; kvm_fd =open_kvm_dev_path_or_exit (); - vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM , ipa); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM , (void *)(unsigned long )ipa);TEST_ASSERT (vm_fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm_fd)); vcpu_fd =ioctl (vm_fd,KVM_CREATE_VCPU ,0 );
tools/testing/selftests/kvm/lib/guest_modes.c +1 -1
@@ -65,7 +65,7 @@ void guest_modes_append_default(void)struct kvm_s390_vm_cpu_processor info; kvm_fd =open_kvm_dev_path_or_exit (); - vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,0 ); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,NULL );kvm_device_attr_get (vm_fd,KVM_S390_VM_CPU_MODEL ,KVM_S390_VM_CPU_PROCESSOR , &info);close (vm_fd);
tools/testing/selftests/kvm/lib/kvm_util.c +2 -27
@@ -72,7 +72,7 @@ unsigned int kvm_check_cap(long cap)int kvm_fd; kvm_fd =open_kvm_dev_path_or_exit (); - ret =__kvm_ioctl (kvm_fd,KVM_CHECK_EXTENSION , cap); + ret =__kvm_ioctl (kvm_fd,KVM_CHECK_EXTENSION , (void *)cap);TEST_ASSERT (ret >=0 ,KVM_IOCTL_ERROR (KVM_CHECK_EXTENSION , ret));close (kvm_fd);
@@ -92,7 +92,7 @@ static void vm_open(struct kvm_vm *vm)TEST_REQUIRE (kvm_has_cap (KVM_CAP_IMMEDIATE_EXIT )); - vm->fd =__kvm_ioctl (vm->kvm_fd,KVM_CREATE_VM , vm->type); + vm->fd =__kvm_ioctl (vm->kvm_fd,KVM_CREATE_VM , (void *)vm->type);TEST_ASSERT (vm->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm->fd)); }
@@ -1449,19 +1449,6 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vcpu *vcpu)return reg_list; } -int __vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd,void *arg) -{ -return ioctl (vcpu->fd, cmd, arg); -} - -void _vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd,const char *name, -void *arg) -{ -int ret =__vcpu_ioctl (vcpu, cmd, arg); - -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} -void *vcpu_map_dirty_ring (struct kvm_vcpu *vcpu) {uint32_t page_size = vcpu->vm->page_size;
@@ -1491,18 +1478,6 @@ void *vcpu_map_dirty_ring(struct kvm_vcpu *vcpu)return vcpu->dirty_gfns; } -int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) -{ -return ioctl (vm->fd, cmd, arg); -} - -void _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,const char *name,void *arg) -{ -int ret =__vm_ioctl (vm, cmd, arg); - -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} -/* * Device Ioctl */
tools/testing/selftests/kvm/s390x/resets.c +3 -3
@@ -224,7 +224,7 @@ static void test_normal(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_NORMAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_NORMAL_RESET ,NULL );/* must clears */ assert_normal (vcpu);
@@ -247,7 +247,7 @@ static void test_initial(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_INITIAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_INITIAL_RESET ,NULL );/* must clears */ assert_normal (vcpu);
@@ -270,7 +270,7 @@ static void test_clear(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_CLEAR_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_CLEAR_RESET ,NULL );/* must clears */ assert_normal (vcpu);
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c +1 -1
@@ -59,7 +59,7 @@ void test(void) kvm =open ("/dev/kvm" ,O_RDWR );TEST_ASSERT (kvm !=-1 ,"failed to open /dev/kvm" ); - kvmvm =__kvm_ioctl (kvm,KVM_CREATE_VM ,0 ); + kvmvm =__kvm_ioctl (kvm,KVM_CREATE_VM ,NULL );TEST_ASSERT (kvmvm >0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , kvmvm)); kvmcpu =ioctl (kvmvm,KVM_CREATE_VCPU ,0 );TEST_ASSERT (kvmcpu !=-1 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , kvmcpu));
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -266,7 +266,7 @@ static void test_without_filter(struct kvm_vcpu *vcpu)static uint64_t test_with_filter (struct kvm_vcpu *vcpu,struct kvm_pmu_event_filter *f) { -vm_ioctl (vcpu->vm,KVM_SET_PMU_EVENT_FILTER , (void *)f); +vm_ioctl (vcpu->vm,KVM_SET_PMU_EVENT_FILTER , f);return run_vcpu_to_sync (vcpu); }
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +3 -3
@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) irq_routes.entries[1 ].u.xen_evtchn.vcpu = vcpu->id; irq_routes.entries[1 ].u.xen_evtchn.priority =KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ; -vm_ioctl (vm,KVM_SET_GSI_ROUTING , &irq_routes); +vm_ioctl (vm,KVM_SET_GSI_ROUTING , &irq_routes.info);struct kvm_irqfd ifd = { };
@@ -716,7 +716,7 @@ int main(int argc, char *argv[])if (verbose)printf ("Testing restored oneshot timer\n" ); - tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , + tmr.u.timer.expires_ns = rs->state_entry_time +100000000 ;vcpu_ioctl (vcpu,KVM_XEN_VCPU_SET_ATTR , &tmr); evtchn_irq_expected = true;alarm (1 );
@@ -743,7 +743,7 @@ int main(int argc, char *argv[])if (verbose)printf ("Testing SCHEDOP_poll wake on masked event\n" ); - tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , + tmr.u.timer.expires_ns = rs->state_entry_time +100000000 ;vcpu_ioctl (vcpu,KVM_XEN_VCPU_SET_ATTR , &tmr);alarm (1 );break ;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 144/144] KVM: selftests: Sanity check input to ioctls() at build time
Quoted 43 lines · Sean Christopherson
Add a static assert to the KVM/VM/vCPU
ioctl()helpers to verify that the size of the argument provided matches the expected size of the IOCTL. Becauseioctl()ultimately takes a "void *", it's all too easy to pass in garbage and not detect the error until runtime. E.g. while working on a CPUID rework, selftests happily compiled whenvcpu_set_cpuid()unintentionally passed thecpuid()function as the parameter toioctl()(a local "cpuid" parameter was removed, but its use was not replaced with "vcpu->cpuid" as intended).Tweak a variety of benign issues that aren't compatible with the sanity check, e.g. passing a non-pointer for
ioctls().Note,
static_assert()requires a string on older versions of GCC. Feed it an empty string to make the compiler happy.Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/include/kvm_util_base.h | 61 +++++++++++++------ .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 29 +-------- tools/testing/selftests/kvm/s390x/resets.c | 6 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 6 +- 8 files changed, 56 insertions(+), 54 deletions(-)tools/testing/selftests/kvm/include/kvm_util_base.h +5
-2@@ -180,29 +180,56 @@ static inline bool kvm_has_cap(long cap)#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret)#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) -#define __kvm_ioctl (kvm_fd, cmd, arg) \ - ioctl(kvm_fd, cmd, arg) +#define kvm_do_ioctl (fd, cmd, arg) \ +({ \ + static_assert(!_IOC_SIZE(cmd) || sizeof(*arg) == _IOC_SIZE(cmd), ""); \ + ioctl(fd, cmd, arg); \ +})
tools/testing/selftests/kvm/include/kvm_util_base.h static inline bool kvm_has_cap(long cap) · line 192
Quoted 10 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +3
-6-static inline void _kvm_ioctl (int kvm_fd,unsigned long cmd,const char *name, -void *arg) -{ -int ret =__kvm_ioctl (kvm_fd, cmd, arg); +#define __kvm_ioctl (kvm_fd, cmd, arg) \ + kvm_do_ioctl(kvm_fd, cmd, arg) -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} +
While we've gained the static asserts we've also lost the type checking that the inline functions provided. Is there anyway we can bring them back with more macro tricks?
Quoted 230 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +36
-9+#define _kvm_ioctl (kvm_fd, cmd, name, arg) \ +({ \ + int ret = __kvm_ioctl(kvm_fd, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +})#define kvm_ioctl (kvm_fd, cmd, arg) \ _kvm_ioctl(kvm_fd, cmd, #cmd, arg) -int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); -void _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,const char *name,void *arg); -#define vm_ioctl (vm, cmd, arg) _vm_ioctl(vm, cmd, #cmd, arg) - -int __vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd, -void *arg); -void _vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd, -const char *name,void *arg); -#define vcpu_ioctl (vcpu, cmd, arg) \ +#define __vm_ioctl (vm, cmd, arg) \ +({ \ + static_assert(sizeof(*(vm)) == sizeof(struct kvm_vm), ""); \ + kvm_do_ioctl((vm)->fd, cmd, arg); \ +}) + +#define _vm_ioctl (vcpu, cmd, name, arg) \ +({ \ + int ret = __vm_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +}) + +#define vm_ioctl (vm, cmd, arg) \ + _vm_ioctl(vm, cmd, #cmd, arg) + +#define __vcpu_ioctl (vcpu, cmd, arg) \ +({ \ + static_assert(sizeof(*(vcpu)) == sizeof(struct kvm_vcpu), ""); \ + kvm_do_ioctl((vcpu)->fd, cmd, arg); \ +}) + +#define _vcpu_ioctl (vcpu, cmd, name, arg) \ +({ \ + int ret = __vcpu_ioctl(vcpu, cmd, arg); \ + \ + TEST_ASSERT(!ret, __KVM_IOCTL_ERROR(name, ret)); \ +}) + +#define vcpu_ioctl (vcpu, cmd, arg) \ _vcpu_ioctl(vcpu, cmd, #cmd, arg)/* tools/testing/selftests/kvm/lib/aarch64/processor.c +1
-1@@ -472,7 +472,7 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, }; kvm_fd =open_kvm_dev_path_or_exit (); - vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM , ipa); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM , (void *)(unsigned long )ipa);TEST_ASSERT (vm_fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm_fd)); vcpu_fd =ioctl (vm_fd,KVM_CREATE_VCPU ,0 );tools/testing/selftests/kvm/lib/guest_modes.c +1
-1@@ -65,7 +65,7 @@ void guest_modes_append_default(void)struct kvm_s390_vm_cpu_processor info; kvm_fd =open_kvm_dev_path_or_exit (); - vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,0 ); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,NULL );kvm_device_attr_get (vm_fd,KVM_S390_VM_CPU_MODEL ,KVM_S390_VM_CPU_PROCESSOR , &info);close (vm_fd);tools/testing/selftests/kvm/lib/kvm_util.c +2
-27@@ -72,7 +72,7 @@ unsigned int kvm_check_cap(long cap)int kvm_fd; kvm_fd =open_kvm_dev_path_or_exit (); - ret =__kvm_ioctl (kvm_fd,KVM_CHECK_EXTENSION , cap); + ret =__kvm_ioctl (kvm_fd,KVM_CHECK_EXTENSION , (void *)cap);TEST_ASSERT (ret >=0 ,KVM_IOCTL_ERROR (KVM_CHECK_EXTENSION , ret));close (kvm_fd);@@ -92,7 +92,7 @@ static void vm_open(struct kvm_vm *vm)TEST_REQUIRE (kvm_has_cap (KVM_CAP_IMMEDIATE_EXIT )); - vm->fd =__kvm_ioctl (vm->kvm_fd,KVM_CREATE_VM , vm->type); + vm->fd =__kvm_ioctl (vm->kvm_fd,KVM_CREATE_VM , (void *)vm->type);TEST_ASSERT (vm->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm->fd)); }@@ -1449,19 +1449,6 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vcpu *vcpu)return reg_list; } -int __vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd,void *arg) -{ -return ioctl (vcpu->fd, cmd, arg); -} - -void _vcpu_ioctl (struct kvm_vcpu *vcpu,unsigned long cmd,const char *name, -void *arg) -{ -int ret =__vcpu_ioctl (vcpu, cmd, arg); - -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} -void *vcpu_map_dirty_ring (struct kvm_vcpu *vcpu) {uint32_t page_size = vcpu->vm->page_size;@@ -1491,18 +1478,6 @@ void *vcpu_map_dirty_ring(struct kvm_vcpu *vcpu)return vcpu->dirty_gfns; } -int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) -{ -return ioctl (vm->fd, cmd, arg); -} - -void _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,const char *name,void *arg) -{ -int ret =__vm_ioctl (vm, cmd, arg); - -TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} -/* * Device Ioctl */ tools/testing/selftests/kvm/s390x/resets.c +3
-3@@ -224,7 +224,7 @@ static void test_normal(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_NORMAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_NORMAL_RESET ,NULL );/* must clears */ assert_normal (vcpu);@@ -247,7 +247,7 @@ static void test_initial(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_INITIAL_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_INITIAL_RESET ,NULL );/* must clears */ assert_normal (vcpu);@@ -270,7 +270,7 @@ static void test_clear(void)inject_irq (vcpu); -vcpu_ioctl (vcpu,KVM_S390_CLEAR_RESET ,0 ); +vcpu_ioctl (vcpu,KVM_S390_CLEAR_RESET ,NULL );/* must clears */ assert_normal (vcpu);tools/testing/selftests/kvm/x86_64/mmio_warning_test.c +1
-1@@ -59,7 +59,7 @@ void test(void) kvm =open ("/dev/kvm" ,O_RDWR );TEST_ASSERT (kvm !=-1 ,"failed to open /dev/kvm" ); - kvmvm =__kvm_ioctl (kvm,KVM_CREATE_VM ,0 ); + kvmvm =__kvm_ioctl (kvm,KVM_CREATE_VM ,NULL );TEST_ASSERT (kvmvm >0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , kvmvm)); kvmcpu =ioctl (kvmvm,KVM_CREATE_VCPU ,0 );TEST_ASSERT (kvmcpu !=-1 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , kvmcpu));tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1
-1@@ -266,7 +266,7 @@ static void test_without_filter(struct kvm_vcpu *vcpu)static uint64_t test_with_filter (struct kvm_vcpu *vcpu,struct kvm_pmu_event_filter *f) { -vm_ioctl (vcpu->vm,KVM_SET_PMU_EVENT_FILTER , (void *)f); +vm_ioctl (vcpu->vm,KVM_SET_PMU_EVENT_FILTER , f);return run_vcpu_to_sync (vcpu); }tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +3
-3@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) irq_routes.entries[1 ].u.xen_evtchn.vcpu = vcpu->id; irq_routes.entries[1 ].u.xen_evtchn.priority =KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ; -vm_ioctl (vm,KVM_SET_GSI_ROUTING , &irq_routes); +vm_ioctl (vm,KVM_SET_GSI_ROUTING , &irq_routes.info);struct kvm_irqfd ifd = { };@@ -716,7 +716,7 @@ int main(int argc, char *argv[])if (verbose)printf ("Testing restored oneshot timer\n" ); - tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , + tmr.u.timer.expires_ns = rs->state_entry_time +100000000 ;vcpu_ioctl (vcpu,KVM_XEN_VCPU_SET_ATTR , &tmr); evtchn_irq_expected = true;alarm (1 );@@ -743,7 +743,7 @@ int main(int argc, char *argv[])if (verbose)printf ("Testing SCHEDOP_poll wake on masked event\n" ); - tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , + tmr.u.timer.expires_ns = rs->state_entry_time +100000000 ;vcpu_ioctl (vcpu,KVM_XEN_VCPU_SET_ATTR , &tmr);alarm (1 );break ;Signature · 1 line
2.36.1.255.ge46751e96f-goog
The last two changes don't really belong in this commit, but I won't tell anyway, if you don't.
Thanks,
drew
Sean Christopherson
reviewerRe: [PATCH v2 144/144] KVM: selftests: Sanity check input to ioctls() at build time
Quoted 51 lines · Andrew Jones
Quoted 50 lines · Sean Christopherson
Add a static assert to the KVM/VM/vCPU
ioctl()helpers to verify that the size of the argument provided matches the expected size of the IOCTL. Becauseioctl()ultimately takes a "void *", it's all too easy to pass in garbage and not detect the error until runtime. E.g. while working on a CPUID rework, selftests happily compiled whenvcpu_set_cpuid()unintentionally passed thecpuid()function as the parameter toioctl()(a local "cpuid" parameter was removed, but its use was not replaced with "vcpu->cpuid" as intended).Tweak a variety of benign issues that aren't compatible with the sanity check, e.g. passing a non-pointer for
ioctls().Note,
static_assert()requires a string on older versions of GCC. Feed it an empty string to make the compiler happy.Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/include/kvm_util_base.h | 61 +++++++++++++------ .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 29 +-------- tools/testing/selftests/kvm/s390x/resets.c | 6 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 6 +- 8 files changed, 56 insertions(+), 54 deletions(-)tools/testing/selftests/kvm/include/kvm_util_base.h +7
-6@@ -180,29 +180,56 @@ static inline bool kvm_has_cap(long cap)#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret)#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) -#define __kvm_ioctl (kvm_fd, cmd, arg) \ - ioctl(kvm_fd, cmd, arg) +#define kvm_do_ioctl (fd, cmd, arg) \ +({ \ + static_assert(!_IOC_SIZE(cmd) || sizeof(*arg) == _IOC_SIZE(cmd), ""); \ + ioctl(fd, cmd, arg); \ +}) -static inline void _kvm_ioctl (int kvm_fd,unsigned long cmd,const char *name, -void *arg) -{ -int ret =__kvm_ioctl (kvm_fd, cmd, arg); +#define __kvm_ioctl (kvm_fd, cmd, arg) \ + kvm_do_ioctl(kvm_fd, cmd, arg)
Quoted 7 lines
tools/testing/selftests/kvm/include/kvm_util_base.h static inline bool kvm_has_cap(long cap) · line 192
Quoted 3 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +1
-2-TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); -} +While we've gained the static asserts we've also lost the type checking that the inline functions provided. Is there anyway we can bring them back with more macro tricks?
Gah, I overthought this. It doesn't even require macros, just a dummy helper. I wasn't trying to use static_assert() to enforce the type check, which is how I ended up with the sizeof() ugliness (not the one above). But it's far easier to let the compiler do the checking.
I'll send a small fixup series to address this and your other feedback.
static __always_inline void static_assert_is_vm(struct kvm_vm *vm) { }
#define __vm_ioctl(vm, cmd, arg) \
({ \
static_assert_is_vm(vm); \
kvm_do_ioctl((vm)->fd, cmd, arg); \
})static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu) { }
#define __vcpu_ioctl(vcpu, cmd, arg) \
({ \
static_assert_is_vcpu(vcpu); \
kvm_do_ioctl((vcpu)->fd, cmd, arg); \
})In file included from include/kvm_util.h:10,
from lib/x86_64/processor.c:9:
lib/x86_64/processor.c: In function ‘_vcpu_set_msr’:
lib/x86_64/processor.c:831:33: error: passing argument 1 of ‘static_assert_is_vcpu’ from incompatible pointer type [-Werror=incompatible-pointer-types]
831 | return __vcpu_ioctl(vcpu->vm, KVM_SET_MSRS, &buffer.header);
| ~~~~^~~~
| |
| struct kvm_vm *include/kvm_util_base.h:232:31: note: in definition of macro ‘__vcpu_ioctl’
232 | static_assert_is_vcpu(vcpu); \
| ^~~~include/kvm_util_base.h:225:68: note: expected ‘struct kvm_vcpu *’ but argument is of type ‘struct kvm_vm *’
225 | static __always_inline void static_assert_is_vcpu(struct kvm_vcpu *vcpu)
| ~~~~~~~~~~~~~~~~~^~~~
cc1: all warnings being treated as errors
Paolo Bonzini
maintainerMarc, Christian, Anup, can you please give this a go?
Paolo
Quoted 319 lines · Sean Christopherson
Overhaul KVM's selftest APIs to get selftests to a state where adding new features and writing tests is less painful/disgusting.
Patches 1 fixes a goof in kvm/queue and should be squashed.
I would really, really, really like to get this queued up sooner than later, or maybe just thrown into a separate selftests-specific branch that folks can develop against. Rebasing is tedious, frustrating, and time consuming. And spoiler alert, there's another 42 x86-centric patches inbound that builds on this series to clean up CPUID related crud...
The primary theme is to stop treating tests like second class citizens. Stop hiding vcpu,
kvm_vm, etc... There's no sensitive data/constructs, and the encapsulation has led to really, really bad and difficult to maintain code. E.g. having to pass around the VM just to call a vCPUioctl(), arbitrary non-zero vCPU IDs, tests having to care about the vCPU ID in the first place, etc...The other theme in the rework is to deduplicate code and try to set us up for success in the future. E.g. provide macros/helpers instead of spamming CTRL-C => CTRL-V (see the -1k LoC), structure the VM creation APIs to build on one another, etc...
The absurd patch count (as opposed to just ridiculous) is due to converting each test away from using hardcoded vCPU IDs in a separate patch. The vast majority of those patches probably aren't worth reviewing in depth, the changes are mostly mechanical in nature.
However, _running_ non-x86 tests (or tests that have unique non-x86 behavior) would be extremely valuable. All patches have been compile tested on x86, arm, risc-v, and s390, but I've only run the tests on x86. Based on my track record for the x86+common tests, I will be very, very surprised if I didn't break any of the non-x86 tests, e.g. pthread_create()'s 'void *' param tripped me up multiple times.
I have not run x86's
amx_testdue to lack of hardware. I also haven't runsev_migration; something is wonky in either the upstream support forINIT_EXor in our test machines and I can't get SEV to initialize.v2:
- Drop the forced -Werror patch. [Vitaly]
- AddTEST_REQUIREto reduceKSFT_SKIPboilerplate.
- Rebase to kvm/queue, commit55371f1d0c01.
- Clean up even more bad copy+paste code (x86 was hiding a lot of crud).
- Assert that the input to anioctl()is (likely) the correct struct.v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (144):
KVM: Fix references to non-existentKVM_CAP_TRIPLE_FAULT_EVENT
KVM: selftests: Fix buggy-but-benign check in
test_v3_new_redist_regions()
KVM: selftests: Fix typo invgic_inittest
KVM: selftests: Drop stale declarations fromkvm_util_base.h
KVM: selftests: Always open VM file descriptors withO_RDWR
KVM: selftests: Add another underscore to innerioctl()helpers
KVM: selftests: Makevcpu_ioctl()a wrapper to pretty print ioctl name
KVM: selftests: Drop @mode from commonvm_create()helper
KVM: selftests: Splitvcpu_set_nested_state()into two helpers
KVM: sefltests: Usevcpu_ioctl()and__vcpu_ioctl()helpers
KVM: selftests: Add__vcpu_run()helper
KVM: selftests: Usevcpu_access_device_attr()in arm64 code
KVM: selftests: Removevcpu_get_fd()
KVM: selftests: Addvcpu_get()to retrieve and assert on vCPU
existence
KVM: selftests: Makevm_ioctl()a wrapper to pretty print ioctl name
KVM: sefltests: Usevm_ioctl()and__vm_ioctl()helpers
KVM: selftests: Makekvm_ioctl()a wrapper to pretty print ioctl name
KVM: selftests: Usekvm_ioctl()helpers
KVM: selftests: Use__KVM_SYSCALL_ERROR()to handle non-KVM syscall
errors
KVM: selftests: Make x86-64's register dump helpers static
KVM: selftests: Get rid ofkvm_util_internal.h
KVM: selftests: UseKVM_IOCTL_ERROR()for one-off arm64 ioctls
KVM: selftests: Drop @test param fromkvm_create_device()
KVM: selftests: MoveKVM_CREATE_DEVICE_TESTcode to separate helper
KVM: selftests: Multiplex return code and fd in__kvm_create_device()
KVM: selftests: RenameKVM_HAS_DEVICE_ATTRhelpers for consistency
KVM: selftests: Drop 'int' return from asserting*_has_device_attr()
KVM: selftests: Split get/setdevice_attrhelpers
KVM: selftests: Add a VM backpointer to 'struct vcpu'
KVM: selftests: ConsolidateKVM_ENABLE_CAPusage
KVM: selftests: SimplifyKVM_ENABLE_CAPhelper APIs
KVM: selftests: Cache list of MSRs to save/restore
KVM: selftests: Harden and comment XSS /KVM_SET_MSRSinteraction
KVM: selftests: Dedup MSR index list helpers, simplify dedicated test
KVM: selftests: RenameMP_STATEandGUEST_DEBUGhelpers for
consistency
KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
KVM: selftests: Add vm_create_*() variants to expose/return 'struct
vcpu'
KVM: selftests: Pushvm_adjust_num_guest_pages()into "w/o vCPUs"
helper
KVM: selftests: Usevm_create_without_vcpus()inset_boot_cpu_id
KVM: selftests: Usevm_create_without_vcpus()indirty_log_test
KVM: selftests: Usevm_create_without_vcpus()inhardware_disable_test
KVM: selftests: Usevm_create_without_vcpus()inpsci_test
KVM: selftests: Renamevm_create()=>vm_create_barebones(), drop
param
KVM: selftests: Renamevm_create_without_vcpus()=>vm_create()
KVM: selftests: Makevm_create()a wrapper that specifies
VM_MODE_DEFAULT
KVM: selftests: Rename xAPIC state test's vcpu struct
KVM: selftests: Rename vcpu.state => vcpu.run
KVM: selftests: Rename 'struct vcpu' to 'structkvm_vcpu'
KVM: selftests: Return the created vCPU fromvm_vcpu_add()
KVM: selftests: Convertmemslot_perf_testaway fromVCPU_ID
KVM: selftests: Convertrseq_testaway fromVCPU_ID
KVM: selftests: Convertxss_msr_testaway fromVCPU_ID
KVM: selftests: Convertvmx_preemption_timer_testaway fromVCPU_ID
KVM: selftests: Convertvmx_pmu_msrs_testaway fromVCPU_ID
KVM: selftests: Convertvmx_set_nested_state_testaway fromVCPU_ID
KVM: selftests: Convertvmx_tsc_adjust_testaway fromVCPU_ID
KVM: selftests: Convertmmu_role_testaway fromVCPU_ID
KVM: selftests: Convertpmu_event_filter_testaway fromVCPU_ID
KVM: selftests: Convertsmm_testaway fromVCPU_ID
KVM: selftests: Convertstate_testaway fromVCPU_ID
KVM: selftests: Convertsvm_int_ctl_testaway fromVCPU_ID
KVM: selftests: Convertsvm_vmcall_testaway fromVCPU_ID
KVM: selftests: Convertsync_regs_testaway fromVCPU_ID
KVM: selftests: Converthyperv_cpuidaway fromVCPU_ID
KVM: selftests: Convertkvm_pv_testaway fromVCPU_ID
KVM: selftests: Convertplatform_info_testaway fromVCPU_ID
KVM: selftests: Convertvmx_nested_tsc_scaling_testaway fromVCPU_ID
KVM: selftests: Convertset_sregs_testaway fromVCPU_ID
KVM: selftests: Convertvmx_dirty_log_testaway fromVCPU_ID
KVM: selftests: Convertvmx_close_while_nested_testaway fromVCPU_ID
KVM: selftests: Convertvmx_apic_access_testaway fromVCPU_ID
KVM: selftests: Convertuserspace_msr_exit_testaway fromVCPU_ID
KVM: selftests: Convertvmx_exception_with_invalid_guest_stateaway
fromVCPU_ID
KVM: selftests: Converttsc_msrs_testaway fromVCPU_ID
KVM: selftests: Convertkvm_clock_testaway fromVCPU_ID
KVM: selftests: Converthyperv_svm_testaway fromVCPU_ID
KVM: selftests: Converthyperv_featuresaway fromVCPU_ID
KVM: selftests: Converthyperv_clockaway fromVCPU_ID
KVM: selftests: Convertevmcs_testaway fromVCPU_ID
KVM: selftests: Convertemulator_error_testaway fromVCPU_ID
KVM: selftests: Convertdebug_regsaway fromVCPU_ID
KVM: selftests: Add proper helper for advancing RIP indebug_regs
KVM: selftests: Convertamx_testaway fromVCPU_ID
KVM: selftests: Convertcr4_cpuid_sync_testaway fromVCPU_ID
KVM: selftests: Convertcpuid_testaway fromVCPU_ID
KVM: selftests: Convertuserspace_io_testaway fromVCPU_ID
KVM: selftests: Convertvmx_invalid_nested_guest_stateaway from
VCPU_ID
KVM: selftests: Convertxen_vmcall_testaway fromVCPU_ID
KVM: selftests: Convertxen_shinfo_testaway fromVCPU_ID
KVM: selftests: Convertdirty_log_testaway fromVCPU_ID
KVM: selftests: Convertset_memory_region_testaway fromVCPU_ID
KVM: selftests: Convertsystem_counter_offset_testaway fromVCPU_ID
KVM: selftests: Trackkvm_vcpuobject intsc_scaling_sync
KVM: selftests: Convertxapic_state_testaway from hardcoded vCPU ID
KVM: selftests: Convert debug-exceptions away fromVCPU_ID
KVM: selftests: Convertfix_hypercall_testaway fromVCPU_ID
KVM: selftests: Convertvgic_irqaway fromVCPU_ID
KVM: selftests: Make arm64'sguest_get_vcpuid()declaration arm64-only
KVM: selftests: Movevm_is_unrestricted_guest()to x86-64
KVM: selftests: Add "arch" to common utils that have arch
implementations
KVM: selftests: Return created vcpu fromvm_vcpu_add_default()
KVM: selftests: Rename vm_vcpu_add* helpers to better show
relationships
KVM: selftests: Convertset_boot_cpu_idaway from globalVCPU_IDs
KVM: selftests: Convertpsci_testaway fromVCPU_ID
KVM: selftests: Converthardware_disable_testto pass around vCPU
objects
KVM: selftests: Add VM creation helper that "returns" vCPUs
KVM: selftests: Convertsteal_timeaway fromVCPU_ID
KVM: selftests: Convertarch_timeraway fromVCPU_ID
KVM: selftests: Convertsvm_nested_soft_inject_testaway fromVCPU_ID
KVM: selftests: Converttriple_fault_event_testaway fromVCPU_ID
KVM: selftests: Convertvgic_initaway from
vm_create_default_with_vcpus()
KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers
KVM: selftests: Sync stage before VM is freed in hypercalls test
KVM: selftests: Convert hypercalls test away fromvm_create_default()
KVM: selftests: Convertxapic_ipi_testaway from*_VCPU_ID
KVM: selftests: Convertsync_regs_testaway fromVCPU_ID
KVM: selftests: Convert s390's "resets" test away fromVCPU_ID
KVM: selftests: Convert memop away fromVCPU_ID
KVM: selftests: Convert s390x/diag318_test_handler away fromVCPU_ID
KVM: selftests: Convert tprot away fromVCPU_ID
KVM: selftests: Usevm_create()intsc_scaling_sync
KVM: selftests: Usevm_create_with_vcpus()inmax_guest_memory_test
KVM: selftests: Drop vm_create_default* helpers
KVM: selftests: Drop @vcpuids param from VM creators
KVM: selftests: Convertkvm_page_table_testaway from reliance on
vcpu_id
KVM: selftests: Convertkvm_binary_stats_testaway from vCPU IDs
KVM: selftests: Convert get-reg-list away from its "VCPU_ID"
KVM: selftests: Stop hardcoding vCPU IDs invcpu_width_config
KVM: selftests: Stop conflating vCPU index and ID in perf tests
KVM: selftests: Removevcpu_get()usage fromdirty_log_test
KVM: selftests: Require vCPU output array when creating VM with vCPUs
KVM: selftests: Purge vm+vcpu_id == vcpu silliness
KVM: selftests: Dropvcpu_get(), renamevcpu_find()=>vcpu_exists()
KVM: selftests: Removevcpu_state()helper
KVM: selftests: Open code and drop 'structkvm_vm' accessors
KVM: selftests: Drop @slot0_mem_pages from__vm_create_with_vcpus()
KVM: selftests: Drop @num_percpu_pages from__vm_create_with_vcpus()
KVM: selftests: Move per-VM/per-vCPU nr pages calculation to__vm_create()KVM: selftests: Trust that MAXPHYADDR > memslot0 in
vmx_apic_access_test
KVM: selftests: DropDEFAULT_GUEST_PHY_PAGES, open code the magic
number
KVM: selftests: Return an 'unsigned int' fromkvm_check_cap()
KVM: selftests: Addkvm_has_cap()to provide syntactic sugar
KVM: selftests: AddTEST_REQUIREmacros to reduce skipping copy+paste
KVM: selftests: Sanity check input toioctls()at build timeDocumentation/virt/kvm/api.rst | 4 +- .../selftests/kvm/aarch64/arch_timer.c | 79 +- .../selftests/kvm/aarch64/debug-exceptions.c | 22 +- .../selftests/kvm/aarch64/get-reg-list.c | 29 +- .../selftests/kvm/aarch64/hypercalls.c | 90 +- .../testing/selftests/kvm/aarch64/psci_test.c | 69 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 71 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 379 +++--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 40 +- .../selftests/kvm/access_tracking_perf_test.c | 92 +- .../selftests/kvm/demand_paging_test.c | 49 +- .../selftests/kvm/dirty_log_perf_test.c | 51 +- tools/testing/selftests/kvm/dirty_log_test.c | 95 +- .../selftests/kvm/hardware_disable_test.c | 29 +- .../selftests/kvm/include/aarch64/processor.h | 28 +- .../selftests/kvm/include/aarch64/vgic.h | 6 +- .../selftests/kvm/include/kvm_util_base.h | 743 ++++++++--- .../selftests/kvm/include/perf_test_util.h | 5 +- .../selftests/kvm/include/riscv/processor.h | 20 - .../testing/selftests/kvm/include/test_util.h | 9 + .../selftests/kvm/include/ucall_common.h | 2 +- .../selftests/kvm/include/x86_64/evmcs.h | 2 +- .../selftests/kvm/include/x86_64/processor.h | 109 +- .../selftests/kvm/kvm_binary_stats_test.c | 31 +- .../selftests/kvm/kvm_create_max_vcpus.c | 10 +- .../selftests/kvm/kvm_page_table_test.c | 66 +- .../selftests/kvm/lib/aarch64/processor.c | 81 +- .../testing/selftests/kvm/lib/aarch64/ucall.c | 9 +- .../testing/selftests/kvm/lib/aarch64/vgic.c | 54 +- tools/testing/selftests/kvm/lib/elf.c | 1 - tools/testing/selftests/kvm/lib/guest_modes.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 1104 +++-------------- .../selftests/kvm/lib/kvm_util_internal.h | 128 -- .../selftests/kvm/lib/perf_test_util.c | 84 +- .../selftests/kvm/lib/riscv/processor.c | 111 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 14 +- .../kvm/lib/s390x/diag318_test_handler.c | 11 +- .../selftests/kvm/lib/s390x/processor.c | 44 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 533 +++----- tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 +- .../testing/selftests/kvm/lib/x86_64/ucall.c | 10 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 16 +- .../selftests/kvm/max_guest_memory_test.c | 53 +- .../kvm/memslot_modification_stress_test.c | 13 +- .../testing/selftests/kvm/memslot_perf_test.c | 28 +- tools/testing/selftests/kvm/rseq_test.c | 22 +- tools/testing/selftests/kvm/s390x/memop.c | 93 +- tools/testing/selftests/kvm/s390x/resets.c | 140 ++- .../selftests/kvm/s390x/sync_regs_test.c | 45 +- tools/testing/selftests/kvm/s390x/tprot.c | 25 +- .../selftests/kvm/set_memory_region_test.c | 43 +- tools/testing/selftests/kvm/steal_time.c | 120 +- .../kvm/system_counter_offset_test.c | 35 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 56 +- .../testing/selftests/kvm/x86_64/cpuid_test.c | 29 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 22 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 77 +- .../kvm/x86_64/emulator_error_test.c | 74 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 61 +- .../selftests/kvm/x86_64/fix_hypercall_test.c | 45 +- .../kvm/x86_64/get_msr_index_features.c | 117 +- .../selftests/kvm/x86_64/hyperv_clock.c | 25 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 34 +- .../selftests/kvm/x86_64/hyperv_features.c | 61 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 20 +- .../selftests/kvm/x86_64/kvm_clock_test.c | 29 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 33 +- .../kvm/x86_64/max_vcpuid_cap_test.c | 28 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 16 +- .../selftests/kvm/x86_64/mmu_role_test.c | 30 +- .../selftests/kvm/x86_64/platform_info_test.c | 51 +- .../kvm/x86_64/pmu_event_filter_test.c | 97 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 91 +- .../selftests/kvm/x86_64/set_sregs_test.c | 47 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 120 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 37 +- .../testing/selftests/kvm/x86_64/state_test.c | 29 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 17 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 16 +- .../selftests/kvm/x86_64/sync_regs_test.c | 62 +- .../kvm/x86_64/triple_fault_event_test.c | 39 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 35 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 25 +- .../selftests/kvm/x86_64/userspace_io_test.c | 18 +- .../kvm/x86_64/userspace_msr_exit_test.c | 187 ++- .../kvm/x86_64/vmx_apic_access_test.c | 27 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 13 +- .../vmx_exception_with_invalid_guest_state.c | 68 +- .../x86_64/vmx_invalid_nested_guest_state.c | 18 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 29 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 48 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 35 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 91 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 13 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 48 +- .../selftests/kvm/x86_64/xapic_state_test.c | 60 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 73 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 25 +- .../selftests/kvm/x86_64/xss_msr_test.c | 56 +- 102 files changed, 3059 insertions(+), 4178 deletions(-)delete mode 100644
tools/testing/selftests/kvm/lib/kvm_util_internal.hbase-commit:
55371f1d0c01357f29da613f7525c3f252320bbf
Sean Christopherson
reviewer+Raghu
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Raghu is going to run on arm64, I'll work with him to iron out any bugs (I should have done this before posting). I.e. Marc is mostly off the hook unless there's tests we can't run.
Quoted 324 lines
Paolo
Quoted 319 lines · Sean Christopherson
Overhaul KVM's selftest APIs to get selftests to a state where adding new features and writing tests is less painful/disgusting.
Patches 1 fixes a goof in kvm/queue and should be squashed.
I would really, really, really like to get this queued up sooner than later, or maybe just thrown into a separate selftests-specific branch that folks can develop against. Rebasing is tedious, frustrating, and time consuming. And spoiler alert, there's another 42 x86-centric patches inbound that builds on this series to clean up CPUID related crud...
The primary theme is to stop treating tests like second class citizens. Stop hiding vcpu,
kvm_vm, etc... There's no sensitive data/constructs, and the encapsulation has led to really, really bad and difficult to maintain code. E.g. having to pass around the VM just to call a vCPUioctl(), arbitrary non-zero vCPU IDs, tests having to care about the vCPU ID in the first place, etc...The other theme in the rework is to deduplicate code and try to set us up for success in the future. E.g. provide macros/helpers instead of spamming CTRL-C => CTRL-V (see the -1k LoC), structure the VM creation APIs to build on one another, etc...
The absurd patch count (as opposed to just ridiculous) is due to converting each test away from using hardcoded vCPU IDs in a separate patch. The vast majority of those patches probably aren't worth reviewing in depth, the changes are mostly mechanical in nature.
However, _running_ non-x86 tests (or tests that have unique non-x86 behavior) would be extremely valuable. All patches have been compile tested on x86, arm, risc-v, and s390, but I've only run the tests on x86. Based on my track record for the x86+common tests, I will be very, very surprised if I didn't break any of the non-x86 tests, e.g. pthread_create()'s 'void *' param tripped me up multiple times.
I have not run x86's
amx_testdue to lack of hardware. I also haven't runsev_migration; something is wonky in either the upstream support forINIT_EXor in our test machines and I can't get SEV to initialize.v2:
- Drop the forced -Werror patch. [Vitaly]
- AddTEST_REQUIREto reduceKSFT_SKIPboilerplate.
- Rebase to kvm/queue, commit55371f1d0c01.
- Clean up even more bad copy+paste code (x86 was hiding a lot of crud).
- Assert that the input to anioctl()is (likely) the correct struct.v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (144):
KVM: Fix references to non-existentKVM_CAP_TRIPLE_FAULT_EVENT
KVM: selftests: Fix buggy-but-benign check in
test_v3_new_redist_regions()
KVM: selftests: Fix typo invgic_inittest
KVM: selftests: Drop stale declarations fromkvm_util_base.h
KVM: selftests: Always open VM file descriptors withO_RDWR
KVM: selftests: Add another underscore to innerioctl()helpers
KVM: selftests: Makevcpu_ioctl()a wrapper to pretty print ioctl name
KVM: selftests: Drop @mode from commonvm_create()helper
KVM: selftests: Splitvcpu_set_nested_state()into two helpers
KVM: sefltests: Usevcpu_ioctl()and__vcpu_ioctl()helpers
KVM: selftests: Add__vcpu_run()helper
KVM: selftests: Usevcpu_access_device_attr()in arm64 code
KVM: selftests: Removevcpu_get_fd()
KVM: selftests: Addvcpu_get()to retrieve and assert on vCPU
existence
KVM: selftests: Makevm_ioctl()a wrapper to pretty print ioctl name
KVM: sefltests: Usevm_ioctl()and__vm_ioctl()helpers
KVM: selftests: Makekvm_ioctl()a wrapper to pretty print ioctl name
KVM: selftests: Usekvm_ioctl()helpers
KVM: selftests: Use__KVM_SYSCALL_ERROR()to handle non-KVM syscall
errors
KVM: selftests: Make x86-64's register dump helpers static
KVM: selftests: Get rid ofkvm_util_internal.h
KVM: selftests: UseKVM_IOCTL_ERROR()for one-off arm64 ioctls
KVM: selftests: Drop @test param fromkvm_create_device()
KVM: selftests: MoveKVM_CREATE_DEVICE_TESTcode to separate helper
KVM: selftests: Multiplex return code and fd in__kvm_create_device()
KVM: selftests: RenameKVM_HAS_DEVICE_ATTRhelpers for consistency
KVM: selftests: Drop 'int' return from asserting*_has_device_attr()
KVM: selftests: Split get/setdevice_attrhelpers
KVM: selftests: Add a VM backpointer to 'struct vcpu'
KVM: selftests: ConsolidateKVM_ENABLE_CAPusage
KVM: selftests: SimplifyKVM_ENABLE_CAPhelper APIs
KVM: selftests: Cache list of MSRs to save/restore
KVM: selftests: Harden and comment XSS /KVM_SET_MSRSinteraction
KVM: selftests: Dedup MSR index list helpers, simplify dedicated test
KVM: selftests: RenameMP_STATEandGUEST_DEBUGhelpers for
consistency
KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
KVM: selftests: Add vm_create_*() variants to expose/return 'struct
vcpu'
KVM: selftests: Pushvm_adjust_num_guest_pages()into "w/o vCPUs"
helper
KVM: selftests: Usevm_create_without_vcpus()inset_boot_cpu_id
KVM: selftests: Usevm_create_without_vcpus()indirty_log_test
KVM: selftests: Usevm_create_without_vcpus()inhardware_disable_test
KVM: selftests: Usevm_create_without_vcpus()inpsci_test
KVM: selftests: Renamevm_create()=>vm_create_barebones(), drop
param
KVM: selftests: Renamevm_create_without_vcpus()=>vm_create()
KVM: selftests: Makevm_create()a wrapper that specifies
VM_MODE_DEFAULT
KVM: selftests: Rename xAPIC state test's vcpu struct
KVM: selftests: Rename vcpu.state => vcpu.run
KVM: selftests: Rename 'struct vcpu' to 'structkvm_vcpu'
KVM: selftests: Return the created vCPU fromvm_vcpu_add()
KVM: selftests: Convertmemslot_perf_testaway fromVCPU_ID
KVM: selftests: Convertrseq_testaway fromVCPU_ID
KVM: selftests: Convertxss_msr_testaway fromVCPU_ID
KVM: selftests: Convertvmx_preemption_timer_testaway fromVCPU_ID
KVM: selftests: Convertvmx_pmu_msrs_testaway fromVCPU_ID
KVM: selftests: Convertvmx_set_nested_state_testaway fromVCPU_ID
KVM: selftests: Convertvmx_tsc_adjust_testaway fromVCPU_ID
KVM: selftests: Convertmmu_role_testaway fromVCPU_ID
KVM: selftests: Convertpmu_event_filter_testaway fromVCPU_ID
KVM: selftests: Convertsmm_testaway fromVCPU_ID
KVM: selftests: Convertstate_testaway fromVCPU_ID
KVM: selftests: Convertsvm_int_ctl_testaway fromVCPU_ID
KVM: selftests: Convertsvm_vmcall_testaway fromVCPU_ID
KVM: selftests: Convertsync_regs_testaway fromVCPU_ID
KVM: selftests: Converthyperv_cpuidaway fromVCPU_ID
KVM: selftests: Convertkvm_pv_testaway fromVCPU_ID
KVM: selftests: Convertplatform_info_testaway fromVCPU_ID
KVM: selftests: Convertvmx_nested_tsc_scaling_testaway fromVCPU_ID
KVM: selftests: Convertset_sregs_testaway fromVCPU_ID
KVM: selftests: Convertvmx_dirty_log_testaway fromVCPU_ID
KVM: selftests: Convertvmx_close_while_nested_testaway fromVCPU_ID
KVM: selftests: Convertvmx_apic_access_testaway fromVCPU_ID
KVM: selftests: Convertuserspace_msr_exit_testaway fromVCPU_ID
KVM: selftests: Convertvmx_exception_with_invalid_guest_stateaway
fromVCPU_ID
KVM: selftests: Converttsc_msrs_testaway fromVCPU_ID
KVM: selftests: Convertkvm_clock_testaway fromVCPU_ID
KVM: selftests: Converthyperv_svm_testaway fromVCPU_ID
KVM: selftests: Converthyperv_featuresaway fromVCPU_ID
KVM: selftests: Converthyperv_clockaway fromVCPU_ID
KVM: selftests: Convertevmcs_testaway fromVCPU_ID
KVM: selftests: Convertemulator_error_testaway fromVCPU_ID
KVM: selftests: Convertdebug_regsaway fromVCPU_ID
KVM: selftests: Add proper helper for advancing RIP indebug_regs
KVM: selftests: Convertamx_testaway fromVCPU_ID
KVM: selftests: Convertcr4_cpuid_sync_testaway fromVCPU_ID
KVM: selftests: Convertcpuid_testaway fromVCPU_ID
KVM: selftests: Convertuserspace_io_testaway fromVCPU_ID
KVM: selftests: Convertvmx_invalid_nested_guest_stateaway from
VCPU_ID
KVM: selftests: Convertxen_vmcall_testaway fromVCPU_ID
KVM: selftests: Convertxen_shinfo_testaway fromVCPU_ID
KVM: selftests: Convertdirty_log_testaway fromVCPU_ID
KVM: selftests: Convertset_memory_region_testaway fromVCPU_ID
KVM: selftests: Convertsystem_counter_offset_testaway fromVCPU_ID
KVM: selftests: Trackkvm_vcpuobject intsc_scaling_sync
KVM: selftests: Convertxapic_state_testaway from hardcoded vCPU ID
KVM: selftests: Convert debug-exceptions away fromVCPU_ID
KVM: selftests: Convertfix_hypercall_testaway fromVCPU_ID
KVM: selftests: Convertvgic_irqaway fromVCPU_ID
KVM: selftests: Make arm64'sguest_get_vcpuid()declaration arm64-only
KVM: selftests: Movevm_is_unrestricted_guest()to x86-64
KVM: selftests: Add "arch" to common utils that have arch
implementations
KVM: selftests: Return created vcpu fromvm_vcpu_add_default()
KVM: selftests: Rename vm_vcpu_add* helpers to better show
relationships
KVM: selftests: Convertset_boot_cpu_idaway from globalVCPU_IDs
KVM: selftests: Convertpsci_testaway fromVCPU_ID
KVM: selftests: Converthardware_disable_testto pass around vCPU
objects
KVM: selftests: Add VM creation helper that "returns" vCPUs
KVM: selftests: Convertsteal_timeaway fromVCPU_ID
KVM: selftests: Convertarch_timeraway fromVCPU_ID
KVM: selftests: Convertsvm_nested_soft_inject_testaway fromVCPU_ID
KVM: selftests: Converttriple_fault_event_testaway fromVCPU_ID
KVM: selftests: Convertvgic_initaway from
vm_create_default_with_vcpus()
KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers
KVM: selftests: Sync stage before VM is freed in hypercalls test
KVM: selftests: Convert hypercalls test away fromvm_create_default()
KVM: selftests: Convertxapic_ipi_testaway from*_VCPU_ID
KVM: selftests: Convertsync_regs_testaway fromVCPU_ID
KVM: selftests: Convert s390's "resets" test away fromVCPU_ID
KVM: selftests: Convert memop away fromVCPU_ID
KVM: selftests: Convert s390x/diag318_test_handler away fromVCPU_ID
KVM: selftests: Convert tprot away fromVCPU_ID
KVM: selftests: Usevm_create()intsc_scaling_sync
KVM: selftests: Usevm_create_with_vcpus()inmax_guest_memory_test
KVM: selftests: Drop vm_create_default* helpers
KVM: selftests: Drop @vcpuids param from VM creators
KVM: selftests: Convertkvm_page_table_testaway from reliance on
vcpu_id
KVM: selftests: Convertkvm_binary_stats_testaway from vCPU IDs
KVM: selftests: Convert get-reg-list away from its "VCPU_ID"
KVM: selftests: Stop hardcoding vCPU IDs invcpu_width_config
KVM: selftests: Stop conflating vCPU index and ID in perf tests
KVM: selftests: Removevcpu_get()usage fromdirty_log_test
KVM: selftests: Require vCPU output array when creating VM with vCPUs
KVM: selftests: Purge vm+vcpu_id == vcpu silliness
KVM: selftests: Dropvcpu_get(), renamevcpu_find()=>vcpu_exists()
KVM: selftests: Removevcpu_state()helper
KVM: selftests: Open code and drop 'structkvm_vm' accessors
KVM: selftests: Drop @slot0_mem_pages from__vm_create_with_vcpus()
KVM: selftests: Drop @num_percpu_pages from__vm_create_with_vcpus()
KVM: selftests: Move per-VM/per-vCPU nr pages calculation to__vm_create()KVM: selftests: Trust that MAXPHYADDR > memslot0 in
vmx_apic_access_test
KVM: selftests: DropDEFAULT_GUEST_PHY_PAGES, open code the magic
number
KVM: selftests: Return an 'unsigned int' fromkvm_check_cap()
KVM: selftests: Addkvm_has_cap()to provide syntactic sugar
KVM: selftests: AddTEST_REQUIREmacros to reduce skipping copy+paste
KVM: selftests: Sanity check input toioctls()at build timeDocumentation/virt/kvm/api.rst | 4 +- .../selftests/kvm/aarch64/arch_timer.c | 79 +- .../selftests/kvm/aarch64/debug-exceptions.c | 22 +- .../selftests/kvm/aarch64/get-reg-list.c | 29 +- .../selftests/kvm/aarch64/hypercalls.c | 90 +- .../testing/selftests/kvm/aarch64/psci_test.c | 69 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 71 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 379 +++--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 40 +- .../selftests/kvm/access_tracking_perf_test.c | 92 +- .../selftests/kvm/demand_paging_test.c | 49 +- .../selftests/kvm/dirty_log_perf_test.c | 51 +- tools/testing/selftests/kvm/dirty_log_test.c | 95 +- .../selftests/kvm/hardware_disable_test.c | 29 +- .../selftests/kvm/include/aarch64/processor.h | 28 +- .../selftests/kvm/include/aarch64/vgic.h | 6 +- .../selftests/kvm/include/kvm_util_base.h | 743 ++++++++--- .../selftests/kvm/include/perf_test_util.h | 5 +- .../selftests/kvm/include/riscv/processor.h | 20 - .../testing/selftests/kvm/include/test_util.h | 9 + .../selftests/kvm/include/ucall_common.h | 2 +- .../selftests/kvm/include/x86_64/evmcs.h | 2 +- .../selftests/kvm/include/x86_64/processor.h | 109 +- .../selftests/kvm/kvm_binary_stats_test.c | 31 +- .../selftests/kvm/kvm_create_max_vcpus.c | 10 +- .../selftests/kvm/kvm_page_table_test.c | 66 +- .../selftests/kvm/lib/aarch64/processor.c | 81 +- .../testing/selftests/kvm/lib/aarch64/ucall.c | 9 +- .../testing/selftests/kvm/lib/aarch64/vgic.c | 54 +- tools/testing/selftests/kvm/lib/elf.c | 1 - tools/testing/selftests/kvm/lib/guest_modes.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 1104 +++-------------- .../selftests/kvm/lib/kvm_util_internal.h | 128 -- .../selftests/kvm/lib/perf_test_util.c | 84 +- .../selftests/kvm/lib/riscv/processor.c | 111 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 14 +- .../kvm/lib/s390x/diag318_test_handler.c | 11 +- .../selftests/kvm/lib/s390x/processor.c | 44 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 533 +++----- tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 +- .../testing/selftests/kvm/lib/x86_64/ucall.c | 10 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 16 +- .../selftests/kvm/max_guest_memory_test.c | 53 +- .../kvm/memslot_modification_stress_test.c | 13 +- .../testing/selftests/kvm/memslot_perf_test.c | 28 +- tools/testing/selftests/kvm/rseq_test.c | 22 +- tools/testing/selftests/kvm/s390x/memop.c | 93 +- tools/testing/selftests/kvm/s390x/resets.c | 140 ++- .../selftests/kvm/s390x/sync_regs_test.c | 45 +- tools/testing/selftests/kvm/s390x/tprot.c | 25 +- .../selftests/kvm/set_memory_region_test.c | 43 +- tools/testing/selftests/kvm/steal_time.c | 120 +- .../kvm/system_counter_offset_test.c | 35 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 56 +- .../testing/selftests/kvm/x86_64/cpuid_test.c | 29 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 22 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 77 +- .../kvm/x86_64/emulator_error_test.c | 74 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 61 +- .../selftests/kvm/x86_64/fix_hypercall_test.c | 45 +- .../kvm/x86_64/get_msr_index_features.c | 117 +- .../selftests/kvm/x86_64/hyperv_clock.c | 25 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 34 +- .../selftests/kvm/x86_64/hyperv_features.c | 61 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 20 +- .../selftests/kvm/x86_64/kvm_clock_test.c | 29 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 33 +- .../kvm/x86_64/max_vcpuid_cap_test.c | 28 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 16 +- .../selftests/kvm/x86_64/mmu_role_test.c | 30 +- .../selftests/kvm/x86_64/platform_info_test.c | 51 +- .../kvm/x86_64/pmu_event_filter_test.c | 97 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 91 +- .../selftests/kvm/x86_64/set_sregs_test.c | 47 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 120 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 37 +- .../testing/selftests/kvm/x86_64/state_test.c | 29 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 17 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 16 +- .../selftests/kvm/x86_64/sync_regs_test.c | 62 +- .../kvm/x86_64/triple_fault_event_test.c | 39 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 35 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 25 +- .../selftests/kvm/x86_64/userspace_io_test.c | 18 +- .../kvm/x86_64/userspace_msr_exit_test.c | 187 ++- .../kvm/x86_64/vmx_apic_access_test.c | 27 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 13 +- .../vmx_exception_with_invalid_guest_state.c | 68 +- .../x86_64/vmx_invalid_nested_guest_state.c | 18 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 29 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 48 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 35 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 91 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 13 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 48 +- .../selftests/kvm/x86_64/xapic_state_test.c | 60 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 73 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 25 +- .../selftests/kvm/x86_64/xss_msr_test.c | 56 +- 102 files changed, 3059 insertions(+), 4178 deletions(-)delete mode 100644
tools/testing/selftests/kvm/lib/kvm_util_internal.hbase-commit:
55371f1d0c01357f29da613f7525c3f252320bbf
Sean Christopherson
reviewerQuoted 8 lines · Sean Christopherson
+Raghu
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Raghu is going to run on arm64, I'll work with him to iron out any bugs (I should have done this before posting). I.e. Marc is mostly off the hook unless there's tests we can't run.
arm64 is quite broken, the only tests that pass are those that don't actually enter the guest. Common tests, e.g. rseq and memslots tests, fail with the same signature, so presumably I botched something in lib/aarch64, but I haven't been able to find anything via inspection.
Raghu is bisecting...
Sean Christopherson
reviewerQuoted 10 lines · Sean Christopherson
Quoted 8 lines · Sean Christopherson
+Raghu
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Raghu is going to run on arm64, I'll work with him to iron out any bugs (I should have done this before posting). I.e. Marc is mostly off the hook unless there's tests we can't run.
Quoted 6 lines
arm64 is quite broken, the only tests that pass are those that don't actually enter the guest. Common tests, e.g. rseq and memslots tests, fail with the same signature, so presumably I botched something in lib/aarch64, but I haven't been able to find anything via inspection.
Raghu is bisecting...
Ha! Looks like it's an issue with running upstream selftest using one of our many internal framework things. Running a few of the tests manually works. We should have full results tomorrow.
I did find one bug during my inspection, in case someone gets ambitious and wants to run tests too :-)
tools/testing/selftests/kvm/lib/aarch64/vgic.c +1 -1
@@ -55,7 +55,7 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs,if (gic_fd <0 )return gic_fd; -kvm_device_attr_get (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 , &nr_irqs); +kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 , &nr_irqs);kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Can you please, pretty please, once and for all, kill that alias you seem to have for me and email me on an address I actually can read?
I can't remember how many times you emailed me on my ex @arm.com address over the past 2+years...
The same thing probably applies to Sean, btw.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Sean Christopherson
reviewerQuoted 10 lines · Marc Zyngier
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Can you please, pretty please, once and for all, kill that alias you seem to have for me and email me on an address I actually can read?
I can't remember how many times you emailed me on my ex @arm.com address over the past 2+years...
The same thing probably applies to Sean, btw.
Ha! I was wondering how my old @intel address snuck in...
On the aarch64 side, with the following tweaks, courtesy of Raghu, all tests pass. I'll work these into the next version, and hopefully also learn how to run on aarch64 myself...
Note, the i => 0 "fix" in test_v3_typer_accesses() is a direct revert of patch 3, "KVM: selftests: Fix typo in vgic_init test". I'll just drop that patch unless someone figures out why doing the right thing causes the test to fail.
tools/testing/selftests/kvm/aarch64/vgic_init.c +4 -3
@@ -317,7 +317,7 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add (v.vm, i, guest_code); + vcpus[i] =vm_vcpu_add (v.vm, i, guest_code); ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" );
@@ -424,7 +424,7 @@ static void test_v3_typer_accesses(void) KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);for (i =0 ; i <NR_VCPUS ; i++) { - ret =v3_redist_reg_get (v.gic_fd, i,GICR_TYPER , &val); + ret =v3_redist_reg_get (v.gic_fd,0 ,GICR_TYPER , &val);TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); }
@@ -654,11 +654,12 @@ static void test_v3_its_region(void)*/ int test_kvm_device (uint32_t gic_dev_type) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;uint32_t other;int ret; - v.vm =vm_create_with_vcpus (NR_VCPUS , guest_code,NULL ); + v.vm =vm_create_with_vcpus (NR_VCPUS , guest_code, vcpus);/* try to create a non existing KVM device */ ret =__kvm_test_create_device (v.vm,0 );
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -419,7 +419,7 @@ static void run_test(struct vcpu_config *c)check_supported (c); - vm =vm_create_barebones (); + vm =vm_create (1 );prepare_vcpu_init (c, &init); vcpu =aarch64_vcpu_add (vm,0 , &init,NULL );finalize_vcpu (vcpu, c);
Quoted 14 lines · Sean Christopherson
Quoted 10 lines · Marc Zyngier
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Can you please, pretty please, once and for all, kill that alias you seem to have for me and email me on an address I actually can read?
I can't remember how many times you emailed me on my ex @arm.com address over the past 2+years...
The same thing probably applies to Sean, btw.
Ha! I was wondering how my old @intel address snuck in...
Quoted 7 lines
On the aarch64 side, with the following tweaks, courtesy of Raghu, all tests pass. I'll work these into the next version, and hopefully also learn how to run on aarch64 myself...
Note, the i => 0 "fix" in
test_v3_typer_accesses()is a direct revert of patch 3, "KVM: selftests: Fix typo invgic_inittest". I'll just drop that patch unless someone figures out why doing the right thing causes the test to fail.
CCing Eric for that one.
Quoted 42 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c +4
-3@@ -317,7 +317,7 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type)/* Add the rest of the VCPUs */ for (i =1 ; i <NR_VCPUS ; ++i) -vm_vcpu_add (v.vm, i, guest_code); + vcpus[i] =vm_vcpu_add (v.vm, i, guest_code); ret =run_vcpu (vcpus[3 ]);TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" );@@ -424,7 +424,7 @@ static void test_v3_typer_accesses(void) KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);for (i =0 ; i <NR_VCPUS ; i++) { - ret =v3_redist_reg_get (v.gic_fd, i,GICR_TYPER , &val); + ret =v3_redist_reg_get (v.gic_fd,0 ,GICR_TYPER , &val);TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); }@@ -654,11 +654,12 @@ static void test_v3_its_region(void)*/ int test_kvm_device (uint32_t gic_dev_type) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;uint32_t other;int ret; - v.vm =vm_create_with_vcpus (NR_VCPUS , guest_code,NULL ); + v.vm =vm_create_with_vcpus (NR_VCPUS , guest_code, vcpus);/* try to create a non existing KVM device */ ret =__kvm_test_create_device (v.vm,0 );tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 422
Quoted 5 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1
-1@@ -419,7 +419,7 @@ static void run_test(struct vcpu_config *c)check_supported (c); - vm =vm_create_barebones (); + vm =vm_create (1 );
Hmm, looks like something, somewhere for AArch64 needs improving to avoid strangeness like this. I'll look into it after we get this series merged.
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 425
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0prepare_vcpu_init (c, &init); vcpu =aarch64_vcpu_add (vm,0 , &init,NULL );finalize_vcpu (vcpu, c);
Thanks,
drew
Sean Christopherson
reviewerQuoted 7 lines · Andrew Jones
Quoted 6 lines · Sean Christopherson
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0@@ -419,7 +419,7 @@ static void run_test(struct vcpu_config *c)
Quoted 7 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 422
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1
-1check_supported (c); - vm =vm_create_barebones (); + vm =vm_create (1 );Hmm, looks like something, somewhere for AArch64 needs improving to avoid strangeness like this. I'll look into it after we get this series merged.
Huh, you're right, that is odd. Ah, duh, aarch64_vcpu_add() allocates a stack for the vCPU, and that will fail if there's no memslot from which to allocate guest memory.
So, this is my goof in
KVM: selftests: Rename vm_create() => vm_create_barebones(), drop param
get-reg-list should first be converted to vm_create_without_vcpus(). I'll also add a comment explaining that vm_create_barebones() can be used with __vm_vcpu_add(), but not the "full" vm_vcpu_add() or vm_arch_vcpu_add() variants.
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 425
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0prepare_vcpu_init (c, &init); vcpu =aarch64_vcpu_add (vm,0 , &init,NULL );finalize_vcpu (vcpu, c);Thanks,
drew
Sean Christopherson
reviewerQuoted 20 lines · Sean Christopherson
Quoted 7 lines · Andrew Jones
Quoted 6 lines · Sean Christopherson
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0@@ -419,7 +419,7 @@ static void run_test(struct vcpu_config *c)Quoted 7 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 422
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1
-1check_supported (c); - vm =vm_create_barebones (); + vm =vm_create (1 );Hmm, looks like something, somewhere for AArch64 needs improving to avoid strangeness like this. I'll look into it after we get this series merged.
Huh, you're right, that is odd. Ah, duh,
aarch64_vcpu_add()allocates a stack for the vCPU, and that will fail if there's no memslot from which to allocate guest memory.
Quoted 7 lines
So, this is my goof in
KVM: selftests: Rename
vm_create()=>vm_create_barebones(), drop paramget-reg-list should first be converted to
vm_create_without_vcpus(). I'll also add a comment explaining thatvm_create_barebones()can be used with__vm_vcpu_add(), but not the "full"vm_vcpu_add()orvm_arch_vcpu_add()variants.
Actually, I agree with your assessment. A better solution is to open code the calls to add and setup the vCPU. It's a small amount of code duplication, but I actually like the end result because it better documents the test's dependencies.
Assuming it actually works, i.e. the stack setup is truly unnecessary, I'll add a patch like so before the barebones change.
tools/testing/selftests/kvm/aarch64/get-reg-list.c +2 -1
@@ -418,7 +418,8 @@ static void run_test(struct vcpu_config *c) vm =vm_create (DEFAULT_GUEST_PHY_PAGES );prepare_vcpu_init (c, &init); -aarch64_vcpu_add_default (vm,0 , &init,NULL ); +vm_vcpu_add (vm, vcpuid); +aarch64_vcpu_setup (vm,0 , &init);finalize_vcpu (vm,0 , c); reg_list =vcpu_get_reg_list (vm,0 );
Quoted 42 lines · Sean Christopherson
Quoted 20 lines · Sean Christopherson
Quoted 7 lines · Andrew Jones
Quoted 6 lines · Sean Christopherson
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0@@ -419,7 +419,7 @@ static void run_test(struct vcpu_config *c)Quoted 7 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 422
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1
-1check_supported (c); - vm =vm_create_barebones (); + vm =vm_create (1 );Hmm, looks like something, somewhere for AArch64 needs improving to avoid strangeness like this. I'll look into it after we get this series merged.
Huh, you're right, that is odd. Ah, duh,
aarch64_vcpu_add()allocates a stack for the vCPU, and that will fail if there's no memslot from which to allocate guest memory.Quoted 7 lines
So, this is my goof in
KVM: selftests: Rename
vm_create()=>vm_create_barebones(), drop paramget-reg-list should first be converted to
vm_create_without_vcpus(). I'll also add a comment explaining thatvm_create_barebones()can be used with__vm_vcpu_add(), but not the "full"vm_vcpu_add()orvm_arch_vcpu_add()variants.Actually, I agree with your assessment. A better solution is to open code the calls to add and setup the vCPU. It's a small amount of code duplication, but I actually like the end result because it better documents the test's dependencies.
Assuming it actually works, i.e. the stack setup is truly unnecessary, I'll add a patch like so before the barebones change.
tools/testing/selftests/kvm/aarch64/get-reg-list.c +0
-0
tools/testing/selftests/kvm/aarch64/get-reg-list.c static void run_test(struct vcpu_config *c) · line 425
Quoted 9 lines
tools/testing/selftests/kvm/aarch64/get-reg-list.c +2
-1@@ -418,7 +418,8 @@ static void run_test(struct vcpu_config *c) vm =vm_create (DEFAULT_GUEST_PHY_PAGES );prepare_vcpu_init (c, &init); -aarch64_vcpu_add_default (vm,0 , &init,NULL ); +vm_vcpu_add (vm, vcpuid); +aarch64_vcpu_setup (vm,0 , &init);finalize_vcpu (vm,0 , c); reg_list =vcpu_get_reg_list (vm,0 );
LGTM, Thanks
Sean Christopherson
reviewerQuoted 25 lines · Andrew Jones
Quoted 14 lines · Sean Christopherson
Quoted 10 lines · Marc Zyngier
Quoted 1 line · Paolo Bonzini
Marc, Christian, Anup, can you please give this a go?
Can you please, pretty please, once and for all, kill that alias you seem to have for me and email me on an address I actually can read?
I can't remember how many times you emailed me on my ex @arm.com address over the past 2+years...
The same thing probably applies to Sean, btw.
Ha! I was wondering how my old @intel address snuck in...
Quoted 7 lines
On the aarch64 side, with the following tweaks, courtesy of Raghu, all tests pass. I'll work these into the next version, and hopefully also learn how to run on aarch64 myself...
Note, the i => 0 "fix" in
test_v3_typer_accesses()is a direct revert of patch 3, "KVM: selftests: Fix typo invgic_inittest". I'll just drop that patch unless someone figures out why doing the right thing causes the test to fail.CCing Eric for that one.
Quoted 7 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c static void test_v3_typer_accesses(void) · line 428
Quoted 7 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c +1
-1@@ -424,7 +424,7 @@ static void test_v3_typer_accesses(void) KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);for (i =0 ; i <NR_VCPUS ; i++) { - ret =v3_redist_reg_get (v.gic_fd, i,GICR_TYPER , &val); + ret =v3_redist_reg_get (v.gic_fd,0 ,GICR_TYPER , &val);TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" );
Figured it out, "val" should be "i * 0x100", not "0". The asserts in this test are awful and don't print the actual "val". test_assert() shares part of the blame for printing a stale errno, but holy moly this test makes it painful to debug trivial issues.