KVM: selftests: Overhaul APIs, purge VCPU_ID
Subsystems (4)
Sean Christopherson
reviewercover KVM: selftests: Overhaul APIs, purge VCPU_ID
First off, hopefully I didn't just spam you with 106 emails. In theory, unless you're subscribed to LKML, you should see only the cover letter and everything else should be on lore if you want to pull down the mbox (instead of saying "LOL, 105 patches!?!?", or maybe after you say that).
This is a (very) early RFC for overhauling KVM's selftests APIs. It's compile tested only (maybe), there are no changelogs, etc...
My end goal with an overhaul is to get to a state where adding new features and writing tests is less painful/disgusting (I feel dirty every time I copy+paste VCPU_ID). I opted to directly send only the cover letter because most of the individual patches aren't all that interesting, there's still 46 patches even if the per-test conversions are omitted, and it's the final state that I really care about and want to discuss.
The overarching theme of my take on where to go with selftests 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. Want to call a vCPU ioctl()? Hope you have the VM...
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 -700 LoC).
I was hoping to get this into a less shabby state before posting, but I'm I'm going to be OOO for the next few weeks and want to get the ball rolling instead of waiting another month or so.
Based on an older version of kvm/queue. The full thing is also on github:
https://github.com/sean-jc/linux.git x86/selftests_overhaul
Sean Christopherson (105):
KVM: selftests: Fix buggy check in test_v3_new_redist_regions()
KVM: selftests: Always open VM file descriptors with O_RDWR
KVM: selftest: Add another underscore to inner ioctl helpers
KVM: selftests: Make vcpu_ioctl() a wrapper to pretty print ioctl name
KVM: selftests: Drop @mode from common vm_create() helper
KVM: selftests: Split vcpu_set_nested_state() into two helpers
KVM: selftests: Add hyperv_svm_test test binary to .gitignore
KVM: sefltests: Use vcpu_ioctl() and __vcpu_ioctl() helpers
KVM: selftests: Add __vcpu_run() helper
KVM: selftests: Use vcpu_access_device_attr() in arm64 code
KVM: selftests: Remove vcpu_get_fd()
KVM: selftests: Add vcpu_get() to retrieve and assert on vCPU
existence
KVM: selftests: Make vm_ioctl() a wrapper to pretty print ioctl name
KVM: sefltests: Use vm_ioctl() and __vm_ioctl() helpers
KVM: selftests: Make kvm_ioctl() a wrapper to pretty print ioctl name
KVM: selftests: Use kvm_ioctl() helpers
KVM: selftests: Make x86-64's register dump helpers static
KVM: selftests: Get rid of kvm_util_internal.h
KVM: selftests: Use KVM_IOCTL_ERROR() for one-off arm64 ioctls
KVM: selftests: Drop @test param from kvm_create_device()
KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper
KVM: selftests: Multiplex return code and fd in __kvm_create_device()
KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency
KVM: selftests: Drop 'int' return from asserting *_device_has_attr()
KVM: selftests: Split get/set device_attr helpers
KVM: selftests: Add a VM backpointer to 'struct vcpu'
KVM: selftests: Add vm_create_*() variants to expose/return 'struct
vcpu'
KVM: selftests: Rename vcpu.state => vcpu.run
KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
KVM: selftests: Return the created vCPU from vm_vcpu_add()
KVM: selftests: Convert memslot_perf_test away from VCPU_ID
KVM: selftests: Convert rseq_test away from VCPU_ID
KVM: selftests: Convert xss_msr_test away from VCPU_ID
KVM: selftests: Convert vmx_preemption_timer_test away from VCPU_ID
KVM: selftests: Convert vmx_pmu_msrs_test away from VCPU_ID
KVM: selftests: Convert vmx_set_nested_state_test away from VCPU_ID
KVM: selftests: Convert vmx_tsc_adjust_test away from VCPU_ID
KVM: selftests: Convert mmu_role_test away from VCPU_ID
KVM: selftests: Convert pmu_event_filter_test away from VCPU_ID
KVM: selftests: Convert smm_test away from VCPU_ID
KVM: selftests: Convert state_test away from VCPU_ID
KVM: selftests: Convert svm_int_ctl_test away from VCPU_ID
KVM: selftests: Convert svm_vmcall_test away from VCPU_ID
KVM: selftests: Convert sync_regs_test away from VCPU_ID
KVM: selftests: Convert hyperv_cpuid away from VCPU_ID
KVM: selftests: Convert kvm_pv_test away from VCPU_ID
KVM: selftests: Convert platform_info_test away from VCPU_ID
KVM: selftests: Convert vmx_nested_tsc_scaling_test away from VCPU_ID
KVM: selftests: Convert set_sregs_test away from VCPU_ID
KVM: selftests: Convert vmx_dirty_log_test away from VCPU_ID
KVM: selftests: Convert vmx_close_while_nested_test away from VCPU_ID
KVM: selftests: Convert vmx_apic_access_test away from VCPU_ID
KVM: selftests: Convert userspace_msr_exit_test away from VCPU_ID
KVM: selftests: Convert vmx_exception_with_invalid_guest_state away
from VCPU_ID
KVM: selftests: Convert tsc_msrs_test away from VCPU_ID
KVM: selftests: Convert kvm_clock_test away from VCPU_ID
KVM: selftests: Convert hyperv_svm_test away from VCPU_ID
KVM: selftests: Convert hyperv_features away from VCPU_ID
KVM: selftests: Convert hyperv_clock away from VCPU_ID
KVM: selftests: Convert evmcs_test away from VCPU_ID
KVM: selftests: Convert emulator_error_test away from VCPU_ID
KVM: selftests: Convert debug_regs away from VCPU_ID
KVM: selftests: Add proper helper for advancing RIP in debug_regs
KVM: selftests: Convert amx_test away from VCPU_ID
KVM: selftests: Convert cr4_cpuid_sync_test away from VCPU_ID
KVM: selftests: Convert cpuid_test away from VCPU_ID
KVM: selftests: Convert userspace_io_test away from VCPU_ID
KVM: selftests: Convert vmx_invalid_nested_guest_state away from
VCPU_ID
KVM: selftests: Convert xen_vmcall_test away from VCPU_ID
KVM: selftests: Convert xen_shinfo_test away from VCPU_ID
KVM: selftests: Convert dirty_log_test away from VCPU_ID
KVM: selftests: Convert set_memory_region_test away from VCPU_ID
KVM: selftests: Convert system_counter_offset_test away from VCPU_ID
KVM: selftests: Convert debug-exceptions away from VCPU_ID
KVM: selftests: Convert vgic_irq.c include/aarch64/vgic.h
lib/aarch64/vgic away from VCPU_ID
KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only
KVM: selftests: Move vm_is_unrestricted_guest() to x86-64
KVM: selftests: Add "arch" to common utils that have arch
implementations
KVM: selftests: Return created vcpu from vm_vcpu_add_default()
KVM: selftests: Rename vm_vcpu_add* helpers to better show
relationships
KVM: selftests: Convert set_boot_cpu_id away from VCPU_ID
KVM: selftests: Convert psci_cpu_on_test away from VCPU_ID
KVM: selftests: Convert hardware_disable_test away from VCPU_ID
KVM: selftests: Add VM creation helper that "returns" vCPUs
KVM: selftests: Convert steal_time away from VCPU_ID
KVM: selftests: Convert arch_timer away from VCPU_ID
KVM: selftests: Fix typo in vgic_init test
KVM: selftests: Convert vgic_init away from
vm_create_default_with_vcpus()
KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID
KVM: selftests: Convert sync_regs_test away from VCPU_ID
KVM: selftests: Convert resets away from VCPU_ID
KVM: selftests: Convert memop away from VCPU_ID
KVM: selftests: Convert s390x/diag318_test_handler away from VCPU_ID
KVM: selftests: Drop vm_create_default* helpers
KVM: selftests: Drop vcpuids param from VM creators
KVM: selftests: Convert kvm_page_table_test away from reliance on
vcpu_id
KVM: selftests: Convert kvm_binary_stats_test away from VCPU_ID
KVM: selftests: Convert get-reg-list away from VCPU_ID
KVM: selftests: Stop conflating vCPU index and ID in perf tests
KVM: selftests: Remove vcpu_get() usage from dirty_log_test
KVM: selftests: Require vCPU output array when creating VM with vCPUs
KVM: selftest: Purge vm+vcpu_id == vcpu silliness
KVM: selftests: Drop vcpu_get(), rename vcpu_find() => vcpu_exists()
KVM: selftests: Remove vcpu_state() helper
KVM: selftests: Open code and drop kvm_vm accessors
tools/testing/selftests/kvm/.gitignore | 1 + .../selftests/kvm/aarch64/arch_timer.c | 68 +- .../selftests/kvm/aarch64/debug-exceptions.c | 17 +- .../selftests/kvm/aarch64/get-reg-list.c | 19 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 22 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 369 +++---- .../testing/selftests/kvm/aarch64/vgic_irq.c | 30 +- .../selftests/kvm/access_tracking_perf_test.c | 81 +- .../selftests/kvm/demand_paging_test.c | 39 +- .../selftests/kvm/dirty_log_perf_test.c | 42 +- tools/testing/selftests/kvm/dirty_log_test.c | 80 +- .../selftests/kvm/hardware_disable_test.c | 27 +- .../selftests/kvm/include/aarch64/processor.h | 20 +- .../selftests/kvm/include/aarch64/vgic.h | 6 +- .../selftests/kvm/include/kvm_util_base.h | 677 ++++++++---- .../selftests/kvm/include/perf_test_util.h | 5 +- .../selftests/kvm/include/riscv/processor.h | 8 +- .../selftests/kvm/include/ucall_common.h | 2 +- .../selftests/kvm/include/x86_64/evmcs.h | 2 +- .../selftests/kvm/include/x86_64/processor.h | 52 +- .../selftests/kvm/kvm_binary_stats_test.c | 27 +- .../selftests/kvm/kvm_create_max_vcpus.c | 4 +- .../selftests/kvm/kvm_page_table_test.c | 66 +- .../selftests/kvm/lib/aarch64/processor.c | 79 +- .../testing/selftests/kvm/lib/aarch64/ucall.c | 9 +- .../testing/selftests/kvm/lib/aarch64/vgic.c | 44 +- 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 | 981 +++--------------- .../selftests/kvm/lib/kvm_util_internal.h | 128 --- .../selftests/kvm/lib/perf_test_util.c | 84 +- .../selftests/kvm/lib/riscv/processor.c | 110 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 7 +- .../kvm/lib/s390x/diag318_test_handler.c | 9 +- .../selftests/kvm/lib/s390x/processor.c | 44 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 311 ++---- tools/testing/selftests/kvm/lib/x86_64/svm.c | 1 - .../testing/selftests/kvm/lib/x86_64/ucall.c | 10 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 5 +- .../kvm/memslot_modification_stress_test.c | 13 +- .../testing/selftests/kvm/memslot_perf_test.c | 28 +- tools/testing/selftests/kvm/rseq_test.c | 9 +- tools/testing/selftests/kvm/s390x/memop.c | 31 +- tools/testing/selftests/kvm/s390x/resets.c | 137 +-- .../selftests/kvm/s390x/sync_regs_test.c | 37 +- .../selftests/kvm/set_memory_region_test.c | 45 +- tools/testing/selftests/kvm/steal_time.c | 120 +-- .../kvm/system_counter_offset_test.c | 29 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 33 +- .../testing/selftests/kvm/x86_64/cpuid_test.c | 29 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 17 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 72 +- .../kvm/x86_64/emulator_error_test.c | 65 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 51 +- .../kvm/x86_64/get_msr_index_features.c | 16 +- .../selftests/kvm/x86_64/hyperv_clock.c | 25 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 25 +- .../selftests/kvm/x86_64/hyperv_features.c | 51 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 14 +- .../selftests/kvm/x86_64/kvm_clock_test.c | 23 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 25 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 6 +- .../selftests/kvm/x86_64/mmu_role_test.c | 20 +- .../selftests/kvm/x86_64/platform_info_test.c | 34 +- .../kvm/x86_64/pmu_event_filter_test.c | 60 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 87 +- .../selftests/kvm/x86_64/set_sregs_test.c | 47 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 17 +- 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 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 16 +- .../selftests/kvm/x86_64/sync_regs_test.c | 52 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 35 +- .../selftests/kvm/x86_64/userspace_io_test.c | 18 +- .../kvm/x86_64/userspace_msr_exit_test.c | 165 ++- .../kvm/x86_64/vmx_apic_access_test.c | 18 +- .../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 | 62 +- .../x86_64/vmx_invalid_nested_guest_state.c | 18 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 19 +- .../selftests/kvm/x86_64/vmx_pmu_msrs_test.c | 25 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 30 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 86 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 12 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 48 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 35 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 17 +- .../selftests/kvm/x86_64/xss_msr_test.c | 10 +- 91 files changed, 2363 insertions(+), 3087 deletions(-) delete mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h
base-commit: f6ae04ddb347f526b4620d1053690ecf1f87d77f
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 1/105 KVM: selftests: Fix buggy check in test_v3_new_redist_regions()
--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +2 -2
@@ -381,8 +381,8 @@ static void test_v3_new_redist_regions(void) v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS );subtest_v3_redist_regions (&v); -_kvm_device_access (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , -KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , dummy, true); + ret =_kvm_device_access (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , dummy, true);TEST_ASSERT (ret && errno ==EFAULT ,"register a third region allowing to cover the 4 vcpus" );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 2/105 KVM: selftests: Always open VM file descriptors with O_RDWR
In reply to Sean Christopherson--- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../selftests/kvm/include/kvm_util_base.h | 4 ++-- .../selftests/kvm/kvm_binary_stats_test.c | 2 +- .../selftests/kvm/kvm_create_max_vcpus.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 20 +++++++++---------- .../selftests/kvm/set_memory_region_test.c | 4 ++-- tools/testing/selftests/kvm/x86_64/amx_test.c | 2 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 2 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- .../selftests/kvm/x86_64/set_sregs_test.c | 2 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 8 ++++---- tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- .../testing/selftests/kvm/x86_64/state_test.c | 2 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 2 +- 17 files changed, 30 insertions(+), 32 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -411,7 +411,7 @@ static void run_test(struct vcpu_config *c)check_supported (c); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );prepare_vcpu_init (c, &init);aarch64_vcpu_add_default (vm,0 , &init,NULL );finalize_vcpu (vm,0 , c);
tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +1 -1
@@ -76,7 +76,7 @@ int main(void)struct kvm_vm *vm;struct ucall uc; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );kvm_vm_elf_load (vm, program_invocation_name);ucall_init (vm,NULL );
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -679,7 +679,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,pr_info ("Testing guest mode: %s\n" ,vm_guest_mode_string (mode)); - vm =vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages,O_RDWR ); + vm =vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);kvm_vm_elf_load (vm, program_invocation_name);#ifdef __x86_64__vm_create_irqchip (vm);
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -104,7 +104,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -2
@@ -110,9 +110,9 @@ int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id,void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);const char *vm_guest_mode_string (uint32_t i); -struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages,int perm); +struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages);void kvm_vm_free (struct kvm_vm *vmp); -void kvm_vm_restart (struct kvm_vm *vmp,int perm); +void kvm_vm_restart (struct kvm_vm *vmp);void kvm_vm_release (struct kvm_vm *vmp);void kvm_vm_get_dirty_log (struct kvm_vm *vm,int slot,void *log); void kvm_vm_clear_dirty_log(struct kvm_vm *vm, int slot, void *log,
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])TEST_ASSERT (vms,"Allocate memory for storing VM pointers" );for (i =0 ; i < max_vm; ++i) { vms[i] =vm_create (VM_MODE_DEFAULT , -DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); +DEFAULT_GUEST_PHY_PAGES );for (j =0 ; j < max_vcpu; ++j)vm_vcpu_add (vms[i], j); }
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +1 -1
@@ -28,7 +28,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus)pr_info ("Testing creating %d vCPUs, with IDs %d...%d.\n" , num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus -1 ); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );for (i = first_vcpu_id; i < first_vcpu_id + num_vcpus; i++)/* This asserts that the vCPU was created. */
tools/testing/selftests/kvm/lib/kvm_util.c +9 -11
@@ -173,9 +173,9 @@ void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size) vm->dirty_ring_size = ring_size; } -static void vm_open (struct kvm_vm *vm,int perm) +static void vm_open (struct kvm_vm *vm) { - vm->kvm_fd =_open_kvm_dev_path_or_exit (perm); + vm->kvm_fd =_open_kvm_dev_path_or_exit (O_RDWR );if (!kvm_check_cap (KVM_CAP_IMMEDIATE_EXIT )) {print_skip ("immediate_exit not available" );
@@ -240,7 +240,6 @@ _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params)* Input Args: * mode - VM Mode (e.g. VM_MODE_P52V48_4K) * phy_pages - Physical memory pages -* perm - permission * * Output Args: None *
@@ -253,12 +252,12 @@ _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params)* descriptor to control the created VM is created with the permissions * given by perm (e.g. O_RDWR). */ -struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages,int perm) +struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages) {struct kvm_vm *vm; -pr_debug ("%s: mode='%s' pages='%ld' perm='%d'\n" , __func__, -vm_guest_mode_string (mode), phy_pages, perm); +pr_debug ("%s: mode='%s' pages='%ld'\n" , __func__, +vm_guest_mode_string (mode), phy_pages); vm =calloc (1 ,sizeof (*vm));TEST_ASSERT (vm !=NULL ,"Insufficient Memory" );
@@ -340,7 +339,7 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) vm->type =KVM_VM_TYPE_ARM_IPA_SIZE (vm->pa_bits);#endif -vm_open (vm, perm); +vm_open (vm);/* Limit to VA-bit canonical virtual addresses. */ vm->vpages_valid =sparsebit_alloc ();
@@ -412,7 +411,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, nr_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); pages =vm_adjust_num_guest_pages (mode, pages); - vm =vm_create (mode, pages,O_RDWR ); + vm =vm_create (mode, pages);kvm_vm_elf_load (vm, program_invocation_name);
@@ -449,7 +448,6 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,* * Input Args: * vm - VM that has been released before -* perm - permission * * Output Args: None *
@@ -457,12 +455,12 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,* global state, such as the irqchip and the memory regions that are mapped * into the guest. */ -void kvm_vm_restart (struct kvm_vm *vmp,int perm) +void kvm_vm_restart (struct kvm_vm *vmp) {int ctr;struct userspace_mem_region *region; -vm_open (vmp, perm); +vm_open (vmp);if (vmp->has_irqchip)vm_create_irqchip (vmp);
tools/testing/selftests/kvm/set_memory_region_test.c +2 -2
@@ -314,7 +314,7 @@ static void test_zero_memory_regions(void)pr_info ("Testing KVM_RUN with zero added memory regions\n" ); - vm =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,0 );vm_vcpu_add (vm,VCPU_ID ); TEST_ASSERT(!ioctl(vm_get_fd(vm), KVM_SET_NR_MMU_PAGES, 64),
@@ -370,7 +370,7 @@ static void test_add_max_memory_regions(void) "KVM_CAP_NR_MEMSLOTS should be greater than 0");pr_info ("Allowed number of memory slots: %i\n" , max_mem_slots); - vm =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,0 );/* Check it can be added memory slots up to the maximum allowed */ pr_info("Adding slots 0..%i, each memory region with %dK size\n",
tools/testing/selftests/kvm/x86_64/amx_test.c +1 -1
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm,O_RDWR ); +kvm_vm_restart (vm);vm_vcpu_add (vm,VCPU_ID );vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ());vcpu_load_state (vm,VCPU_ID , state);
tools/testing/selftests/kvm/x86_64/evmcs_test.c +1 -1
@@ -184,7 +184,7 @@ static void save_restore_vm(struct kvm_vm *vm)kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm,O_RDWR ); +kvm_vm_restart (vm);vm_vcpu_add (vm,VCPU_ID );vcpu_set_hv_cpuid (vm,VCPU_ID );vcpu_enable_evmcs (vm,VCPU_ID );
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -88,7 +88,7 @@ static struct kvm_vm *create_vm(void)uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); - vm =vm_create (VM_MODE_DEFAULT , pages,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT , pages);kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);
tools/testing/selftests/kvm/x86_64/set_sregs_test.c +1 -1
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])* use it to verify all supported CR4 bits can be set prior to defining * the vCPU model, i.e. without doing KVM_SET_CPUID2. */ - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );vm_vcpu_add (vm,VCPU_ID );vcpu_sregs_get (vm,VCPU_ID , &sregs);
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +4 -4
@@ -52,7 +52,7 @@ static struct kvm_vm *sev_vm_create(bool es)struct kvm_sev_launch_start start = {0 };int i; - vm =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,0 );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);
@@ -69,7 +69,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)struct kvm_vm *vm;int i; - vm =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,0 );if (!with_vcpus)return vm;
@@ -174,9 +174,9 @@ static void test_sev_migrate_parameters(void) sev_vm =sev_vm_create (/* es= */ false); sev_es_vm =sev_vm_create (/* es= */ true); - vm_no_vcpu =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm_no_vcpu =vm_create (VM_MODE_DEFAULT ,0 ); vm_no_sev =aux_vm_create (true); - sev_es_vm_no_vmsa =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + sev_es_vm_no_vmsa =vm_create (VM_MODE_DEFAULT ,0 );sev_ioctl (sev_es_vm_no_vmsa->fd,KVM_SEV_ES_INIT ,NULL );vm_vcpu_add (sev_es_vm_no_vmsa,1 );
tools/testing/selftests/kvm/x86_64/smm_test.c +1 -1
@@ -206,7 +206,7 @@ int main(int argc, char *argv[]) state =vcpu_save_state (vm,VCPU_ID );kvm_vm_release (vm); -kvm_vm_restart (vm,O_RDWR ); +kvm_vm_restart (vm);vm_vcpu_add (vm,VCPU_ID );vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ());vcpu_load_state (vm,VCPU_ID , state);
tools/testing/selftests/kvm/x86_64/state_test.c +1 -1
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm,O_RDWR ); +kvm_vm_restart (vm);vm_vcpu_add (vm,VCPU_ID );vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ());vcpu_load_state (vm,VCPU_ID , state);
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +1 -1
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm,O_RDWR ); +kvm_vm_restart (vm);vm_vcpu_add (vm,VCPU_ID );vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ());vcpu_load_state (vm,VCPU_ID , state);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 3/105 KVM: selftest: Add another underscore to inner ioctl helpers
In reply to Sean Christopherson--- .../selftests/kvm/aarch64/get-reg-list.c | 6 ++--- .../testing/selftests/kvm/aarch64/vgic_init.c | 2 +- .../selftests/kvm/include/kvm_util_base.h | 8 +++---- tools/testing/selftests/kvm/lib/kvm_util.c | 24 +++++++++---------- .../selftests/kvm/lib/riscv/processor.c | 2 +- tools/testing/selftests/kvm/s390x/memop.c | 14 +++++------ tools/testing/selftests/kvm/s390x/resets.c | 4 ++-- tools/testing/selftests/kvm/steal_time.c | 6 ++--- .../selftests/kvm/x86_64/hyperv_cpuid.c | 4 ++-- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 6 ++--- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +3 -3
@@ -452,7 +452,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_ioctl (vm,0 ,KVM_GET_ONE_REG , ®);if (ret) {printf ("%s: Failed to get " ,config_name (c));print_reg (c, reg.id);
@@ -464,7 +464,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,0 ,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);
@@ -476,7 +476,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,0 ,KVM_SET_ONE_REG , ®);if (ret) {printf ("%s: Failed to set " ,config_name (c));print_reg (c, reg.id);
tools/testing/selftests/kvm/aarch64/vgic_init.c +1 -1
@@ -55,7 +55,7 @@ static void guest_code(void)static int run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) {ucall_init (vm,NULL ); -int ret =_vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); +int ret =__vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL );if (ret)return -errno;return 0 ;
tools/testing/selftests/kvm/include/kvm_util_base.h +4 -4
@@ -154,12 +154,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,void vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl,void *arg); -int _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, -void *arg); +int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, +void *arg);void vm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg); -int _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); +int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg);void kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg); -int _kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg); +int __kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg);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);
tools/testing/selftests/kvm/lib/kvm_util.c +12 -12
@@ -1680,7 +1680,7 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vm *vm, uint32_t vcpuid)struct kvm_reg_list reg_list_n = { .n =0 }, *reg_list;int ret; - ret =_vcpu_ioctl (vm, vcpuid,KVM_GET_REG_LIST , ®_list_n); + ret =__vcpu_ioctl (vm, vcpuid,KVM_GET_REG_LIST , ®_list_n);TEST_ASSERT (ret ==-1 && errno ==E2BIG ,"KVM_GET_REG_LIST n=0" ); reg_list =calloc (1 ,sizeof (*reg_list) + reg_list_n.n *sizeof (__u64)); reg_list->n = reg_list_n.n;
@@ -1866,7 +1866,7 @@ void vcpu_fpu_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu) {int ret; - ret =_vcpu_ioctl (vm, vcpuid,KVM_GET_FPU , fpu); + ret =__vcpu_ioctl (vm, vcpuid,KVM_GET_FPU , fpu);TEST_ASSERT (ret ==0 ,"KVM_GET_FPU failed, rc: %i errno: %i (%s)" , ret, errno,strerror (errno)); }
@@ -1875,7 +1875,7 @@ void vcpu_fpu_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu) {int ret; - ret =_vcpu_ioctl (vm, vcpuid,KVM_SET_FPU , fpu); + ret =__vcpu_ioctl (vm, vcpuid,KVM_SET_FPU , fpu);TEST_ASSERT (ret ==0 ,"KVM_SET_FPU failed, rc: %i errno: %i (%s)" , ret, errno,strerror (errno)); }
@@ -1884,7 +1884,7 @@ void vcpu_get_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg) {int ret; - ret =_vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , reg); + ret =__vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , reg);TEST_ASSERT (ret ==0 ,"KVM_GET_ONE_REG failed, rc: %i errno: %i (%s)" , ret, errno,strerror (errno)); }
@@ -1893,7 +1893,7 @@ void vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg) {int ret; - ret =_vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , reg); + ret =__vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , reg);TEST_ASSERT (ret ==0 ,"KVM_SET_ONE_REG failed, rc: %i errno: %i (%s)" , ret, errno,strerror (errno)); }
@@ -1916,13 +1916,13 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, {int ret; - ret =_vcpu_ioctl (vm, vcpuid, cmd, arg); + ret =__vcpu_ioctl (vm, vcpuid, cmd, arg);TEST_ASSERT (ret ==0 ,"vcpu ioctl %lu failed, rc: %i errno: %i (%s)" , cmd, ret, errno,strerror (errno)); } -int _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid, -unsigned long cmd,void *arg) +int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid, +unsigned long cmd,void *arg) {struct vcpu *vcpu =vcpu_find (vm, vcpuid);int ret;
@@ -1986,12 +1986,12 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) {int ret; - ret =_vm_ioctl (vm, cmd, arg); + ret =__vm_ioctl (vm, cmd, arg);TEST_ASSERT (ret ==0 ,"vm ioctl %lu failed, rc: %i errno: %i (%s)" , cmd, ret, errno,strerror (errno)); } -int _vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) +int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) {return ioctl (vm->fd, cmd, arg); }
@@ -2017,7 +2017,7 @@ void kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) cmd, ret, errno, strerror(errno)); } -int _kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) +int __kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) {return ioctl (vm->kvm_fd, cmd, arg); }
@@ -2146,7 +2146,7 @@ int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level) .level = level, }; -return _vm_ioctl (vm,KVM_IRQ_LINE , &irq_level); +return __vm_ioctl (vm,KVM_IRQ_LINE , &irq_level); }void kvm_irq_line (struct kvm_vm *vm,uint32_t irq,int level)
tools/testing/selftests/kvm/lib/riscv/processor.c +1 -1
@@ -294,7 +294,7 @@ void vm_vcpu_add_default(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, vcpuid,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 */
tools/testing/selftests/kvm/s390x/memop.c +7 -7
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==E2BIG ,"ioctl allows insane sizes" );/* Zero size: */
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && (errno ==EINVAL || errno ==ENOMEM ),"ioctl allows 0 as size" );
@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows all flags" );/* Bad operation: */
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) ksmo.op =-1 ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows bad operations" );/* Bad guest address: */
@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv >0 ,"ioctl does not report bad guest memory access" );/* Bad host address: */
@@ -141,7 +141,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf =0 ; ksmo.ar =0 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EFAULT ,"ioctl does not report bad host memory address" );
@@ -155,7 +155,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =17 ; - rv =_vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows ARs > 15" ); run->psw_mask &= ~(3UL << (63 -17 ));/* Disable AR mode */ vcpu_run (vm,VCPU_ID );/* Run to sync new state */
tools/testing/selftests/kvm/s390x/resets.c +2 -2
@@ -76,7 +76,7 @@ static void assert_noirq(void) 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 (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
@@ -196,7 +196,7 @@ static void inject_irq(int cpu_id) 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); + irqs =__vcpu_ioctl (vm, cpu_id,KVM_S390_SET_IRQ_STATE , &irq_state);TEST_ASSERT (irqs >=0 ,"Error injecting EMERGENCY IRQ errno %d\n" , errno); }
tools/testing/selftests/kvm/steal_time.c +3 -3
@@ -173,7 +173,7 @@ static void steal_time_init(struct kvm_vm *vm) };int i, ret; - ret =_vcpu_ioctl (vm,0 ,KVM_HAS_DEVICE_ATTR , &dev); + ret =__vcpu_ioctl (vm,0 ,KVM_HAS_DEVICE_ATTR , &dev);if (ret !=0 && errno ==ENXIO ) {print_skip ("steal-time not supported" );exit (KSFT_SKIP );
@@ -191,13 +191,13 @@ static void steal_time_init(struct kvm_vm *vm)sync_global_to_guest (vm, st_gva[i]); st_ipa = (ulong )st_gva[i] |1 ; - ret =_vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev); + ret =__vcpu_ioctl (vm, i,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, i,KVM_SET_DEVICE_ATTR , &dev); - ret =_vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev); + ret =__vcpu_ioctl (vm, i,KVM_SET_DEVICE_ATTR , &dev);TEST_ASSERT (ret ==-1 && errno ==EEXIST ,"Set IPA twice without EEXIST" ); }
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +2 -2
@@ -121,9 +121,9 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, bool system)int ret;if (!system) - ret =_vcpu_ioctl (vm,VCPU_ID ,KVM_GET_SUPPORTED_HV_CPUID , &cpuid); + ret =__vcpu_ioctl (vm,VCPU_ID ,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);else - ret =_kvm_ioctl (vm,KVM_GET_SUPPORTED_HV_CPUID , &cpuid); + ret =__kvm_ioctl (vm,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);TEST_ASSERT (ret ==-1 && errno ==E2BIG , "%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when"
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +3 -3
@@ -42,7 +42,7 @@ static void test_set_boot_busy(struct kvm_vm *vm) {int res; - res =_vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)VCPU_ID0 ); + 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" ); }
@@ -133,13 +133,13 @@ static void check_set_bsp_busy(void)add_x86_vcpu (vm,VCPU_ID0 , true);add_x86_vcpu (vm,VCPU_ID1 , false); - res =_vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)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 after adding vcpu" );run_vcpu (vm,VCPU_ID0 );run_vcpu (vm,VCPU_ID1 ); - res =_vm_ioctl (vm,KVM_SET_BOOT_CPU_ID , (void *)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" );kvm_vm_free (vm);
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +1 -1
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])vcpu_alloc_vmx (vm, &vmx_pages_gva);vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); - tsc_khz =_vcpu_ioctl (vm,VCPU_ID ,KVM_GET_TSC_KHZ ,NULL ); + tsc_khz =__vcpu_ioctl (vm,VCPU_ID ,KVM_GET_TSC_KHZ ,NULL );TEST_ASSERT (tsc_khz !=-1 ,"vcpu ioctl KVM_GET_TSC_KHZ failed" );/* scale down L1's TSC frequency */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 4/105 KVM: selftests: Make vcpu_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonDeliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence, the intent is print the name of the macro.
--- .../selftests/kvm/include/kvm_util_base.h | 12 +++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 31 +++++-------------- 2 files changed, 18 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +10 -2
@@ -152,10 +152,18 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, uint64_t guest_paddr, uint32_t slot, uint64_t npages, uint32_t flags); -void vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, -void *arg); +#define __KVM_IOCTL_ERROR (_name, _ret) \ + "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) + +#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) + +void _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, +const char *name,void *arg);int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl,void *arg); +#define vcpu_ioctl (vm, vcpuid, ioctl, arg) \ + _vcpu_ioctl(vm, vcpuid, ioctl, #ioctl, arg) +void vm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg);int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg);void kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg);
tools/testing/selftests/kvm/lib/kvm_util.c +8 -23
@@ -1898,29 +1898,6 @@ void vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg) ret, errno, strerror(errno)); } -/* -* VCPU Ioctl -* -* Input Args: -* vm - Virtual Machine -* vcpuid - VCPU ID -* cmd - Ioctl number -* arg - Argument to pass to the ioctl -* -* Return: None -* -* Issues an arbitrary ioctl on a VCPU fd. -*/ -void vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid, -unsigned long cmd,void *arg) -{ -int ret; - - ret =__vcpu_ioctl (vm, vcpuid, cmd, arg); -TEST_ASSERT (ret ==0 ,"vcpu ioctl %lu failed, rc: %i errno: %i (%s)" , - cmd, ret, errno,strerror (errno)); -} -int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long cmd,void *arg) {
@@ -1934,6 +1911,14 @@ int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,return ret; } +void _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long cmd, +const char *name,void *arg) +{ +int ret =__vcpu_ioctl (vm, vcpuid, cmd, arg); + +TEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); +} +void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid) {struct vcpu *vcpu;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 5/105 KVM: selftests: Drop @mode from common vm_create() helper
In reply to Sean Christopherson--- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../selftests/kvm/include/kvm_util_base.h | 3 +- .../selftests/kvm/kvm_binary_stats_test.c | 3 +- .../selftests/kvm/kvm_create_max_vcpus.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 43 ++++++++++--------- .../selftests/kvm/set_memory_region_test.c | 4 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- .../selftests/kvm/x86_64/set_sregs_test.c | 2 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 8 ++-- 12 files changed, 39 insertions(+), 36 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -411,7 +411,7 @@ static void run_test(struct vcpu_config *c)check_supported (c); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );prepare_vcpu_init (c, &init);aarch64_vcpu_add_default (vm,0 , &init,NULL );finalize_vcpu (vm,0 , c);
tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +1 -1
@@ -76,7 +76,7 @@ int main(void)struct kvm_vm *vm;struct ucall uc; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );kvm_vm_elf_load (vm, program_invocation_name);ucall_init (vm,NULL );
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -679,7 +679,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,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,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);kvm_vm_elf_load (vm, program_invocation_name);#ifdef __x86_64__vm_create_irqchip (vm);
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -104,7 +104,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -1
@@ -110,7 +110,8 @@ int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id,void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);const char *vm_guest_mode_string (uint32_t i); -struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages); +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t phy_pages); +struct kvm_vm *vm_create (uint64_t phy_pages);void kvm_vm_free (struct kvm_vm *vmp);void kvm_vm_restart (struct kvm_vm *vmp);void kvm_vm_release (struct kvm_vm *vmp);
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -2
@@ -229,8 +229,7 @@ int main(int argc, char *argv[]) vms =malloc (sizeof (vms[0 ]) * max_vm);TEST_ASSERT (vms,"Allocate memory for storing VM pointers" );for (i =0 ; i < max_vm; ++i) { - vms[i] =vm_create (VM_MODE_DEFAULT , -DEFAULT_GUEST_PHY_PAGES ); + vms[i] =vm_create (DEFAULT_GUEST_PHY_PAGES );for (j =0 ; j < max_vcpu; ++j)vm_vcpu_add (vms[i], j); }
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +1 -1
@@ -28,7 +28,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus)pr_info ("Testing creating %d vCPUs, with IDs %d...%d.\n" , num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus -1 ); - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );for (i = first_vcpu_id; i < first_vcpu_id + num_vcpus; i++)/* This asserts that the vCPU was created. */
tools/testing/selftests/kvm/lib/kvm_util.c +23 -20
61 lines not on this page · raw message
tools/testing/selftests/kvm/set_memory_region_test.c +2 -2
@@ -314,7 +314,7 @@ static void test_zero_memory_regions(void)pr_info ("Testing KVM_RUN with zero added memory regions\n" ); - vm =vm_create (VM_MODE_DEFAULT ,0 ); + vm =vm_create (0 );vm_vcpu_add (vm,VCPU_ID ); TEST_ASSERT(!ioctl(vm_get_fd(vm), KVM_SET_NR_MMU_PAGES, 64),
@@ -370,7 +370,7 @@ static void test_add_max_memory_regions(void) "KVM_CAP_NR_MEMSLOTS should be greater than 0");pr_info ("Allowed number of memory slots: %i\n" , max_mem_slots); - vm =vm_create (VM_MODE_DEFAULT ,0 ); + vm =vm_create (0 );/* Check it can be added memory slots up to the maximum allowed */ pr_info("Adding slots 0..%i, each memory region with %dK size\n",
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -88,7 +88,7 @@ static struct kvm_vm *create_vm(void)uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); - vm =vm_create (VM_MODE_DEFAULT , pages); + vm =vm_create (pages);kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);
tools/testing/selftests/kvm/x86_64/set_sregs_test.c +1 -1
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])* use it to verify all supported CR4 bits can be set prior to defining * the vCPU model, i.e. without doing KVM_SET_CPUID2. */ - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );vm_vcpu_add (vm,VCPU_ID );vcpu_sregs_get (vm,VCPU_ID , &sregs);
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +4 -4
@@ -52,7 +52,7 @@ static struct kvm_vm *sev_vm_create(bool es)struct kvm_sev_launch_start start = {0 };int i; - vm =vm_create (VM_MODE_DEFAULT ,0 ); + vm =vm_create (0 );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);
@@ -69,7 +69,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)struct kvm_vm *vm;int i; - vm =vm_create (VM_MODE_DEFAULT ,0 ); + vm =vm_create (0 );if (!with_vcpus)return vm;
@@ -174,9 +174,9 @@ static void test_sev_migrate_parameters(void) sev_vm =sev_vm_create (/* es= */ false); sev_es_vm =sev_vm_create (/* es= */ true); - vm_no_vcpu =vm_create (VM_MODE_DEFAULT ,0 ); + vm_no_vcpu =vm_create (0 ); vm_no_sev =aux_vm_create (true); - sev_es_vm_no_vmsa =vm_create (VM_MODE_DEFAULT ,0 ); + sev_es_vm_no_vmsa =vm_create (0 );sev_ioctl (sev_es_vm_no_vmsa->fd,KVM_SEV_ES_INIT ,NULL );vm_vcpu_add (sev_es_vm_no_vmsa,1 );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 6/105 KVM: selftests: Split vcpu_set_nested_state() into two helpers
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 6 ++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 20 +++++++++---------- .../kvm/x86_64/vmx_set_nested_state_test.c | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +4 -2
@@ -255,8 +255,10 @@ void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,#ifdef __x86_64__void vcpu_nested_state_get (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_nested_state *state); -int vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_nested_state *state,bool ignore_error); +int __vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state); +void vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state);#endif void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid);
tools/testing/selftests/kvm/lib/kvm_util.c +10 -10
@@ -1788,22 +1788,22 @@ void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid, ret, errno); } -int vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_nested_state *state,bool ignore_error) +int __vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state) {struct vcpu *vcpu =vcpu_find (vm, vcpuid); -int ret;TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); - ret =ioctl (vcpu->fd,KVM_SET_NESTED_STATE , state); -if (!ignore_error) { -TEST_ASSERT (ret ==0 , -"KVM_SET_NESTED_STATE failed, ret: %i errno: %i" , - ret, errno); - } +return ioctl (vcpu->fd,KVM_SET_NESTED_STATE , state); +} -return ret; +void vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state) +{ +int ret =__vcpu_nested_state_set (vm, vcpuid, state); + +TEST_ASSERT (!ret,"KVM_SET_NESTED_STATE failed, ret: %i errno: %i" , ret, errno); }#endif
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +2 -2
@@ -29,7 +29,7 @@ bool have_evmcs;void test_nested_state (struct kvm_vm *vm,struct kvm_nested_state *state) { -vcpu_nested_state_set (vm,VCPU_ID , state, false); +vcpu_nested_state_set (vm,VCPU_ID , state); } void test_nested_state_expect_errno(struct kvm_vm *vm,
@@ -38,7 +38,7 @@ void test_nested_state_expect_errno(struct kvm_vm *vm, {int rv; - rv =vcpu_nested_state_set (vm,VCPU_ID , state, true); + rv =__vcpu_nested_state_set (vm,VCPU_ID , state); TEST_ASSERT(rv == -1 && errno == expected_errno, "Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)", strerror(expected_errno), expected_errno, rv, strerror(errno),
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 7/105 KVM: selftests: Add hyperv_svm_test test binary to .gitignore
In reply to Sean Christopherson--- tools/testing/selftests/kvm/.gitignore | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -20,6 +20,7 @@ /x86_64/hyperv_clock /x86_64/hyperv_cpuid /x86_64/hyperv_features +/x86_64/hyperv_svm_test /x86_64/mmio_warning_test /x86_64/mmu_role_test /x86_64/platform_info_test
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 8/105 KVM: sefltests: Use vcpu_ioctl() and __vcpu_ioctl() helpers
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 142 ++++++--- .../selftests/kvm/include/x86_64/processor.h | 28 +- .../selftests/kvm/kvm_binary_stats_test.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 282 ------------------ .../selftests/kvm/lib/x86_64/processor.c | 103 +------ 5 files changed, 131 insertions(+), 430 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +105 -37
@@ -105,8 +105,6 @@ int open_kvm_dev_path_or_exit(void);int kvm_check_cap (long cap);int vm_check_cap (struct kvm_vm *vm,long cap);int vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap); -int vcpu_enable_cap (struct kvm_vm *vm,uint32_t vcpu_id, -struct kvm_enable_cap *cap);void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);const char *vm_guest_mode_string (uint32_t i);
@@ -206,13 +204,112 @@ void vcpu_run(struct kvm_vm *vm, uint32_t vcpuid);int _vcpu_run (struct kvm_vm *vm,uint32_t vcpuid);int vcpu_get_fd (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid); -void vcpu_set_guest_debug (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_guest_debug *debug); -void vcpu_set_mp_state (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_mp_state *mp_state);struct kvm_reg_list *vcpu_get_reg_list (struct kvm_vm *vm,uint32_t vcpuid); -void vcpu_regs_get (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_regs *regs); -void vcpu_regs_set (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_regs *regs); + +static inline void vcpu_enable_cap (struct kvm_vm *vm,uint32_t vcpu_id, +struct kvm_enable_cap *cap) +{ +vcpu_ioctl (vm, vcpu_id,KVM_ENABLE_CAP , cap); +} + +static inline void vcpu_set_guest_debug (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_guest_debug *debug) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_GUEST_DEBUG , debug); +} + +static inline void vcpu_set_mp_state (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_mp_state *mp_state) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_MP_STATE , mp_state); +} + +static inline void vcpu_regs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_regs *regs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_REGS , regs); +} + +static inline void vcpu_regs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_regs *regs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_REGS , regs); +} +static inline void vcpu_sregs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_sregs *sregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_SREGS , sregs); + +} +static inline void vcpu_sregs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_sregs *sregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_SREGS , sregs); +} +static inline int _vcpu_sregs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_sregs *sregs) +{ +return __vcpu_ioctl (vm, vcpuid,KVM_SET_SREGS , sregs); +} +static inline void vcpu_fpu_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_fpu *fpu) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_FPU , fpu); +} +static inline void vcpu_fpu_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_fpu *fpu) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_FPU , fpu); +} +static inline void vcpu_get_reg (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_one_reg *reg) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_ONE_REG , reg); +} +static inline void vcpu_set_reg (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_one_reg *reg) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_ONE_REG , reg); +} +#ifdef __KVM_HAVE_VCPU_EVENTS +static inline void vcpu_events_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_vcpu_events *events) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_VCPU_EVENTS , events); +} +static inline void vcpu_events_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_vcpu_events *events) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_VCPU_EVENTS , events); +} +#endif +#ifdef __x86_64__ +static inline void vcpu_nested_state_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_NESTED_STATE , state); +} +static inline int __vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state) +{ +return __vcpu_ioctl (vm, vcpuid,KVM_SET_NESTED_STATE , state); +} + +static inline void vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_nested_state *state) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_NESTED_STATE , state); +} +#endif +static inline int vcpu_get_stats_fd (struct kvm_vm *vm,uint32_t vcpuid) +{ +int fd =__vcpu_ioctl (vm, vcpuid,KVM_GET_STATS_FD ,NULL ); + +TEST_ASSERT (fd >=0 ,KVM_IOCTL_ERROR (KVM_GET_STATS_FD , fd)); +return fd; +} + +void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid);/* * VM VCPU Args Set
@@ -234,34 +331,6 @@ void vcpu_regs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_regs *regs);*/ void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...); -void vcpu_sregs_get (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_sregs *sregs); -void vcpu_sregs_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_sregs *sregs); -int _vcpu_sregs_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_sregs *sregs); -void vcpu_fpu_get (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_fpu *fpu); -void vcpu_fpu_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_fpu *fpu); -void vcpu_get_reg (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_one_reg *reg); -void vcpu_set_reg (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_one_reg *reg); -#ifdef __KVM_HAVE_VCPU_EVENTS -void vcpu_events_get (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_vcpu_events *events); -void vcpu_events_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_vcpu_events *events); -#endif -#ifdef __x86_64__ -void vcpu_nested_state_get (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_nested_state *state); -int __vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_nested_state *state); -void vcpu_nested_state_set (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_nested_state *state); -#endif -void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid); -int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int _kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test,int *fd);
@@ -402,7 +471,6 @@ int vm_create_device(struct kvm_vm *vm, struct kvm_create_device *cd);void assert_on_unhandled_exception (struct kvm_vm *vm,uint32_t vcpuid);int vm_get_stats_fd (struct kvm_vm *vm); -int vcpu_get_stats_fd (struct kvm_vm *vm,uint32_t vcpuid);uint32_t guest_get_vcpuid (void );
tools/testing/selftests/kvm/include/x86_64/processor.h +21 -7
@@ -391,12 +391,19 @@ void kvm_x86_state_cleanup(struct kvm_x86_state *state);struct kvm_msr_list *kvm_get_msr_index_list (void );uint64_t kvm_get_feature_msr (uint64_t msr_index);struct kvm_cpuid2 *kvm_get_supported_cpuid (void ); -struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid); -int __vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_cpuid2 *cpuid); -void vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, -struct kvm_cpuid2 *cpuid); + +static inline int __vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_cpuid2 *cpuid) +{ +return __vcpu_ioctl (vm, vcpuid,KVM_SET_CPUID2 , cpuid); +} + +static inline void vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_cpuid2 *cpuid) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_CPUID2 , cpuid); +}struct kvm_cpuid_entry2 *kvm_get_supported_cpuid_index (uint32_t function,uint32_t index);
@@ -410,8 +417,15 @@ kvm_get_supported_cpuid_entry(uint32_t function)uint64_t vcpu_get_msr (struct kvm_vm *vm,uint32_t vcpuid,uint64_t msr_index);int _vcpu_set_msr (struct kvm_vm *vm,uint32_t vcpuid,uint64_t msr_index,uint64_t msr_value); -void vcpu_set_msr (struct kvm_vm *vm,uint32_t vcpuid,uint64_t msr_index, -uint64_t msr_value); + +static inline void vcpu_set_msr (struct kvm_vm *vm,uint32_t vcpuid, +uint64_t msr_index,uint64_t msr_value) +{ +int r =_vcpu_set_msr (vm, vcpuid, msr_index, msr_value); + +TEST_ASSERT (r ==1 ,KVM_IOCTL_ERROR (KVM_SET_MSRS , r)); +} +uint32_t kvm_get_cpuid_max_basic (void );uint32_t kvm_get_cpuid_max_extended (void );
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -5
@@ -178,11 +178,7 @@ static void vm_stats_test(struct kvm_vm *vm)static void vcpu_stats_test (struct kvm_vm *vm,int vcpu_id) { -int stats_fd; - -/* Get fd for VCPU stats */ - stats_fd =vcpu_get_stats_fd (vm, vcpu_id); -TEST_ASSERT (stats_fd >=0 ,"Get VCPU stats fd" ); +int stats_fd =vcpu_get_stats_fd (vm, vcpu_id);stats_test (stats_fd);close (stats_fd);
tools/testing/selftests/kvm/lib/kvm_util.c +0 -282
303 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -99
136 lines not on this page · raw message
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 9/105 KVM: selftests: Add __vcpu_run() helper
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 6 ++---- tools/testing/selftests/kvm/dirty_log_test.c | 6 ++---- tools/testing/selftests/kvm/include/kvm_util_base.h | 6 ++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++---- 4 files changed, 12 insertions(+), 12 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +2 -4
@@ -55,10 +55,8 @@ static void guest_code(void)static int run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) {ucall_init (vm,NULL ); -int ret =__vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); -if (ret) -return -errno; -return 0 ; + +return __vcpu_run (vm, vcpuid) ? -errno :0 ; }static struct vm_gic vm_gic_create_with_vcpus (uint32_t gic_dev_type,uint32_t nr_vcpus)
tools/testing/selftests/kvm/dirty_log_test.c +2 -4
@@ -509,7 +509,7 @@ static void generate_random_array(uint64_t *guest_array, uint64_t size)static void *vcpu_worker (void *data) { -int ret, vcpu_fd; +int ret;struct kvm_vm *vm = data;uint64_t *guest_array;uint64_t pages_count =0 ;
@@ -517,8 +517,6 @@ static void *vcpu_worker(void *data) + sizeof(sigset_t));sigset_t *sigset = (sigset_t *) &sigmask->sigset; - vcpu_fd =vcpu_get_fd (vm,VCPU_ID ); -/* * SIG_IPI is unblocked atomically while in KVM_RUN. It causes the * ioctl to return with -EINTR, but it is still pending and we need
@@ -539,7 +537,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 =ioctl (vcpu_fd,KVM_RUN ,NULL ); + ret =__vcpu_run (vm,VCPU_ID );if (ret ==-1 && errno ==EINTR ) {int sig =-1 ;sigwait (sigset, &sig);
tools/testing/selftests/kvm/include/kvm_util_base.h +6 -0
@@ -202,6 +202,12 @@ 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); + +static inline int __vcpu_run (struct kvm_vm *vm,uint32_t vcpuid) +{ +return __vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); +} +int vcpu_get_fd (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid);struct kvm_reg_list *vcpu_get_reg_list (struct kvm_vm *vm,uint32_t vcpuid);
tools/testing/selftests/kvm/lib/kvm_util.c +2 -4
@@ -1559,12 +1559,10 @@ void vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)int _vcpu_run (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid);int rc; -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid);do { - rc =ioctl (vcpu->fd,KVM_RUN ,NULL ); + rc =__vcpu_run (vm, vcpuid); }while (rc ==-1 && errno ==EINTR );assert_on_unhandled_exception (vm, vcpuid);
@@ -1589,7 +1587,7 @@ void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); vcpu->state->immediate_exit =1 ; - ret =ioctl (vcpu->fd,KVM_RUN ,NULL ); + ret =__vcpu_run (vm, vcpuid); vcpu->state->immediate_exit =0 ; TEST_ASSERT(ret == -1 && errno == EINTR,
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 10/105 KVM: selftests: Use vcpu_access_device_attr() in arm64 code
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/arch_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +4 -6
@@ -349,12 +349,10 @@ 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 */ -int vcpu0_fd =vcpu_get_fd (vm,0 ); - -kvm_device_access (vcpu0_fd,KVM_ARM_VCPU_TIMER_CTRL , -KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq, false); -kvm_device_access (vcpu0_fd,KVM_ARM_VCPU_TIMER_CTRL , -KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq, false); +vcpu_access_device_attr (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq, false); +vcpu_access_device_attr (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq, false);sync_global_to_guest (vm, ptimer_irq);sync_global_to_guest (vm, vtimer_irq);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 11/105 KVM: selftests: Remove vcpu_get_fd()
In reply to Sean Christopherson--- tools/testing/selftests/kvm/include/kvm_util_base.h | 1 - tools/testing/selftests/kvm/lib/kvm_util.c | 9 --------- 2 files changed, 10 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -1
@@ -208,7 +208,6 @@ static inline int __vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)return __vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); } -int vcpu_get_fd (struct kvm_vm *vm,uint32_t vcpuid);void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid);struct kvm_reg_list *vcpu_get_reg_list (struct kvm_vm *vm,uint32_t vcpuid);
tools/testing/selftests/kvm/lib/kvm_util.c +0 -9
@@ -1570,15 +1570,6 @@ int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)return rc; } -int vcpu_get_fd (struct kvm_vm *vm,uint32_t vcpuid) -{ -struct vcpu *vcpu =vcpu_find (vm, vcpuid); - -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); - -return vcpu->fd; -} -void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid) {struct vcpu *vcpu =vcpu_find (vm, vcpuid);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 12/105 KVM: selftests: Add vcpu_get() to retrieve and assert on vCPU existence
In reply to Sean Christopherson--- tools/testing/selftests/kvm/lib/kvm_util.c | 56 ++++++------------- .../selftests/kvm/lib/kvm_util_internal.h | 2 +- .../selftests/kvm/lib/s390x/processor.c | 5 +- .../selftests/kvm/lib/x86_64/processor.c | 6 +- 4 files changed, 21 insertions(+), 48 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +16 -40
@@ -553,23 +553,7 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,return ®ion->region; } -/* -* VCPU Find -* -* Input Args: -* vm - Virtual Machine -* vcpuid - VCPU ID -* -* Output Args: None -* -* Return: -* Pointer to VCPU structure -* -* Locates a vcpu structure that describes the VCPU specified by vcpuid and -* returns a pointer to it. Returns NULL if the VM doesn't contain a VCPU -* for the specified vcpuid. -*/ -struct vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpuid) +static struct vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpuid) {struct vcpu *vcpu;
@@ -581,6 +565,14 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid)return NULL ; } +struct vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpuid) +{ +struct vcpu *vcpu =vcpu_find (vm, vcpuid); + +TEST_ASSERT (vcpu,"vCPU %d does not exist" , vcpuid); +return vcpu; +} +/* * VM VCPU Remove *
@@ -1530,8 +1522,7 @@ void vm_create_irqchip(struct kvm_vm *vm)*/ struct kvm_run *vcpu_state (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);return vcpu->state; }
@@ -1572,11 +1563,9 @@ int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);int ret; -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); - vcpu->state->immediate_exit =1 ; ret =__vcpu_run (vm, vcpuid); vcpu->state->immediate_exit =0 ;
@@ -1618,14 +1607,9 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vm *vm, uint32_t vcpuid)int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long cmd,void *arg) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); -int ret; +struct vcpu *vcpu =vcpu_get (vm, vcpuid); -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); - - ret =ioctl (vcpu->fd, cmd, arg); - -return ret; +return ioctl (vcpu->fd, cmd, arg); } void _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long cmd,
@@ -1638,15 +1622,11 @@ void _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long cmd,void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu; +struct vcpu *vcpu =vcpu_get (vm, vcpuid);uint32_t size = vm->dirty_ring_size;TEST_ASSERT (size >0 ,"Should enable dirty ring first" ); - vcpu =vcpu_find (vm, vcpuid); - -TEST_ASSERT (vcpu,"Cannot find vcpu %u" , vcpuid); -if (!vcpu->dirty_gfns) {void *addr;
@@ -1802,9 +1782,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,int _vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); - -TEST_ASSERT (vcpu,"nonexistent vcpu id: %d" , vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);return _kvm_device_check_attr (vcpu->fd, group, attr); }
@@ -1821,9 +1799,7 @@ int vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,int _vcpu_access_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr,void *val,bool write) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); - -TEST_ASSERT (vcpu,"nonexistent vcpu id: %d" , vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);return _kvm_device_access (vcpu->fd, group, attr, val, write); }
tools/testing/selftests/kvm/lib/kvm_util_internal.h +1 -1
@@ -69,7 +69,7 @@ struct kvm_vm {uint32_t dirty_ring_size; }; -struct vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpuid); +struct vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpuid);/* * Virtual Translation Tables Dump
tools/testing/selftests/kvm/lib/s390x/processor.c +1 -4
@@ -208,10 +208,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...)void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); - -if (!vcpu) -return ; +struct vcpu *vcpu =vcpu_get (vm, vcpuid);fprintf (stream,"%*spstate: psw: 0x%.16llx:0x%.16llx\n" , indent,"" , vcpu->state->psw_mask, vcpu->state->psw_addr);
tools/testing/selftests/kvm/lib/x86_64/processor.c +3 -3
@@ -841,7 +841,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index)*/ struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);struct kvm_cpuid2 *cpuid;int max_ent;int rc =-1 ;
@@ -1039,7 +1039,7 @@ static int vcpu_save_xsave_state(struct kvm_vm *vm, struct vcpu *vcpu,struct kvm_x86_state *vcpu_save_state (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);struct kvm_msr_list *list;struct kvm_x86_state *state;int nmsrs, r, i;
@@ -1122,7 +1122,7 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid)void vcpu_load_state (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_x86_state *state) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); +struct vcpu *vcpu =vcpu_get (vm, vcpuid);int r; r =ioctl (vcpu->fd,KVM_SET_SREGS , &state->sregs);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 13/105 KVM: selftests: Make vm_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonDeliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence, the intent is print the name of the macro.
--- .../selftests/kvm/include/kvm_util_base.h | 36 ++++++++++--------- tools/testing/selftests/kvm/lib/kvm_util.c | 28 ++++----------- 2 files changed, 27 insertions(+), 37 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +20 -16
@@ -105,6 +105,26 @@ int open_kvm_dev_path_or_exit(void);int kvm_check_cap (long cap);int vm_check_cap (struct kvm_vm *vm,long cap);int vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap); + +#define __KVM_IOCTL_ERROR (_name, _ret) \ + "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) + +#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) + +int __kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); +void kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *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_vm *vm,uint32_t vcpuid,unsigned long cmd, +void *arg); +void _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long cmd, +const char *name,void *arg); +#define vcpu_ioctl (vm, vcpuid, cmd, arg) \ + _vcpu_ioctl(vm, vcpuid, cmd, #cmd, arg) +void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);const char *vm_guest_mode_string (uint32_t i);
@@ -151,22 +171,6 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, uint64_t guest_paddr, uint32_t slot, uint64_t npages, uint32_t flags); -#define __KVM_IOCTL_ERROR (_name, _ret) \ - "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) - -#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) - -void _vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, -const char *name,void *arg); -int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long ioctl, -void *arg); -#define vcpu_ioctl (vm, vcpuid, ioctl, arg) \ - _vcpu_ioctl(vm, vcpuid, ioctl, #ioctl, arg) - -void vm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg); -int __vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); -void kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg); -int __kvm_ioctl (struct kvm_vm *vm,unsigned long ioctl,void *arg);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);
tools/testing/selftests/kvm/lib/kvm_util.c +7 -21
@@ -1652,32 +1652,18 @@ void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid)return vcpu->dirty_gfns; } -/* -* VM Ioctl -* -* Input Args: -* vm - Virtual Machine -* cmd - Ioctl number -* arg - Argument to pass to the ioctl -* -* Return: None -* -* Issues an arbitrary ioctl on a VM fd. -*/ -void vm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) -{ -int ret; - - ret =__vm_ioctl (vm, cmd, arg); -TEST_ASSERT (ret ==0 ,"vm ioctl %lu failed, rc: %i errno: %i (%s)" , - cmd, ret, errno,strerror (errno)); -} -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)); +} +/* * KVM system ioctl *
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 14/105 KVM: sefltests: Use vm_ioctl() and __vm_ioctl() helpers
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 59 ++++++++-- .../selftests/kvm/kvm_binary_stats_test.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 111 ++---------------- .../selftests/kvm/set_memory_region_test.c | 5 +- 4 files changed, 65 insertions(+), 116 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +51 -8
@@ -103,8 +103,6 @@ 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); -int vm_check_cap (struct kvm_vm *vm,long cap); -int vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap);#define __KVM_IOCTL_ERROR (_name, _ret) \ "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)
@@ -125,6 +123,23 @@ void _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long cmd,#define vcpu_ioctl (vm, vcpuid, cmd, arg) \ _vcpu_ioctl(vm, vcpuid, cmd, #cmd, arg) +/* +* Looks up and returns the value corresponding to the capability +* (KVM_CAP_*) given by cap. +*/ +static inline int vm_check_cap (struct kvm_vm *vm,long cap) +{ +int ret =__vm_ioctl (vm,KVM_CHECK_EXTENSION , (void *)cap); + +TEST_ASSERT (ret >=0 ,KVM_IOCTL_ERROR (KVM_CHECK_EXTENSION , ret)); +return ret; +} + +static inline void vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap) +{ +vm_ioctl (vm,KVM_ENABLE_CAP , cap); +} +void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);const char *vm_guest_mode_string (uint32_t i);
@@ -133,18 +148,46 @@ struct kvm_vm *vm_create(uint64_t phy_pages);void kvm_vm_free (struct kvm_vm *vmp);void kvm_vm_restart (struct kvm_vm *vmp);void kvm_vm_release (struct kvm_vm *vmp); -void kvm_vm_get_dirty_log (struct kvm_vm *vm,int slot,void *log); -void kvm_vm_clear_dirty_log (struct kvm_vm *vm,int slot,void *log, -uint64_t first_page,uint32_t num_pages); -uint32_t kvm_vm_reset_dirty_ring (struct kvm_vm *vm); -int kvm_memcmp_hva_gva (void *hva,struct kvm_vm *vm,const vm_vaddr_t gva,size_t len); -void kvm_vm_elf_load (struct kvm_vm *vm,const char *filename);void vm_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent); +static inline void kvm_vm_get_dirty_log (struct kvm_vm *vm,int slot,void *log) +{ +struct kvm_dirty_log args = { .dirty_bitmap = log, .slot = slot }; + +vm_ioctl (vm,KVM_GET_DIRTY_LOG , &args); +} + +static inline void kvm_vm_clear_dirty_log (struct kvm_vm *vm,int slot,void *log, +uint64_t first_page,uint32_t num_pages) +{ +struct kvm_clear_dirty_log args = { + .dirty_bitmap = log, + .slot = slot, + .first_page = first_page, + .num_pages = num_pages + }; + +vm_ioctl (vm,KVM_CLEAR_DIRTY_LOG , &args); +} + +static inline uint32_t kvm_vm_reset_dirty_ring (struct kvm_vm *vm) +{ +return __vm_ioctl (vm,KVM_RESET_DIRTY_RINGS ,NULL ); +} + +static inline int vm_get_stats_fd (struct kvm_vm *vm) +{ +int fd =__vm_ioctl (vm,KVM_GET_STATS_FD ,NULL ); + +TEST_ASSERT (fd >=0 ,KVM_IOCTL_ERROR (KVM_GET_STATS_FD , fd)); +return fd; +} + +/* * VM VCPU Dump *
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -5
@@ -165,11 +165,7 @@ static void stats_test(int stats_fd)static void vm_stats_test (struct kvm_vm *vm) { -int stats_fd; - -/* Get fd for VM stats */ - stats_fd =vm_get_stats_fd (vm); -TEST_ASSERT (stats_fd >=0 ,"Get VM stats fd" ); +int stats_fd =vm_get_stats_fd (vm);stats_test (stats_fd);close (stats_fd);
tools/testing/selftests/kvm/lib/kvm_util.c +11 -100
181 lines not on this page · raw message
tools/testing/selftests/kvm/set_memory_region_test.c +2 -3
@@ -317,8 +317,7 @@ static void test_zero_memory_regions(void) vm =vm_create (0 );vm_vcpu_add (vm,VCPU_ID ); -TEST_ASSERT (!ioctl (vm_get_fd (vm),KVM_SET_NR_MMU_PAGES ,64 ), -"KVM_SET_NR_MMU_PAGES failed, errno = %d\n" , errno); +vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul );vcpu_run (vm,VCPU_ID ); run =vcpu_state (vm,VCPU_ID );
@@ -340,7 +339,7 @@ static int test_memory_region_add(struct kvm_vm *vm, void *mem, uint32_t slot, region.guest_phys_addr = guest_addr; region.memory_size = size; region.userspace_addr = (uintptr_t ) mem; - ret =ioctl (vm_get_fd (vm),KVM_SET_USER_MEMORY_REGION , ®ion); + ret =__vm_ioctl (vm,KVM_SET_USER_MEMORY_REGION , ®ion);return ret; }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 15/105 KVM: selftests: Make kvm_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonDeliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence, the intent is print the name of the macro.
--- .../selftests/kvm/include/kvm_util_base.h | 16 ++++++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 31 +++---------------- .../selftests/kvm/x86_64/hyperv_cpuid.c | 2 +- 3 files changed, 20 insertions(+), 29 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +14 -2
@@ -109,8 +109,19 @@ int kvm_check_cap(long cap);#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) -int __kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); -void kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg); +#define __kvm_ioctl (kvm_fd, cmd, arg) \ + ioctl(kvm_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); + +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);
@@ -484,6 +495,7 @@ 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);
tools/testing/selftests/kvm/lib/kvm_util.c +5 -26
@@ -1580,32 +1580,6 @@ void _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, const char *name, void *argTEST_ASSERT (!ret,__KVM_IOCTL_ERROR (name, ret)); } -/* -* KVM system ioctl -* -* Input Args: -* vm - Virtual Machine -* cmd - Ioctl number -* arg - Argument to pass to the ioctl -* -* Return: None -* -* Issues an arbitrary ioctl on a KVM fd. -*/ -void kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) -{ -int ret; - - ret =ioctl (vm->kvm_fd, cmd, arg); -TEST_ASSERT (ret ==0 ,"KVM ioctl %lu failed, rc: %i errno: %i (%s)" , - cmd, ret, errno,strerror (errno)); -} - -int __kvm_ioctl (struct kvm_vm *vm,unsigned long cmd,void *arg) -{ -return ioctl (vm->kvm_fd, cmd, arg); -} -/* * Device Ioctl */
@@ -2039,6 +2013,11 @@ 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;
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +1 -1
@@ -123,7 +123,7 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, bool system)if (!system) ret =__vcpu_ioctl (vm,VCPU_ID ,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);else - ret =__kvm_ioctl (vm,KVM_GET_SUPPORTED_HV_CPUID , &cpuid); + ret =__kvm_ioctl (vm_get_kvm_fd (vm),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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 16/105 KVM: selftests: Use kvm_ioctl() helpers
In reply to Sean Christopherson--- .../selftests/kvm/lib/aarch64/processor.c | 4 +-- tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 10 +++--- .../selftests/kvm/lib/x86_64/processor.c | 31 ++++++------------- .../kvm/x86_64/get_msr_index_features.c | 16 +++------- .../selftests/kvm/x86_64/mmio_warning_test.c | 6 ++-- 6 files changed, 24 insertions(+), 45 deletions(-)
tools/testing/selftests/kvm/lib/aarch64/processor.c +2 -2
@@ -469,8 +469,8 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, }; kvm_fd =open_kvm_dev_path_or_exit (); - vm_fd =ioctl (kvm_fd,KVM_CREATE_VM , ipa); -TEST_ASSERT (vm_fd >=0 ,"Can't create VM" ); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM , ipa); +TEST_ASSERT (vm_fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm_fd)); vcpu_fd =ioctl (vm_fd,KVM_CREATE_VCPU ,0 );TEST_ASSERT (vcpu_fd >=0 ,"Can't create vcpu" );
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 =ioctl (kvm_fd,KVM_CREATE_VM ,0 ); + vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,0 );kvm_device_access (vm_fd,KVM_S390_VM_CPU_MODEL ,KVM_S390_VM_CPU_PROCESSOR , &info, false);close (vm_fd);
tools/testing/selftests/kvm/lib/kvm_util.c +4 -6
@@ -76,9 +76,8 @@ int kvm_check_cap(long cap)int kvm_fd; kvm_fd =open_kvm_dev_path_or_exit (); - ret =ioctl (kvm_fd,KVM_CHECK_EXTENSION , cap); -TEST_ASSERT (ret >=0 ,"KVM_CHECK_EXTENSION IOCTL failed,\n" -" rc: %i errno: %i" , ret, errno); + ret =__kvm_ioctl (kvm_fd,KVM_CHECK_EXTENSION , cap); +TEST_ASSERT (ret >=0 ,KVM_IOCTL_ERROR (KVM_CHECK_EXTENSION , ret));close (kvm_fd);
@@ -104,9 +103,8 @@ static void vm_open(struct kvm_vm *vm)exit (KSFT_SKIP ); } - vm->fd =ioctl (vm->kvm_fd,KVM_CREATE_VM , vm->type); -TEST_ASSERT (vm->fd >=0 ,"KVM_CREATE_VM ioctl failed, " -"rc: %i errno: %i" , vm->fd, errno); + 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)); }const char *vm_guest_mode_string (uint32_t i)
tools/testing/selftests/kvm/lib/x86_64/processor.c +10 -21
@@ -677,7 +677,7 @@ void vm_xsave_req_perm(int bit) }; kvm_fd =open_kvm_dev_path_or_exit (); - rc =ioctl (kvm_fd,KVM_GET_DEVICE_ATTR , &attr); + rc =__kvm_ioctl (kvm_fd,KVM_GET_DEVICE_ATTR , &attr);close (kvm_fd);if (rc ==-1 && (errno ==ENXIO || errno ==EINVAL ))exit (KSFT_SKIP );
@@ -777,7 +777,6 @@ static struct kvm_cpuid2 *allocate_kvm_cpuid2(void)struct kvm_cpuid2 *kvm_get_supported_cpuid (void ) {static struct kvm_cpuid2 *cpuid; -int ret;int kvm_fd;if (cpuid)
@@ -786,9 +785,7 @@ struct kvm_cpuid2 *kvm_get_supported_cpuid(void) cpuid =allocate_kvm_cpuid2 (); kvm_fd =open_kvm_dev_path_or_exit (); - ret =ioctl (kvm_fd,KVM_GET_SUPPORTED_CPUID , cpuid); -TEST_ASSERT (ret ==0 ,"KVM_GET_SUPPORTED_CPUID failed %d %d\n" , - ret, errno); +kvm_ioctl (kvm_fd,KVM_GET_SUPPORTED_CPUID , cpuid);close (kvm_fd);return cpuid;
@@ -818,7 +815,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index) buffer.entry.index = msr_index; kvm_fd =open_kvm_dev_path_or_exit (); - r =ioctl (kvm_fd,KVM_GET_MSRS , &buffer.header); + r =__kvm_ioctl (kvm_fd,KVM_GET_MSRS , &buffer.header);TEST_ASSERT (r ==1 ,"KVM_GET_MSRS IOCTL failed,\n" " rc: %i errno: %i" , r, errno);
@@ -990,9 +987,9 @@ static int kvm_get_num_msrs_fd(int kvm_fd)int r; nmsrs.nmsrs =0 ; - r =ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , &nmsrs); -TEST_ASSERT (r ==-1 && errno ==E2BIG ,"Unexpected result from KVM_GET_MSR_INDEX_LIST probe, r: %i" , - r); + r =__kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , &nmsrs); +TEST_ASSERT (r ==-1 && errno ==E2BIG , +"Unexpected result from KVM_GET_MSR_INDEX_LIST probe, r: %i" , r);return nmsrs.nmsrs; }
@@ -1005,19 +1002,16 @@ static int kvm_get_num_msrs(struct kvm_vm *vm)struct kvm_msr_list *kvm_get_msr_index_list (void ) {struct kvm_msr_list *list; -int nmsrs, r, kvm_fd; +int nmsrs, kvm_fd; kvm_fd =open_kvm_dev_path_or_exit (); nmsrs =kvm_get_num_msrs_fd (kvm_fd); list =malloc (sizeof (*list) + nmsrs *sizeof (list->indices[0 ])); list->nmsrs = nmsrs; - r =ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list); +kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list);close (kvm_fd); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_MSR_INDEX_LIST, r: %i" , - r); -return list; }
@@ -1063,9 +1057,7 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid) nmsrs =kvm_get_num_msrs (vm); list =malloc (sizeof (*list) + nmsrs *sizeof (list->indices[0 ])); list->nmsrs = nmsrs; - r =ioctl (vm->kvm_fd,KVM_GET_MSR_INDEX_LIST , list); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_MSR_INDEX_LIST, r: %i" , - r); +kvm_ioctl (vm->kvm_fd,KVM_GET_MSR_INDEX_LIST , list); state =malloc (sizeof (*state) + nmsrs *sizeof (state->msrs.entries[0 ])); r =ioctl (vcpu->fd,KVM_GET_VCPU_EVENTS , &state->events);
@@ -1373,7 +1365,6 @@ uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, uint64_t a1, uint64_t a2,struct kvm_cpuid2 *kvm_get_supported_hv_cpuid (void ) {static struct kvm_cpuid2 *cpuid; -int ret;int kvm_fd;if (cpuid)
@@ -1382,9 +1373,7 @@ struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void) cpuid =allocate_kvm_cpuid2 (); kvm_fd =open_kvm_dev_path_or_exit (); - ret =ioctl (kvm_fd,KVM_GET_SUPPORTED_HV_CPUID , cpuid); -TEST_ASSERT (ret ==0 ,"KVM_GET_SUPPORTED_HV_CPUID failed %d %d\n" , - ret, errno); +kvm_ioctl (kvm_fd,KVM_GET_SUPPORTED_HV_CPUID , cpuid);close (kvm_fd);return cpuid;
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +4 -12
@@ -34,7 +34,7 @@ static int kvm_num_index_msrs(int kvm_fd, int nmsrs)static void test_get_msr_index (void ) { -int old_res, res, kvm_fd, r; +int old_res, res, kvm_fd;struct kvm_msr_list *list; kvm_fd =open_kvm_dev_path_or_exit ();
@@ -50,11 +50,8 @@ static void test_get_msr_index(void) list =malloc (sizeof (*list) + old_res *sizeof (list->indices[0 ])); list->nmsrs = old_res; - r =ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list); +kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list); -TEST_ASSERT (r ==0 , -"Unexpected result from KVM_GET_MSR_FEATURE_INDEX_LIST, r: %i" , - r);TEST_ASSERT (list->nmsrs == old_res,"Expecting nmsrs to be identical" );free (list);
@@ -68,7 +65,7 @@ static int kvm_num_feature_msrs(int kvm_fd, int nmsrs) list =malloc (sizeof (*list) + nmsrs *sizeof (list->indices[0 ])); list->nmsrs = nmsrs; - r =ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , list); + r =__kvm_ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , list);TEST_ASSERT (r ==-1 && errno ==E2BIG ,"Unexpected result from KVM_GET_MSR_FEATURE_INDEX_LIST probe, r: %i" , r);
@@ -81,15 +78,10 @@ static int kvm_num_feature_msrs(int kvm_fd, int nmsrs)struct kvm_msr_list *kvm_get_msr_feature_list (int kvm_fd,int nmsrs) {struct kvm_msr_list *list; -int r; list =malloc (sizeof (*list) + nmsrs *sizeof (list->indices[0 ])); list->nmsrs = nmsrs; - r =ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , list); - -TEST_ASSERT (r ==0 , -"Unexpected result from KVM_GET_MSR_FEATURE_INDEX_LIST, r: %i" , - r); +kvm_ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , list);return list; }
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c +3 -3
@@ -59,10 +59,10 @@ void test(void) kvm =open ("/dev/kvm" ,O_RDWR );TEST_ASSERT (kvm !=-1 ,"failed to open /dev/kvm" ); - kvmvm =ioctl (kvm,KVM_CREATE_VM ,0 ); -TEST_ASSERT (kvmvm !=-1 ,"KVM_CREATE_VM failed" ); + kvmvm =__kvm_ioctl (kvm,KVM_CREATE_VM ,0 ); +TEST_ASSERT (kvmvm >0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , kvmvm)); kvmcpu =ioctl (kvmvm,KVM_CREATE_VCPU ,0 ); -TEST_ASSERT (kvmcpu !=-1 ,"KVM_CREATE_VCPU failed" ); +TEST_ASSERT (kvmcpu !=-1 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , kvmcpu)); run = (struct kvm_run *)mmap (0 ,4096 ,PROT_READ |PROT_WRITE ,MAP_SHARED , kvmcpu,0 ); tc.kvmcpu = kvmcpu;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 17/105 KVM: selftests: Make x86-64's register dump helpers static
In reply to Sean Christopherson--- .../selftests/kvm/lib/kvm_util_internal.h | 34 ------------------ .../selftests/kvm/lib/x86_64/processor.c | 36 ++----------------- 2 files changed, 2 insertions(+), 68 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util_internal.h +0 -34
@@ -88,40 +88,6 @@ struct vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpuid);*/ void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent); -/* -* Register Dump -* -* Input Args: -* stream - Output FILE stream -* regs - Registers -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps the state of the registers given by @regs, to the FILE stream -* given by @stream. -*/ -void regs_dump (FILE *stream,struct kvm_regs *regs,uint8_t indent); - -/* -* System Register Dump -* -* Input Args: -* stream - Output FILE stream -* sregs - System registers -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps the state of the system registers given by @sregs, to the FILE stream -* given by @stream. -*/ -void sregs_dump (FILE *stream,struct kvm_sregs *sregs,uint8_t indent); -struct userspace_mem_region *memslot2region (struct kvm_vm *vm,uint32_t memslot);
tools/testing/selftests/kvm/lib/x86_64/processor.c +2 -34
@@ -51,8 +51,7 @@ struct pageTableEntry { uint64_t execute_disable:1; }; -void regs_dump (FILE *stream,struct kvm_regs *regs, -uint8_t indent) +static void regs_dump (FILE *stream,struct kvm_regs *regs,uint8_t indent) { fprintf(stream, "%*srax: 0x%.16llx rbx: 0x%.16llx " "rcx: 0x%.16llx rdx: 0x%.16llx\n",
@@ -75,21 +74,6 @@ void regs_dump(FILE *stream, struct kvm_regs *regs, regs->rip, regs->rflags); } -/* -* Segment Dump -* -* Input Args: -* stream - Output FILE stream -* segment - KVM segment -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps the state of the KVM segment given by @segment, to the FILE stream -* given by @stream. -*/ static void segment_dump (FILE *stream,struct kvm_segment *segment,uint8_t indent) {
@@ -107,21 +91,6 @@ static void segment_dump(FILE *stream, struct kvm_segment *segment, segment->unusable, segment->padding); } -/* -* dtable Dump -* -* Input Args: -* stream - Output FILE stream -* dtable - KVM dtable -* indent - Left margin indent amount -* -* Output Args: None -* -* Return: None -* -* Dumps the state of the KVM dtable given by @dtable, to the FILE stream -* given by @stream. -*/ static void dtable_dump (FILE *stream,struct kvm_dtable *dtable,uint8_t indent) {
@@ -131,8 +100,7 @@ static void dtable_dump(FILE *stream, struct kvm_dtable *dtable, dtable->padding[0], dtable->padding[1], dtable->padding[2]); } -void sregs_dump (FILE *stream,struct kvm_sregs *sregs, -uint8_t indent) +static void sregs_dump (FILE *stream,struct kvm_sregs *sregs,uint8_t indent) {unsigned int i;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 18/105 KVM: selftests: Get rid of kvm_util_internal.h
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 99 +++++++++++++++++-- .../selftests/kvm/lib/aarch64/processor.c | 1 - .../testing/selftests/kvm/lib/aarch64/ucall.c | 1 - .../testing/selftests/kvm/lib/aarch64/vgic.c | 1 - tools/testing/selftests/kvm/lib/elf.c | 1 - tools/testing/selftests/kvm/lib/kvm_util.c | 1 - .../selftests/kvm/lib/kvm_util_internal.h | 94 ------------------ .../selftests/kvm/lib/riscv/processor.c | 1 - tools/testing/selftests/kvm/lib/riscv/ucall.c | 1 - .../selftests/kvm/lib/s390x/processor.c | 1 - .../selftests/kvm/lib/x86_64/processor.c | 1 - tools/testing/selftests/kvm/lib/x86_64/svm.c | 1 - tools/testing/selftests/kvm/lib/x86_64/vmx.c | 1 - .../selftests/kvm/x86_64/sev_migrate_tests.c | 1 - 14 files changed, 91 insertions(+), 114 deletions(-) delete mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h
tools/testing/selftests/kvm/include/kvm_util_base.h +91 -8
@@ -9,9 +9,13 @@#include "test_util.h" -#include "asm/kvm.h" +#include <linux/compiler.h> +#include "linux/hashtable.h" #include "linux/list.h" -#include "linux/kvm.h" +#include <linux/kernel.h> +#include <linux/kvm.h> +#include "linux/rbtree.h" +#include <sys/ioctl.h> #include "sparsebit.h"
@@ -21,15 +25,94 @@#define NSEC_PER_SEC 1000000000L -/* -* Callers of kvm_util only have an incomplete/opaque description of the -* structure kvm_util is using to maintain the state of a VM. -*/ -struct kvm_vm ; -typedef uint64_t vm_paddr_t ;/* Virtual Machine (Guest) physical address */ typedef uint64_t vm_vaddr_t ;/* Virtual Machine (Guest) virtual address */ +struct userspace_mem_region { +struct kvm_userspace_memory_region region; +struct sparsebit *unused_phy_pages; +int fd; +off_t offset; +void *host_mem; +void *host_alias; +void *mmap_start; +void *mmap_alias; +size_t mmap_size; +struct rb_node gpa_node; +struct rb_node hva_node; +struct hlist_node slot_node; +}; + +struct vcpu { +struct list_head list; +uint32_t id; +int fd; +struct kvm_run *state; +struct kvm_dirty_gfn *dirty_gfns; +uint32_t fetch_index; +uint32_t dirty_gfns_count; +}; + +struct userspace_mem_regions { +struct rb_root gpa_tree; +struct rb_root hva_tree; + DECLARE_HASHTABLE(slot_hash, 9); +}; + +struct kvm_vm { +int mode; +unsigned long type; +int kvm_fd; +int fd; +unsigned int pgtable_levels; +unsigned int page_size; +unsigned int page_shift; +unsigned int pa_bits; +unsigned int va_bits; +uint64_t max_gfn; +struct list_head vcpus; +struct userspace_mem_regions regions; +struct sparsebit *vpages_valid; +struct sparsebit *vpages_mapped; +bool has_irqchip; +bool pgd_created; +vm_paddr_t pgd; +vm_vaddr_t gdt; +vm_vaddr_t tss; +vm_vaddr_t idt; +vm_vaddr_t handlers; +uint32_t dirty_ring_size; +}; + + +#define kvm_for_each_vcpu (vm, i, vcpu) \ + for ((i) = 0; (i) <= (vm)->last_vcpu_id; (i)++) \ + if (!((vcpu) = vm->vcpus[i])) \ + continue; \ + else + +struct 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); +/* Minimum allocated guest virtual and physical addresses */ #define KVM_UTIL_MIN_VADDR 0x2000#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000
tools/testing/selftests/kvm/lib/aarch64/processor.c +0 -1
@@ -10,7 +10,6 @@#include "guest_modes.h" #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" #define DEFAULT_ARM64_GUEST_STACK_VADDR_MIN 0xac0000
tools/testing/selftests/kvm/lib/aarch64/ucall.c +0 -1
@@ -5,7 +5,6 @@* Copyright (C) 2018, Red Hat, Inc. */ #include "kvm_util.h" -#include "../kvm_util_internal.h" static vm_vaddr_t *ucall_exit_mmio_addr;
tools/testing/selftests/kvm/lib/aarch64/vgic.c +0 -1
@@ -9,7 +9,6 @@#include <asm/kvm.h> #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "vgic.h" #include "gic.h" #include "gic_v3.h"
tools/testing/selftests/kvm/lib/elf.c +0 -1
@@ -11,7 +11,6 @@#include <linux/elf.h> #include "kvm_util.h" -#include "kvm_util_internal.h" static void elfhdr_get (const char *filename,Elf64_Ehdr *hdrp) {
tools/testing/selftests/kvm/lib/kvm_util.c +0 -1
@@ -8,7 +8,6 @@#define _GNU_SOURCE/* for program_invocation_name */ #include "test_util.h" #include "kvm_util.h" -#include "kvm_util_internal.h" #include "processor.h" #include <assert.h>
tools/testing/selftests/kvm/lib/kvm_util_internal.h deleted +0 -94
94 lines not on this page · raw message
tools/testing/selftests/kvm/lib/riscv/processor.c +0 -1
@@ -9,7 +9,6 @@#include <assert.h> #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" #define DEFAULT_RISCV_GUEST_STACK_VADDR_MIN 0xac0000
tools/testing/selftests/kvm/lib/riscv/ucall.c +0 -1
@@ -8,7 +8,6 @@#include <linux/kvm.h> #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" void ucall_init (struct kvm_vm *vm,void *arg)
tools/testing/selftests/kvm/lib/s390x/processor.c +0 -1
@@ -7,7 +7,6 @@#include "processor.h" #include "kvm_util.h" -#include "../kvm_util_internal.h" #define PAGES_PER_REGION 4
tools/testing/selftests/kvm/lib/x86_64/processor.c +0 -1
@@ -7,7 +7,6 @@#include "test_util.h" #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" #ifndef NUM_INTERRUPTS
tools/testing/selftests/kvm/lib/x86_64/svm.c +0 -1
@@ -9,7 +9,6 @@#include "test_util.h" #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" #include "svm_util.h"
tools/testing/selftests/kvm/lib/x86_64/vmx.c +0 -1
@@ -7,7 +7,6 @@#include "test_util.h" #include "kvm_util.h" -#include "../kvm_util_internal.h" #include "processor.h" #include "vmx.h"
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +0 -1
@@ -12,7 +12,6 @@#include "processor.h" #include "svm_util.h" #include "kselftest.h" -#include "../lib/kvm_util_internal.h" #define SEV_POLICY_ES 0b100
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 19/105 KVM: selftests: Use KVM_IOCTL_ERROR() for one-off arm64 ioctls
In reply to Sean Christopherson--- tools/testing/selftests/kvm/lib/aarch64/processor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/lib/aarch64/processor.c +4 -4
@@ -472,15 +472,15 @@ void aarch64_get_supported_page_sizes(uint32_t ipa,TEST_ASSERT (vm_fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VM , vm_fd)); vcpu_fd =ioctl (vm_fd,KVM_CREATE_VCPU ,0 ); -TEST_ASSERT (vcpu_fd >=0 ,"Can't create vcpu" ); +TEST_ASSERT (vcpu_fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , vcpu_fd)); err =ioctl (vm_fd,KVM_ARM_PREFERRED_TARGET , &preferred_init); -TEST_ASSERT (err ==0 ,"Can't get target" ); +TEST_ASSERT (err ==0 ,KVM_IOCTL_ERROR (KVM_ARM_PREFERRED_TARGET , err)); err =ioctl (vcpu_fd,KVM_ARM_VCPU_INIT , &preferred_init); -TEST_ASSERT (err ==0 ,"Can't get init vcpu" ); +TEST_ASSERT (err ==0 ,KVM_IOCTL_ERROR (KVM_ARM_VCPU_INIT , err)); err =ioctl (vcpu_fd,KVM_GET_ONE_REG , ®); -TEST_ASSERT (err ==0 ,"Can't get MMFR0" ); +TEST_ASSERT (err ==0 ,KVM_IOCTL_ERROR (KVM_GET_ONE_REG , vcpu_fd)); *ps4k = ((val >>28 ) &0xf ) !=0xf ; *ps64k = ((val >>24 ) &0xf ) ==0 ;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 20/105 KVM: selftests: Drop @test param from kvm_create_device()
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 14 ++++++-------- .../testing/selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/aarch64/vgic.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 12 ++++-------- 4 files changed, 12 insertions(+), 18 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +6 -8
@@ -65,7 +65,7 @@ static struct vm_gic vm_gic_create_with_vcpus(uint32_t gic_dev_type, uint32_t nr v.gic_dev_type = gic_dev_type; v.vm =vm_create_default_with_vcpus (nr_vcpus,0 ,0 , guest_code,NULL ); - v.gic_fd =kvm_create_device (v.vm, gic_dev_type, false); + v.gic_fd =kvm_create_device (v.vm, gic_dev_type);return v; }
@@ -406,7 +406,7 @@ static void test_v3_typer_accesses(void) v.vm =vm_create_default (0 ,0 , guest_code); - v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); + v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 );vm_vcpu_add_default (v.vm,3 , guest_code);
@@ -486,7 +486,7 @@ static void test_v3_last_bit_redist_regions(void) 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 , false); + v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 );kvm_device_access (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true);
@@ -535,7 +535,7 @@ static void test_v3_last_bit_single_rdist(void) 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 , false); + v.gic_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_V3 );kvm_device_access (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true);
@@ -602,7 +602,7 @@ static void test_v3_its_region(void)int its_fd, ret; v =vm_gic_create_with_vcpus (KVM_DEV_TYPE_ARM_VGIC_V3 ,NR_VCPUS ); - its_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_ITS , false); + its_fd =kvm_create_device (v.vm,KVM_DEV_TYPE_ARM_VGIC_ITS ); addr =0x401000 ; ret = _kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
@@ -655,13 +655,11 @@ int test_kvm_device(uint32_t gic_dev_type) ret =_kvm_create_device (v.vm, gic_dev_type, true, &fd);if (ret)return ret; - v.gic_fd =kvm_create_device (v.vm, gic_dev_type, false); + v.gic_fd =kvm_create_device (v.vm, gic_dev_type); ret =_kvm_create_device (v.vm, gic_dev_type, false, &fd);TEST_ASSERT (ret && errno ==EEXIST ,"create GIC device twice" ); -kvm_create_device (v.vm, gic_dev_type, true); -/* try to create the other gic_dev_type */ other =VGIC_DEV_IS_V2 (gic_dev_type) ?KVM_DEV_TYPE_ARM_VGIC_V3 :KVM_DEV_TYPE_ARM_VGIC_V2 ;
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -480,7 +480,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int _kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test,int *fd); -int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test); +int kvm_create_device (struct kvm_vm *vm,uint64_t type);int _kvm_device_access (int dev_fd,uint32_t group,uint64_t attr,void *val,bool write); int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
tools/testing/selftests/kvm/lib/aarch64/vgic.c +1 -1
@@ -51,7 +51,7 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created);/* Distributor setup */ - gic_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); + gic_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 );kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 , &nr_irqs, true);
tools/testing/selftests/kvm/lib/kvm_util.c +4 -8
@@ -1613,18 +1613,14 @@ int _kvm_create_device(struct kvm_vm *vm, uint64_t type, bool test, int *fd)return ret; } -int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test) +int kvm_create_device (struct kvm_vm *vm,uint64_t type) {int fd, ret; - ret =_kvm_create_device (vm, type, test, &fd); + ret =_kvm_create_device (vm, type, false, &fd); -if (!test) { -TEST_ASSERT (!ret, -"KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i" , ret, errno); -return fd; - } -return ret; +TEST_ASSERT (!ret,"KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i" , ret, errno); +return fd; } int _kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 21/105 KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper
In reply to Sean Christopherson--- .../testing/selftests/kvm/aarch64/vgic_init.c | 10 ++++---- .../selftests/kvm/include/kvm_util_base.h | 3 ++- tools/testing/selftests/kvm/lib/kvm_util.c | 23 ++++++++++++++----- 3 files changed, 24 insertions(+), 12 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +5 -5
@@ -648,24 +648,24 @@ int test_kvm_device(uint32_t gic_dev_type) v.vm =vm_create_default_with_vcpus (NR_VCPUS ,0 ,0 , guest_code,NULL );/* try to create a non existing KVM device */ - ret =_kvm_create_device (v.vm,0 , true, &fd); + ret =__kvm_test_create_device (v.vm,0 );TEST_ASSERT (ret && errno ==ENODEV ,"unsupported device" );/* trial mode */ - ret =_kvm_create_device (v.vm, gic_dev_type, true, &fd); + ret =__kvm_test_create_device (v.vm, gic_dev_type);if (ret)return ret; v.gic_fd =kvm_create_device (v.vm, gic_dev_type); - ret =_kvm_create_device (v.vm, gic_dev_type, false, &fd); + ret =__kvm_create_device (v.vm, gic_dev_type, &fd);TEST_ASSERT (ret && errno ==EEXIST ,"create GIC device twice" );/* try to create the other gic_dev_type */ other =VGIC_DEV_IS_V2 (gic_dev_type) ?KVM_DEV_TYPE_ARM_VGIC_V3 :KVM_DEV_TYPE_ARM_VGIC_V2 ; -if (!_kvm_create_device (v.vm, other, true, &fd)) { - ret =_kvm_create_device (v.vm, other, false, &fd); +if (!__kvm_test_create_device (v.vm, other)) { + ret =__kvm_test_create_device (v.vm, other);TEST_ASSERT (ret && errno ==EINVAL ,"create GIC device while other version exists" ); }
tools/testing/selftests/kvm/include/kvm_util_base.h +2 -1
@@ -479,7 +479,8 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); -int _kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test,int *fd); +int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type); +int __kvm_create_device (struct kvm_vm *vm,uint64_t type,int *fd);int kvm_create_device (struct kvm_vm *vm,uint64_t type);int _kvm_device_access (int dev_fd,uint32_t group,uint64_t attr,void *val,bool write);
tools/testing/selftests/kvm/lib/kvm_util.c +17 -6
@@ -1600,14 +1600,25 @@ int kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr)return ret; } -int _kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test,int *fd) +int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type) { -struct kvm_create_device create_dev; +struct kvm_create_device create_dev = { + .type = type, + .flags =KVM_CREATE_DEVICE_TEST , + }; + +return __vm_ioctl (vm,KVM_CREATE_DEVICE , &create_dev); +} + +int __kvm_create_device (struct kvm_vm *vm,uint64_t type,int *fd) +{ +struct kvm_create_device create_dev = { + .type = type, + .fd =-1 , + .flags =0 , + };int ret; - create_dev.type = type; - create_dev.fd =-1 ; - create_dev.flags = test ?KVM_CREATE_DEVICE_TEST :0 ; ret =__vm_ioctl (vm,KVM_CREATE_DEVICE , &create_dev); *fd = create_dev.fd;return ret;
@@ -1617,7 +1628,7 @@ int kvm_create_device(struct kvm_vm *vm, uint64_t type) {int fd, ret; - ret =_kvm_create_device (vm, type, false, &fd); + ret =__kvm_create_device (vm, type, &fd);TEST_ASSERT (!ret,"KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i" , ret, errno);return fd;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 22/105 KVM: selftests: Multiplex return code and fd in __kvm_create_device()
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 6 +++--- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 16 +++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +3 -3
@@ -642,8 +642,8 @@ static void test_v3_its_region(void)int test_kvm_device (uint32_t gic_dev_type) {struct vm_gic v; -int ret, fd;uint32_t other; +int ret; v.vm =vm_create_default_with_vcpus (NR_VCPUS ,0 ,0 , guest_code,NULL );
@@ -657,8 +657,8 @@ int test_kvm_device(uint32_t gic_dev_type)return ret; v.gic_fd =kvm_create_device (v.vm, gic_dev_type); - ret =__kvm_create_device (v.vm, gic_dev_type, &fd); -TEST_ASSERT (ret && errno ==EEXIST ,"create GIC device twice" ); + ret =__kvm_create_device (v.vm, gic_dev_type); +TEST_ASSERT (ret <0 && errno ==EEXIST ,"create GIC device twice" );/* try to create the other gic_dev_type */ other = VGIC_DEV_IS_V2(gic_dev_type) ? KVM_DEV_TYPE_ARM_VGIC_V3
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -480,7 +480,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr);int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type); -int __kvm_create_device (struct kvm_vm *vm,uint64_t type,int *fd); +int __kvm_create_device (struct kvm_vm *vm,uint64_t type);int kvm_create_device (struct kvm_vm *vm,uint64_t type);int _kvm_device_access (int dev_fd,uint32_t group,uint64_t attr,void *val,bool write);
tools/testing/selftests/kvm/lib/kvm_util.c +7 -9
@@ -1610,27 +1610,25 @@ int __kvm_test_create_device(struct kvm_vm *vm, uint64_t type)return __vm_ioctl (vm,KVM_CREATE_DEVICE , &create_dev); } -int __kvm_create_device (struct kvm_vm *vm,uint64_t type,int *fd) +int __kvm_create_device (struct kvm_vm *vm,uint64_t type) {struct kvm_create_device create_dev = { .type = type, .fd =-1 , .flags =0 , }; -int ret; +int err; - ret =__vm_ioctl (vm,KVM_CREATE_DEVICE , &create_dev); - *fd = create_dev.fd; -return ret; + err =__vm_ioctl (vm,KVM_CREATE_DEVICE , &create_dev); +TEST_ASSERT (err <=0 ,"KVM_CREATE_DEVICE shouldn't return a positive value" ); +return err ? : create_dev.fd; }int kvm_create_device (struct kvm_vm *vm,uint64_t type) { -int fd, ret; +int fd =__kvm_create_device (vm, type); - ret =__kvm_create_device (vm, type, &fd); - -TEST_ASSERT (!ret,"KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i" , ret, errno); +TEST_ASSERT (fd >=0 ,"KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i" , fd, errno);return fd; }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 23/105 KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 12 +++++------- tools/testing/selftests/kvm/include/kvm_util_base.h | 6 +++--- tools/testing/selftests/kvm/lib/kvm_util.c | 12 ++++++------ .../selftests/kvm/system_counter_offset_test.c | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +5 -7
@@ -127,14 +127,12 @@ static void subtest_dist_rdist(struct vm_gic *v) : gic_v2_dist_region;/* Check existing group/attributes */ -kvm_device_check_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , - dist.attr); +kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , dist.attr); -kvm_device_check_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , - rdist.attr); +kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , rdist.attr);/* check non existing attribute */ - ret =_kvm_device_check_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,-1 ); + ret =__kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,-1 );TEST_ASSERT (ret && errno ==ENXIO ,"attribute not supported" );/* misaligned DIST and REDIST address settings */
@@ -176,7 +174,7 @@ static void subtest_dist_rdist(struct vm_gic *v) rdist.attr, &addr, true);TEST_ASSERT (ret && errno ==EEXIST ,"GIC redist base set again" ); - ret =_kvm_device_check_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , + ret =__kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,KVM_VGIC_V3_ADDR_TYPE_REDIST );if (!ret) {/* Attempt to mix legacy and new redistributor regions */
@@ -203,7 +201,7 @@ static void subtest_v3_redist_regions(struct vm_gic *v)uint64_t addr, expected_addr;int ret; - ret =kvm_device_check_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , + ret =kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,KVM_VGIC_V3_ADDR_TYPE_REDIST );TEST_ASSERT (!ret,"Multiple redist regions advertised" );
tools/testing/selftests/kvm/include/kvm_util_base.h +3 -3
@@ -477,8 +477,8 @@ void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid);*/ void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...); -int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); -int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); +int __kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr); +int kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr);int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type);int __kvm_create_device (struct kvm_vm *vm,uint64_t type);int kvm_create_device (struct kvm_vm *vm,uint64_t type);
@@ -489,7 +489,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,void kvm_irq_line (struct kvm_vm *vm,uint32_t irq,int level);int _kvm_irq_line (struct kvm_vm *vm,uint32_t irq,int level); -int _vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group, +int __vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr);int vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr);
tools/testing/selftests/kvm/lib/kvm_util.c +6 -6
@@ -1581,7 +1581,7 @@ void _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, const char *name, void *arg* Device Ioctl */ -int _kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr) +int __kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr) {struct kvm_device_attr attribute = { .group = group,
@@ -1592,9 +1592,9 @@ int _kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr)return ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attribute); } -int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr) +int kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr) { -int ret =_kvm_device_check_attr (dev_fd, group, attr); +int ret =__kvm_has_device_attr (dev_fd, group, attr);TEST_ASSERT (!ret,"KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i" , ret, errno);return ret;
@@ -1657,18 +1657,18 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,return ret; } -int _vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group, +int __vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr) {struct vcpu *vcpu =vcpu_get (vm, vcpuid); -return _kvm_device_check_attr (vcpu->fd, group, attr); +return __kvm_has_device_attr (vcpu->fd, group, attr); }int vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr) { -int ret =_vcpu_has_device_attr (vm, vcpuid, group, attr); +int ret =__vcpu_has_device_attr (vm, vcpuid, group, attr);TEST_ASSERT (!ret,"KVM_HAS_DEVICE_ATTR IOCTL failed, rc: %i errno: %i" , ret, errno);return ret;
tools/testing/selftests/kvm/system_counter_offset_test.c +1 -1
@@ -30,7 +30,7 @@ static struct test_case test_cases[] = {static void check_preconditions (struct kvm_vm *vm) { -if (!_vcpu_has_device_attr (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET )) +if (!__vcpu_has_device_attr (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL ,KVM_VCPU_TSC_OFFSET ))return ;print_skip ("KVM_VCPU_TSC_OFFSET not supported; skipping test" );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 24/105 KVM: selftests: Drop 'int' return from asserting *_device_has_attr()
In reply to Sean Christopherson--- .../testing/selftests/kvm/aarch64/vgic_init.c | 4 ++-- .../selftests/kvm/include/kvm_util_base.h | 20 ++++++++++++++++--- tools/testing/selftests/kvm/lib/kvm_util.c | 17 ---------------- 3 files changed, 19 insertions(+), 22 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +2 -2
@@ -201,8 +201,8 @@ static void subtest_v3_redist_regions(struct vm_gic *v)uint64_t addr, expected_addr;int ret; - ret =kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , -KVM_VGIC_V3_ADDR_TYPE_REDIST ); + ret =__kvm_has_device_attr (v->gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST );TEST_ASSERT (!ret,"Multiple redist regions advertised" ); addr =REDIST_REGION_ATTR_ADDR (NR_VCPUS ,0x100000 ,2 ,0 );
tools/testing/selftests/kvm/include/kvm_util_base.h +17 -3
@@ -478,7 +478,14 @@ void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid);void vcpu_args_set (struct kvm_vm *vm,uint32_t vcpuid,unsigned int num, ...);int __kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr); -int kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr); + +static inline void kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr) +{ +int ret =__kvm_has_device_attr (dev_fd, group, attr); + +TEST_ASSERT (!ret,"KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i" , ret, errno); +} +int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type);int __kvm_create_device (struct kvm_vm *vm,uint64_t type);int kvm_create_device (struct kvm_vm *vm,uint64_t type);
@@ -491,8 +498,15 @@ int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level);int __vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr); -int vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group, -uint64_t attr); + +static inline void vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid, +uint32_t group,uint64_t attr) +{ +int ret =__vcpu_has_device_attr (vm, vcpuid, group, attr); + +TEST_ASSERT (!ret,KVM_IOCTL_ERROR (KVM_HAS_DEVICE_ATTR , ret)); +} +int _vcpu_access_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr,void *val,bool write); int vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
tools/testing/selftests/kvm/lib/kvm_util.c +0 -17
@@ -1592,14 +1592,6 @@ int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr)return ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attribute); } -int kvm_has_device_attr (int dev_fd,uint32_t group,uint64_t attr) -{ -int ret =__kvm_has_device_attr (dev_fd, group, attr); - -TEST_ASSERT (!ret,"KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i" , ret, errno); -return ret; -} -int __kvm_test_create_device (struct kvm_vm *vm,uint64_t type) {struct kvm_create_device create_dev = {
@@ -1665,15 +1657,6 @@ int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,return __kvm_has_device_attr (vcpu->fd, group, attr); } -int vcpu_has_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group, -uint64_t attr) -{ -int ret =__vcpu_has_device_attr (vm, vcpuid, group, attr); - -TEST_ASSERT (!ret,"KVM_HAS_DEVICE_ATTR IOCTL failed, rc: %i errno: %i" , ret, errno); -return ret; -} -int _vcpu_access_device_attr (struct kvm_vm *vm,uint32_t vcpuid,uint32_t group,uint64_t attr,void *val,bool write) {
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 25/105 KVM: selftests: Split get/set device_attr helpers
In reply to Sean Christopherson--- .../selftests/kvm/aarch64/arch_timer.c | 8 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 246 +++++++++--------- .../selftests/kvm/include/kvm_util_base.h | 105 +++++--- .../testing/selftests/kvm/lib/aarch64/vgic.c | 31 ++- tools/testing/selftests/kvm/lib/guest_modes.c | 4 +- tools/testing/selftests/kvm/lib/kvm_util.c | 59 ++--- .../kvm/system_counter_offset_test.c | 4 +- 7 files changed, 240 insertions(+), 217 deletions(-)
tools/testing/selftests/kvm/aarch64/arch_timer.c +4 -4
@@ -349,10 +349,10 @@ 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_access_device_attr (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , -KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq, false); -vcpu_access_device_attr (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , -KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq, false); +vcpu_device_attr_get (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +KVM_ARM_VCPU_TIMER_IRQ_PTIMER , &ptimer_irq); +vcpu_device_attr_get (vm,0 ,KVM_ARM_VCPU_TIMER_CTRL , +KVM_ARM_VCPU_TIMER_IRQ_VTIMER , &vtimer_irq);sync_global_to_guest (vm, ptimer_irq);sync_global_to_guest (vm, vtimer_irq);
tools/testing/selftests/kvm/aarch64/vgic_init.c +121 -125
488 lines not on this page · raw message
tools/testing/selftests/kvm/include/kvm_util_base.h +73 -32
120 lines not on this page · raw message
tools/testing/selftests/kvm/lib/aarch64/vgic.c +15 -16
@@ -53,27 +53,26 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs,/* Distributor setup */ gic_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); -kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS , -0 , &nr_irqs, true); +kvm_device_attr_get (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 , &nr_irqs); -kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , -KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL ); -kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , -KVM_VGIC_V3_ADDR_TYPE_DIST , &gicd_base_gpa, true); +kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &gicd_base_gpa); nr_gic_pages =vm_calc_num_guest_pages (vm->mode,KVM_VGIC_V3_DIST_SIZE );virt_map (vm, gicd_base_gpa, gicd_base_gpa, nr_gic_pages);/* Redistributor setup */ redist_attr =REDIST_REGION_ATTR_ADDR (nr_vcpus, gicr_base_gpa,0 ,0 ); -kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , -KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &redist_attr, true); +kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &redist_attr); nr_gic_pages =vm_calc_num_guest_pages (vm->mode,KVM_VGIC_V3_REDIST_SIZE * nr_vcpus);virt_map (vm, gicr_base_gpa, gicr_base_gpa, nr_gic_pages); -kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , -KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL );return gic_fd; }
@@ -86,14 +85,14 @@ int _kvm_irq_set_level_info(int gic_fd, uint32_t intid, int level)uint64_t val;int ret; - ret =_kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO , - attr, &val, false); + ret =__kvm_device_attr_get (gic_fd,KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO , + attr, &val);if (ret !=0 )return ret; val |=1U << index; - ret =_kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO , - attr, &val, true); + ret =__kvm_device_attr_set (gic_fd,KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO , + attr, &val);return ret; }
@@ -154,9 +153,9 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid,* intid will just make the read/writes point to above the intended * register space (i.e., ICPENDR after ISPENDR). */ -kvm_device_access (gic_fd, group, attr, &val, false); +kvm_device_attr_get (gic_fd, group, attr, &val); val |=1ULL << index; -kvm_device_access (gic_fd, group, attr, &val, true); +kvm_device_attr_set (gic_fd, group, attr, &val); }void kvm_irq_write_ispendr (int gic_fd,uint32_t intid,uint32_t vcpu)
tools/testing/selftests/kvm/lib/guest_modes.c +2 -2
@@ -66,8 +66,8 @@ void guest_modes_append_default(void) kvm_fd =open_kvm_dev_path_or_exit (); vm_fd =__kvm_ioctl (kvm_fd,KVM_CREATE_VM ,0 ); -kvm_device_access (vm_fd,KVM_S390_VM_CPU_MODEL , -KVM_S390_VM_CPU_PROCESSOR , &info, false); +kvm_device_attr_get (vm_fd,KVM_S390_VM_CPU_MODEL , +KVM_S390_VM_CPU_PROCESSOR , &info);close (vm_fd);close (kvm_fd);/* Starting with z13 we have 47bits of physical address */
tools/testing/selftests/kvm/lib/kvm_util.c +23 -36
82 lines not on this page · raw message
tools/testing/selftests/kvm/system_counter_offset_test.c +2 -2
@@ -39,8 +39,8 @@ static void check_preconditions(struct kvm_vm *vm)static void setup_system_counter (struct kvm_vm *vm,struct test_case *test) { -vcpu_access_device_attr (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL , -KVM_VCPU_TSC_OFFSET , &test->tsc_offset, true); +vcpu_device_attr_set (vm,VCPU_ID ,KVM_VCPU_TSC_CTRL , +KVM_VCPU_TSC_OFFSET , &test->tsc_offset); }static uint64_t guest_read_system_counter (struct test_case *test)
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 26/105 KVM: selftests: Add a VM backpointer to 'struct vcpu'
In reply to Sean Christopherson--- tools/testing/selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 1 + 2 files changed, 2 insertions(+)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -0
@@ -47,6 +47,7 @@ struct vcpu {struct list_head list;uint32_t id;int fd; +struct kvm_vm *vm;struct kvm_run *state;struct kvm_dirty_gfn *dirty_gfns;uint32_t fetch_index;
tools/testing/selftests/kvm/lib/kvm_util.c +1 -0
@@ -1070,6 +1070,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) vcpu =calloc (1 ,sizeof (*vcpu));TEST_ASSERT (vcpu !=NULL ,"Insufficient Memory" ); + vcpu->vm = vm; vcpu->id = vcpuid; vcpu->fd =__vm_ioctl (vm,KVM_CREATE_VCPU , (void *)(unsigned long )vcpuid);TEST_ASSERT (vcpu->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , vcpu->fd));
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 27/105 KVM: selftests: Add vm_create_*() variants to expose/return 'struct vcpu'
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 17 +++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+)
tools/testing/selftests/kvm/include/kvm_util_base.h +17 -0
@@ -619,6 +619,23 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, uint32_t num_percpu_pages, void *guest_code, uint32_t vcpuids[]); + +/* +* Create a VM with a single vCPU with reasonable defaults and @extra_mem_pages +* additional pages of guest memory. Returns the VM and vCPU (via out param). +*/ +struct kvm_vm *__vm_create_with_one_vcpu (struct vcpu **vcpu, +uint64_t extra_mem_pages, +void *guest_code); + +static inline struct kvm_vm *vm_create_with_one_vcpu (struct vcpu **vcpu, +void *guest_code) +{ +return __vm_create_with_one_vcpu (vcpu,0 , guest_code); +} + +struct vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm); +/* * Adds a vCPU with reasonable defaults (e.g. a stack) *
tools/testing/selftests/kvm/lib/kvm_util.c +18 -0
@@ -365,6 +365,16 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages, (uint32_t []){ vcpuid }); } +struct kvm_vm *__vm_create_with_one_vcpu (struct vcpu **vcpu, +uint64_t extra_mem_pages, +void *guest_code) +{ +struct kvm_vm *vm =vm_create_default (0 , extra_mem_pages, guest_code); + + *vcpu =vcpu_get (vm,0 ); +return vm; +} +/* * VM Restart *
@@ -399,6 +409,14 @@ void kvm_vm_restart(struct kvm_vm *vmp) } } +struct vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm) +{ +kvm_vm_restart (vm); + +vm_vcpu_add (vm,0 ); +return vcpu_get (vm,0 ); +} +/* * Userspace Memory Region Find *
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 28/105 KVM: selftests: Rename vcpu.state => vcpu.run
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 24 +++++++------------ .../selftests/kvm/lib/s390x/processor.c | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -48,7 +48,7 @@ struct vcpu {uint32_t id;int fd;struct kvm_vm *vm; -struct kvm_run *state; +struct kvm_run *run;struct kvm_dirty_gfn *dirty_gfns;uint32_t fetch_index;uint32_t dirty_gfns_count;
tools/testing/selftests/kvm/lib/kvm_util.c +9 -15
@@ -531,7 +531,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu) vcpu->dirty_gfns =NULL ; } - ret =munmap (vcpu->state,vcpu_mmap_sz ()); + ret =munmap (vcpu->run,vcpu_mmap_sz ());TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " "errno: %i" , ret, errno); ret =close (vcpu->fd);
@@ -1076,13 +1076,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)struct vcpu *vcpu;/* Confirm a vcpu with the specified id doesn't already exist. */ - vcpu =vcpu_find (vm, vcpuid); -if (vcpu !=NULL ) -TEST_FAIL ("vcpu with the specified id " -"already exists,\n" -" requested vcpuid: %u\n" -" existing vcpuid: %u state: %p" , - vcpuid, vcpu->id, vcpu->state); +TEST_ASSERT (!vcpu_find (vm, vcpuid),"vCPU%d already exists\n" , vcpuid);/* Allocate and initialize new vcpu structure. */ vcpu =calloc (1 ,sizeof (*vcpu));
@@ -1093,12 +1087,12 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) vcpu->fd =__vm_ioctl (vm,KVM_CREATE_VCPU , (void *)(unsigned long )vcpuid);TEST_ASSERT (vcpu->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , vcpu->fd)); -TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->state),"vcpu mmap size " +TEST_ASSERT (vcpu_mmap_sz () >=sizeof (*vcpu->run),"vcpu mmap size " "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi" , -vcpu_mmap_sz (),sizeof (*vcpu->state)); - vcpu->state = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (), +vcpu_mmap_sz (),sizeof (*vcpu->run)); + vcpu->run = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 ); -TEST_ASSERT (vcpu->state !=MAP_FAILED ,"mmap vcpu_state failed, " +TEST_ASSERT (vcpu->run !=MAP_FAILED ,"mmap vcpu_state failed, " "vcpu id: %u errno: %i" , vcpuid, errno);/* Add to linked-list of VCPUs. */
@@ -1456,7 +1450,7 @@ struct kvm_run *vcpu_state(struct kvm_vm *vm, uint32_t vcpuid) {struct vcpu *vcpu =vcpu_get (vm, vcpuid); -return vcpu->state; +return vcpu->run; }/*
@@ -1498,9 +1492,9 @@ void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid)struct vcpu *vcpu =vcpu_get (vm, vcpuid);int ret; - vcpu->state->immediate_exit =1 ; + vcpu->run->immediate_exit =1 ; ret =__vcpu_run (vm, vcpuid); - vcpu->state->immediate_exit =0 ; + vcpu->run->immediate_exit =0 ; TEST_ASSERT(ret == -1 && errno == EINTR, "KVM_RUN IOCTL didn't exit immediately, rc: %i, errno: %i",
tools/testing/selftests/kvm/lib/s390x/processor.c +1 -1
@@ -210,7 +210,7 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent)struct vcpu *vcpu =vcpu_get (vm, vcpuid);fprintf (stream,"%*spstate: psw: 0x%.16llx:0x%.16llx\n" , - indent,"" , vcpu->state->psw_mask, vcpu->state->psw_addr); + indent,"" , vcpu->run->psw_mask, vcpu->run->psw_addr); }void assert_on_unhandled_exception (struct kvm_vm *vm,uint32_t vcpuid)
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 29/105 KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 11 ++++--- tools/testing/selftests/kvm/lib/kvm_util.c | 32 +++++++++---------- .../selftests/kvm/lib/s390x/processor.c | 2 +- .../selftests/kvm/lib/x86_64/processor.c | 8 ++--- 4 files changed, 27 insertions(+), 26 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +6 -5
@@ -16,6 +16,7 @@#include <linux/kvm.h> #include "linux/rbtree.h" +#include <sys/ioctl.h> #include "sparsebit.h"
@@ -43,7 +44,7 @@ struct userspace_mem_region {struct hlist_node slot_node; }; -struct vcpu { +struct kvm_vcpu {struct list_head list;uint32_t id;int fd;
@@ -92,7 +93,7 @@ struct kvm_vm {continue ; \ else -struct vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpuid); +struct kvm_vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpuid);/* * Virtual Translation Tables Dump
@@ -624,17 +625,17 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,* Create a VM with a single vCPU with reasonable defaults and @extra_mem_pages * additional pages of guest memory. Returns the VM and vCPU (via out param). */ -struct kvm_vm *__vm_create_with_one_vcpu (struct vcpu **vcpu, +struct kvm_vm *__vm_create_with_one_vcpu (struct kvm_vcpu **vcpu,uint64_t extra_mem_pages,void *guest_code); -static inline struct kvm_vm *vm_create_with_one_vcpu (struct vcpu **vcpu, +static inline struct kvm_vm *vm_create_with_one_vcpu (struct kvm_vcpu **vcpu,void *guest_code) {return __vm_create_with_one_vcpu (vcpu,0 , guest_code); } -struct vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm); +struct kvm_vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm);/* * Adds a vCPU with reasonable defaults (e.g. a stack)
tools/testing/selftests/kvm/lib/kvm_util.c +16 -16
@@ -365,7 +365,7 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages, (uint32_t []){ vcpuid }); } -struct kvm_vm *__vm_create_with_one_vcpu (struct vcpu **vcpu, +struct kvm_vm *__vm_create_with_one_vcpu (struct kvm_vcpu **vcpu,uint64_t extra_mem_pages,void *guest_code) {
@@ -409,7 +409,7 @@ void kvm_vm_restart(struct kvm_vm *vmp) } } -struct vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm) +struct kvm_vcpu *vm_recreate_with_one_vcpu (struct kvm_vm *vm) {kvm_vm_restart (vm);
@@ -488,23 +488,23 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,return ®ion->region; } -static struct vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpuid) +static struct kvm_vcpu *vcpu_find (struct kvm_vm *vm,uint32_t vcpu_id) { -struct vcpu *vcpu; +struct kvm_vcpu *vcpu;list_for_each_entry (vcpu, &vm->vcpus, list) { -if (vcpu->id == vcpuid) +if (vcpu->id == vcpu_id)return vcpu; }return NULL ; } -struct vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpuid) +struct kvm_vcpu *vcpu_get (struct kvm_vm *vm,uint32_t vcpu_id) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_find (vm, vcpu_id); -TEST_ASSERT (vcpu,"vCPU %d does not exist" , vcpuid); +TEST_ASSERT (vcpu,"vCPU %d does not exist" , vcpu_id);return vcpu; }
@@ -520,7 +520,7 @@ struct vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpuid)* * Removes a vCPU from a VM and frees its resources. */ -static void vm_vcpu_rm (struct kvm_vm *vm,struct vcpu *vcpu) +static void vm_vcpu_rm (struct kvm_vm *vm,struct kvm_vcpu *vcpu) {int ret;
@@ -544,7 +544,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)void kvm_vm_release (struct kvm_vm *vmp) { -struct vcpu *vcpu, *tmp; +struct kvm_vcpu *vcpu, *tmp;int ret;list_for_each_entry_safe (vcpu, tmp, &vmp->vcpus, list)
@@ -1073,7 +1073,7 @@ static int vcpu_mmap_sz(void)*/ void vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu; +struct kvm_vcpu *vcpu;/* Confirm a vcpu with the specified id doesn't already exist. */ TEST_ASSERT (!vcpu_find (vm, vcpuid),"vCPU%d already exists\n" , vcpuid);
@@ -1448,7 +1448,7 @@ void vm_create_irqchip(struct kvm_vm *vm)*/ struct kvm_run *vcpu_state (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);return vcpu->run; }
@@ -1489,7 +1489,7 @@ int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid)void vcpu_run_complete_io (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);int ret; vcpu->run->immediate_exit =1 ;
@@ -1533,7 +1533,7 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vm *vm, uint32_t vcpuid)int __vcpu_ioctl (struct kvm_vm *vm,uint32_t vcpuid,unsigned long cmd,void *arg) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);return ioctl (vcpu->fd, cmd, arg); }
@@ -1548,7 +1548,7 @@ void _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long cmd,void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);uint32_t size = vm->dirty_ring_size;TEST_ASSERT (size >0 ,"Should enable dirty ring first" );
@@ -1765,7 +1765,7 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) {int ctr;struct userspace_mem_region *region; -struct vcpu *vcpu; +struct kvm_vcpu *vcpu;fprintf (stream,"%*smode: 0x%x\n" , indent,"" , vm->mode);fprintf (stream,"%*sfd: %i\n" , indent,"" , vm->fd);
tools/testing/selftests/kvm/lib/s390x/processor.c +1 -1
@@ -207,7 +207,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...)void vcpu_dump (FILE *stream,struct kvm_vm *vm,uint32_t vcpuid,uint8_t indent) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +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);
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -4
@@ -805,7 +805,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index)*/ struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);struct kvm_cpuid2 *cpuid;int max_ent;int rc =-1 ;
@@ -982,7 +982,7 @@ struct kvm_msr_list *kvm_get_msr_index_list(void)return list; } -static int vcpu_save_xsave_state (struct kvm_vm *vm,struct vcpu *vcpu, +static int vcpu_save_xsave_state (struct kvm_vm *vm,struct kvm_vcpu *vcpu,struct kvm_x86_state *state) {int size;
@@ -1000,7 +1000,7 @@ static int vcpu_save_xsave_state(struct kvm_vm *vm, struct vcpu *vcpu,struct kvm_x86_state *vcpu_save_state (struct kvm_vm *vm,uint32_t vcpuid) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);struct kvm_msr_list *list;struct kvm_x86_state *state;int nmsrs, r, i;
@@ -1081,7 +1081,7 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid)void vcpu_load_state (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_x86_state *state) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); +struct kvm_vcpu *vcpu =vcpu_get (vm, vcpuid);int r; r =ioctl (vcpu->fd,KVM_SET_SREGS , &state->sregs);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 30/105 KVM: selftests: Return the created vCPU from vm_vcpu_add()
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 29 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -313,7 +313,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); -void 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);
tools/testing/selftests/kvm/lib/kvm_util.c +10 -19
@@ -413,8 +413,7 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm) {kvm_vm_restart (vm); -vm_vcpu_add (vm,0 ); -return vcpu_get (vm,0 ); +return vm_vcpu_add (vm,0 ); }/*
@@ -1058,33 +1057,23 @@ static int vcpu_mmap_sz(void) }/* -* VM VCPU Add -* -* Input Args: -* vm - Virtual Machine -* vcpuid - VCPU ID -* -* Output Args: None -* -* Return: None -* -* Adds a virtual CPU to the VM specified by vm with the ID given by vcpuid. -* No additional VCPU setup is done. +* 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. */ -void vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid) +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, vcpuid),"vCPU%d already exists\n" , vcpuid); +TEST_ASSERT (!vcpu_find (vm, vcpu_id),"vCPU%d already exists\n" , vcpu_id);/* Allocate and initialize new vcpu structure. */ vcpu =calloc (1 ,sizeof (*vcpu));TEST_ASSERT (vcpu !=NULL ,"Insufficient Memory" ); vcpu->vm = vm; - vcpu->id = vcpuid; - vcpu->fd =__vm_ioctl (vm,KVM_CREATE_VCPU , (void *)(unsigned long )vcpuid); + vcpu->id = vcpu_id; + vcpu->fd =__vm_ioctl (vm,KVM_CREATE_VCPU , (void *)(unsigned long )vcpu_id);TEST_ASSERT (vcpu->fd >=0 ,KVM_IOCTL_ERROR (KVM_CREATE_VCPU , vcpu->fd)); TEST_ASSERT(vcpu_mmap_sz() >= sizeof(*vcpu->run), "vcpu mmap size "
@@ -1093,10 +1082,12 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) vcpu->run = (struct kvm_run *)mmap (NULL ,vcpu_mmap_sz (),PROT_READ |PROT_WRITE ,MAP_SHARED , vcpu->fd,0 );TEST_ASSERT (vcpu->run !=MAP_FAILED ,"mmap vcpu_state failed, " -"vcpu id: %u errno: %i" , vcpuid, errno); +"vcpu id: %u errno: %i" , vcpu_id, errno);/* Add to linked-list of VCPUs. */ list_add (&vcpu->list, &vm->vcpus); + +return vcpu; }/*
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 31/105 KVM: selftests: Convert memslot_perf_test away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/memslot_perf_test.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/memslot_perf_test.c +14 -14
@@ -25,8 +25,6 @@#include <kvm_util.h> #include <processor.h> -#define VCPU_ID 0 -#define MEM_SIZE ((512U << 20) + 4096)#define MEM_SIZE_PAGES (MEM_SIZE / 4096)#define MEM_GPA 0x10000000UL
@@ -90,6 +88,7 @@ static_assert(MEM_TEST_MOVE_SIZE <= MEM_TEST_SIZE,struct vm_data {struct kvm_vm *vm; +struct kvm_vcpu *vcpu;pthread_t vcpu_thread;uint32_t nslots;uint64_t npages;
@@ -127,29 +126,29 @@ static bool verbose;pr_info (__VA_ARGS__); \ }while (0 ) -static void check_mmio_access(struct vm_data *vm, struct kvm_run *run) +static void check_mmio_access(struct vm_data *data, struct kvm_run *run) { -TEST_ASSERT (vm->mmio_ok,"Unexpected mmio exit" ); +TEST_ASSERT (data->mmio_ok,"Unexpected mmio exit" );TEST_ASSERT (run->mmio.is_write,"Unexpected mmio read" );TEST_ASSERT (run->mmio.len ==8 ,"Unexpected exit mmio size = %u" , run->mmio.len); -TEST_ASSERT (run->mmio.phys_addr >= vm->mmio_gpa_min && - run->mmio.phys_addr <= vm->mmio_gpa_max, +TEST_ASSERT (run->mmio.phys_addr >= data->mmio_gpa_min && + run->mmio.phys_addr <= data->mmio_gpa_max,"Unexpected exit mmio address = 0x%llx" , run->mmio.phys_addr); } -static void *vcpu_worker (void *data) +static void *vcpu_worker (void *__data) { -struct vm_data *vm = data; -struct kvm_run *run; +struct vm_data *data = __data; +struct kvm_vcpu *vcpu = data->vcpu; +struct kvm_run *run = vcpu->run;struct ucall uc; - run =vcpu_state (vm->vm,VCPU_ID );while (1 ) { -vcpu_run (vm->vm,VCPU_ID ); +vcpu_run (data->vm, vcpu->id); -switch (get_ucall (vm->vm,VCPU_ID , &uc)) { +switch (get_ucall (data->vm, vcpu->id, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected sync ucall, got %lx",
@@ -158,7 +157,7 @@ static void *vcpu_worker(void *data)continue ;case UCALL_NONE :if (run->exit_reason ==KVM_EXIT_MMIO ) -check_mmio_access (vm, run); +check_mmio_access (data, run);else goto done;break ;
@@ -238,6 +237,7 @@ static struct vm_data *alloc_vm(void)TEST_ASSERT (data,"malloc(vmdata) failed" ); data->vm =NULL ; + data->vcpu =NULL ; data->hva_slots =NULL ;return data;
@@ -278,7 +278,7 @@ static bool prepare_vm(struct vm_data *data, int nslots, uint64_t *maxslots, data->hva_slots =malloc (sizeof (*data->hva_slots) * data->nslots);TEST_ASSERT (data->hva_slots,"malloc() fail" ); - data->vm =vm_create_default (VCPU_ID , mempages, guest_code); + data->vm =__vm_create_with_one_vcpu (&data->vcpu, mempages, guest_code);ucall_init (data->vm,NULL ); pr_info_v("Adding slots 1..%i, each slot with %"PRIu64" pages + %"PRIu64" extra pages last\n",
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 32/105 KVM: selftests: Convert rseq_test away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/rseq_test.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/rseq_test.c +4 -5
@@ -20,8 +20,6 @@#include "processor.h" #include "test_util.h" -#define VCPU_ID 0 -static __threadvolatile struct rseq __rseq = { .cpu_id =RSEQ_CPU_ID_UNINITIALIZED , };
@@ -207,6 +205,7 @@ int main(int argc, char *argv[]) {int r, i, snapshot;struct kvm_vm *vm; +struct kvm_vcpu *vcpu;u32 cpu, rseq_cpu;/* Tell stdout not to buffer its content */
@@ -228,14 +227,14 @@ int main(int argc, char *argv[])* GUEST_SYNC, while concurrently migrating the process by setting its * CPU affinity. */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);ucall_init (vm,NULL );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 (vm, vcpu->id); +TEST_ASSERT (get_ucall (vm, vcpu->id,NULL ) ==UCALL_SYNC ,"Guest failed?" );/*
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 33/105 KVM: selftests: Convert xss_msr_test away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +5 -5
@@ -12,7 +12,6 @@#include "kvm_util.h" #include "vmx.h" -#define VCPU_ID 1#define MSR_BITS 64#define X86_FEATURE_XSAVES (1<<3)
@@ -40,11 +39,12 @@ int main(int argc, char *argv[])struct kvm_cpuid_entry2 *entry;bool xss_supported = false;struct kvm_vm *vm; +struct kvm_vcpu *vcpu;uint64_t xss_val;int i, r;/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 ,0 ); + vm =vm_create_with_one_vcpu (&vcpu,NULL );if (kvm_get_cpuid_max_basic () >=0xd ) { entry =kvm_get_supported_cpuid_index (0xd ,1 );
@@ -55,11 +55,11 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - xss_val =vcpu_get_msr (vm,VCPU_ID ,MSR_IA32_XSS ); + xss_val =vcpu_get_msr (vm, vcpu->id,MSR_IA32_XSS );TEST_ASSERT (xss_val ==0 ,"MSR_IA32_XSS should be initialized to zero\n" ); -vcpu_set_msr (vm,VCPU_ID ,MSR_IA32_XSS , xss_val); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_XSS , xss_val);/* * At present, KVM only supports a guest IA32_XSS value of 0. Verify * that trying to set the guest IA32_XSS to an unsupported value fails.
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])* IA32_XSS is in the KVM_GET_MSR_INDEX_LIST. */ for (i =0 ; i <MSR_BITS ; ++i) { - r =_vcpu_set_msr (vm,VCPU_ID ,MSR_IA32_XSS ,1ull << i); + r =_vcpu_set_msr (vm, vcpu->id,MSR_IA32_XSS ,1ull << i);TEST_ASSERT (r ==0 ||is_supported_msr (MSR_IA32_XSS ),"IA32_XSS was able to be set, but was not found in KVM_GET_MSR_INDEX_LIST.\n" ); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 34/105 KVM: selftests: Convert vmx_preemption_timer_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/vmx_preemption_timer_test.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +15 -15
@@ -22,7 +22,6 @@#include "processor.h" #include "vmx.h" -#define VCPU_ID 5#define PREEMPTION_TIMER_VALUE 100000000ull#define PREEMPTION_TIMER_VALUE_THRESHOLD1 80000000ull
@@ -159,6 +158,7 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vm *vm;struct kvm_run *run; +struct kvm_vcpu *vcpu;struct kvm_x86_state *state;struct ucall uc;int stage;
@@ -175,22 +175,22 @@ int main(int argc, char *argv[]) }/* Create VM */ - 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; -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva);for (stage =1 ;; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
@@ -232,22 +232,22 @@ int main(int argc, char *argv[]) stage, uc.args[4], uc.args[5]); } - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (vm, vcpu->id);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm); -vm_vcpu_add (vm,VCPU_ID ); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); -vcpu_load_state (vm,VCPU_ID , state); - run =vcpu_state (vm,VCPU_ID ); + vcpu =vm_recreate_with_one_vcpu (vm); + +vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ()); +vcpu_load_state (vm, vcpu->id, state); + run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm,VCPU_ID , ®s2); +vcpu_regs_get (vm, vcpu->id, ®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);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 35/105 KVM: selftests: Convert vmx_pmu_msrs_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/vmx_pmu_msrs_test.c | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_pmu_msrs_test.c +12 -13
@@ -18,8 +18,6 @@#include "kvm_util.h" #include "vmx.h" -#define VCPU_ID 0 -#define X86_FEATURE_PDCM (1<<15)#define PMU_CAP_FW_WRITES (1ULL << 13)#define PMU_CAP_LBR_FMT 0x3f
@@ -62,6 +60,7 @@ int main(int argc, char *argv[])struct kvm_cpuid_entry2 *entry_a_0;bool pdcm_supported = false;struct kvm_vm *vm; +struct kvm_vcpu *vcpu;int ret;union cpuid10_eax eax;union perf_capabilities host_cap;
@@ -70,7 +69,7 @@ int main(int argc, char *argv[]) host_cap.capabilities &= (PMU_CAP_FW_WRITES |PMU_CAP_LBR_FMT );/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); cpuid =kvm_get_supported_cpuid ();if (kvm_get_cpuid_max_basic () >=0xa ) {
@@ -89,25 +88,25 @@ int main(int argc, char *argv[]) }/* testcase 1, set capabilities when we have PDCM bit */ -vcpu_set_cpuid (vm,VCPU_ID , cpuid); -vcpu_set_msr (vm,0 ,MSR_IA32_PERF_CAPABILITIES ,PMU_CAP_FW_WRITES ); +vcpu_set_cpuid (vm, vcpu->id, cpuid); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ,PMU_CAP_FW_WRITES );/* check capabilities can be retrieved with KVM_GET_MSR */ -ASSERT_EQ (vcpu_get_msr (vm,VCPU_ID ,MSR_IA32_PERF_CAPABILITIES ),PMU_CAP_FW_WRITES ); +ASSERT_EQ (vcpu_get_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ),PMU_CAP_FW_WRITES );/* check whatever we write with KVM_SET_MSR is _not_ modified */ -vcpu_run (vm,VCPU_ID ); -ASSERT_EQ (vcpu_get_msr (vm,VCPU_ID ,MSR_IA32_PERF_CAPABILITIES ),PMU_CAP_FW_WRITES ); +vcpu_run (vm, vcpu->id); +ASSERT_EQ (vcpu_get_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ),PMU_CAP_FW_WRITES );/* testcase 2, check valid LBR formats are accepted */ -vcpu_set_msr (vm,0 ,MSR_IA32_PERF_CAPABILITIES ,0 ); -ASSERT_EQ (vcpu_get_msr (vm,VCPU_ID ,MSR_IA32_PERF_CAPABILITIES ),0 ); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ,0 ); +ASSERT_EQ (vcpu_get_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ),0 ); -vcpu_set_msr (vm,0 ,MSR_IA32_PERF_CAPABILITIES , host_cap.lbr_format); -ASSERT_EQ (vcpu_get_msr (vm,VCPU_ID ,MSR_IA32_PERF_CAPABILITIES ), (u64 )host_cap.lbr_format); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES , host_cap.lbr_format); +ASSERT_EQ (vcpu_get_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ), (u64 )host_cap.lbr_format);/* testcase 3, check invalid LBR format is rejected */ - ret =_vcpu_set_msr (vm,0 ,MSR_IA32_PERF_CAPABILITIES ,PMU_CAP_LBR_FMT ); + ret =_vcpu_set_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ,PMU_CAP_LBR_FMT );TEST_ASSERT (ret ==0 ,"Bad PERF_CAPABILITIES didn't fail." );kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 36/105 KVM: selftests: Convert vmx_set_nested_state_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/vmx_set_nested_state_test.c | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c +43 -43
@@ -23,38 +23,37 @@* changes this should be updated. */ #define VMCS12_REVISION 0x11e57ed0 -#define VCPU_ID 5bool have_evmcs; -void test_nested_state (struct kvm_vm *vm,struct kvm_nested_state *state) +void test_nested_state (struct kvm_vcpu *vcpu,struct kvm_nested_state *state) { -vcpu_nested_state_set (vm,VCPU_ID , state); +vcpu_nested_state_set (vcpu->vm, vcpu->id, state); } -void test_nested_state_expect_errno (struct kvm_vm *vm, +void test_nested_state_expect_errno (struct kvm_vcpu *vcpu,struct kvm_nested_state *state,int expected_errno) {int rv; - rv =__vcpu_nested_state_set (vm,VCPU_ID , state); + rv =__vcpu_nested_state_set (vcpu->vm, vcpu->id, state);TEST_ASSERT (rv ==-1 && errno == expected_errno,"Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)" ,strerror (expected_errno), expected_errno, rv,strerror (errno), errno); } -void test_nested_state_expect_einval (struct kvm_vm *vm, +void test_nested_state_expect_einval (struct kvm_vcpu *vcpu,struct kvm_nested_state *state) { -test_nested_state_expect_errno (vm, state,EINVAL ); +test_nested_state_expect_errno (vcpu, state,EINVAL ); } -void test_nested_state_expect_efault (struct kvm_vm *vm, +void test_nested_state_expect_efault (struct kvm_vcpu *vcpu,struct kvm_nested_state *state) { -test_nested_state_expect_errno (vm, state,EFAULT ); +test_nested_state_expect_errno (vcpu, state,EFAULT ); } void set_revision_id_for_vmcs12(struct kvm_nested_state *state,
@@ -86,7 +85,7 @@ void set_default_vmx_state(struct kvm_nested_state *state, int size)set_revision_id_for_vmcs12 (state,VMCS12_REVISION ); } -void test_vmx_nested_state (struct kvm_vm *vm) +void test_vmx_nested_state (struct kvm_vcpu *vcpu) {/* Add a page for VMCS12. */ const int state_sz =sizeof (struct kvm_nested_state ) +getpagesize ();
@@ -96,14 +95,14 @@ void test_vmx_nested_state(struct kvm_vm *vm)/* The format must be set to 0. 0 for VMX, 1 for SVM. */ set_default_vmx_state (state, state_sz); state->format =1 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * We cannot virtualize anything if the guest does not have VMX * enabled. */ set_default_vmx_state (state, state_sz); -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * We cannot virtualize anything if the guest does not have VMX
@@ -112,17 +111,17 @@ void test_vmx_nested_state(struct kvm_vm *vm)*/ set_default_vmx_state (state, state_sz); state->hdr.vmx.vmxon_pa =-1ull ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state); state->hdr.vmx.vmcs12_pa =-1ull ; state->flags =KVM_STATE_NESTED_EVMCS ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state); state->flags =0 ; -test_nested_state (vm, state); +test_nested_state (vcpu, state);/* Enable VMX in the guest CPUID. */ -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); +vcpu_set_cpuid (vcpu->vm, vcpu->id,kvm_get_supported_cpuid ());/* * Setting vmxon_pa == -1ull and vmcs_pa == -1ull exits early without
@@ -133,34 +132,34 @@ void test_vmx_nested_state(struct kvm_vm *vm)set_default_vmx_state (state, state_sz); state->hdr.vmx.vmxon_pa =-1ull ; state->hdr.vmx.vmcs12_pa =-1ull ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state); state->flags &=KVM_STATE_NESTED_EVMCS ;if (have_evmcs) { -test_nested_state_expect_einval (vm, state); -vcpu_enable_evmcs (vm,VCPU_ID ); +test_nested_state_expect_einval (vcpu, state); +vcpu_enable_evmcs (vcpu->vm, vcpu->id); } -test_nested_state (vm, state); +test_nested_state (vcpu, state);/* It is invalid to have vmxon_pa == -1ull and SMM flags non-zero. */ state->hdr.vmx.smm.flags =1 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* Invalid flags are rejected. */ set_default_vmx_state (state, state_sz); state->hdr.vmx.flags = ~0 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* It is invalid to have vmxon_pa == -1ull and vmcs_pa != -1ull. */ set_default_vmx_state (state, state_sz); state->hdr.vmx.vmxon_pa =-1ull ; state->flags =0 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* It is invalid to have vmxon_pa set to a non-page aligned address. */ set_default_vmx_state (state, state_sz); state->hdr.vmx.vmxon_pa =1 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * It is invalid to have KVM_STATE_NESTED_SMM_GUEST_MODE and
@@ -170,7 +169,7 @@ void test_vmx_nested_state(struct kvm_vm *vm) state->flags =KVM_STATE_NESTED_GUEST_MODE |KVM_STATE_NESTED_RUN_PENDING ; state->hdr.vmx.smm.flags =KVM_STATE_NESTED_SMM_GUEST_MODE ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * It is invalid to have any of the SMM flags set besides:
@@ -180,13 +179,13 @@ void test_vmx_nested_state(struct kvm_vm *vm)set_default_vmx_state (state, state_sz); state->hdr.vmx.smm.flags = ~(KVM_STATE_NESTED_SMM_GUEST_MODE |KVM_STATE_NESTED_SMM_VMXON ); -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* Outside SMM, SMM flags must be zero. */ set_default_vmx_state (state, state_sz); state->flags =0 ; state->hdr.vmx.smm.flags =KVM_STATE_NESTED_SMM_GUEST_MODE ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * Size must be large enough to fit kvm_nested_state and vmcs12
@@ -195,13 +194,13 @@ void test_vmx_nested_state(struct kvm_vm *vm)set_default_vmx_state (state, state_sz); state->size =sizeof (*state); state->flags =0 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);set_default_vmx_state (state, state_sz); state->size =sizeof (*state); state->flags =0 ; state->hdr.vmx.vmcs12_pa =-1 ; -test_nested_state (vm, state); +test_nested_state (vcpu, state);/* * KVM_SET_NESTED_STATE succeeds with invalid VMCS
@@ -209,7 +208,7 @@ void test_vmx_nested_state(struct kvm_vm *vm)*/ set_default_vmx_state (state, state_sz); state->flags =0 ; -test_nested_state (vm, state); +test_nested_state (vcpu, state);/* Invalid flags are rejected, even if no VMCS loaded. */ set_default_vmx_state (state, state_sz);
@@ -217,13 +216,13 @@ void test_vmx_nested_state(struct kvm_vm *vm) state->flags =0 ; state->hdr.vmx.vmcs12_pa =-1 ; state->hdr.vmx.flags = ~0 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* vmxon_pa cannot be the same address as vmcs_pa. */ set_default_vmx_state (state, state_sz); state->hdr.vmx.vmxon_pa =0 ; state->hdr.vmx.vmcs12_pa =0 ; -test_nested_state_expect_einval (vm, state); +test_nested_state_expect_einval (vcpu, state);/* * Test that if we leave nesting the state reflects that when we get
@@ -233,8 +232,8 @@ void test_vmx_nested_state(struct kvm_vm *vm) state->hdr.vmx.vmxon_pa =-1ull ; state->hdr.vmx.vmcs12_pa =-1ull ; state->flags =0 ; -test_nested_state (vm, state); -vcpu_nested_state_get (vm,VCPU_ID , state); +test_nested_state (vcpu, state); +vcpu_nested_state_get (vcpu->vm, vcpu->id, state);TEST_ASSERT (state->size >=sizeof (*state) && state->size <= state_sz,"Size must be between %ld and %d. The size returned was %d." ,sizeof (*state), state_sz, state->size);
@@ -244,7 +243,7 @@ void test_vmx_nested_state(struct kvm_vm *vm)free (state); } -void disable_vmx (struct kvm_vm *vm) +void disable_vmx (struct kvm_vcpu *vcpu) {struct kvm_cpuid2 *cpuid =kvm_get_supported_cpuid ();int i;
@@ -256,7 +255,7 @@ void disable_vmx(struct kvm_vm *vm)TEST_ASSERT (i != cpuid->nent,"CPUID function 1 not found" ); cpuid->entries[i].ecx &= ~CPUID_VMX ; -vcpu_set_cpuid (vm,VCPU_ID , cpuid); +vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); cpuid->entries[i].ecx |=CPUID_VMX ; }
@@ -264,6 +263,7 @@ int main(int argc, char *argv[]) {struct kvm_vm *vm;struct kvm_nested_state state; +struct kvm_vcpu *vcpu; have_evmcs =kvm_check_cap (KVM_CAP_HYPERV_ENLIGHTENED_VMCS );
@@ -278,20 +278,20 @@ int main(int argc, char *argv[])*/ nested_vmx_check_supported (); - vm =vm_create_default (VCPU_ID ,0 ,0 ); + vm =vm_create_with_one_vcpu (&vcpu,NULL );/* * First run tests with VMX disabled to check error handling. */ -disable_vmx (vm); +disable_vmx (vcpu);/* Passing a NULL kvm_nested_state causes a EFAULT. */ -test_nested_state_expect_efault (vm,NULL ); +test_nested_state_expect_efault (vcpu,NULL );/* 'size' cannot be smaller than sizeof(kvm_nested_state). */ set_default_state (&state); state.size =0 ; -test_nested_state_expect_einval (vm, &state); +test_nested_state_expect_einval (vcpu, &state);/* * Setting the flags 0xf fails the flags check. The only flags that
@@ -302,7 +302,7 @@ int main(int argc, char *argv[])*/ set_default_state (&state); state.flags =0xf ; -test_nested_state_expect_einval (vm, &state); +test_nested_state_expect_einval (vcpu, &state);/* * If KVM_STATE_NESTED_RUN_PENDING is set then
@@ -310,9 +310,9 @@ int main(int argc, char *argv[])*/ set_default_state (&state); state.flags =KVM_STATE_NESTED_RUN_PENDING ; -test_nested_state_expect_einval (vm, &state); +test_nested_state_expect_einval (vcpu, &state); -test_vmx_nested_state (vm); +test_vmx_nested_state (vcpu);kvm_vm_free (vm);return 0 ;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 37/105 KVM: selftests: Convert vmx_tsc_adjust_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +6 -6
@@ -33,7 +33,6 @@#endif #define PAGE_SIZE 4096 -#define VCPU_ID 5#define TSC_ADJUST_VALUE (1ll << 32)#define TSC_OFFSET_VALUE -(1ll << 48)
@@ -128,26 +127,27 @@ static void report(int64_t val)int main (int argc,char *argv[]) {vm_vaddr_t vmx_pages_gva; +struct kvm_vcpu *vcpu;nested_vmx_check_supported (); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, (void *) l1_guest_code);/* Allocate VMX pages and shared descriptors (vmx_pages). */ vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva);for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +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,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *)uc.args[0 ]);/* NOT REACHED */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 38/105 KVM: selftests: Convert mmu_role_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/mmu_role_test.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-)
tools/testing/selftests/kvm/x86_64/mmu_role_test.c +8 -12
@@ -3,8 +3,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 1 -#define MMIO_GPA 0x100000000ullstatic void guest_code (void )
@@ -25,22 +23,21 @@ static void guest_pf_handler(struct ex_regs *regs)static void mmu_role_test (u32 *cpuid_reg,u32 evil_cpuid_val) {u32 good_cpuid_val = *cpuid_reg; +struct kvm_vcpu *vcpu;struct kvm_run *run;struct kvm_vm *vm;uint64_t cmd; -int r;/* Create VM */ - 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;/* Map 1gb page without a backing memlot. */ __virt_pg_map (vm,MMIO_GPA ,MMIO_GPA ,X86_PAGE_SIZE_1G ); - r =_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);/* Guest access to the 1gb page should trigger MMIO. */ -TEST_ASSERT (r ==0 ,"vcpu_run failed: %d\n" , r);TEST_ASSERT (run->exit_reason ==KVM_EXIT_MMIO ,"Unexpected exit reason: %u (%s), expected MMIO exit (1gb page w/o memslot)\n" , run->exit_reason,exit_reason_str (run->exit_reason));
@@ -57,7 +54,7 @@ static void mmu_role_test(u32 *cpuid_reg, u32 evil_cpuid_val)* returns the struct that contains the entry being modified. Eww. */ *cpuid_reg = evil_cpuid_val; -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); +vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ());/* * Add a dummy memslot to coerce KVM into bumping the MMIO generation.
@@ -70,13 +67,12 @@ static void mmu_role_test(u32 *cpuid_reg, u32 evil_cpuid_val)/* Set up a #PF handler to eat the RSVD #PF and signal all done! */ vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,PF_VECTOR , guest_pf_handler); - r =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (r ==0 ,"vcpu_run failed: %d\n" , r); +vcpu_run (vm, vcpu->id); - cmd =get_ucall (vm,VCPU_ID ,NULL ); + cmd =get_ucall (vm, vcpu->id,NULL );TEST_ASSERT (cmd ==UCALL_DONE ,"Unexpected guest exit, exit_reason=%s, ucall.cmd = %lu\n" ,exit_reason_str (run->exit_reason), cmd);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 39/105 KVM: selftests: Convert pmu_event_filter_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/pmu_event_filter_test.c | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-)
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +30 -30
@@ -49,7 +49,6 @@ union cpuid10_ebx {/* Oddly, this isn't in perf_event.h. */ #define ARCH_PERFMON_BRANCHES_RETIRED 5 -#define VCPU_ID 0#define NUM_BRANCHES 42/*
@@ -173,17 +172,17 @@ static void amd_guest_code(void)* Run the VM to the next GUEST_SYNC(value), and return the value passed * to the sync. Any other exit from the guest is fatal. */ -static uint64_t run_vm_to_sync (struct kvm_vm *vm) +static uint64_t run_vcpu_to_sync (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +vcpu_run (vcpu->vm, vcpu->id);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Exit_reason other than KVM_EXIT_IO: %u (%s)\n" , run->exit_reason,exit_reason_str (run->exit_reason)); -get_ucall (vm,VCPU_ID , &uc); +get_ucall (vcpu->vm, vcpu->id, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu" , uc.cmd);return uc.args[1 ];
@@ -197,13 +196,13 @@ static uint64_t run_vm_to_sync(struct kvm_vm *vm)* a sanity check and then GUEST_SYNC(success). In the case of failure, * the behavior of the guest on resumption is undefined. */ -static bool sanity_check_pmu (struct kvm_vm *vm) +static bool sanity_check_pmu (struct kvm_vcpu *vcpu) {bool success; -vm_install_exception_handler (vm,GP_VECTOR , guest_gp_handler); - success =run_vm_to_sync (vm); -vm_install_exception_handler (vm,GP_VECTOR ,NULL ); +vm_install_exception_handler (vcpu->vm,GP_VECTOR , guest_gp_handler); + success =run_vcpu_to_sync (vcpu); +vm_install_exception_handler (vcpu->vm,GP_VECTOR ,NULL );return success; }
@@ -254,9 +253,9 @@ static struct kvm_pmu_event_filter *remove_event(struct kvm_pmu_event_filter *f,return f; } -static void test_without_filter (struct kvm_vm *vm) +static void test_without_filter (struct kvm_vcpu *vcpu) { -uint64_t count =run_vm_to_sync (vm); +uint64_t count =run_vcpu_to_sync (vcpu);if (count !=NUM_BRANCHES ) pr_info("%s: Branch instructions retired = %lu (expected %u)\n",
@@ -264,17 +263,17 @@ static void test_without_filter(struct kvm_vm *vm)TEST_ASSERT (count,"Allowed PMU event is not counting" ); } -static uint64_t test_with_filter (struct kvm_vm *vm, +static uint64_t test_with_filter (struct kvm_vcpu *vcpu,struct kvm_pmu_event_filter *f) { -vm_ioctl (vm,KVM_SET_PMU_EVENT_FILTER , (void *)f); -return run_vm_to_sync (vm); +vm_ioctl (vcpu->vm,KVM_SET_PMU_EVENT_FILTER , (void *)f); +return run_vcpu_to_sync (vcpu); } -static void test_member_deny_list (struct kvm_vm *vm) +static void test_member_deny_list (struct kvm_vcpu *vcpu) {struct kvm_pmu_event_filter *f =event_filter (KVM_PMU_EVENT_DENY ); -uint64_t count =test_with_filter (vm, f); +uint64_t count =test_with_filter (vcpu, f);free (f);if (count)
@@ -283,10 +282,10 @@ static void test_member_deny_list(struct kvm_vm *vm)TEST_ASSERT (!count,"Disallowed PMU Event is counting" ); } -static void test_member_allow_list (struct kvm_vm *vm) +static void test_member_allow_list (struct kvm_vcpu *vcpu) {struct kvm_pmu_event_filter *f =event_filter (KVM_PMU_EVENT_ALLOW ); -uint64_t count =test_with_filter (vm, f); +uint64_t count =test_with_filter (vcpu, f);free (f);if (count !=NUM_BRANCHES )
@@ -295,14 +294,14 @@ static void test_member_allow_list(struct kvm_vm *vm)TEST_ASSERT (count,"Allowed PMU event is not counting" ); } -static void test_not_member_deny_list (struct kvm_vm *vm) +static void test_not_member_deny_list (struct kvm_vcpu *vcpu) {struct kvm_pmu_event_filter *f =event_filter (KVM_PMU_EVENT_DENY );uint64_t count;remove_event (f,INTEL_BR_RETIRED );remove_event (f,AMD_ZEN_BR_RETIRED ); - count =test_with_filter (vm, f); + count =test_with_filter (vcpu, f);free (f);if (count !=NUM_BRANCHES ) pr_info("%s: Branch instructions retired = %lu (expected %u)\n",
@@ -310,14 +309,14 @@ static void test_not_member_deny_list(struct kvm_vm *vm)TEST_ASSERT (count,"Allowed PMU event is not counting" ); } -static void test_not_member_allow_list (struct kvm_vm *vm) +static void test_not_member_allow_list (struct kvm_vcpu *vcpu) {struct kvm_pmu_event_filter *f =event_filter (KVM_PMU_EVENT_ALLOW );uint64_t count;remove_event (f,INTEL_BR_RETIRED );remove_event (f,AMD_ZEN_BR_RETIRED ); - count =test_with_filter (vm, f); + count =test_with_filter (vcpu, f);free (f);if (count) pr_info("%s: Branch instructions retired = %lu (expected 0)\n",
@@ -390,6 +389,7 @@ static bool use_amd_pmu(void)int main (int argc,char *argv[]) {void (*guest_code)(void ) =NULL ; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;int r;
@@ -412,21 +412,21 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id); -if (!sanity_check_pmu (vm)) { +if (!sanity_check_pmu (vcpu)) {print_skip ("Guest PMU is not functional" );exit (KSFT_SKIP ); } -test_without_filter (vm); -test_member_deny_list (vm); -test_member_allow_list (vm); -test_not_member_deny_list (vm); -test_not_member_allow_list (vm); +test_without_filter (vcpu); +test_member_deny_list (vcpu); +test_member_allow_list (vcpu); +test_not_member_deny_list (vcpu); +test_not_member_allow_list (vcpu);kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 40/105 KVM: selftests: Convert smm_test away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/x86_64/smm_test.c | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/x86_64/smm_test.c +18 -19
@@ -19,8 +19,6 @@#include "vmx.h" #include "svm_util.h" -#define VCPU_ID 1 -#define PAGE_SIZE 4096#define SMRAM_SIZE 65536
@@ -118,22 +116,23 @@ static void guest_code(void *arg)sync_with_host (DONE ); } -void inject_smi (struct kvm_vm *vm) +void inject_smi (struct kvm_vcpu *vcpu) {struct kvm_vcpu_events events; -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vcpu->vm, vcpu->id, &events); events.smi.pending =1 ; events.flags |=KVM_VCPUEVENT_VALID_SMM ; -vcpu_events_set (vm,VCPU_ID , &events); +vcpu_events_set (vcpu->vm, vcpu->id, &events); }int main (int argc,char *argv[]) {vm_vaddr_t nested_gva =0 ; +struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_vm *vm;struct kvm_run *run;
@@ -141,9 +140,9 @@ int main(int argc, char *argv[])int stage, stage_reported;/* 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;vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,SMRAM_GPA ,SMRAM_MEMSLOT ,SMRAM_PAGES ,0 );
@@ -154,7 +153,7 @@ int main(int argc, char *argv[])memcpy (addr_gpa2hva (vm,SMRAM_GPA ) +0x8000 , smi_handler,sizeof (smi_handler)); -vcpu_set_msr (vm,VCPU_ID ,MSR_IA32_SMBASE ,SMRAM_GPA ); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_SMBASE ,SMRAM_GPA );if (kvm_check_cap (KVM_CAP_NESTED_STATE )) {if (nested_svm_supported ())
@@ -166,17 +165,17 @@ int main(int argc, char *argv[])if (!nested_gva)pr_info ("will skip SMM test with VMX enabled\n" ); -vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); +vcpu_args_set (vm, vcpu->id,1 , nested_gva);for (stage =1 ;; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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));memset (®s,0 ,sizeof (regs)); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s); stage_reported = regs.rax &0xff ;
@@ -193,7 +192,7 @@ int main(int argc, char *argv[])* return from it. Do not perform save/restore while in SMM yet. */ if (stage ==8 ) { -inject_smi (vm); +inject_smi (vcpu);continue ; }
@@ -202,15 +201,15 @@ int main(int argc, char *argv[])* during L2 execution. */ if (stage ==10 ) -inject_smi (vm); +inject_smi (vcpu); - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (vm, vcpu->id);kvm_vm_release (vm); -kvm_vm_restart (vm); -vm_vcpu_add (vm,VCPU_ID ); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); -vcpu_load_state (vm,VCPU_ID , state); - run =vcpu_state (vm,VCPU_ID ); + + vcpu =vm_recreate_with_one_vcpu (vm); +vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ()); +vcpu_load_state (vm, vcpu->id, state); + run = vcpu->run;kvm_x86_state_cleanup (state); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 41/105 KVM: selftests: Convert state_test away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/state_test.c | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/x86_64/state_test.c +14 -15
@@ -20,7 +20,6 @@#include "vmx.h" #include "svm_util.h" -#define VCPU_ID 5#define L2_GUEST_STACK_SIZE 256void svm_l2_guest_code (void )
@@ -157,6 +156,7 @@ int main(int argc, char *argv[])vm_vaddr_t nested_gva =0 ;struct kvm_regs regs1, regs2; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct kvm_x86_state *state;
@@ -164,10 +164,10 @@ int main(int argc, char *argv[])int stage;/* Create VM */ - 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; -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);if (kvm_check_cap (KVM_CAP_NESTED_STATE )) {if (nested_svm_supported ())
@@ -179,16 +179,16 @@ int main(int argc, char *argv[])if (!nested_gva)pr_info ("will skip nested state checks\n" ); -vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); +vcpu_args_set (vm, vcpu->id,1 , nested_gva);for (stage =1 ;; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
@@ -206,22 +206,21 @@ int main(int argc, char *argv[]) uc.args[1 ] == stage,"Stage %d: Unexpected register values vmexit, got %lx" , stage, (ulong)uc.args[1]); - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (vm, vcpu->id);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm); -vm_vcpu_add (vm,VCPU_ID ); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); -vcpu_load_state (vm,VCPU_ID , state); - run =vcpu_state (vm,VCPU_ID ); + vcpu =vm_recreate_with_one_vcpu (vm); +vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ()); +vcpu_load_state (vm, vcpu->id, state); + run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm,VCPU_ID , ®s2); +vcpu_regs_get (vm, vcpu->id, ®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);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 42/105 KVM: selftests: Convert svm_int_ctl_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-)
tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c +10 -11
@@ -13,10 +13,6 @@#include "svm_util.h" #include "apic.h" -#define VCPU_ID 0 - -static struct kvm_vm *vm; -bool vintr_irq_called;bool intr_irq_called;
@@ -88,31 +84,34 @@ static void l1_guest_code(struct svm_test_data *svm)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu; +struct kvm_run *run;vm_vaddr_t svm_gva; +struct kvm_vm *vm; +struct ucall uc;nested_svm_check_supported (); - 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,VINTR_IRQ_NUMBER , vintr_irq_handler);vm_install_exception_handler (vm,INTR_IRQ_NUMBER , intr_irq_handler);vcpu_alloc_svm (vm, &svm_gva); -vcpu_args_set (vm,VCPU_ID ,1 , svm_gva); +vcpu_args_set (vm, vcpu->id,1 , svm_gva); -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); -struct ucall uc; + run = vcpu->run; -vcpu_run (vm,VCPU_ID ); +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,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *)uc.args[0 ]);break ;
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 43/105 KVM: selftests: Convert svm_vmcall_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/svm_vmcall_test.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +7 -9
@@ -12,10 +12,6 @@#include "processor.h" #include "svm_util.h" -#define VCPU_ID 5 - -static struct kvm_vm *vm; -static void l2_guest_code (struct svm_test_data *svm) { __asm__ __volatile__("vmcall" );
@@ -39,26 +35,28 @@ static void l1_guest_code(struct svm_test_data *svm)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;vm_vaddr_t svm_gva; +struct kvm_vm *vm;nested_svm_check_supported (); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);vcpu_alloc_svm (vm, &svm_gva); -vcpu_args_set (vm,VCPU_ID ,1 , svm_gva); +vcpu_args_set (vm, vcpu->id,1 , svm_gva);for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +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,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *)uc.args[0 ]);/* NOT REACHED */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 44/105 KVM: selftests: Convert sync_regs_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/sync_regs_test.c | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-)
tools/testing/selftests/kvm/x86_64/sync_regs_test.c +25 -27
@@ -20,8 +20,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 5 -#define UCALL_PIO_PORT ((uint16_t)0x1000)struct ucall uc_none = {
@@ -84,6 +82,7 @@ static void compare_vcpu_events(struct kvm_vcpu_events *left,int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct kvm_regs regs;
@@ -104,57 +103,56 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } -/* 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. */ /* TODO: BUILD TIME CHECK: TEST_ASSERT(KVM_SYNC_X86_NUM_FIELDS != 3); */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Unexpected exit reason: %u (%s),\n" , run->exit_reason,exit_reason_str (run->exit_reason)); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);compare_regs (®s, &run->s.regs.regs); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs);compare_sregs (&sregs, &run->s.regs.sregs); -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vm, vcpu->id, &events);compare_vcpu_events (&events, &run->s.regs.events);/* Set and verify various register values. */
@@ -164,7 +162,7 @@ int main(int argc, char *argv[]) run->kvm_valid_regs =TEST_SYNC_FIELDS ; run->kvm_dirty_regs =KVM_SYNC_X86_REGS |KVM_SYNC_X86_SREGS ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Unexpected exit reason: %u (%s),\n", run->exit_reason,
@@ -176,13 +174,13 @@ int main(int argc, char *argv[])"apic_base sync regs value incorrect 0x%llx." , run->s.regs.sregs.apic_base); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);compare_regs (®s, &run->s.regs.regs); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs);compare_sregs (&sregs, &run->s.regs.sregs); -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vm, vcpu->id, &events);compare_vcpu_events (&events, &run->s.regs.events);/* Clear kvm_dirty_regs bits, verify new s.regs values are
@@ -191,7 +189,7 @@ int main(int argc, char *argv[]) run->kvm_valid_regs =TEST_SYNC_FIELDS ; run->kvm_dirty_regs =0 ; run->s.regs.regs.rbx =0xDEADBEEF ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Unexpected exit reason: %u (%s),\n", run->exit_reason,
@@ -208,8 +206,8 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =0 ; run->s.regs.regs.rbx =0xAAAA ; regs.rbx =0xBAC0 ; -vcpu_regs_set (vm,VCPU_ID , ®s); - rv =_vcpu_run (vm,VCPU_ID ); +vcpu_regs_set (vm, vcpu->id, ®s); + rv =_vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Unexpected exit reason: %u (%s),\n", run->exit_reason,
@@ -217,7 +215,7 @@ int main(int argc, char *argv[])TEST_ASSERT (run->s.regs.regs.rbx ==0xAAAA ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);TEST_ASSERT (regs.rbx ==0xBAC0 +1 ,"rbx guest value incorrect 0x%llx." , regs.rbx);
@@ -229,7 +227,7 @@ int main(int argc, char *argv[]) run->kvm_valid_regs =0 ; run->kvm_dirty_regs =TEST_SYNC_FIELDS ; run->s.regs.regs.rbx =0xBBBB ; - rv =_vcpu_run (vm,VCPU_ID ); + rv =_vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Unexpected exit reason: %u (%s),\n", run->exit_reason,
@@ -237,7 +235,7 @@ int main(int argc, char *argv[])TEST_ASSERT (run->s.regs.regs.rbx ==0xBBBB ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx); -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);TEST_ASSERT (regs.rbx ==0xBBBB +1 ,"rbx guest value incorrect 0x%llx." , regs.rbx);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 45/105 KVM: selftests: Convert hyperv_cpuid away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/hyperv_cpuid.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-)
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +11 -12
@@ -20,8 +20,6 @@#include "processor.h" #include "vmx.h" -#define VCPU_ID 0 -static void guest_code (void ) { }
@@ -115,25 +113,26 @@ static void test_hv_cpuid(struct kvm_cpuid2 *hv_cpuid_entries, } } -void test_hv_cpuid_e2big (struct kvm_vm *vm,bool system) +void test_hv_cpuid_e2big (struct kvm_vm *vm,struct kvm_vcpu *vcpu) {static struct kvm_cpuid2 cpuid = {.nent =0 };int ret; -if (!system) - ret =__vcpu_ioctl (vm,VCPU_ID ,KVM_GET_SUPPORTED_HV_CPUID , &cpuid); +if (vcpu) + ret =__vcpu_ioctl (vm, vcpu->id,KVM_GET_SUPPORTED_HV_CPUID , &cpuid);else ret =__kvm_ioctl (vm_get_kvm_fd (vm),KVM_GET_SUPPORTED_HV_CPUID , &cpuid);TEST_ASSERT (ret ==-1 && errno ==E2BIG ,"%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when" -" it should have: %d %d" , system ?"KVM" :"vCPU" , ret, errno); +" it should have: %d %d" , !vcpu ?"KVM" :"vCPU" , ret, errno); }int main (int argc,char *argv[]) {struct kvm_vm *vm;struct kvm_cpuid2 *hv_cpuid_entries; +struct kvm_vcpu *vcpu;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL );
@@ -143,12 +142,12 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);/* Test vCPU ioctl version */ -test_hv_cpuid_e2big (vm, false); +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 (vm, vcpu->id);test_hv_cpuid (hv_cpuid_entries, false);free (hv_cpuid_entries);
@@ -157,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 (vm, vcpu->id); + hv_cpuid_entries =vcpu_get_supported_hv_cpuid (vm, vcpu->id);test_hv_cpuid (hv_cpuid_entries, true);free (hv_cpuid_entries);
@@ -169,7 +168,7 @@ int main(int argc, char *argv[]) goto out; } -test_hv_cpuid_e2big (vm, true); +test_hv_cpuid_e2big (vm,NULL ); hv_cpuid_entries =kvm_get_supported_hv_cpuid ();test_hv_cpuid (hv_cpuid_entries,nested_vmx_supported ());
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 46/105 KVM: selftests: Convert kvm_pv_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/kvm_pv_test.c | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +10 -15
@@ -171,24 +171,18 @@ static void handle_abort(struct ucall *uc) __FILE__, uc->args[1]); } -#define VCPU_ID 0 - -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; -int r; - - run =vcpu_state (vm,VCPU_ID );while (true) { - r =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (!r,"vcpu_run failed: %d\n" , r); +vcpu_run (vcpu->vm, vcpu->id);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->vm, vcpu->id, &uc)) {case UCALL_PR_MSR :pr_msr (&uc);break ;
@@ -208,6 +202,7 @@ int main(void) {struct kvm_enable_cap cap = {0 };struct kvm_cpuid2 *best; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;if (!kvm_check_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )) {
@@ -215,20 +210,20 @@ int main(void)exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , guest_main); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); cap.cap =KVM_CAP_ENFORCE_PV_FEATURE_CPUID ; cap.args[0 ] =1 ; -vcpu_enable_cap (vm,VCPU_ID , &cap); +vcpu_enable_cap (vm, vcpu->id, &cap); best =kvm_get_supported_cpuid ();clear_kvm_cpuid_features (best); -vcpu_set_cpuid (vm,VCPU_ID , best); +vcpu_set_cpuid (vm, vcpu->id, best);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,GP_VECTOR , guest_gp_handler); -enter_guest (vm); +enter_guest (vcpu);kvm_vm_free (vm); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 47/105 KVM: selftests: Convert platform_info_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/platform_info_test.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)
tools/testing/selftests/kvm/x86_64/platform_info_test.c +16 -16
@@ -21,7 +21,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0#define MSR_PLATFORM_INFO_MAX_TURBO_RATIO 0xff00static void guest_code (void )
@@ -45,18 +44,18 @@ static void set_msr_platform_info_enabled(struct kvm_vm *vm, bool enable)vm_enable_cap (vm, &cap); } -static void test_msr_platform_info_enabled (struct kvm_vm *vm) +static void test_msr_platform_info_enabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc; -set_msr_platform_info_enabled (vm, true); -vcpu_run (vm,VCPU_ID ); +set_msr_platform_info_enabled (vcpu->vm, true); +vcpu_run (vcpu->vm, vcpu->id);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Exit_reason other than KVM_EXIT_IO: %u (%s),\n" , run->exit_reason,exit_reason_str (run->exit_reason)); -get_ucall (vm,VCPU_ID , &uc); +get_ucall (vcpu->vm, vcpu->id, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu\n" , uc.cmd); TEST_ASSERT((uc.args[1] & MSR_PLATFORM_INFO_MAX_TURBO_RATIO) ==
@@ -65,12 +64,12 @@ static void test_msr_platform_info_enabled(struct kvm_vm *vm) MSR_PLATFORM_INFO_MAX_TURBO_RATIO); } -static void test_msr_platform_info_disabled (struct kvm_vm *vm) +static void test_msr_platform_info_disabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run; -set_msr_platform_info_enabled (vm, false); -vcpu_run (vm,VCPU_ID ); +set_msr_platform_info_enabled (vcpu->vm, false); +vcpu_run (vcpu->vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN, "Exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n", run->exit_reason,
@@ -79,6 +78,7 @@ static void test_msr_platform_info_disabled(struct kvm_vm *vm)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;int rv;uint64_t msr_platform_info;
@@ -92,14 +92,14 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); - msr_platform_info =vcpu_get_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO ); -vcpu_set_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO , + msr_platform_info =vcpu_get_msr (vm, vcpu->id,MSR_PLATFORM_INFO ); +vcpu_set_msr (vm, vcpu->id,MSR_PLATFORM_INFO , msr_platform_info |MSR_PLATFORM_INFO_MAX_TURBO_RATIO ); -test_msr_platform_info_enabled (vm); -test_msr_platform_info_disabled (vm); -vcpu_set_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO , msr_platform_info); +test_msr_platform_info_enabled (vcpu); +test_msr_platform_info_disabled (vcpu); +vcpu_set_msr (vm, vcpu->id,MSR_PLATFORM_INFO , msr_platform_info);kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 48/105 KVM: selftests: Convert vmx_nested_tsc_scaling_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +8 -10
@@ -15,9 +15,6 @@#include "vmx.h" #include "kselftest.h" - -#define VCPU_ID 0 -/* L2 is scaled up (from L1's perspective) by this factor */ #define L2_SCALE_FACTOR 4ULL
@@ -150,6 +147,7 @@ static void stable_tsc_check_supported(void)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;vm_vaddr_t vmx_pages_gva;
@@ -182,28 +180,28 @@ int main(int argc, char *argv[]) l0_tsc_freq = tsc_end - tsc_start;printf ("real TSC frequency is around: %" PRIu64"\n" , l0_tsc_freq); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva); - tsc_khz =__vcpu_ioctl (vm,VCPU_ID ,KVM_GET_TSC_KHZ ,NULL ); + tsc_khz =__vcpu_ioctl (vm, vcpu->id,KVM_GET_TSC_KHZ ,NULL );TEST_ASSERT (tsc_khz !=-1 ,"vcpu ioctl KVM_GET_TSC_KHZ failed" );/* scale down L1's TSC frequency */ -vcpu_ioctl (vm,VCPU_ID ,KVM_SET_TSC_KHZ , +vcpu_ioctl (vm, vcpu->id,KVM_SET_TSC_KHZ , (void *) (tsc_khz / l1_scale_factor));for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +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,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *) uc.args[0 ]);case UCALL_SYNC :
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 49/105 KVM: selftests: Convert set_sregs_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/set_sregs_test.c | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-)
tools/testing/selftests/kvm/x86_64/set_sregs_test.c +22 -23
@@ -22,9 +22,7 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 5 - -static void test_cr4_feature_bit (struct kvm_vm *vm,struct kvm_sregs *orig, +static void test_cr4_feature_bit (struct kvm_vcpu *vcpu,struct kvm_sregs *orig,uint64_t feature_bit) {struct kvm_sregs sregs;
@@ -37,11 +35,11 @@ static void test_cr4_feature_bit(struct kvm_vm *vm, struct kvm_sregs *orig,memcpy (&sregs, orig,sizeof (sregs)); sregs.cr4 |= feature_bit; - rc =_vcpu_sregs_set (vm,VCPU_ID , &sregs); + rc =_vcpu_sregs_set (vcpu->vm, vcpu->id, &sregs);TEST_ASSERT (rc,"KVM allowed unsupported CR4 bit (0x%lx)" , feature_bit);/* Sanity check that KVM didn't change anything. */ -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs);TEST_ASSERT (!memcmp (&sregs, orig,sizeof (sregs)),"KVM modified sregs" ); }
@@ -83,6 +81,7 @@ static uint64_t calc_cr4_feature_bits(struct kvm_vm *vm)int main (int argc,char *argv[]) {struct kvm_sregs sregs; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;uint64_t cr4;int rc;
@@ -96,43 +95,43 @@ int main(int argc, char *argv[])* the vCPU model, i.e. without doing KVM_SET_CPUID2. */ vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); -vm_vcpu_add (vm,VCPU_ID ); + vcpu =vm_vcpu_add (vm,0 ); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs); sregs.cr4 |=calc_cr4_feature_bits (vm); cr4 = sregs.cr4; - rc =_vcpu_sregs_set (vm,VCPU_ID , &sregs); + rc =_vcpu_sregs_set (vm, vcpu->id, &sregs);TEST_ASSERT (!rc,"Failed to set supported CR4 bits (0x%lx)" , cr4); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs);TEST_ASSERT (sregs.cr4 == cr4,"sregs.CR4 (0x%llx) != CR4 (0x%lx)" , sregs.cr4, cr4);/* Verify all unsupported features are rejected by KVM. */ -test_cr4_feature_bit (vm, &sregs,X86_CR4_UMIP ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_LA57 ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_VMXE ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_SMXE ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_FSGSBASE ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_PCIDE ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_OSXSAVE ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_SMEP ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_SMAP ); -test_cr4_feature_bit (vm, &sregs,X86_CR4_PKE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_UMIP ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_LA57 ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_VMXE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_SMXE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_FSGSBASE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_PCIDE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_OSXSAVE ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_SMEP ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_SMAP ); +test_cr4_feature_bit (vcpu, &sregs,X86_CR4_PKE );kvm_vm_free (vm);/* Create a "real" VM and verify APIC_BASE can be set. */ - vm =vm_create_default (VCPU_ID ,0 ,NULL ); + vm =vm_create_with_one_vcpu (&vcpu,NULL ); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs); sregs.apic_base =1 <<10 ; - rc =_vcpu_sregs_set (vm,VCPU_ID , &sregs); + rc =_vcpu_sregs_set (vm, vcpu->id, &sregs);TEST_ASSERT (rc,"Set IA32_APIC_BASE to %llx (invalid)" , sregs.apic_base); sregs.apic_base =1 <<11 ; - rc =_vcpu_sregs_set (vm,VCPU_ID , &sregs); + rc =_vcpu_sregs_set (vm, vcpu->id, &sregs);TEST_ASSERT (!rc,"Couldn't set IA32_APIC_BASE to %llx (valid)" , sregs.apic_base);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 50/105 KVM: selftests: Convert vmx_dirty_log_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +6 -7
@@ -17,8 +17,6 @@#include "processor.h" #include "vmx.h" -#define VCPU_ID 1 -/* The memory slot index to track dirty pages */ #define TEST_MEM_SLOT_INDEX 1#define TEST_MEM_PAGES 3
@@ -73,6 +71,7 @@ int main(int argc, char *argv[])unsigned long *bmap;uint64_t *host_test_mem; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct ucall uc;
@@ -81,10 +80,10 @@ int main(int argc, char *argv[])nested_vmx_check_supported ();/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code); vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); - run =vcpu_state (vm,VCPU_ID ); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva); + run = vcpu->run;/* Add an extra memory slot for testing dirty logging */ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
@@ -116,13 +115,13 @@ int main(int argc, char *argv[])while (!done) {memset (host_test_mem,0xaa ,TEST_MEM_PAGES *4096 ); -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 51/105 KVM: selftests: Convert vmx_close_while_nested_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c +7 -10
@@ -18,15 +18,10 @@#include "kselftest.h" -#define VCPU_ID 5 -enum {PORT_L0_EXIT =0x2000 , }; -/* The virtual machine object. */ -static struct kvm_vm *vm; -static void l2_guest_code (void ) {/* Exit to L0 */
@@ -53,20 +48,22 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)int main (int argc,char *argv[]) {vm_vaddr_t vmx_pages_gva; +struct kvm_vcpu *vcpu; +struct kvm_vm *vm;nested_vmx_check_supported (); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);/* Allocate VMX pages and shared descriptors (vmx_pages). */ vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva);for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +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,
@@ -75,7 +72,7 @@ int main(int argc, char *argv[])if (run->io.port ==PORT_L0_EXIT )break ; -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *)uc.args[0 ]);/* NOT REACHED */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 52/105 KVM: selftests: Convert vmx_apic_access_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/vmx_apic_access_test.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +8 -10
@@ -28,11 +28,6 @@#include "kselftest.h" -#define VCPU_ID 0 - -/* The virtual machine object. */ -static struct kvm_vm *vm; -static void l2_guest_code (void ) {/* Exit to L1 */
@@ -84,9 +79,12 @@ int main(int argc, char *argv[])struct vmx_pages *vmx;bool done = false; +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +nested_vmx_check_supported (); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + 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 ();
@@ -97,13 +95,13 @@ int main(int argc, char *argv[]) vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva);prepare_virtualize_apic_accesses (vmx, vm); -vcpu_args_set (vm,VCPU_ID ,2 , vmx_pages_gva, high_gpa); +vcpu_args_set (vm, vcpu->id,2 , vmx_pages_gva, high_gpa);while (!done) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);if (apic_access_addr == high_gpa) { TEST_ASSERT(run->exit_reason == KVM_EXIT_INTERNAL_ERROR,
@@ -121,7 +119,7 @@ int main(int argc, char *argv[]) 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" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 53/105 KVM: selftests: Convert userspace_msr_exit_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/userspace_msr_exit_test.c | 165 +++++++++--------- 1 file changed, 78 insertions(+), 87 deletions(-)
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +78 -87
@@ -17,7 +17,6 @@#define KVM_FEP_LENGTH 5static int fep_available =1 ; -#define VCPU_ID 1#define MSR_NON_EXISTENT 0x474f4f00static u64 deny_bits =0 ;
@@ -395,31 +394,22 @@ static void guest_ud_handler(struct ex_regs *regs) regs->rip +=KVM_FEP_LENGTH ; } -static void run_guest (struct kvm_vm *vm) +static void check_for_guest_assert (struct kvm_vcpu *vcpu) { -int rc; - - rc =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (rc ==0 ,"vcpu_run failed: %d\n" , rc); -} - -static void check_for_guest_assert (struct kvm_vm *vm) -{ -struct kvm_run *run =vcpu_state (vm,VCPU_ID );struct ucall uc; -if (run->exit_reason ==KVM_EXIT_IO && -get_ucall (vm,VCPU_ID , &uc) ==UCALL_ABORT ) { -TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], - __FILE__, uc.args[1 ]); +if (vcpu->run->exit_reason ==KVM_EXIT_IO && +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 process_rdmsr (struct kvm_vm *vm,uint32_t msr_index) +static void process_rdmsr (struct kvm_vcpu *vcpu,uint32_t msr_index) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run; -check_for_guest_assert (vm); +check_for_guest_assert (vcpu); TEST_ASSERT(run->exit_reason == KVM_EXIT_X86_RDMSR, "Unexpected exit reason: %u (%s),\n",
@@ -450,11 +440,11 @@ static void process_rdmsr(struct kvm_vm *vm, uint32_t msr_index) } } -static void process_wrmsr (struct kvm_vm *vm,uint32_t msr_index) +static void process_wrmsr (struct kvm_vcpu *vcpu,uint32_t msr_index) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run; -check_for_guest_assert (vm); +check_for_guest_assert (vcpu); TEST_ASSERT(run->exit_reason == KVM_EXIT_X86_WRMSR, "Unexpected exit reason: %u (%s),\n",
@@ -481,43 +471,43 @@ static void process_wrmsr(struct kvm_vm *vm, uint32_t msr_index) } } -static void process_ucall_done (struct kvm_vm *vm) +static void process_ucall_done (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc; -check_for_guest_assert (vm); +check_for_guest_assert (vcpu);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Unexpected exit reason: %u (%s)" , run->exit_reason,exit_reason_str (run->exit_reason)); -TEST_ASSERT (get_ucall (vm,VCPU_ID , &uc) ==UCALL_DONE , +TEST_ASSERT (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_DONE ,"Unexpected ucall command: %lu, expected UCALL_DONE (%d)" , uc.cmd,UCALL_DONE ); } -static uint64_t process_ucall (struct kvm_vm *vm) +static uint64_t process_ucall (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc = {}; -check_for_guest_assert (vm); +check_for_guest_assert (vcpu);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Unexpected exit reason: %u (%s)" , run->exit_reason,exit_reason_str (run->exit_reason)); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :break ;case UCALL_ABORT : -check_for_guest_assert (vm); +check_for_guest_assert (vcpu);break ;case UCALL_DONE : -process_ucall_done (vm); +process_ucall_done (vcpu);break ;default :TEST_ASSERT (false,"Unexpected ucall" );
@@ -526,41 +516,43 @@ static uint64_t process_ucall(struct kvm_vm *vm)return uc.cmd; } -static void run_guest_then_process_rdmsr (struct kvm_vm *vm,uint32_t msr_index) +static void run_guest_then_process_rdmsr (struct kvm_vcpu *vcpu, +uint32_t msr_index) { -run_guest (vm); -process_rdmsr (vm, msr_index); +vcpu_run (vcpu->vm, vcpu->id); +process_rdmsr (vcpu, msr_index); } -static void run_guest_then_process_wrmsr (struct kvm_vm *vm,uint32_t msr_index) +static void run_guest_then_process_wrmsr (struct kvm_vcpu *vcpu, +uint32_t msr_index) { -run_guest (vm); -process_wrmsr (vm, msr_index); +vcpu_run (vcpu->vm, vcpu->id); +process_wrmsr (vcpu, msr_index); } -static uint64_t run_guest_then_process_ucall (struct kvm_vm *vm) +static uint64_t run_guest_then_process_ucall (struct kvm_vcpu *vcpu) { -run_guest (vm); -return process_ucall (vm); +vcpu_run (vcpu->vm, vcpu->id); +return process_ucall (vcpu); } -static void run_guest_then_process_ucall_done (struct kvm_vm *vm) +static void run_guest_then_process_ucall_done (struct kvm_vcpu *vcpu) { -run_guest (vm); -process_ucall_done (vm); +vcpu_run (vcpu->vm, vcpu->id); +process_ucall_done (vcpu); } -static void test_msr_filter_allow (void ) { +static void test_msr_filter_allow (void ) +{struct kvm_enable_cap cap = { .cap =KVM_CAP_X86_USER_SPACE_MSR , .args[0 ] =KVM_MSR_EXIT_REASON_FILTER , }; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;int rc; -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code_filter_allow); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); + vm =vm_create_with_one_vcpu (&vcpu, guest_code_filter_allow); rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" );
@@ -572,43 +564,43 @@ static void test_msr_filter_allow(void) {vm_ioctl (vm,KVM_X86_SET_MSR_FILTER , &filter_allow);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,GP_VECTOR , guest_gp_handler);/* Process guest code userspace exits. */ -run_guest_then_process_rdmsr (vm,MSR_IA32_XSS ); -run_guest_then_process_wrmsr (vm,MSR_IA32_XSS ); -run_guest_then_process_wrmsr (vm,MSR_IA32_XSS ); +run_guest_then_process_rdmsr (vcpu,MSR_IA32_XSS ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_XSS ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_XSS ); -run_guest_then_process_rdmsr (vm,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_rdmsr (vcpu,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_NON_EXISTENT ); -run_guest_then_process_rdmsr (vm,MSR_NON_EXISTENT ); +run_guest_then_process_wrmsr (vcpu,MSR_NON_EXISTENT ); +run_guest_then_process_rdmsr (vcpu,MSR_NON_EXISTENT );vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler); -run_guest (vm); +vcpu_run (vm, vcpu->id);vm_install_exception_handler (vm,UD_VECTOR ,NULL ); -if (process_ucall (vm) !=UCALL_DONE ) { +if (process_ucall (vcpu) !=UCALL_DONE ) {vm_install_exception_handler (vm,GP_VECTOR , guest_fep_gp_handler);/* Process emulated rdmsr and wrmsr instructions. */ -run_guest_then_process_rdmsr (vm,MSR_IA32_XSS ); -run_guest_then_process_wrmsr (vm,MSR_IA32_XSS ); -run_guest_then_process_wrmsr (vm,MSR_IA32_XSS ); +run_guest_then_process_rdmsr (vcpu,MSR_IA32_XSS ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_XSS ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_XSS ); -run_guest_then_process_rdmsr (vm,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_rdmsr (vcpu,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_FLUSH_CMD ); +run_guest_then_process_wrmsr (vcpu,MSR_IA32_FLUSH_CMD ); -run_guest_then_process_wrmsr (vm,MSR_NON_EXISTENT ); -run_guest_then_process_rdmsr (vm,MSR_NON_EXISTENT ); +run_guest_then_process_wrmsr (vcpu,MSR_NON_EXISTENT ); +run_guest_then_process_rdmsr (vcpu,MSR_NON_EXISTENT );/* Confirm the guest completed without issues. */ -run_guest_then_process_ucall_done (vm); +run_guest_then_process_ucall_done (vcpu); }else {printf ("To run the instruction emulated tests set the module parameter 'kvm.force_emulation_prefix=1'\n" ); }
@@ -616,16 +608,16 @@ static void test_msr_filter_allow(void) {kvm_vm_free (vm); } -static int handle_ucall (struct kvm_vm *vm) +static int handle_ucall (struct kvm_vcpu *vcpu) {struct ucall uc; -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("Guest assertion not met" );break ;case UCALL_SYNC : -vm_ioctl (vm,KVM_X86_SET_MSR_FILTER , &no_filter_deny); +vm_ioctl (vcpu->vm,KVM_X86_SET_MSR_FILTER , &no_filter_deny);break ;case UCALL_DONE :return 1 ;
@@ -673,21 +665,21 @@ static void handle_wrmsr(struct kvm_run *run) } } -static void test_msr_filter_deny (void ) { +static void test_msr_filter_deny (void ) +{struct kvm_enable_cap cap = { .cap =KVM_CAP_X86_USER_SPACE_MSR , .args[0 ] =KVM_MSR_EXIT_REASON_INVAL |KVM_MSR_EXIT_REASON_UNKNOWN |KVM_MSR_EXIT_REASON_FILTER , }; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;int rc; -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code_filter_deny); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code_filter_deny); + run = vcpu->run; rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" );
@@ -700,9 +692,7 @@ static void test_msr_filter_deny(void) {vm_ioctl (vm,KVM_X86_SET_MSR_FILTER , &filter_deny);while (1 ) { - rc =_vcpu_run (vm,VCPU_ID ); - -TEST_ASSERT (rc ==0 ,"vcpu_run failed: %d\n" , rc); +vcpu_run (vm, vcpu->id);switch (run->exit_reason) {case KVM_EXIT_X86_RDMSR :
@@ -712,7 +702,7 @@ static void test_msr_filter_deny(void) {handle_wrmsr (run);break ;case KVM_EXIT_IO : -if (handle_ucall (vm)) +if (handle_ucall (vcpu)) goto done;break ; }
@@ -726,17 +716,17 @@ static void test_msr_filter_deny(void) {kvm_vm_free (vm); } -static void test_msr_permission_bitmap (void ) { +static void test_msr_permission_bitmap (void ) +{struct kvm_enable_cap cap = { .cap =KVM_CAP_X86_USER_SPACE_MSR , .args[0 ] =KVM_MSR_EXIT_REASON_FILTER , }; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;int rc; -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code_permission_bitmap); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); + vm =vm_create_with_one_vcpu (&vcpu, guest_code_permission_bitmap); rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" );
@@ -746,11 +736,12 @@ static void test_msr_permission_bitmap(void) {TEST_ASSERT (rc,"KVM_CAP_X86_MSR_FILTER is available" );vm_ioctl (vm,KVM_X86_SET_MSR_FILTER , &filter_fs); -run_guest_then_process_rdmsr (vm,MSR_FS_BASE ); -TEST_ASSERT (run_guest_then_process_ucall (vm) ==UCALL_SYNC ,"Expected ucall state to be UCALL_SYNC." ); +run_guest_then_process_rdmsr (vcpu,MSR_FS_BASE ); +TEST_ASSERT (run_guest_then_process_ucall (vcpu) ==UCALL_SYNC , +"Expected ucall state to be UCALL_SYNC." );vm_ioctl (vm,KVM_X86_SET_MSR_FILTER , &filter_gs); -run_guest_then_process_rdmsr (vm,MSR_GS_BASE ); -run_guest_then_process_ucall_done (vm); +run_guest_then_process_rdmsr (vcpu,MSR_GS_BASE ); +run_guest_then_process_ucall_done (vcpu);kvm_vm_free (vm); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 54/105 KVM: selftests: Convert vmx_exception_with_invalid_guest_state away from VCPU_ID
In reply to Sean Christopherson--- .../vmx_exception_with_invalid_guest_state.c | 62 +++++++++++-------- 1 file changed, 36 insertions(+), 26 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +36 -26
@@ -10,10 +10,6 @@#include "kselftest.h" -#define VCPU_ID 0 - -static struct kvm_vm *vm; -static void guest_ud_handler (struct ex_regs *regs) {/* Loop on the ud2 until guest state is made invalid. */
@@ -24,11 +20,11 @@ static void guest_code(void) asmvolatile ("ud2" ); } -static void __run_vcpu_with_invalid_state (void ) +static void __run_vcpu_with_invalid_state (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run; -vcpu_run (vm,VCPU_ID ); +vcpu_run (vcpu->vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_INTERNAL_ERROR, "Expected KVM_EXIT_INTERNAL_ERROR, got %d (%s)\n",
@@ -38,15 +34,15 @@ static void __run_vcpu_with_invalid_state(void) run->emulation_failure.suberror); } -static void run_vcpu_with_invalid_state (void ) +static void run_vcpu_with_invalid_state (struct kvm_vcpu *vcpu) {/* * Always run twice to verify KVM handles the case where _KVM_ queues * an exception with invalid state and then exits to userspace, i.e. * that KVM doesn't explode if userspace ignores the initial error. */ -__run_vcpu_with_invalid_state (); -__run_vcpu_with_invalid_state (); +__run_vcpu_with_invalid_state (vcpu); +__run_vcpu_with_invalid_state (vcpu); }static void set_timer (void )
@@ -59,33 +55,43 @@ static void set_timer(void)ASSERT_EQ (setitimer (ITIMER_REAL , &timer,NULL ),0 ); } -static void set_or_clear_invalid_guest_state (bool set) +static void set_or_clear_invalid_guest_state (struct kvm_vcpu *vcpu,bool set) {static struct kvm_sregs sregs;if (!sregs.cr0) -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vcpu->vm, vcpu->id, &sregs); sregs.tr.unusable = !!set; -vcpu_sregs_set (vm,VCPU_ID , &sregs); +vcpu_sregs_set (vcpu->vm, vcpu->id, &sregs); } -static void set_invalid_guest_state (void ) +static void set_invalid_guest_state (struct kvm_vcpu *vcpu) { -set_or_clear_invalid_guest_state (true); +set_or_clear_invalid_guest_state (vcpu, true); } -static void clear_invalid_guest_state (void ) +static void clear_invalid_guest_state (struct kvm_vcpu *vcpu) { -set_or_clear_invalid_guest_state (false); +set_or_clear_invalid_guest_state (vcpu, false); +} + +static struct kvm_vcpu *get_set_sigalrm_vcpu (struct kvm_vcpu *__vcpu) +{ +static struct kvm_vcpu *vcpu =NULL ; + +if (__vcpu) + vcpu = __vcpu; +return vcpu; }static void sigalrm_handler (int sig) { +struct kvm_vcpu *vcpu =get_set_sigalrm_vcpu (NULL );struct kvm_vcpu_events events;TEST_ASSERT (sig ==SIGALRM ,"Unexpected signal = %d" , sig); -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vcpu->vm, vcpu->id, &events);/* * If an exception is pending, attempt KVM_RUN with invalid guest,
@@ -93,8 +99,8 @@ static void sigalrm_handler(int sig)* between KVM queueing an exception and re-entering the guest. */ if (events.exception.pending) { -set_invalid_guest_state (); -run_vcpu_with_invalid_state (); +set_invalid_guest_state (vcpu); +run_vcpu_with_invalid_state (vcpu); }else {set_timer (); }
@@ -102,15 +108,19 @@ static void sigalrm_handler(int sig)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 ); } - vm =vm_create_default (VCPU_ID ,0 , (void *)guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); +get_set_sigalrm_vcpu (vcpu);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);
@@ -119,8 +129,8 @@ int main(int argc, char *argv[])* KVM_RUN should induce a TRIPLE_FAULT in L2 as KVM doesn't support * emulating invalid guest state for L2. */ -set_invalid_guest_state (); -run_vcpu_with_invalid_state (); +set_invalid_guest_state (vcpu); +run_vcpu_with_invalid_state (vcpu);/* * Verify KVM also handles the case where userspace gains control while
@@ -129,11 +139,11 @@ int main(int argc, char *argv[])* guest with invalid state when the handler interrupts KVM with an * exception pending. */ -clear_invalid_guest_state (); +clear_invalid_guest_state (vcpu);TEST_ASSERT (signal (SIGALRM , sigalrm_handler) !=SIG_ERR ,"Failed to register SIGALRM handler, errno = %d (%s)" , errno,strerror (errno));set_timer (); -run_vcpu_with_invalid_state (); +run_vcpu_with_invalid_state (vcpu); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 55/105 KVM: selftests: Convert tsc_msrs_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/tsc_msrs_test.c | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c +16 -19
@@ -9,14 +9,12 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 -#define UNITY (1ull << 30)#define HOST_ADJUST (UNITY * 64)#define GUEST_STEP (UNITY * 4)#define ROUND (x) ((x + UNITY / 2) & -UNITY)#define rounded_rdmsr (x) ROUND(rdmsr(x)) -#define rounded_host_rdmsr (x) ROUND(vcpu_get_msr(vm, 0, x)) +#define rounded_host_rdmsr (x) ROUND(vcpu_get_msr(vm, vcpu->id, x))static void guest_code (void ) {
@@ -66,15 +64,13 @@ static void guest_code(void)GUEST_DONE (); } -static void run_vcpu (struct kvm_vm *vm,uint32_t vcpuid,int stage) +static void run_vcpu (struct kvm_vcpu *vcpu,int stage) {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 : TEST_ASSERT(!strcmp((const char *)uc.args[0], "hello") && uc.args[1] == stage + 1, "Stage %d: Unexpected register values vmexit, got %lx",
@@ -88,29 +84,30 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage) __FILE__, 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)); } }int main (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;uint64_t val; - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); val =0 ;ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ), val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val);/* Guest: writes to MSR_IA32_TSC affect both MSRs. */ -run_vcpu (vm,VCPU_ID ,1 ); +run_vcpu (vcpu,1 ); val =1ull *GUEST_STEP ;ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ), val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val);/* Guest: writes to MSR_IA32_TSC_ADJUST affect both MSRs. */ -run_vcpu (vm,VCPU_ID ,2 ); +run_vcpu (vcpu,2 ); val =2ull *GUEST_STEP ;ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ), val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val);
@@ -119,18 +116,18 @@ int main(void)* Host: writes to MSR_IA32_TSC set the host-side offset * and therefore do not change MSR_IA32_TSC_ADJUST. */ -vcpu_set_msr (vm,0 ,MSR_IA32_TSC ,HOST_ADJUST + val); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_TSC ,HOST_ADJUST + val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ),HOST_ADJUST + val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val); -run_vcpu (vm,VCPU_ID ,3 ); +run_vcpu (vcpu,3 );/* Host: writes to MSR_IA32_TSC_ADJUST do not modify the TSC. */ -vcpu_set_msr (vm,0 ,MSR_IA32_TSC_ADJUST ,UNITY *123456 ); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_TSC_ADJUST ,UNITY *123456 );ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ),HOST_ADJUST + val); -ASSERT_EQ (vcpu_get_msr (vm,0 ,MSR_IA32_TSC_ADJUST ),UNITY *123456 ); +ASSERT_EQ (vcpu_get_msr (vm, vcpu->id,MSR_IA32_TSC_ADJUST ),UNITY *123456 );/* Restore previous value. */ -vcpu_set_msr (vm,0 ,MSR_IA32_TSC_ADJUST , val); +vcpu_set_msr (vm, vcpu->id,MSR_IA32_TSC_ADJUST , val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ),HOST_ADJUST + val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val);
@@ -138,7 +135,7 @@ int main(void)* Guest: writes to MSR_IA32_TSC_ADJUST do not destroy the * host-side offset and affect both MSRs. */ -run_vcpu (vm,VCPU_ID ,4 ); +run_vcpu (vcpu,4 ); val =3ull *GUEST_STEP ;ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ),HOST_ADJUST + val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val);
@@ -147,7 +144,7 @@ int main(void)* Guest: writes to MSR_IA32_TSC affect both MSRs, so the host-side * offset is now visible in MSR_IA32_TSC_ADJUST. */ -run_vcpu (vm,VCPU_ID ,5 ); +run_vcpu (vcpu,5 ); val =4ull *GUEST_STEP ;ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC ), val);ASSERT_EQ (rounded_host_rdmsr (MSR_IA32_TSC_ADJUST ), val -HOST_ADJUST );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 56/105 KVM: selftests: Convert kvm_clock_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/kvm_clock_test.c | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +10 -13
@@ -16,8 +16,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 -struct test_case {uint64_t kvmclock_base;int64_t realtime_offset;
@@ -105,29 +103,27 @@ static void setup_clock(struct kvm_vm *vm, struct test_case *test_case)vm_ioctl (vm,KVM_SET_CLOCK , &data); } -static void enter_guest (struct kvm_vm *vm) +static void enter_guest (struct kvm_vcpu *vcpu) {struct kvm_clock_data start, end; -struct kvm_run *run; +struct kvm_run *run = vcpu->run; +struct kvm_vm *vm = vcpu->vm;struct ucall uc; -int i, r; - - run =vcpu_state (vm,VCPU_ID ); +int i;for (i =0 ; i <ARRAY_SIZE (test_cases); i++) {setup_clock (vm, &test_cases[i]);vm_ioctl (vm,KVM_GET_CLOCK , &start); - r =_vcpu_run (vm,VCPU_ID ); +vcpu_run (vcpu->vm, vcpu->id);vm_ioctl (vm,KVM_GET_CLOCK , &end); -TEST_ASSERT (!r,"vcpu_run failed: %d\n" , r);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->vm, vcpu->id, &uc)) {case UCALL_SYNC :handle_sync (&uc, &start, &end);break ;
@@ -178,6 +174,7 @@ static void check_clocksource(void)int main (void ) { +struct kvm_vcpu *vcpu;vm_vaddr_t pvti_gva;vm_paddr_t pvti_gpa;struct kvm_vm *vm;
@@ -192,12 +189,12 @@ int main(void)check_clocksource (); - vm =vm_create_default (VCPU_ID ,0 , guest_main); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); pvti_gva =vm_vaddr_alloc (vm,getpagesize (),0x10000 ); pvti_gpa =addr_gva2gpa (vm, pvti_gva); -vcpu_args_set (vm,VCPU_ID ,2 , pvti_gpa, pvti_gva); +vcpu_args_set (vm, vcpu->id,2 , pvti_gpa, pvti_gva); -enter_guest (vm); +enter_guest (vcpu);kvm_vm_free (vm); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 57/105 KVM: selftests: Convert hyperv_svm_test away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +7 -7
@@ -21,7 +21,6 @@#include "svm_util.h" #include "hyperv.h" -#define VCPU_ID 1#define L2_GUEST_STACK_SIZE 256struct hv_enlightenments {
@@ -127,6 +126,7 @@ int main(int argc, char *argv[]) {vm_vaddr_t nested_gva =0 ; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct ucall uc;
@@ -137,20 +137,20 @@ int main(int argc, char *argv[])exit (KSFT_SKIP ); }/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); -vcpu_set_hv_cpuid (vm,VCPU_ID ); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); +vcpu_set_hv_cpuid (vm, vcpu->id); + run = vcpu->run;vcpu_alloc_svm (vm, &nested_gva); -vcpu_args_set (vm,VCPU_ID ,1 , nested_gva); +vcpu_args_set (vm, vcpu->id,1 , nested_gva);for (stage =1 ;; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 58/105 KVM: selftests: Convert hyperv_features away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/hyperv_features.c | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-)
tools/testing/selftests/kvm/x86_64/hyperv_features.c +25 -26
@@ -13,7 +13,6 @@#include "processor.h" #include "hyperv.h" -#define VCPU_ID 0#define LINUX_OS_ID ((u64)0x8100 << 48)extern unsigned char rdmsr_start;
@@ -151,7 +150,7 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)GUEST_DONE (); } -static void hv_set_cpuid (struct kvm_vm *vm,struct kvm_cpuid2 *cpuid, +static void hv_set_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid2 *cpuid,struct kvm_cpuid_entry2 *feat,struct kvm_cpuid_entry2 *recomm,struct kvm_cpuid_entry2 *dbg)
@@ -162,15 +161,16 @@ static void hv_set_cpuid(struct kvm_vm *vm, 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 (vm,VCPU_ID , cpuid); +vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid); }static void guest_test_msrs_access (void ) { +struct kvm_vcpu *vcpu;struct kvm_run *run;struct kvm_vm *vm;struct ucall uc; -int stage =0 , r; +int stage =0 ;struct kvm_cpuid_entry2 feat = { .function =HYPERV_CPUID_FEATURES };
@@ -189,24 +189,24 @@ static void guest_test_msrs_access(void)struct msr_data *msr;while (true) { - vm =vm_create_default (VCPU_ID ,0 , guest_msr); + vm =vm_create_with_one_vcpu (&vcpu, guest_msr); msr_gva =vm_vaddr_alloc_page (vm);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 , &cap); +vcpu_args_set (vm, vcpu->id,1 , msr_gva); +vcpu_enable_cap (vm, vcpu->id, &cap); -vcpu_set_hv_cpuid (vm,VCPU_ID ); +vcpu_set_hv_cpuid (vm, vcpu->id); best =kvm_get_supported_hv_cpuid ();vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,GP_VECTOR , guest_gp_handler); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;switch (stage) {case 0 :
@@ -339,7 +339,7 @@ static void guest_test_msrs_access(void)*/ cap.cap =KVM_CAP_HYPERV_SYNIC2 ; cap.args[0 ] =0 ; -vcpu_enable_cap (vm,VCPU_ID , &cap); +vcpu_enable_cap (vm, vcpu->id, &cap);break ;case 22 : feat.eax |=HV_MSR_SYNIC_AVAILABLE ;
@@ -469,7 +469,7 @@ static void guest_test_msrs_access(void)break ; } -hv_set_cpuid (vm, best, &feat, &recomm, &dbg); +hv_set_cpuid (vcpu, best, &feat, &recomm, &dbg);if (msr->idx) pr_debug("Stage %d: testing msr: 0x%x for %s\n", stage,
@@ -477,13 +477,12 @@ static void guest_test_msrs_access(void)else pr_debug ("Stage %d: finish\n" , stage); - r =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (!r,"vcpu_run failed: %d\n" , r); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected stage: %ld (0 expected)\n",
@@ -504,10 +503,11 @@ static void guest_test_msrs_access(void)static void guest_test_hcalls_access (void ) { +struct kvm_vcpu *vcpu;struct kvm_run *run;struct kvm_vm *vm;struct ucall uc; -int stage =0 , r; +int stage =0 ;struct kvm_cpuid_entry2 feat = { .function =HYPERV_CPUID_FEATURES , .eax =HV_MSR_HYPERCALL_AVAILABLE
@@ -527,10 +527,10 @@ static void guest_test_hcalls_access(void)struct kvm_cpuid2 *best;while (true) { - vm =vm_create_default (VCPU_ID ,0 , guest_hcall); + 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 (vm, vcpu->id);vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);/* Hypercall input/output */
@@ -541,14 +541,14 @@ 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 , &cap); +vcpu_args_set (vm, vcpu->id,2 ,addr_gva2gpa (vm, hcall_page), hcall_params); +vcpu_enable_cap (vm, vcpu->id, &cap); -vcpu_set_hv_cpuid (vm,VCPU_ID ); +vcpu_set_hv_cpuid (vm, vcpu->id); best =kvm_get_supported_hv_cpuid (); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;switch (stage) {case 0 :
@@ -643,7 +643,7 @@ static void guest_test_hcalls_access(void)break ; } -hv_set_cpuid (vm, best, &feat, &recomm, &dbg); +hv_set_cpuid (vcpu, best, &feat, &recomm, &dbg);if (hcall->control) pr_debug("Stage %d: testing hcall: 0x%lx\n", stage,
@@ -651,13 +651,12 @@ static void guest_test_hcalls_access(void)else pr_debug ("Stage %d: finish\n" , stage); - r =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (!r,"vcpu_run failed: %d\n" , r); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_SYNC : TEST_ASSERT(uc.args[1] == 0, "Unexpected stage: %ld (0 expected)\n",
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 59/105 KVM: selftests: Convert hyperv_clock away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/hyperv_clock.c | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +12 -13
@@ -171,22 +171,20 @@ static void guest_main(struct ms_hyperv_tsc_page *tsc_page, vm_paddr_t tsc_page_GUEST_DONE (); } -#define VCPU_ID 0 - -static void host_check_tsc_msr_rdtsc (struct kvm_vm *vm) +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 (vm,VCPU_ID ,HV_X64_MSR_TSC_FREQUENCY ); + tsc_freq =vcpu_get_msr (vcpu->vm, vcpu->id,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 (vm,VCPU_ID ,HV_X64_MSR_TIME_REF_COUNT ); + t1 =vcpu_get_msr (vcpu->vm, vcpu->id,HV_X64_MSR_TIME_REF_COUNT );nop_loop (); r2 =rdtsc (); - t2 =vcpu_get_msr (vm,VCPU_ID ,HV_X64_MSR_TIME_REF_COUNT ); + t2 =vcpu_get_msr (vcpu->vm, vcpu->id,HV_X64_MSR_TIME_REF_COUNT );TEST_ASSERT (t2 > t1,"Time reference MSR is not monotonic (%ld <= %ld)" , t1, t2);
@@ -203,33 +201,34 @@ static void host_check_tsc_msr_rdtsc(struct kvm_vm *vm)int main (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct ucall uc;vm_vaddr_t tsc_page_gva;int stage; - vm =vm_create_default (VCPU_ID ,0 , guest_main); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); + run = vcpu->run; -vcpu_set_hv_cpuid (vm,VCPU_ID ); +vcpu_set_hv_cpuid (vm, vcpu->id); 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 (vm, vcpu->id,2 , tsc_page_gva,addr_gva2gpa (vm, tsc_page_gva)); -host_check_tsc_msr_rdtsc (vm); +host_check_tsc_msr_rdtsc (vcpu);for (stage =1 ;; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 60/105 KVM: selftests: Convert evmcs_test away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/evmcs_test.c | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/x86_64/evmcs_test.c +26 -25
@@ -18,7 +18,6 @@#include "vmx.h" -#define VCPU_ID 5#define NMI_VECTOR 2static int ud_count;
@@ -160,55 +159,56 @@ void guest_code(struct vmx_pages *vmx_pages)GUEST_DONE (); } -void inject_nmi (struct kvm_vm *vm) +void inject_nmi (struct kvm_vcpu *vcpu) {struct kvm_vcpu_events events; -vcpu_events_get (vm,VCPU_ID , &events); +vcpu_events_get (vcpu->vm, vcpu->id, &events); events.nmi.pending =1 ; events.flags |=KVM_VCPUEVENT_VALID_NMI_PENDING ; -vcpu_events_set (vm,VCPU_ID , &events); +vcpu_events_set (vcpu->vm, vcpu->id, &events); } -static void save_restore_vm (struct kvm_vm *vm) +static struct kvm_vcpu *save_restore_vm (struct kvm_vm *vm, +struct kvm_vcpu *vcpu) {struct kvm_regs regs1, regs2;struct kvm_x86_state *state; - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (vm, vcpu->id);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm); -vm_vcpu_add (vm,VCPU_ID ); -vcpu_set_hv_cpuid (vm,VCPU_ID ); -vcpu_enable_evmcs (vm,VCPU_ID ); -vcpu_load_state (vm,VCPU_ID , state); + 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);kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm,VCPU_ID , ®s2); +vcpu_regs_get (vm, vcpu->id, ®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); +return vcpu; }int main (int argc,char *argv[]) {vm_vaddr_t vmx_pages_gva =0 ; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct ucall uc;int stage; -/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); if (!nested_vmx_supported() || !kvm_check_cap(KVM_CAP_NESTED_STATE) ||
@@ -217,28 +217,29 @@ 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 (vm, vcpu->id); +vcpu_enable_evmcs (vm, vcpu->id);vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);vm_install_exception_handler (vm,NMI_VECTOR , guest_nmi_handler);pr_info ("Running L1 which uses EVMCS to run L2\n" );for (stage =1 ;; stage++) { - run =vcpu_state (vm,VCPU_ID ); -_vcpu_run (vm,VCPU_ID ); + run = vcpu->run; + +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
@@ -256,12 +257,12 @@ int main(int argc, char *argv[]) uc.args[1 ] == stage,"Stage %d: Unexpected register values vmexit, got %lx" , stage, (ulong)uc.args[1]); -save_restore_vm (vm); + vcpu =save_restore_vm (vm, vcpu);/* Force immediate L2->L1 exit before resuming */ if (stage ==8 ) {pr_info ("Injecting NMI into L1 before L2 had a chance to run after restore\n" ); -inject_nmi (vm); +inject_nmi (vcpu); }/*
@@ -271,7 +272,7 @@ int main(int argc, char *argv[])*/ if (stage ==9 ) {pr_info ("Trying extra KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE cycle\n" ); -save_restore_vm (vm); + vcpu =save_restore_vm (vm, vcpu); } }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 61/105 KVM: selftests: Convert emulator_error_test away from VCPU_ID
In reply to Sean Christopherson--- .../kvm/x86_64/emulator_error_test.c | 65 ++++++++----------- 1 file changed, 28 insertions(+), 37 deletions(-)
tools/testing/selftests/kvm/x86_64/emulator_error_test.c +28 -37
@@ -11,7 +11,6 @@#include "kvm_util.h" #include "vmx.h" -#define VCPU_ID 1#define PAGE_SIZE 4096#define MAXPHYADDR 36
@@ -28,14 +27,6 @@ static void guest_code(void)GUEST_DONE (); } -static void run_guest (struct kvm_vm *vm) -{ -int rc; - - rc =_vcpu_run (vm,VCPU_ID ); -TEST_ASSERT (rc ==0 ,"vcpu_run failed: %d\n" , rc); -} -/* * Accessors to get R/M, REG, and Mod bits described in the SDM vol 2, * figure 2-2 "Table Interpretation of ModR/M Byte (C8H)".
@@ -57,9 +48,9 @@ static bool is_flds(uint8_t *insn_bytes, uint8_t insn_size)GET_RM (insn_bytes[1 ]) !=0x5 ; } -static void process_exit_on_emulation_error (struct kvm_vm *vm) +static void process_exit_on_emulation_error (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct kvm_regs regs;uint8_t *insn_bytes;uint8_t insn_size;
@@ -93,50 +84,49 @@ static void process_exit_on_emulation_error(struct kvm_vm *vm)* contained an flds instruction that is 2-bytes in * length (ie: no prefix, no SIB, no displacement). */ -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vcpu->vm, vcpu->id, ®s); regs.rip +=2 ; -vcpu_regs_set (vm,VCPU_ID , ®s); +vcpu_regs_set (vcpu->vm, vcpu->id, ®s); } } } -static void do_guest_assert (struct kvm_vm *vm,struct ucall *uc) +static void do_guest_assert (struct ucall *uc) {TEST_FAIL ("%s at %s:%ld" , (const char *)uc->args[0 ], __FILE__, uc->args[1 ]); } -static void check_for_guest_assert (struct kvm_vm *vm) +static void check_for_guest_assert (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID );struct ucall uc; -if (run->exit_reason ==KVM_EXIT_IO && -get_ucall (vm,VCPU_ID , &uc) ==UCALL_ABORT ) { -do_guest_assert (vm, &uc); +if (vcpu->run->exit_reason ==KVM_EXIT_IO && +get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_ABORT ) { +do_guest_assert (&uc); } } -static void process_ucall_done (struct kvm_vm *vm) +static void process_ucall_done (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc; -check_for_guest_assert (vm); +check_for_guest_assert (vcpu);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Unexpected exit reason: %u (%s)" , run->exit_reason,exit_reason_str (run->exit_reason)); -TEST_ASSERT (get_ucall (vm,VCPU_ID , &uc) ==UCALL_DONE , +TEST_ASSERT (get_ucall (vcpu->vm, vcpu->id, &uc) ==UCALL_DONE ,"Unexpected ucall command: %lu, expected UCALL_DONE (%d)" , uc.cmd,UCALL_DONE ); } -static uint64_t process_ucall (struct kvm_vm *vm) +static uint64_t process_ucall (struct kvm_vcpu *vcpu) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;struct ucall uc; TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
@@ -144,14 +134,14 @@ static uint64_t process_ucall(struct kvm_vm *vm) run->exit_reason, exit_reason_str(run->exit_reason)); -switch (get_ucall (vm,VCPU_ID , &uc)) { +switch (get_ucall (vcpu->vm, vcpu->id, &uc)) {case UCALL_SYNC :break ;case UCALL_ABORT : -do_guest_assert (vm, &uc); +do_guest_assert (&uc);break ;case UCALL_DONE : -process_ucall_done (vm); +process_ucall_done (vcpu);break ;default :TEST_ASSERT (false,"Unexpected ucall" );
@@ -168,6 +158,7 @@ int main(int argc, char *argv[]) };struct kvm_cpuid_entry2 *entry;struct kvm_cpuid2 *cpuid; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;uint64_t gpa, pte;uint64_t *hva;
@@ -176,20 +167,20 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); - vm =vm_create_default (VCPU_ID ,0 , guest_code); -if (!kvm_check_cap (KVM_CAP_SMALLER_MAXPHYADDR )) {printf ("module parameter 'allow_smaller_maxphyaddr' is not set. Skipping test.\n" );return 0 ; } + vm =vm_create_with_one_vcpu (&vcpu, guest_code); + cpuid =kvm_get_supported_cpuid (); entry =kvm_get_supported_cpuid_index (0x80000008 ,0 ); entry->eax = (entry->eax &0xffffff00 ) |MAXPHYADDR ;set_cpuid (cpuid, entry); -vcpu_set_cpuid (vm,VCPU_ID , cpuid); +vcpu_set_cpuid (vm, vcpu->id, cpuid); rc =kvm_check_cap (KVM_CAP_EXIT_ON_EMULATION_FAILURE );TEST_ASSERT (rc,"KVM_CAP_EXIT_ON_EMULATION_FAILURE is unavailable" );
@@ -204,14 +195,14 @@ 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->id,MEM_REGION_GVA ); +vm_set_page_table_entry (vm, vcpu->id,MEM_REGION_GVA , pte | (1ull <<36 )); -run_guest (vm); -process_exit_on_emulation_error (vm); -run_guest (vm); +vcpu_run (vm, vcpu->id); +process_exit_on_emulation_error (vcpu); +vcpu_run (vm, vcpu->id); -TEST_ASSERT (process_ucall (vm) ==UCALL_DONE ,"Expected UCALL_DONE" ); +TEST_ASSERT (process_ucall (vcpu) ==UCALL_DONE ,"Expected UCALL_DONE" );kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 62/105 KVM: selftests: Convert debug_regs away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/debug_regs.c | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-)
tools/testing/selftests/kvm/x86_64/debug_regs.c +25 -28
@@ -10,8 +10,6 @@#include "processor.h" #include "apic.h" -#define VCPU_ID 0 -#define DR6_BD (1 << 13)#define DR7_GD (1 << 13)
@@ -66,13 +64,11 @@ static void guest_code(void)GUEST_DONE (); } -#define CLEAR_DEBUG () memset(&debug, 0, sizeof(debug)) -#define APPLY_DEBUG () vcpu_set_guest_debug(vm, VCPU_ID, &debug)#define CAST_TO_RIP (v) ((unsigned long long)&(v))#define SET_RIP (v) do { \ - vcpu_regs_get(vm, VCPU_ID, ®s); \ + vcpu_regs_get(vm, vcpu->id, ®s); \ regs.rip = (v); \ - vcpu_regs_set(vm, VCPU_ID, ®s); \ + vcpu_regs_set(vm, vcpu->id, ®s); \ } while (0)#define MOVE_RIP (v) SET_RIP(regs.rip + (v));
@@ -80,6 +76,7 @@ int main(void) {struct kvm_guest_debug debug;unsigned long long target_dr6, target_rip; +struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_run *run;struct kvm_vm *vm;
@@ -101,14 +98,14 @@ int main(void)return 0 ; } - 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;/* Test software BPs - int3 */ -CLEAR_DEBUG (); +memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_SW_BP ; -APPLY_DEBUG (); -vcpu_run (vm,VCPU_ID ); +vcpu_set_guest_debug (vm, vcpu->id, &debug); +vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == BP_VECTOR && run->debug.arch.pc == CAST_TO_RIP(sw_bp),
@@ -119,12 +116,12 @@ int main(void)/* Test instruction HW BP over DR[0-3] */ for (i =0 ; i <4 ; i++) { -CLEAR_DEBUG (); +memset (&debug,0 ,sizeof (debug)); 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 )); -APPLY_DEBUG (); -vcpu_run (vm,VCPU_ID ); +vcpu_set_guest_debug (vm, vcpu->id, &debug); +vcpu_run (vm, vcpu->id); target_dr6 =0xffff0ff0 | (1UL << i); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -141,13 +138,13 @@ int main(void)/* Test data access HW BP over DR[0-3] */ for (i =0 ; i <4 ; i++) { -CLEAR_DEBUG (); +memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_HW_BP ; debug.arch.debugreg[i] =CAST_TO_RIP (guest_value); debug.arch.debugreg[7 ] =0x00000400 | (1UL << (2 *i+1 )) | (0x000d0000UL << (4 *i)); -APPLY_DEBUG (); -vcpu_run (vm,VCPU_ID ); +vcpu_set_guest_debug (vm, vcpu->id, &debug); +vcpu_run (vm, vcpu->id); target_dr6 =0xffff0ff0 | (1UL << i); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -167,15 +164,15 @@ int main(void)/* Test single step */ target_rip =CAST_TO_RIP (ss_start); target_dr6 =0xffff4ff0ULL ; -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);for (i =0 ; i < (sizeof (ss_size) /sizeof (ss_size[0 ])); i++) { target_rip += ss_size[i]; -CLEAR_DEBUG (); +memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_SINGLESTEP |KVM_GUESTDBG_BLOCKIRQ ; debug.arch.debugreg[7 ] =0x00000400 ; -APPLY_DEBUG (); -vcpu_run (vm,VCPU_ID ); +vcpu_set_guest_debug (vm, vcpu->id, &debug); +vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR && run->debug.arch.pc == target_rip &&
@@ -188,11 +185,11 @@ int main(void) }/* Finally test global disable */ -CLEAR_DEBUG (); +memset (&debug,0 ,sizeof (debug)); debug.control =KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_USE_HW_BP ; debug.arch.debugreg[7 ] =0x400 |DR7_GD ; -APPLY_DEBUG (); -vcpu_run (vm,VCPU_ID ); +vcpu_set_guest_debug (vm, vcpu->id, &debug); +vcpu_run (vm, vcpu->id); target_dr6 =0xffff0ff0 |DR6_BD ; TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG && run->debug.arch.exception == DB_VECTOR &&
@@ -205,12 +202,12 @@ int main(void) target_dr6);/* Disable all debug controls, run to the end */ -CLEAR_DEBUG (); -APPLY_DEBUG (); +memset (&debug,0 ,sizeof (debug)); +vcpu_set_guest_debug (vm, vcpu->id, &debug); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"KVM_EXIT_IO" ); - cmd =get_ucall (vm,VCPU_ID , &uc); + cmd =get_ucall (vm, vcpu->id, &uc);TEST_ASSERT (cmd ==UCALL_DONE ,"UCALL_DONE" );kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 63/105 KVM: selftests: Add proper helper for advancing RIP in debug_regs
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/debug_regs.c | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-)
tools/testing/selftests/kvm/x86_64/debug_regs.c +13 -12
@@ -65,19 +65,21 @@ static void guest_code(void) }#define CAST_TO_RIP (v) ((unsigned long long)&(v)) -#define SET_RIP (v) do { \ - vcpu_regs_get(vm, vcpu->id, ®s); \ - regs.rip = (v); \ - vcpu_regs_set(vm, vcpu->id, ®s); \ - } while (0) -#define MOVE_RIP (v) SET_RIP(regs.rip + (v)); + +static void vcpu_skip_insn (struct kvm_vcpu *vcpu,int insn_len) +{ +struct kvm_regs regs; + +vcpu_regs_get (vcpu->vm, vcpu->id, ®s); + regs.rip += insn_len; +vcpu_regs_set (vcpu->vm, vcpu->id, ®s); +}int main (void ) {struct kvm_guest_debug debug;unsigned long long target_dr6, target_rip;struct kvm_vcpu *vcpu; -struct kvm_regs regs;struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;
@@ -112,7 +114,7 @@ int main(void)"INT3: exit %d exception %d rip 0x%llx (should be 0x%llx)" , run->exit_reason, run->debug.arch.exception, run->debug.arch.pc, CAST_TO_RIP(sw_bp)); -MOVE_RIP (1 ); +vcpu_skip_insn (vcpu,1 );/* Test instruction HW BP over DR[0-3] */ for (i =0 ; i <4 ; i++) {
@@ -134,7 +136,7 @@ int main(void) run->debug.arch.dr6, target_dr6); }/* Skip "nop" */ -MOVE_RIP (1 ); +vcpu_skip_insn (vcpu,1 );/* Test data access HW BP over DR[0-3] */ for (i =0 ; i <4 ; i++) {
@@ -156,15 +158,14 @@ int main(void) run->debug.arch.pc,CAST_TO_RIP (write_data), run->debug.arch.dr6, target_dr6);/* Rollback the 4-bytes "mov" */ -MOVE_RIP (-7 ); +vcpu_skip_insn (vcpu,-7 ); }/* Skip the 4-bytes "mov" */ -MOVE_RIP (7 ); +vcpu_skip_insn (vcpu,7 );/* Test single step */ target_rip =CAST_TO_RIP (ss_start); target_dr6 =0xffff4ff0ULL ; -vcpu_regs_get (vm, vcpu->id, ®s);for (i =0 ; i < (sizeof (ss_size) /sizeof (ss_size[0 ])); i++) { target_rip += ss_size[i];memset (&debug,0 ,sizeof (debug));
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 64/105 KVM: selftests: Convert amx_test away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/x86_64/amx_test.c | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/x86_64/amx_test.c +16 -17
@@ -25,7 +25,6 @@# error This test is 64-bit only#endif -#define VCPU_ID 0#define X86_FEATURE_XSAVE (1 << 26)#define X86_FEATURE_OSXSAVE (1 << 27)
@@ -320,6 +319,7 @@ 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;struct kvm_x86_state *state;
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])vm_xsave_req_perm (XSTATE_XTILE_DATA_BIT );/* Create VM */ - vm =vm_create_default (VCPU_ID ,0 , guest_code); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); entry =kvm_get_supported_cpuid_entry (1 );if (!(entry->ecx &X86_FEATURE_XSAVE )) {
@@ -351,12 +351,12 @@ int main(int argc, char *argv[]) xsave_restore_size = entry->ecx; } - run =vcpu_state (vm,VCPU_ID ); -vcpu_regs_get (vm,VCPU_ID , ®s1); + run = vcpu->run; +vcpu_regs_get (vm, vcpu->id, ®s1);/* Register #NM handler */ vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,NM_VECTOR , guest_nm_handler);/* amx cfg for guest_code */
@@ -370,16 +370,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 (vm, vcpu->id,3 , amx_cfg, tiledata, xsavedata);for (stage =1 ; ; stage++) { -_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);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 (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s at %s:%ld" , (const char *)uc.args[0 ], __FILE__, uc.args[1 ]);
@@ -404,7 +404,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 (vm, vcpu->id);void *amx_start = (void *)state->xsave + amx_offset;void *tiles_data = (void *)addr_gva2hva (vm, tiledata);/* Only check TMM0 register, 1 tile */
@@ -425,22 +425,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 (vm, vcpu->id);memset (®s1,0 ,sizeof (regs1)); -vcpu_regs_get (vm,VCPU_ID , ®s1); +vcpu_regs_get (vm, vcpu->id, ®s1);kvm_vm_release (vm);/* Restore state in a new VM. */ -kvm_vm_restart (vm); -vm_vcpu_add (vm,VCPU_ID ); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); -vcpu_load_state (vm,VCPU_ID , state); - run =vcpu_state (vm,VCPU_ID ); + vcpu =vm_recreate_with_one_vcpu (vm); +vcpu_set_cpuid (vm, vcpu->id,kvm_get_supported_cpuid ()); +vcpu_load_state (vm, vcpu->id, state); + run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2)); -vcpu_regs_get (vm,VCPU_ID , ®s2); +vcpu_regs_get (vm, vcpu->id, ®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);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 65/105 KVM: selftests: Convert cr4_cpuid_sync_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +7 -10
@@ -21,7 +21,6 @@#define X86_FEATURE_XSAVE (1<<26)#define X86_FEATURE_OSXSAVE (1<<27) -#define VCPU_ID 1static inline bool cr4_cpuid_is_sync (void ) {
@@ -63,12 +62,12 @@ static void guest_code(void)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_run *run;struct kvm_vm *vm;struct kvm_sregs sregs;struct kvm_cpuid_entry2 *entry;struct ucall uc; -int rc; entry =kvm_get_supported_cpuid_entry (1 );if (!(entry->ecx &X86_FEATURE_XSAVE )) {
@@ -79,25 +78,23 @@ int main(int argc, char *argv[])/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -/* Create VM */ - 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;while (1 ) { - rc =_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -TEST_ASSERT (rc ==0 ,"vcpu_run failed: %d\n" , rc);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 (vm, vcpu->id, &uc)) {case UCALL_SYNC :/* emulate hypervisor clearing CR4.OSXSAVE */ -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs); sregs.cr4 &= ~X86_CR4_OSXSAVE ; -vcpu_sregs_set (vm,VCPU_ID , &sregs); +vcpu_sregs_set (vm, vcpu->id, &sregs);break ;case UCALL_ABORT :TEST_FAIL ("Guest CR4 bit (OSXSAVE) unsynchronized with CPUID bit." );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 66/105 KVM: selftests: Convert cpuid_test away from VCPU_ID
In reply to Sean Christopherson--- .../testing/selftests/kvm/x86_64/cpuid_test.c | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/x86_64/cpuid_test.c +14 -15
@@ -12,8 +12,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 -/* CPUIDs known to differ */ struct {u32 function;
@@ -118,13 +116,13 @@ static void compare_cpuids(struct kvm_cpuid2 *cpuid1, struct kvm_cpuid2 *cpuid2)check_cpuid (cpuid1, &cpuid2->entries[i]); } -static void run_vcpu (struct kvm_vm *vm,uint32_t vcpuid,int stage) +static void run_vcpu (struct kvm_vcpu *vcpu,int stage) {struct ucall uc; -_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,
@@ -138,7 +136,7 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage) __FILE__, 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)); } }
@@ -154,21 +152,21 @@ struct kvm_cpuid2 *vcpu_alloc_cpuid(struct kvm_vm *vm, vm_vaddr_t *p_gva, structreturn guest_cpuids; } -static void set_cpuid_after_run (struct kvm_vm *vm,struct kvm_cpuid2 *cpuid) +static void set_cpuid_after_run (struct kvm_vcpu *vcpu,struct kvm_cpuid2 *cpuid) {struct kvm_cpuid_entry2 *ent;int rc;u32 eax, ebx, x;/* Setting unmodified CPUID is allowed */ - rc =__vcpu_set_cpuid (vm,VCPU_ID , cpuid); + rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, 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 (vm,VCPU_ID , cpuid); + rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid);TEST_ASSERT (rc,"Changing CPU features should fail" ); ent->ebx = ebx;
@@ -177,7 +175,7 @@ static void set_cpuid_after_run(struct kvm_vm *vm, struct kvm_cpuid2 *cpuid) eax = ent->eax; x = eax &0xff ; ent->eax = (eax & ~0xffu ) | (x -1 ); - rc =__vcpu_set_cpuid (vm,VCPU_ID , cpuid); + rc =__vcpu_set_cpuid (vcpu->vm, vcpu->id, cpuid);TEST_ASSERT (rc,"Changing MAXPHYADDR should fail" ); ent->eax = eax; }
@@ -185,25 +183,26 @@ static void set_cpuid_after_run(struct kvm_vm *vm, struct kvm_cpuid2 *cpuid)int main (void ) {struct kvm_cpuid2 *supp_cpuid, *cpuid2; +struct kvm_vcpu *vcpu;vm_vaddr_t cpuid_gva;struct kvm_vm *vm;int stage; - vm =vm_create_default (VCPU_ID ,0 , guest_main); + 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 (vm, vcpu->id);compare_cpuids (supp_cpuid, cpuid2);vcpu_alloc_cpuid (vm, &cpuid_gva, cpuid2); -vcpu_args_set (vm,VCPU_ID ,1 , cpuid_gva); +vcpu_args_set (vm, vcpu->id,1 , cpuid_gva);for (stage =0 ; stage <3 ; stage++) -run_vcpu (vm,VCPU_ID , stage); +run_vcpu (vcpu, stage); -set_cpuid_after_run (vm, cpuid2); +set_cpuid_after_run (vcpu, cpuid2);kvm_vm_free (vm); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 67/105 KVM: selftests: Convert userspace_io_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/userspace_io_test.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
tools/testing/selftests/kvm/x86_64/userspace_io_test.c +7 -11
@@ -10,8 +10,6 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 1 -static void guest_ins_port80 (uint8_t *buffer,unsigned int count) {unsigned long end;
@@ -52,31 +50,29 @@ static void guest_code(void)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_run *run;struct kvm_vm *vm;struct ucall uc; -int rc;/* Tell stdout not to buffer its content */ setbuf (stdout,NULL ); -/* Create VM */ - 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;memset (®s,0 ,sizeof (regs));while (1 ) { - rc =_vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); -TEST_ASSERT (rc ==0 ,"vcpu_run failed: %d\n" , rc);TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"Unexpected exit reason: %u (%s),\n" , run->exit_reason,exit_reason_str (run->exit_reason)); -if (get_ucall (vm,VCPU_ID , &uc)) +if (get_ucall (vm, vcpu->id, &uc))break ; TEST_ASSERT(run->io.port == 0x80,
@@ -89,13 +85,13 @@ int main(int argc, char *argv[])* scope from a testing perspective as it's not ABI in any way, * i.e. it really is abusing internal KVM knowledge. */ -vcpu_regs_get (vm,VCPU_ID , ®s); +vcpu_regs_get (vm, vcpu->id, ®s);if (regs.rcx ==2 ) regs.rcx =1 ;if (regs.rcx ==3 ) regs.rcx =8192 ;memset ((void *)run + run->io.data_offset,0xaa ,4096 ); -vcpu_regs_set (vm,VCPU_ID , ®s); +vcpu_regs_set (vm, vcpu->id, ®s); }switch (uc.cmd) {
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 68/105 KVM: selftests: Convert vmx_invalid_nested_guest_state away from VCPU_ID
In reply to Sean Christopherson--- .../x86_64/vmx_invalid_nested_guest_state.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c +9 -9
@@ -9,7 +9,6 @@#include "kselftest.h" -#define VCPU_ID 0#define ARBITRARY_IO_PORT 0x2000static struct kvm_vm *vm;
@@ -55,20 +54,21 @@ int main(int argc, char *argv[]) {vm_vaddr_t vmx_pages_gva;struct kvm_sregs sregs; +struct kvm_vcpu *vcpu;struct kvm_run *run;struct ucall uc;nested_vmx_check_supported (); - vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); + vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code);/* Allocate VMX pages and shared descriptors (vmx_pages). */ vcpu_alloc_vmx (vm, &vmx_pages_gva); -vcpu_args_set (vm,VCPU_ID ,1 , vmx_pages_gva); +vcpu_args_set (vm, vcpu->id,1 , vmx_pages_gva); -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); - run =vcpu_state (vm,VCPU_ID ); + run = vcpu->run;/* * The first exit to L0 userspace should be an I/O access from L2.
@@ -88,13 +88,13 @@ int main(int argc, char *argv[])* emulating invalid guest state for L2. */ memset (&sregs,0 ,sizeof (sregs)); -vcpu_sregs_get (vm,VCPU_ID , &sregs); +vcpu_sregs_get (vm, vcpu->id, &sregs); sregs.tr.unusable =1 ; -vcpu_sregs_set (vm,VCPU_ID , &sregs); +vcpu_sregs_set (vm, vcpu->id, &sregs); -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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 69/105 KVM: selftests: Convert xen_vmcall_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/xen_vmcall_test.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +8 -9
@@ -11,14 +11,10 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 5 -#define HCALL_REGION_GPA 0xc0000000ULL#define HCALL_REGION_SLOT 10#define PAGE_SIZE 4096 -static struct kvm_vm *vm; -#define INPUTVALUE 17#define ARGVALUE (x) (0xdeadbeef5a5a0000UL + x)#define RETVALUE 0xcafef00dfbfbffffUL
@@ -85,14 +81,17 @@ static void guest_code(void)int main (int argc,char *argv[]) { +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 ); } - vm =vm_create_default (VCPU_ID ,0 , (void *) guest_code); -vcpu_set_hv_cpuid (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); +vcpu_set_hv_cpuid (vm, vcpu->id);struct kvm_xen_hvm_config hvmc = { .flags =KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL ,
@@ -106,10 +105,10 @@ int main(int argc, char *argv[])virt_map (vm,HCALL_REGION_GPA ,HCALL_REGION_GPA ,2 );for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id);if (run->exit_reason ==KVM_EXIT_XEN ) {ASSERT_EQ (run->xen.type,KVM_EXIT_XEN_HCALL );
@@ -131,7 +130,7 @@ int main(int argc, char *argv[]) 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" , (const char *)uc.args[0 ]);/* NOT REACHED */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 70/105 KVM: selftests: Convert xen_shinfo_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/xen_shinfo_test.c | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +16 -19
@@ -18,8 +18,6 @@#include <sys/eventfd.h> -#define VCPU_ID 5 -#define SHINFO_REGION_GVA 0xc0000000ULL#define SHINFO_REGION_GPA 0xc0000000ULL#define SHINFO_REGION_SLOT 10
@@ -39,8 +37,6 @@#define EVTCHN_VECTOR 0x10 -static struct kvm_vm *vm; -#define XEN_HYPERCALL_MSR 0x40000000#define MIN_STEAL_TIME 50000
@@ -200,6 +196,8 @@ static void handle_alrm(int sig)int main (int argc,char *argv[]) {struct timespec min_ts, max_ts, vm_ts; +struct kvm_vcpu *vcpu; +struct kvm_vm *vm;bool verbose; verbose = argc > 1 && (!strncmp(argv[1], "-v", 3) ||
@@ -216,8 +214,7 @@ int main(int argc, char *argv[])clock_gettime (CLOCK_REALTIME , &min_ts); - vm =vm_create_default (VCPU_ID ,0 , (void *) guest_code); -vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); + vm =vm_create_with_one_vcpu (&vcpu, guest_code);/* Map a region for the shared_info page */ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
@@ -261,13 +258,13 @@ int main(int argc, char *argv[]) .type = KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, .u.gpa = VCPU_INFO_ADDR, }; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &vi); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &vi);struct kvm_xen_vcpu_attr pvclock = { .type =KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO , .u.gpa =PVTIME_ADDR , }; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &pvclock); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &pvclock);struct kvm_xen_hvm_attr vec = { .type =KVM_XEN_ATTR_TYPE_UPCALL_VECTOR ,
@@ -276,7 +273,7 @@ int main(int argc, char *argv[])vm_ioctl (vm,KVM_XEN_HVM_SET_ATTR , &vec);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); +vcpu_init_descriptor_tables (vm, vcpu->id);vm_install_exception_handler (vm,EVTCHN_VECTOR , evtchn_handler);if (do_runstate_tests) {
@@ -284,7 +281,7 @@ int main(int argc, char *argv[]) .type = KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR, .u.gpa = RUNSTATE_ADDR, }; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &st); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &st); }int irq_fd[2 ] = {-1 ,-1 };
@@ -304,13 +301,13 @@ int main(int argc, char *argv[]) irq_routes.entries[0 ].gsi =32 ; irq_routes.entries[0 ].type =KVM_IRQ_ROUTING_XEN_EVTCHN ; irq_routes.entries[0 ].u.xen_evtchn.port =15 ; - irq_routes.entries[0 ].u.xen_evtchn.vcpu =VCPU_ID ; + irq_routes.entries[0 ].u.xen_evtchn.vcpu = vcpu->id; irq_routes.entries[0 ].u.xen_evtchn.priority =KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ; irq_routes.entries[1 ].gsi =33 ; irq_routes.entries[1 ].type =KVM_IRQ_ROUTING_XEN_EVTCHN ; irq_routes.entries[1 ].u.xen_evtchn.port =66 ; - irq_routes.entries[1 ].u.xen_evtchn.vcpu =VCPU_ID ; + 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);
@@ -339,17 +336,17 @@ int main(int argc, char *argv[])bool evtchn_irq_expected = false;for (;;) { -volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +volatile struct kvm_run *run = vcpu->run;struct ucall uc; -vcpu_run (vm,VCPU_ID ); +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,VCPU_ID , &uc)) { +switch (get_ucall (vm, vcpu->id, &uc)) {case UCALL_ABORT :TEST_FAIL ("%s" , (const char *)uc.args[0 ]);/* NOT REACHED */
@@ -378,7 +375,7 @@ int main(int argc, char *argv[])printf ("Testing runstate %s\n" , runstate_names[uc.args[1 ]]); rst.type =KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_CURRENT ; rst.u.runstate.state = uc.args[1 ]; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &rst); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &rst);break ;case 4 :
@@ -393,7 +390,7 @@ int main(int argc, char *argv[])0x6b6b - rs->time[RUNSTATE_offline]; rst.u.runstate.time_runnable = -rst.u.runstate.time_blocked - rst.u.runstate.time_offline; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &rst); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &rst);break ;case 5 :
@@ -405,7 +402,7 @@ int main(int argc, char *argv[]) rst.u.runstate.state_entry_time =0x6b6b +0x5a ; rst.u.runstate.time_blocked =0x6b6b ; rst.u.runstate.time_offline =0x5a ; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &rst); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &rst);break ;case 6 :
@@ -512,7 +509,7 @@ int main(int argc, char *argv[])struct kvm_xen_vcpu_attr rst = { .type =KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_DATA , }; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_GET_ATTR , &rst); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_GET_ATTR , &rst);if (verbose) { printf("Runstate: %s(%d), entry %" PRIu64 " ns\n",
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 71/105 KVM: selftests: Convert dirty_log_test away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/dirty_log_test.c | 59 ++++++++++---------- 1 file changed, 30 insertions(+), 29 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +30 -29
@@ -23,8 +23,6 @@#include "guest_modes.h" #include "processor.h" -#define VCPU_ID 1 -/* The memory slot index to track dirty pages */ #define TEST_MEM_SLOT_INDEX 1
@@ -229,17 +227,17 @@ static void clear_log_create_vm_done(struct kvm_vm *vm)vm_enable_cap (vm, &cap); } -static void dirty_log_collect_dirty_pages (struct kvm_vm *vm,int slot, +static void dirty_log_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot,void *bitmap,uint32_t num_pages) { -kvm_vm_get_dirty_log (vm, slot, bitmap); +kvm_vm_get_dirty_log (vcpu->vm, slot, bitmap); } -static void clear_log_collect_dirty_pages (struct kvm_vm *vm,int slot, +static void clear_log_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot,void *bitmap,uint32_t num_pages) { -kvm_vm_get_dirty_log (vm, slot, bitmap); -kvm_vm_clear_dirty_log (vm, slot, bitmap,0 , num_pages); +kvm_vm_get_dirty_log (vcpu->vm, slot, bitmap); +kvm_vm_clear_dirty_log (vcpu->vm, slot, bitmap,0 , num_pages); }/* Should only be called after a GUEST_SYNC */
@@ -253,14 +251,14 @@ static void vcpu_handle_sync_stop(void) } } -static void default_after_vcpu_run (struct kvm_vm *vm,int ret,int err) +static void default_after_vcpu_run (struct kvm_vcpu *vcpu,int ret,int err) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;TEST_ASSERT (ret ==0 || (ret ==-1 && err ==EINTR ),"vcpu run failed: errno=%d" , err); -TEST_ASSERT (get_ucall (vm,VCPU_ID ,NULL ) ==UCALL_SYNC , +TEST_ASSERT (get_ucall (vcpu->vm, vcpu->id,NULL ) ==UCALL_SYNC ,"Invalid guest sync status: exit_reason=%s\n" ,exit_reason_str (run->exit_reason));
@@ -331,7 +329,7 @@ static void dirty_ring_continue_vcpu(void)sem_post (&sem_vcpu_cont); } -static void dirty_ring_collect_dirty_pages (struct kvm_vm *vm,int slot, +static void dirty_ring_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot,void *bitmap,uint32_t num_pages) {/* We only have one vcpu */
@@ -351,10 +349,10 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vm *vm, int slot, }/* Only have one vcpu */ - count =dirty_ring_collect_one (vcpu_map_dirty_ring (vm,VCPU_ID ), + count =dirty_ring_collect_one (vcpu_map_dirty_ring (vcpu->vm, vcpu->id), slot, bitmap, num_pages, &fetch_index); - cleared =kvm_vm_reset_dirty_ring (vm); + cleared =kvm_vm_reset_dirty_ring (vcpu->vm);/* Cleared pages should be the same as collected */ TEST_ASSERT(cleared == count, "Reset dirty pages (%u) mismatch "
@@ -369,12 +367,12 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vm *vm, int slot,pr_info ("Iteration %ld collected %u pages\n" , iteration, count); } -static void dirty_ring_after_vcpu_run (struct kvm_vm *vm,int ret,int err) +static void dirty_ring_after_vcpu_run (struct kvm_vcpu *vcpu,int ret,int err) { -struct kvm_run *run =vcpu_state (vm,VCPU_ID ); +struct kvm_run *run = vcpu->run;/* A ucall-sync or ring-full event is allowed */ -if (get_ucall (vm,VCPU_ID ,NULL ) ==UCALL_SYNC ) { +if (get_ucall (vcpu->vm, vcpu->id,NULL ) ==UCALL_SYNC ) {/* We should allow this to continue */ ; } else if (run->exit_reason == KVM_EXIT_DIRTY_RING_FULL ||
@@ -408,10 +406,10 @@ struct log_mode {/* Hook when the vm creation is done (before vcpu creation) */ void (*create_vm_done)(struct kvm_vm *vm);/* Hook to collect the dirty pages into the bitmap provided */ -void (*collect_dirty_pages) (struct kvm_vm *vm,int slot, +void (*collect_dirty_pages) (struct kvm_vcpu *vcpu,int slot,void *bitmap,uint32_t num_pages);/* Hook to call when after each vcpu run */ -void (*after_vcpu_run)(struct kvm_vm *vm,int ret,int err); +void (*after_vcpu_run)(struct kvm_vcpu *vcpu,int ret,int err);void (*before_vcpu_join) (void ); } log_modes[LOG_MODE_NUM] = { {
@@ -473,22 +471,22 @@ static void log_mode_create_vm_done(struct kvm_vm *vm) mode->create_vm_done (vm); } -static void log_mode_collect_dirty_pages (struct kvm_vm *vm,int slot, +static void log_mode_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot,void *bitmap,uint32_t num_pages) {struct log_mode *mode = &log_modes[host_log_mode];TEST_ASSERT (mode->collect_dirty_pages !=NULL ,"collect_dirty_pages() is required for any log mode!" ); - mode->collect_dirty_pages (vm, slot, bitmap, num_pages); + mode->collect_dirty_pages (vcpu, slot, bitmap, num_pages); } -static void log_mode_after_vcpu_run (struct kvm_vm *vm,int ret,int err) +static void log_mode_after_vcpu_run (struct kvm_vcpu *vcpu,int ret,int err) {struct log_mode *mode = &log_modes[host_log_mode];if (mode->after_vcpu_run) - mode->after_vcpu_run (vm, ret, err); + mode->after_vcpu_run (vcpu, ret, err); }static void log_mode_before_vcpu_join (void )
@@ -510,7 +508,8 @@ static void generate_random_array(uint64_t *guest_array, uint64_t size)static void *vcpu_worker (void *data) {int ret; -struct kvm_vm *vm = data; +struct kvm_vcpu *vcpu = data; +struct kvm_vm *vm = vcpu->vm;uint64_t *guest_array;uint64_t pages_count =0 ; struct kvm_signal_mask *sigmask = alloca(offsetof(struct kvm_signal_mask, sigset)
@@ -525,7 +524,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 (vm, vcpu->id,KVM_SET_SIGNAL_MASK , sigmask);sigemptyset (sigset);sigaddset (sigset,SIG_IPI );
@@ -537,13 +536,13 @@ 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 (vm, vcpu->id);if (ret ==-1 && errno ==EINTR ) {int sig =-1 ;sigwait (sigset, &sig);assert (sig ==SIG_IPI ); } -log_mode_after_vcpu_run (vm, ret, errno); +log_mode_after_vcpu_run (vcpu, ret, errno); }pr_info ("Dirtied %" PRIu64" pages\n" , pages_count);
@@ -699,6 +698,7 @@ struct test_params {static void run_test (enum vm_guest_mode mode,void *arg) {struct test_params *p = arg; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;unsigned long *bmap;
@@ -716,9 +716,10 @@ 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,VCPU_ID , + vm =create_vm (mode,0 ,2ul << (DIRTY_MEM_BITS -PAGE_SHIFT_4K ), guest_code); + vcpu =vcpu_get (vm,0 ); guest_page_size =vm_get_page_size (vm);/*
@@ -779,12 +780,12 @@ static void run_test(enum vm_guest_mode mode, void *arg) host_clear_count =0 ; host_track_next_count =0 ; -pthread_create (&vcpu_thread,NULL , vcpu_worker, vm); +pthread_create (&vcpu_thread,NULL , vcpu_worker, vcpu);while (iteration < p->iterations) {/* Give the vcpu thread some time to dirty some pages */ usleep (p->interval *1000 ); -log_mode_collect_dirty_pages (vm,TEST_MEM_SLOT_INDEX , +log_mode_collect_dirty_pages (vcpu,TEST_MEM_SLOT_INDEX , bmap, host_num_pages);/*
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 72/105 KVM: selftests: Convert set_memory_region_test away from VCPU_ID
In reply to Sean Christopherson--- .../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 (0 ); -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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 73/105 KVM: selftests: Convert system_counter_offset_test away from VCPU_ID
In reply to Sean Christopherson--- .../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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 74/105 KVM: selftests: Convert debug-exceptions away from VCPU_ID
In reply to Sean Christopherson--- .../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)
@@ -186,27 +184,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 );
@@ -224,9 +223,9 @@ int main(int argc, char *argv[]) ESR_EC_SVC64, guest_svc_handler);for (stage =0 ; stage <7 ; 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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 75/105 KVM: selftests: Convert vgic_irq.c include/aarch64/vgic.h lib/aarch64/vgic away from VCPU_ID
In reply to Sean Christopherson--- .../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
@@ -586,7 +585,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
@@ -657,15 +657,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;
@@ -703,12 +704,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 ;
@@ -737,6 +738,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;
@@ -750,14 +752,14 @@ 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). */ -vcpu_args_set (vm,0 ,1 , args); +vcpu_args_set (vm, vcpu->id,1 , args); gic_fd =vgic_v3_setup (vm,1 , nr_irqs,GICD_BASE_GPA ,GICR_BASE_GPA );
@@ -766,12 +768,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) ret, errno); } -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 ;
@@ -144,7 +144,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 ; }
@@ -158,12 +158,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 76/105 KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only
In reply to Sean Christopherson--- 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
@@ -185,4 +185,6 @@ static inline void local_irq_disable(void) asm volatile("msr daifset, #3" : : : "memory"); } +uint32_t guest_get_vcpuid (void ); +#endif /* SELFTEST_KVM_PROCESSOR_H */
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -2
@@ -694,6 +694,4 @@ void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid);int vm_get_stats_fd (struct kvm_vm *vm); -uint32_t guest_get_vcpuid (void ); -#endif /* SELFTEST_KVM_UTIL_BASE_H */
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 77/105 KVM: selftests: Move vm_is_unrestricted_guest() to x86-64
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 7 ---- .../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(+), 40 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -7
@@ -647,8 +647,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);
@@ -675,11 +673,6 @@ struct kvm_userspace_memory_region * kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start, uint64_t end); -struct kvm_dirty_log * -allocate_kvm_dirty_log (struct kvm_userspace_memory_region *region); - -int vm_create_device (struct kvm_vm *vm,struct kvm_create_device *cd); -#define sync_global_to_guest (vm, g) ({ \ typeof(g) *_p = addr_gva2hva(vm, (vm_vaddr_t)&(g)); \ memcpy(_p, &(g), sizeof(g)); \
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
@@ -430,6 +430,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
@@ -1936,39 +1936,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
@@ -1440,3 +1440,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 78/105 KVM: selftests: Add "arch" to common utils that have arch implementations
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 201 ++++++++++-------- .../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(+), 108 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +117 -84
@@ -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);
@@ -283,26 +266,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_userspace_mem_region_add(struct kvm_vm *vm,
@@ -325,23 +288,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);
@@ -565,26 +511,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,
@@ -637,16 +563,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);
@@ -687,4 +603,121 @@ void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid);int vm_get_stats_fd (struct kvm_vm *vm); +/* +* 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;
@@ -273,7 +273,7 @@ static void guest_hang(void) ; } -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
@@ -141,7 +141,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);
@@ -244,7 +244,7 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, pte->present =1 ; } -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 ); }
@@ -341,7 +341,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) {struct pageUpperEntry *pml4e, *pml4e_start;struct pageUpperEntry *pdpe, *pdpe_start;
@@ -522,7 +522,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 ];struct pageUpperEntry *pml4e, *pdpe, *pde;
@@ -671,7 +671,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;
@@ -932,7 +932,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 79/105 KVM: selftests: Return created vcpu from vm_vcpu_add_default()
In reply to Sean Christopherson--- .../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 | 18 ++++++++++------- .../selftests/kvm/lib/s390x/processor.c | 18 ++++++++++------- .../selftests/kvm/lib/x86_64/processor.c | 20 +++++++++++-------- 6 files changed, 55 insertions(+), 36 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
@@ -637,12 +637,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 +11 -7
@@ -273,7 +273,8 @@ static void guest_hang(void) ; } -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 ?
@@ -283,8 +284,9 @@ 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); + vcpu =vm_vcpu_add (vm, vcpuid);riscv_vcpu_mmu_setup (vm, vcpuid);/*
@@ -293,23 +295,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_hang); + +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, vcpuid);/* 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
@@ -671,29 +671,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_set_mp_state (vm, vcpuid, &mp_state); +vcpu_set_mp_state (vm, vcpu_id, &mp_state); + +return vcpu; }/*
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 80/105 KVM: selftests: Rename vm_vcpu_add* helpers to better show relationships
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/get-reg-list.c | 2 +- tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c | 4 ++-- 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 +- 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/xapic_ipi_test.c | 2 +- 20 files changed, 37 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -413,7 +413,7 @@ 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 ); +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_cpu_on_test.c +2 -2
@@ -83,13 +83,13 @@ int main(void)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_main); +aarch64_vcpu_add (vm,VCPU_ID_SOURCE , &init, guest_main);/* * make sure the target is already off when executing the test. */ init.features[0 ] |= (1 <<KVM_ARM_VCPU_POWER_OFF ); -aarch64_vcpu_add_default (vm,VCPU_ID_TARGET , &init, guest_main); +aarch64_vcpu_add (vm,VCPU_ID_TARGET , &init, guest_main);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 );
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
@@ -682,7 +682,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,vm_create_irqchip (vm);#endif 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
@@ -110,7 +110,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
@@ -276,7 +276,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);
@@ -640,9 +640,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 (DEFAULT_GUEST_PHY_PAGES );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
@@ -344,7 +344,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;
@@ -413,7 +413,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 ); }/*
@@ -1060,7 +1060,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
@@ -286,7 +286,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, vcpuid); + vcpu =__vm_vcpu_add (vm, vcpuid);riscv_vcpu_mmu_setup (vm, vcpuid);/*
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, vcpuid); + 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
@@ -682,7 +682,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 (0 ); - 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
@@ -282,7 +282,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/set_boot_cpu_id.c +2 -2
@@ -99,9 +99,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 (DEFAULT_GUEST_PHY_PAGES ); - 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
@@ -54,7 +54,7 @@ static struct kvm_vm *sev_vm_create(bool es) vm =vm_create (0 );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);
@@ -73,7 +73,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; }
@@ -177,7 +177,7 @@ static void test_sev_migrate_parameters(void) vm_no_sev =aux_vm_create (true); sev_es_vm_no_vmsa =vm_create (0 );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->fd, sev_es_vm->fd); TEST_ASSERT(
@@ -282,7 +282,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/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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 81/105 KVM: selftests: Convert set_boot_cpu_id away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 85 ++++++++----------- 1 file changed, 34 insertions(+), 51 deletions(-)
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +34 -51
@@ -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,17 +70,19 @@ 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[]) { -struct kvm_vm *vm; -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; pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); vm =vm_create (pages);
@@ -93,54 +90,40 @@ static struct kvm_vm *create_vm(void)kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm); +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 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); -} - -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 (); + vm =create_vm (ARRAY_SIZE (vcpus), bsp_vcpu_id, vcpus); -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); - -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); }
@@ -152,9 +135,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 82/105 KVM: selftests: Convert psci_cpu_on_test away from VCPU_ID
In reply to Sean Christopherson--- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +9 -11
@@ -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
@@ -72,6 +69,7 @@ static void guest_main(uint64_t target_cpu)int main (void ) {uint64_t target_mpidr, obs_pc, obs_x0; +struct kvm_vcpu *vcpu0, *vcpu1;struct kvm_vcpu_init init;struct kvm_vm *vm;struct ucall uc;
@@ -83,19 +81,19 @@ int main(void)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_main); + vcpu0 =aarch64_vcpu_add (vm,0 , &init, guest_main);/* * make sure the target is already off when executing the test. */ init.features[0 ] |= (1 <<KVM_ARM_VCPU_POWER_OFF ); -aarch64_vcpu_add (vm,VCPU_ID_TARGET , &init, guest_main); + vcpu1 =aarch64_vcpu_add (vm,1 , &init, guest_main); -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 ); -vcpu_run (vm,VCPU_ID_SOURCE ); +get_reg (vm, vcpu1->id,KVM_ARM64_SYS_REG (SYS_MPIDR_EL1 ), &target_mpidr); +vcpu_args_set (vm, vcpu0->id,1 , target_mpidr &MPIDR_HWID_BITMASK ); +vcpu_run (vm, vcpu0->id); -switch (get_ucall (vm,VCPU_ID_SOURCE , &uc)) { +switch (get_ucall (vm, vcpu0->id, &uc)) {case UCALL_DONE :break ;case UCALL_ABORT :
@@ -106,8 +104,8 @@ int main(void)TEST_FAIL ("Unhandled ucall: %lu" , uc.cmd); } -get_reg (vm,VCPU_ID_TARGET ,ARM64_CORE_REG (regs.pc), &obs_pc); -get_reg (vm,VCPU_ID_TARGET ,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); +get_reg (vm, vcpu1->id,ARM64_CORE_REG (regs.pc), &obs_pc); +get_reg (vm, vcpu1->id,ARM64_CORE_REG (regs.regs[0 ]), &obs_x0); TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, "unexpected target cpu pc: %lx (expected: %lx)",
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 83/105 KVM: selftests: Convert hardware_disable_test away from VCPU_ID
In reply to Sean Christopherson--- .../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;
@@ -110,12 +104,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 84/105 KVM: selftests: Add VM creation helper that "returns" vCPUs
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 16 ++++++++++++---- .../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, 26 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +12 -4
@@ -541,11 +541,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
@@ -305,12 +305,13 @@ struct kvm_vm *vm_create(uint64_t phy_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;
@@ -344,7 +345,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;
@@ -354,8 +357,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 85/105 KVM: selftests: Convert steal_time away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/steal_time.c | 120 +++++++++++------------ 1 file changed, 60 insertions(+), 60 deletions(-)
tools/testing/selftests/kvm/steal_time.c +60 -60
@@ -58,36 +58,33 @@ 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);
@@ -165,49 +162,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);
@@ -231,15 +229,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 ;
@@ -248,12 +244,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;
@@ -274,25 +271,28 @@ int main(int ac, char **av)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); + 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 ();
@@ -313,7 +313,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 86/105 KVM: selftests: Convert arch_timer away from VCPU_ID
In reply to Sean Christopherson--- .../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);
@@ -366,17 +362,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 87/105 KVM: selftests: Fix typo in vgic_init test
In reply to Sean Christopherson--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +1 -1
@@ -418,7 +418,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,0 ,GICR_TYPER , &val); + ret =v3_redist_reg_get (v.gic_fd, i,GICR_TYPER , &val);TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); }
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 88/105 KVM: selftests: Convert vgic_init away from vm_create_default_with_vcpus()
In reply to Sean Christopherson--- .../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);
@@ -393,26 +398,27 @@ static void test_v3_new_redist_regions(void)static void test_v3_typer_accesses (void ) { +struct kvm_vcpu *vcpus[NR_VCPUS ];struct vm_gic v;uint64_t addr;uint32_t val;int ret, i; - v.vm =vm_create_default (0 ,0 , guest_code); + v.vm =vm_create_with_one_vcpu (&vcpus[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); + vcpus[3 ] =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); + vcpus[1 ] =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); + vcpus[2 ] =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_with_vcpus (0 ,NULL ,NULL ); +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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 89/105 KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID
In reply to Sean Christopherson--- .../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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 90/105 KVM: selftests: Convert sync_regs_test away from VCPU_ID
In reply to Sean Christopherson--- .../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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 91/105 KVM: selftests: Convert resets away from VCPU_ID
In reply to Sean Christopherson--- 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,25 +56,25 @@ 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) {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 (vcpu->vm, vcpu->id, ®);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
@@ -86,19 +84,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 */
@@ -112,8 +111,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,
@@ -127,13 +128,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)" );
@@ -156,36 +158,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 ];
@@ -195,73 +199,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_with_vcpus (0 ,NULL ,NULL ); + + *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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 92/105 KVM: selftests: Convert memop away from VCPU_ID
In reply to Sean Christopherson--- tools/testing/selftests/kvm/s390x/memop.c | 31 +++++++++++------------ 1 file changed, 15 insertions(+), 16 deletions(-)
tools/testing/selftests/kvm/s390x/memop.c +15 -16
@@ -13,8 +13,6 @@#include "test_util.h" #include "kvm_util.h" -#define VCPU_ID 1 -static uint8_t mem1[65536 ];static uint8_t mem2[65536 ];
@@ -31,6 +29,7 @@ static void guest_code(void)int main (int argc,char *argv[]) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;struct kvm_s390_mem_op ksmo;
@@ -47,8 +46,8 @@ int main(int argc, char *argv[]) maxsize =sizeof (mem1);/* Create VM */ - 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;for (i =0 ; i <sizeof (mem1); i++) mem1[i] = i * i + i;
@@ -60,10 +59,10 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; -vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); +vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);/* Let the guest code copy the first array to the second */ -vcpu_run (vm,VCPU_ID ); +vcpu_run (vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_S390_SIEIC, "Unexpected exit reason: %u (%s)\n", run->exit_reason,
@@ -78,7 +77,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_READ ; ksmo.buf = (uintptr_t )mem2; ksmo.ar =0 ; -vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); +vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (!memcmp (mem1, mem2, maxsize),"Memory contents do not match!" );
@@ -90,7 +89,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==E2BIG ,"ioctl allows insane sizes" );/* Zero size: */
@@ -100,7 +99,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && (errno ==EINVAL || errno ==ENOMEM ),"ioctl allows 0 as size" );
@@ -111,7 +110,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows all flags" );/* Bad operation: */
@@ -121,7 +120,7 @@ int main(int argc, char *argv[]) ksmo.op =-1 ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows bad operations" );/* Bad guest address: */
@@ -131,7 +130,7 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv >0 ,"ioctl does not report bad guest memory access" );/* Bad host address: */
@@ -141,24 +140,24 @@ int main(int argc, char *argv[]) ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf =0 ; ksmo.ar =0 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EFAULT ,"ioctl does not report bad host memory address" );/* Bad access register: */ run->psw_mask &= ~(3UL << (63 -17 )); run->psw_mask |=1UL << (63 -17 );/* Enable AR mode */ -vcpu_run (vm,VCPU_ID );/* To sync new state to SIE block */ +vcpu_run (vm, vcpu->id);/* To sync new state to SIE block */ ksmo.gaddr = (uintptr_t )mem1; ksmo.flags =0 ; ksmo.size = maxsize; ksmo.op =KVM_S390_MEMOP_LOGICAL_WRITE ; ksmo.buf = (uintptr_t )mem1; ksmo.ar =17 ; - rv =__vcpu_ioctl (vm,VCPU_ID ,KVM_S390_MEM_OP , &ksmo); + rv =__vcpu_ioctl (vm, vcpu->id,KVM_S390_MEM_OP , &ksmo);TEST_ASSERT (rv ==-1 && errno ==EINVAL ,"ioctl allows ARs > 15" ); run->psw_mask &= ~(3UL << (63 -17 ));/* Disable AR mode */ -vcpu_run (vm,VCPU_ID );/* Run to sync new state */ +vcpu_run (vm, vcpu->id);/* Run to sync new state */ kvm_vm_free (vm);
Signature · 1 line
2.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 93/105 KVM: selftests: Convert s390x/diag318_test_handler away from VCPU_ID
In reply to Sean Christopherson--- .../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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 94/105 KVM: selftests: Drop vm_create_default* helpers
In reply to Sean Christopherson--- .../selftests/kvm/include/kvm_util_base.h | 24 ------------------- tools/testing/selftests/kvm/lib/kvm_util.c | 23 +++++------------- 2 files changed, 6 insertions(+), 41 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -24
@@ -517,30 +517,6 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, vm_paddr_t paddr_min, uint32_t memslot);vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm); -/* -* 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, uint32_t num_percpu_pages, void *guest_code,
tools/testing/selftests/kvm/lib/kvm_util.c +6 -17
@@ -353,28 +353,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 95/105 KVM: selftests: Drop vcpuids param from VM creators
In reply to Sean Christopherson--- 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
@@ -520,7 +520,7 @@ vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm);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,
@@ -528,7 +528,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
@@ -308,7 +308,7 @@ struct kvm_vm *vm_create(uint64_t phy_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;
@@ -343,9 +343,7 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus#endif 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; }
@@ -361,7 +359,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.35.1.723.g4982287a31-goog
Sean Christopherson
reviewerRFC PATCH 96/105 KVM: selftests: Convert kvm_page_table_test away from reliance on vcpu_id
In reply to Sean Christopherson--- .../selftests/kvm/kvm_page_table_test.c | 61 +++++++------------ 1 file changed, 21 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/kvm_page_table_test.c +21 -40
@@ -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,9 +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);
@@ -424,13 +405,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.35.1.723.g4982287a31-goog