KVM: selftests: Overhaul APIs, purge VCPU_ID
Subsystems (5)
Sean Christopherson
reviewerv2 cover KVM: selftests: Overhaul APIs, purge VCPU_ID
Overhaul KVM's selftest APIs to get selftests to a state where adding new features and writing tests is less painful/disgusting.
Patches 1 fixes a goof in kvm/queue and should be squashed.
I would really, really, really like to get this queued up sooner than later, or maybe just thrown into a separate selftests-specific branch that folks can develop against. Rebasing is tedious, frustrating, and time consuming. And spoiler alert, there's another 42 x86-centric patches inbound that builds on this series to clean up CPUID related crud...
The primary theme is to stop treating tests like second class citizens. Stop hiding vcpu, kvm_vm, etc... There's no sensitive data/constructs, and the encapsulation has led to really, really bad and difficult to maintain code. E.g. having to pass around the VM just to call a vCPU ioctl(), arbitrary non-zero vCPU IDs, tests having to care about the vCPU ID in the first place, etc...
The other theme in the rework is to deduplicate code and try to set us up for success in the future. E.g. provide macros/helpers instead of spamming CTRL-C => CTRL-V (see the -1k LoC), structure the VM creation APIs to build on one another, etc...
The absurd patch count (as opposed to just ridiculous) is due to converting each test away from using hardcoded vCPU IDs in a separate patch. The vast majority of those patches probably aren't worth reviewing in depth, the changes are mostly mechanical in nature.
However, _running_ non-x86 tests (or tests that have unique non-x86 behavior) would be extremely valuable. All patches have been compile tested on x86, arm, risc-v, and s390, but I've only run the tests on x86. Based on my track record for the x86+common tests, I will be very, very surprised if I didn't break any of the non-x86 tests, e.g. pthread_create()'s 'void *' param tripped me up multiple times.
I have not run x86's amx_test due to lack of hardware. I also haven't run sev_migration; something is wonky in either the upstream support for INIT_EX or in our test machines and I can't get SEV to initialize.
v2:
- Drop the forced -Werror patch. [Vitaly]
- Add TEST_REQUIRE to reduce KSFT_SKIP boilerplate.
- Rebase to kvm/queue, commit 55371f1d0c01.
- Clean up even more bad copy+paste code (x86 was hiding a lot of crud).
- Assert that the input to an ioctl() is (likely) the correct struct.
v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (144):
KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT
KVM: selftests: Fix buggy-but-benign check in
test_v3_new_redist_regions()
KVM: selftests: Fix typo in vgic_init test
KVM: selftests: Drop stale declarations from kvm_util_base.h
KVM: selftests: Always open VM file descriptors with O_RDWR
KVM: selftests: 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: 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: Use __KVM_SYSCALL_ERROR() to handle non-KVM syscall
errors
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 *_has_device_attr()
KVM: selftests: Split get/set device_attr helpers
KVM: selftests: Add a VM backpointer to 'struct vcpu'
KVM: selftests: Consolidate KVM_ENABLE_CAP usage
KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs
KVM: selftests: Cache list of MSRs to save/restore
KVM: selftests: Harden and comment XSS / KVM_SET_MSRS interaction
KVM: selftests: Dedup MSR index list helpers, simplify dedicated test
KVM: selftests: Rename MP_STATE and GUEST_DEBUG helpers for
consistency
KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
KVM: selftests: Add vm_create_*() variants to expose/return 'struct
vcpu'
KVM: selftests: Push vm_adjust_num_guest_pages() into "w/o vCPUs"
helper
KVM: selftests: Use vm_create_without_vcpus() in set_boot_cpu_id
KVM: selftests: Use vm_create_without_vcpus() in dirty_log_test
KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test
KVM: selftests: Use vm_create_without_vcpus() in psci_test
KVM: selftests: Rename vm_create() => vm_create_barebones(), drop
param
KVM: selftests: Rename vm_create_without_vcpus() => vm_create()
KVM: selftests: Make vm_create() a wrapper that specifies
VM_MODE_DEFAULT
KVM: selftests: Rename xAPIC state test's vcpu struct
KVM: selftests: Rename vcpu.state => vcpu.run
KVM: selftests: Rename 'struct vcpu' to '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: Track kvm_vcpu object in tsc_scaling_sync
KVM: selftests: Convert xapic_state_test away from hardcoded vCPU ID
KVM: selftests: Convert debug-exceptions away from VCPU_ID
KVM: selftests: Convert fix_hypercall_test away from VCPU_ID
KVM: selftests: Convert vgic_irq 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 global VCPU_IDs
KVM: selftests: Convert psci_test away from VCPU_ID
KVM: selftests: Convert hardware_disable_test to pass around vCPU
objects
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: Convert svm_nested_soft_inject_test away from VCPU_ID
KVM: selftests: Convert triple_fault_event_test away from VCPU_ID
KVM: selftests: Convert vgic_init away from
vm_create_default_with_vcpus()
KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers
KVM: selftests: Sync stage before VM is freed in hypercalls test
KVM: selftests: Convert hypercalls test away from vm_create_default()
KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID
KVM: selftests: Convert sync_regs_test away from VCPU_ID
KVM: selftests: Convert s390's "resets" test 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: Convert tprot away from VCPU_ID
KVM: selftests: Use vm_create() in tsc_scaling_sync
KVM: selftests: Use vm_create_with_vcpus() in max_guest_memory_test
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 IDs
KVM: selftests: Convert get-reg-list away from its "VCPU_ID"
KVM: selftests: Stop hardcoding vCPU IDs in vcpu_width_config
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: selftests: 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 'struct kvm_vm' accessors
KVM: selftests: Drop @slot0_mem_pages from __vm_create_with_vcpus()
KVM: selftests: Drop @num_percpu_pages from __vm_create_with_vcpus()
KVM: selftests: Move per-VM/per-vCPU nr pages calculation to
__vm_create()
KVM: selftests: Trust that MAXPHYADDR > memslot0 in
vmx_apic_access_test
KVM: selftests: Drop DEFAULT_GUEST_PHY_PAGES, open code the magic
number
KVM: selftests: Return an 'unsigned int' from kvm_check_cap()
KVM: selftests: Add kvm_has_cap() to provide syntactic sugar
KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste
KVM: selftests: Sanity check input to ioctls() at build time
Documentation/virt/kvm/api.rst | 4 +- .../selftests/kvm/aarch64/arch_timer.c | 79 +- .../selftests/kvm/aarch64/debug-exceptions.c | 22 +- .../selftests/kvm/aarch64/get-reg-list.c | 29 +- .../selftests/kvm/aarch64/hypercalls.c | 90 +- .../testing/selftests/kvm/aarch64/psci_test.c | 69 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 71 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 379 +++--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 40 +- .../selftests/kvm/access_tracking_perf_test.c | 92 +- .../selftests/kvm/demand_paging_test.c | 49 +- .../selftests/kvm/dirty_log_perf_test.c | 51 +- tools/testing/selftests/kvm/dirty_log_test.c | 95 +- .../selftests/kvm/hardware_disable_test.c | 29 +- .../selftests/kvm/include/aarch64/processor.h | 28 +- .../selftests/kvm/include/aarch64/vgic.h | 6 +- .../selftests/kvm/include/kvm_util_base.h | 743 ++++++++--- .../selftests/kvm/include/perf_test_util.h | 5 +- .../selftests/kvm/include/riscv/processor.h | 20 - .../testing/selftests/kvm/include/test_util.h | 9 + .../selftests/kvm/include/ucall_common.h | 2 +- .../selftests/kvm/include/x86_64/evmcs.h | 2 +- .../selftests/kvm/include/x86_64/processor.h | 109 +- .../selftests/kvm/kvm_binary_stats_test.c | 31 +- .../selftests/kvm/kvm_create_max_vcpus.c | 10 +- .../selftests/kvm/kvm_page_table_test.c | 66 +- .../selftests/kvm/lib/aarch64/processor.c | 81 +- .../testing/selftests/kvm/lib/aarch64/ucall.c | 9 +- .../testing/selftests/kvm/lib/aarch64/vgic.c | 54 +- tools/testing/selftests/kvm/lib/elf.c | 1 - tools/testing/selftests/kvm/lib/guest_modes.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 1104 +++-------------- .../selftests/kvm/lib/kvm_util_internal.h | 128 -- .../selftests/kvm/lib/perf_test_util.c | 84 +- .../selftests/kvm/lib/riscv/processor.c | 111 +- tools/testing/selftests/kvm/lib/riscv/ucall.c | 14 +- .../kvm/lib/s390x/diag318_test_handler.c | 11 +- .../selftests/kvm/lib/s390x/processor.c | 44 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 8 +- .../selftests/kvm/lib/x86_64/processor.c | 533 +++----- tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 +- .../testing/selftests/kvm/lib/x86_64/ucall.c | 10 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 16 +- .../selftests/kvm/max_guest_memory_test.c | 53 +- .../kvm/memslot_modification_stress_test.c | 13 +- .../testing/selftests/kvm/memslot_perf_test.c | 28 +- tools/testing/selftests/kvm/rseq_test.c | 22 +- tools/testing/selftests/kvm/s390x/memop.c | 93 +- tools/testing/selftests/kvm/s390x/resets.c | 140 ++- .../selftests/kvm/s390x/sync_regs_test.c | 45 +- tools/testing/selftests/kvm/s390x/tprot.c | 25 +- .../selftests/kvm/set_memory_region_test.c | 43 +- tools/testing/selftests/kvm/steal_time.c | 120 +- .../kvm/system_counter_offset_test.c | 35 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 56 +- .../testing/selftests/kvm/x86_64/cpuid_test.c | 29 +- .../kvm/x86_64/cr4_cpuid_sync_test.c | 22 +- .../testing/selftests/kvm/x86_64/debug_regs.c | 77 +- .../kvm/x86_64/emulator_error_test.c | 74 +- .../testing/selftests/kvm/x86_64/evmcs_test.c | 61 +- .../selftests/kvm/x86_64/fix_hypercall_test.c | 45 +- .../kvm/x86_64/get_msr_index_features.c | 117 +- .../selftests/kvm/x86_64/hyperv_clock.c | 25 +- .../selftests/kvm/x86_64/hyperv_cpuid.c | 34 +- .../selftests/kvm/x86_64/hyperv_features.c | 61 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 20 +- .../selftests/kvm/x86_64/kvm_clock_test.c | 29 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 33 +- .../kvm/x86_64/max_vcpuid_cap_test.c | 28 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 16 +- .../selftests/kvm/x86_64/mmu_role_test.c | 30 +- .../selftests/kvm/x86_64/platform_info_test.c | 51 +- .../kvm/x86_64/pmu_event_filter_test.c | 97 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 91 +- .../selftests/kvm/x86_64/set_sregs_test.c | 47 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 120 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 37 +- .../testing/selftests/kvm/x86_64/state_test.c | 29 +- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 17 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 16 +- .../selftests/kvm/x86_64/sync_regs_test.c | 62 +- .../kvm/x86_64/triple_fault_event_test.c | 39 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 35 +- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 25 +- .../selftests/kvm/x86_64/userspace_io_test.c | 18 +- .../kvm/x86_64/userspace_msr_exit_test.c | 187 ++- .../kvm/x86_64/vmx_apic_access_test.c | 27 +- .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 13 +- .../vmx_exception_with_invalid_guest_state.c | 68 +- .../x86_64/vmx_invalid_nested_guest_state.c | 18 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 29 +- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 48 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 35 +- .../kvm/x86_64/vmx_set_nested_state_test.c | 91 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 13 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 48 +- .../selftests/kvm/x86_64/xapic_state_test.c | 60 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 73 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 25 +- .../selftests/kvm/x86_64/xss_msr_test.c | 56 +- 102 files changed, 3059 insertions(+), 4178 deletions(-) delete mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h
base-commit: 55371f1d0c01357f29da613f7525c3f252320bbf
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 1/144 KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT
The x86-only KVM_CAP_TRIPLE_FAULT_EVENT was (appropriately) renamed to KVM_CAP_X86_TRIPLE_FAULT_EVENT when the patches were applied, but the docs and selftests got left behind. Fix them.
--- Documentation/virt/kvm/api.rst | 4 ++-- .../testing/selftests/kvm/x86_64/triple_fault_event_test.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
Documentation/virt/kvm/api.rst +2 -2
@@ -1152,7 +1152,7 @@ The following bits are defined in the flags field: - KVM_VCPUEVENT_VALID_TRIPLE_FAULT may be set to signal that the triple_fault_pending field contains a valid state. This bit will - be set whenever KVM_CAP_TRIPLE_FAULT_EVENT is enabled. + be set whenever KVM_CAP_X86_TRIPLE_FAULT_EVENT is enabled. ARM64: ^^^^^^
@@ -1249,7 +1249,7 @@ can be set in the flags field to signal that the exception_has_payload, exception_payload, and exception.pending fields contain a valid state and shall be written into the VCPU. -If KVM_CAP_TRIPLE_FAULT_EVENT is enabled, KVM_VCPUEVENT_VALID_TRIPLE_FAULT +If KVM_CAP_X86_TRIPLE_FAULT_EVENT is enabled, KVM_VCPUEVENT_VALID_TRIPLE_FAULT can be set in flags field to signal that the triple_fault field contains a valid state and shall be written into the VCPU.
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +3 -3
@@ -47,7 +47,7 @@ int main(void)struct ucall uc;struct kvm_enable_cap cap = { - .cap =KVM_CAP_TRIPLE_FAULT_EVENT , + .cap =KVM_CAP_X86_TRIPLE_FAULT_EVENT , .args = {1 } };
@@ -56,8 +56,8 @@ int main(void)exit (KSFT_SKIP ); } -if (!kvm_check_cap (KVM_CAP_TRIPLE_FAULT_EVENT )) { -print_skip ("KVM_CAP_TRIPLE_FAULT_EVENT not supported" ); +if (!kvm_check_cap (KVM_CAP_X86_TRIPLE_FAULT_EVENT )) { +print_skip ("KVM_CAP_X86_TRIPLE_FAULT_EVENT not supported" );exit (KSFT_SKIP ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 2/144 KVM: selftests: Fix buggy-but-benign check in test_v3_new_redist_regions()
In reply to Sean ChristophersonUpdate 'ret' with the return value of _kvm_device_access() prior to asserting that ret is non-zero. In the current code base, the flaw is benign as 'ret' is guaranteed to be -EBUSY from the previous run_vcpu(), which also means that errno==EBUSY prior to _kvm_device_access(), thus the "errno == EFAULT" part of the assert means that a false negative is impossible (unless the kernel is being truly mean and spuriously setting errno=EFAULT while returning success).
--- 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 3/144 KVM: selftests: Fix typo in vgic_init test
In reply to Sean ChristophersonWhen iterating over vCPUs, invoke access_v3_redist_reg() on the "current" vCPU instead of vCPU0, which is presumably what was intended by iterating over all vCPUs.
--- 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
@@ -426,7 +426,7 @@ static void test_v3_typer_accesses(void) KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);for (i =0 ; i <NR_VCPUS ; i++) { - ret =access_v3_redist_reg (v.gic_fd,0 ,GICR_TYPER , &val, false); + ret =access_v3_redist_reg (v.gic_fd, i,GICR_TYPER , &val, false);TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 4/144 KVM: selftests: Drop stale declarations from kvm_util_base.h
In reply to Sean ChristophersonDrop declarations for allocate_kvm_dirty_log() and vm_create_device(), which no longer have implementations.
--- tools/testing/selftests/kvm/include/kvm_util_base.h | 5 ----- 1 file changed, 5 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +0 -5
@@ -381,11 +381,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)); \
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 5/144 KVM: selftests: Always open VM file descriptors with O_RDWR
In reply to Sean ChristophersonDrop the @perm param from vm_create() and always open VM file descriptors with O_RDWR. There's no legitimate use case for other permissions, and if a selftest wants to do oddball negative testing it can open code the necessary bits instead of forcing a bunch of tests to provide useless information.
--- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../testing/selftests/kvm/aarch64/psci_test.c | 2 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 6 +++--- 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 +- .../kvm/x86_64/max_vcpuid_cap_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 +- 19 files changed, 34 insertions(+), 36 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -416,7 +416,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_test.c +1 -1
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)struct kvm_vcpu_init init;struct kvm_vm *vm; - 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/aarch64/vcpu_width_config.c +3 -3
@@ -24,7 +24,7 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - 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,0 ); ret =_vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);
@@ -49,7 +49,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - 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,0 );vm_vcpu_add (vm,1 );
@@ -86,7 +86,7 @@ int main(void) }/* Get the preferred target type and copy that to init2 for later use */ - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init1);kvm_vm_free (vm); init2 = init1;
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 ();
@@ -366,7 +365,7 @@ struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) {struct kvm_vm *vm; - vm =vm_create (mode, pages,O_RDWR ); + vm =vm_create (mode, pages);kvm_vm_elf_load (vm, program_invocation_name);
@@ -458,7 +457,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 *
@@ -466,12 +464,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),
@@ -354,7 +354,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
@@ -431,7 +431,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
@@ -183,7 +183,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/max_vcpuid_cap_test.c +1 -1
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])struct kvm_enable_cap cap = {0 };int ret; - vm =vm_create (VM_MODE_DEFAULT ,0 ,O_RDWR ); + vm =vm_create (VM_MODE_DEFAULT ,0 );/* Get KVM_CAP_MAX_VCPU_ID cap supported in KVM */ ret =vm_check_cap (vm,KVM_CAP_MAX_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
@@ -54,7 +54,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);
@@ -71,7 +71,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,7 +174,7 @@ static void test_sev_migrate_parameters(void) *sev_es_vm_no_vmsa;int ret; - 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); ret =__sev_migrate_from (vm_no_vcpu->fd, vm_no_sev->fd); TEST_ASSERT(ret == -1 && errno == EINVAL,
@@ -186,7 +186,7 @@ static void test_sev_migrate_parameters(void) sev_vm =sev_vm_create (/* es= */ false); sev_es_vm =sev_vm_create (/* es= */ 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
@@ -204,7 +204,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 6/144 KVM: selftests: Add another underscore to inner ioctl() helpers
In reply to Sean ChristophersonAdd a second underscore to inner ioctl() helpers to better align with commonly accepted kernel coding style, and to allow using a single underscore variant in the future for macro shenanigans.
--- .../selftests/kvm/aarch64/get-reg-list.c | 6 ++--- .../selftests/kvm/aarch64/hypercalls.c | 2 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 8 +++---- .../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 | 4 ++-- 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 +- 13 files changed, 39 insertions(+), 39 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +3 -3
@@ -457,7 +457,7 @@ static void run_test(struct vcpu_config *c)bool reject_reg = false;int ret; - ret =_vcpu_ioctl (vm,0 ,KVM_GET_ONE_REG , ®); + ret =__vcpu_ioctl (vm,0 ,KVM_GET_ONE_REG , ®);if (ret) {printf ("%s: Failed to get " ,config_name (c));print_reg (c, reg.id);
@@ -469,7 +469,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);
@@ -481,7 +481,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/hypercalls.c +1 -1
@@ -148,7 +148,7 @@ static int set_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t val) .addr = (uint64_t)&val, }; -return _vcpu_ioctl (vm,0 ,KVM_SET_ONE_REG , ®); +return __vcpu_ioctl (vm,0 ,KVM_SET_ONE_REG , ®); }static void get_fw_reg (struct kvm_vm *vm,uint64_t id,uint64_t *addr)
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +4 -4
@@ -27,12 +27,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );vm_vcpu_add (vm,0 ); - ret =_vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1); + ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);if (ret) goto free_exit;vm_vcpu_add (vm,1 ); - ret =_vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); + ret =__vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); free_exit:kvm_vm_free (vm);
@@ -54,11 +54,11 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,vm_vcpu_add (vm,0 );vm_vcpu_add (vm,1 ); - ret =_vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1); + ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);if (ret) goto free_exit; - ret =_vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); + ret =__vcpu_ioctl (vm,1 ,KVM_ARM_VCPU_INIT , init2); free_exit:kvm_vm_free (vm);
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
@@ -159,12 +159,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
@@ -1719,7 +1719,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;
@@ -1905,7 +1905,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)); }
@@ -1914,7 +1914,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)); }
@@ -1923,7 +1923,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)); }
@@ -1932,7 +1932,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)); }
@@ -1955,13 +1955,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;
@@ -2025,12 +2025,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); }
@@ -2056,7 +2056,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); }
@@ -2185,7 +2185,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
@@ -295,7 +295,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 +2 -2
@@ -158,9 +158,9 @@ static void memop_ioctl(struct test_vcpu vcpu, struct kvm_s390_mem_op *ksmo)static int err_memop_ioctl (struct test_vcpu vcpu,struct kvm_s390_mem_op *ksmo) {if (vcpu.id ==VM_VCPU_ID ) -return _vm_ioctl (vcpu.vm,KVM_S390_MEM_OP , ksmo); +return __vm_ioctl (vcpu.vm,KVM_S390_MEM_OP , ksmo);else -return _vcpu_ioctl (vcpu.vm, vcpu.id,KVM_S390_MEM_OP , ksmo); +return __vcpu_ioctl (vcpu.vm, vcpu.id,KVM_S390_MEM_OP , ksmo); }#define MEMOP (err, vcpu_p, mop_target_p, access_mode_p, buf_p, size_p, ...) \
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
@@ -166,7 +166,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 );
@@ -184,13 +184,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 7/144 KVM: selftests: Make vcpu_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonMake vcpu_ioctl() a macro wrapper and pretty the _name_ of the ioctl on failure instead of the number. Add inner macros to allow handling cases where the name of the ioctl needs to be resolved higher up the stack, and to allow using the formatting for non-ioctl syscalls without being technically wrong.
Deliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence, again the intent is to print the name of the macro.
--- .../selftests/kvm/include/kvm_util_base.h | 13 ++++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 31 +++++-------------- 2 files changed, 19 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +11 -2
@@ -157,10 +157,19 @@ 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_SYSCALL_ERROR (_name, _ret) \ + "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) + +#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret) +#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
@@ -1937,29 +1937,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) {
@@ -1973,6 +1950,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 8/144 KVM: selftests: Drop @mode from common vm_create() helper
In reply to Sean ChristophersonDrop @mode from vm_create() and have it use VM_MODE_DEFAULT. Add and use an inner helper, __vm_create(), to service the handful of tests that want something other than VM_MODE_DEFAULT.
--- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../testing/selftests/kvm/aarch64/psci_test.c | 2 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 6 +-- 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 | 42 ++++++++++--------- .../selftests/kvm/set_memory_region_test.c | 4 +- .../kvm/x86_64/max_vcpuid_cap_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 ++-- 14 files changed, 42 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -416,7 +416,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_test.c +1 -1
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)struct kvm_vcpu_init init;struct kvm_vm *vm; - 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/aarch64/vcpu_width_config.c +3 -3
@@ -24,7 +24,7 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );vm_vcpu_add (vm,0 ); ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);
@@ -49,7 +49,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );vm_vcpu_add (vm,0 );vm_vcpu_add (vm,1 );
@@ -86,7 +86,7 @@ int main(void) }/* Get the preferred target type and copy that to init2 for later use */ - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init1);kvm_vm_free (vm); init2 = init1;
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 +22 -20
58 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),
@@ -354,7 +354,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/max_vcpuid_cap_test.c +1 -1
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])struct kvm_enable_cap cap = {0 };int ret; - vm =vm_create (VM_MODE_DEFAULT ,0 ); + vm =vm_create (0 );/* Get KVM_CAP_MAX_VCPU_ID cap supported in KVM */ ret =vm_check_cap (vm,KVM_CAP_MAX_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); + 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
@@ -54,7 +54,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);
@@ -71,7 +71,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,7 +174,7 @@ static void test_sev_migrate_parameters(void) *sev_es_vm_no_vmsa;int ret; - vm_no_vcpu =vm_create (VM_MODE_DEFAULT ,0 ); + vm_no_vcpu =vm_create (0 ); vm_no_sev =aux_vm_create (true); ret =__sev_migrate_from (vm_no_vcpu->fd, vm_no_sev->fd); TEST_ASSERT(ret == -1 && errno == EINVAL,
@@ -186,7 +186,7 @@ static void test_sev_migrate_parameters(void) sev_vm =sev_vm_create (/* es= */ false); sev_es_vm =sev_vm_create (/* es= */ 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 9/144 KVM: selftests: Split vcpu_set_nested_state() into two helpers
In reply to Sean ChristophersonSplit vcpu_nested_state_set() into a wrapper that asserts, and an inner helper that does not. Passing a bool is all kinds of awful as it's unintuitive for readers and requires returning an 'int' from a function that for most users can never return anything other than "success".
--- .../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
@@ -261,8 +261,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
@@ -1826,22 +1826,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 10/144 KVM: sefltests: Use vcpu_ioctl() and __vcpu_ioctl() helpers
In reply to Sean ChristophersonUse the recently introduced vCPU-specific ioctl() helpers instead of open coding calls to ioctl() just to pretty print the ioctl name.
--- .../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 | 286 +----------------- .../selftests/kvm/lib/x86_64/processor.c | 112 +------ 5 files changed, 135 insertions(+), 439 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);
@@ -212,13 +210,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
@@ -240,34 +337,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);
@@ -406,7 +475,6 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,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
@@ -430,12 +430,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);
@@ -449,8 +456,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 +2 -284
313 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86_64/processor.c +6 -106
165 lines not on this page · raw message
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 11/144 KVM: selftests: Add __vcpu_run() helper
In reply to Sean ChristophersonAdd __vcpu_run() so that tests that want to avoid asserts on KVM_RUN failures don't need to open code the ioctl() call.
--- 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
@@ -208,6 +208,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
@@ -1597,12 +1597,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);
@@ -1627,7 +1625,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 12/144 KVM: selftests: Use vcpu_access_device_attr() in arm64 code
In reply to Sean ChristophersonUse vcpu_access_device_attr() in arm's arch_timer test instead of manually retrieving the vCPU's fd. This will allow dropping vcpu_get_fd() in a future patch.
--- 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 13/144 KVM: selftests: Remove vcpu_get_fd()
In reply to Sean ChristophersonDrop vcpu_get_fd(), it no longer has any users, and really should not exist as the framework has failed if tests need to manually operate on a vCPU fd.
--- 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
@@ -214,7 +214,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
@@ -1608,15 +1608,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 14/144 KVM: selftests: Add vcpu_get() to retrieve and assert on vCPU existence
In reply to Sean ChristophersonAdd vcpu_get() to wrap vcpu_find() and deduplicate a pile of code that asserts the requested vCPU exists.
--- 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 | 4 +- 4 files changed, 20 insertions(+), 47 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +16 -40
@@ -561,23 +561,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;
@@ -589,6 +573,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 *
@@ -1568,8 +1560,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; }
@@ -1610,11 +1601,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 ;
@@ -1656,14 +1645,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,
@@ -1676,15 +1660,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;
@@ -1840,9 +1820,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); }
@@ -1859,9 +1837,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 +2 -2
@@ -996,7 +996,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;
@@ -1079,7 +1079,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 15/144 KVM: selftests: Make vm_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonMake vm_ioctl() a macro wrapper and print the _name_ of the ioctl on failure instead of the number.
Deliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence. Again the intent is to print the name of the macro.
--- .../selftests/kvm/include/kvm_util_base.h | 38 ++++++++++--------- tools/testing/selftests/kvm/lib/kvm_util.c | 28 ++++---------- 2 files changed, 28 insertions(+), 38 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +21 -17
@@ -105,6 +105,27 @@ 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_SYSCALL_ERROR (_name, _ret) \ + "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) + +#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret) +#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);
@@ -156,23 +177,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_SYSCALL_ERROR (_name, _ret) \ - "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno) - -#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret) -#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
@@ -1690,32 +1690,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 16/144 KVM: sefltests: Use vm_ioctl() and __vm_ioctl() helpers
In reply to Sean ChristophersonUse the recently introduced VM-specific ioctl() helpers instead of open coding calls to ioctl() just to pretty print the ioctl name. Keep a few open coded assertions that provide additional info.
--- .../selftests/kvm/include/kvm_util_base.h | 60 +++++++-- .../selftests/kvm/kvm_binary_stats_test.c | 6 +- .../testing/selftests/kvm/lib/aarch64/vgic.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 116 ++---------------- .../selftests/kvm/set_memory_region_test.c | 3 +- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- 6 files changed, 67 insertions(+), 126 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +50 -10
@@ -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_SYSCALL_ERROR (_name, _ret) \ "%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)
@@ -126,6 +124,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);
@@ -134,19 +149,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);int kvm_memfd_alloc (size_t size,bool hugepages);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 *
@@ -483,8 +525,6 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,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 */
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/aarch64/vgic.c +2 -4
@@ -104,8 +104,7 @@ void kvm_irq_set_level_info(int gic_fd, uint32_t intid, int level) {int ret =_kvm_irq_set_level_info (gic_fd, intid, level); -TEST_ASSERT (ret ==0 ,"KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO failed, " -"rc: %i errno: %i" , ret, errno); +TEST_ASSERT (!ret,KVM_IOCTL_ERROR (KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO , ret)); }int _kvm_arm_irq_line (struct kvm_vm *vm,uint32_t intid,int level)
@@ -127,8 +126,7 @@ void kvm_arm_irq_line(struct kvm_vm *vm, uint32_t intid, int level) {int ret =_kvm_arm_irq_line (vm, intid, level); -TEST_ASSERT (ret ==0 ,"KVM_IRQ_LINE failed, rc: %i errno: %i" , - ret, errno); +TEST_ASSERT (!ret,KVM_IOCTL_ERROR (KVM_IRQ_LINE , ret)); } static void vgic_poke_irq(int gic_fd, uint32_t intid,
tools/testing/selftests/kvm/lib/kvm_util.c +12 -104
192 lines not on this page · raw message
tools/testing/selftests/kvm/set_memory_region_test.c +1 -2
@@ -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 );
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -344,7 +344,7 @@ static void test_pmu_config_disable(void (*guest_code)(void)) cap.cap =KVM_CAP_PMU_CAPABILITY ; cap.args[0 ] =KVM_PMU_CAP_DISABLE ; -TEST_ASSERT (!vm_enable_cap (vm, &cap),"Failed to set KVM_PMU_CAP_DISABLE." ); +vm_enable_cap (vm, &cap);vm_vcpu_add_default (vm,VCPU_ID , guest_code);vm_init_descriptor_tables (vm);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 17/144 KVM: selftests: Make kvm_ioctl() a wrapper to pretty print ioctl name
In reply to Sean ChristophersonMake kvm_ioctl() a macro wrapper and print the _name_ of the ioctl on failure instead of the number.
Deliberately do not use __stringify(), as that will expand the ioctl all the way down to its numerical sequence, again the intent is to 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
@@ -110,8 +110,19 @@ int kvm_check_cap(long cap);#define __KVM_IOCTL_ERROR (_name, _ret) __KVM_SYSCALL_ERROR(_name, _ret)#define KVM_IOCTL_ERROR (_ioctl, _ret) __KVM_IOCTL_ERROR(#_ioctl, _ret) -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);
@@ -492,6 +503,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
@@ -1616,32 +1616,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 */
@@ -2074,6 +2048,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 18/144 KVM: selftests: Use kvm_ioctl() helpers
In reply to Sean ChristophersonUse the recently introduced KVM-specific ioctl() helpers instead of open coding calls to ioctl() just to pretty print the ioctl name.
--- .../selftests/kvm/lib/aarch64/processor.c | 4 +-- tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 13 +++---- .../selftests/kvm/lib/x86_64/processor.c | 34 ++++++------------- .../kvm/x86_64/get_msr_index_features.c | 16 +++------ .../selftests/kvm/x86_64/mmio_warning_test.c | 6 ++-- 6 files changed, 26 insertions(+), 49 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 +5 -8
@@ -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)
@@ -1070,8 +1068,7 @@ static int vcpu_mmap_sz(void) ret =ioctl (dev_fd,KVM_GET_VCPU_MMAP_SIZE ,NULL );TEST_ASSERT (ret >=sizeof (struct kvm_run ), -"%s KVM_GET_VCPU_MMAP_SIZE ioctl failed, rc: %i errno: %i" , - __func__, ret, errno); +KVM_IOCTL_ERROR (KVM_GET_VCPU_MMAP_SIZE , ret));close (dev_fd);
tools/testing/selftests/kvm/lib/x86_64/processor.c +11 -23
@@ -639,7 +639,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 );
@@ -739,7 +739,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)
@@ -748,9 +747,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;
@@ -780,9 +777,8 @@ 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); -TEST_ASSERT (r ==1 ,"KVM_GET_MSRS IOCTL failed,\n" -" rc: %i errno: %i" , r, errno); + r =__kvm_ioctl (kvm_fd,KVM_GET_MSRS , &buffer.header); +TEST_ASSERT (r ==1 ,KVM_IOCTL_ERROR (KVM_GET_MSRS , r));close (kvm_fd);return buffer.entry.data;
@@ -947,9 +943,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; }
@@ -962,19 +958,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; }
@@ -1020,9 +1013,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);
@@ -1330,7 +1321,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)
@@ -1339,9 +1329,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 19/144 KVM: selftests: Use __KVM_SYSCALL_ERROR() to handle non-KVM syscall errors
In reply to Sean ChristophersonUse __KVM_SYSCALL_ERROR() to report and pretty print non-KVM syscall and ioctl errors, e.g. for mmap(), munmap(), uffd ioctls, etc...
--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 5 ++- .../selftests/kvm/demand_paging_test.c | 12 +++---- tools/testing/selftests/kvm/lib/kvm_util.c | 34 ++++++++----------- 3 files changed, 22 insertions(+), 29 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_irq.c +2 -3
@@ -630,8 +630,7 @@ static void kvm_routing_and_irqfd_check(struct kvm_vm *vm,for (f =0 , i = intid; i < (uint64_t )intid + num; i++, f++) { fd[f] =eventfd (0 ,0 ); -TEST_ASSERT (fd[f] !=-1 , -"eventfd failed, errno: %i\n" , errno); +TEST_ASSERT (fd[f] !=-1 ,__KVM_SYSCALL_ERROR ("eventfd()" , fd[f])); }for (f =0 , i = intid; i < (uint64_t )intid + num; i++, f++) {
@@ -647,7 +646,7 @@ static void kvm_routing_and_irqfd_check(struct kvm_vm *vm, val =1 ; ret =write (fd[f], &val,sizeof (uint64_t ));TEST_ASSERT (ret ==sizeof (uint64_t ), -"Write to KVM_IRQFD failed with ret: %d\n" , ret); +__KVM_SYSCALL_ERROR ("write()" , ret)); }for (f =0 , i = intid; i < (uint64_t )intid + num; i++, f++)
tools/testing/selftests/kvm/demand_paging_test.c +6 -6
@@ -223,6 +223,7 @@ static void setup_demand_paging(struct kvm_vm *vm,struct uffdio_api uffdio_api;struct uffdio_register uffdio_register;uint64_t expected_ioctls = ((uint64_t )1 ) << _UFFDIO_COPY; +int ret; PER_PAGE_DEBUG("Userfaultfd %s mode, faults resolved with %s\n", is_minor ? "MINOR" : "MISSING",
@@ -242,19 +243,18 @@ static void setup_demand_paging(struct kvm_vm *vm, } uffd =syscall (__NR_userfaultfd,O_CLOEXEC |O_NONBLOCK ); -TEST_ASSERT (uffd >=0 ,"uffd creation failed, errno: %d" , errno); +TEST_ASSERT (uffd >=0 ,__KVM_SYSCALL_ERROR ("userfaultfd()" , uffd)); uffdio_api.api =UFFD_API ; uffdio_api.features =0 ; -TEST_ASSERT (ioctl (uffd,UFFDIO_API , &uffdio_api) !=-1 , -"ioctl UFFDIO_API failed: %" PRIu64, - (uint64_t )uffdio_api.api); + ret =ioctl (uffd,UFFDIO_API , &uffdio_api); +TEST_ASSERT (ret !=-1 ,__KVM_SYSCALL_ERROR ("UFFDIO_API" , ret)); uffdio_register.range.start = (uint64_t )hva; uffdio_register.range.len = len; uffdio_register.mode = uffd_mode; -TEST_ASSERT (ioctl (uffd,UFFDIO_REGISTER , &uffdio_register) !=-1 , -"ioctl UFFDIO_REGISTER failed" ); + ret =ioctl (uffd,UFFDIO_REGISTER , &uffdio_register); +TEST_ASSERT (ret !=-1 ,__KVM_SYSCALL_ERROR ("UFFDIO_REGISTER" , ret));TEST_ASSERT ((uffdio_register.ioctls & expected_ioctls) == expected_ioctls,"missing userfaultfd ioctls" );
tools/testing/selftests/kvm/lib/kvm_util.c +14 -20
@@ -517,17 +517,15 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)if (vcpu->dirty_gfns) { ret =munmap (vcpu->dirty_gfns, vm->dirty_ring_size); -TEST_ASSERT (ret ==0 ,"munmap of VCPU dirty ring failed, " -"rc: %i errno: %i" , ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("munmap()" , ret)); vcpu->dirty_gfns =NULL ; } ret =munmap (vcpu->state,vcpu_mmap_sz ()); -TEST_ASSERT (ret ==0 ,"munmap of VCPU fd failed, rc: %i " -"errno: %i" , ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("munmap()" , ret)); + ret =close (vcpu->fd); -TEST_ASSERT (ret ==0 ,"Close of VCPU fd failed, rc: %i " -"errno: %i" , ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("close()" , ret));list_del (&vcpu->list);free (vcpu);
@@ -542,12 +540,10 @@ void kvm_vm_release(struct kvm_vm *vmp)vm_vcpu_rm (vmp, vcpu); ret =close (vmp->fd); -TEST_ASSERT (ret ==0 ,"Close of vm fd failed,\n" -" vmp->fd: %i rc: %i errno: %i" , vmp->fd, ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("close()" , ret)); ret =close (vmp->kvm_fd); -TEST_ASSERT (ret ==0 ,"Close of /dev/kvm fd failed,\n" -" vmp->kvm_fd: %i rc: %i errno: %i" , vmp->kvm_fd, ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("close()" , ret)); } static void __vm_mem_region_delete(struct kvm_vm *vm,
@@ -567,7 +563,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm,sparsebit_free (®ion->unused_phy_pages); ret =munmap (region->mmap_start, region->mmap_size); -TEST_ASSERT (ret ==0 ,"munmap failed, rc: %i errno: %i" , ret, errno); +TEST_ASSERT (!ret,__KVM_SYSCALL_ERROR ("munmap()" , ret));free (region); }
@@ -607,14 +603,13 @@ int kvm_memfd_alloc(size_t size, bool hugepages) memfd_flags |=MFD_HUGETLB ; fd =memfd_create ("kvm_selftest" , memfd_flags); -TEST_ASSERT (fd !=-1 ,"memfd_create() failed, errno: %i (%s)" , - errno,strerror (errno)); +TEST_ASSERT (fd !=-1 ,__KVM_SYSCALL_ERROR ("memfd_create()" , fd)); r =ftruncate (fd, size); -TEST_ASSERT (!r,"ftruncate() failed, errno: %i (%s)" , errno,strerror (errno)); +TEST_ASSERT (!r,__KVM_SYSCALL_ERROR ("ftruncate()" , r)); r =fallocate (fd,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ,0 , size); -TEST_ASSERT (!r,"fallocate() failed, errno: %i (%s)" , errno,strerror (errno)); +TEST_ASSERT (!r,__KVM_SYSCALL_ERROR ("fallocate()" , r));return fd; }
@@ -880,8 +875,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,vm_mem_backing_src_alias (src_type)->flag, region->fd, 0);TEST_ASSERT (region->mmap_start !=MAP_FAILED , -"test_malloc failed, mmap_start: %p errno: %i" , - region->mmap_start, errno); +__KVM_SYSCALL_ERROR ("mmap()" , (int )(unsigned long )MAP_FAILED )); TEST_ASSERT(!is_backing_src_hugetlb(src_type) || region->mmap_start == align_ptr_up(region->mmap_start, backing_src_pagesz),
@@ -929,7 +923,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,vm_mem_backing_src_alias (src_type)->flag, region->fd, 0);TEST_ASSERT (region->mmap_alias !=MAP_FAILED , -"mmap of alias failed, errno: %i" , errno); +__KVM_SYSCALL_ERROR ("mmap()" , (int )(unsigned long )MAP_FAILED ));/* Align host alias address */ region->host_alias =align_ptr_up (region->mmap_alias, alignment);
@@ -1115,8 +1109,8 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) vcpu_mmap_sz(), sizeof(*vcpu->state)); vcpu->state = (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, " -"vcpu id: %u errno: %i" , vcpuid, errno); +TEST_ASSERT (vcpu->state !=MAP_FAILED , +__KVM_SYSCALL_ERROR ("mmap()" , (int )(unsigned long )MAP_FAILED ));/* Add to linked-list of VCPUs. */ list_add (&vcpu->list, &vm->vcpus);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 20/144 KVM: selftests: Make x86-64's register dump helpers static
In reply to Sean ChristophersonMake regs_dump() and sregs_dump() static, they're only implemented by x86 and only used internally.
--- .../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
@@ -19,8 +19,7 @@vm_vaddr_t exception_handlers; -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",
@@ -43,21 +42,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) {
@@ -75,21 +59,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) {
@@ -99,8 +68,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 21/144 KVM: selftests: Get rid of kvm_util_internal.h
In reply to Sean ChristophersonFold kvm_util_internal.h into kvm_util_base.h, i.e. make all KVM utility stuff "public". Hiding struct implementations from tests has been a massive failure, as it has led to pointless and poorly named wrappers, unnecessarily opaque code, etc...
Not to mention that the approach was a complete failure as evidenced by the non-zero number of tests that were including kvm_util_internal.h.
--- .../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 - .../kvm/x86_64/max_vcpuid_cap_test.c | 1 - .../selftests/kvm/x86_64/sev_migrate_tests.c | 1 - .../kvm/x86_64/svm_nested_soft_inject_test.c | 1 - 16 files changed, 91 insertions(+), 116 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/max_vcpuid_cap_test.c +0 -1
@@ -8,7 +8,6 @@*/ #include "kvm_util.h" -#include "../lib/kvm_util_internal.h" #define MAX_VCPU_ID 2
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
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +0 -1
@@ -17,7 +17,6 @@#include "processor.h" #include "svm_util.h" #include "test_util.h" -#include "../lib/kvm_util_internal.h" #define VCPU_ID 0#define INT_NR 0x20
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 22/144 KVM: selftests: Use KVM_IOCTL_ERROR() for one-off arm64 ioctls
In reply to Sean ChristophersonUse the KVM_IOCTL_ERROR() macro to generate error messages for a handful of one-off arm64 ioctls. The calls in question are made without an associated struct kvm_vm/kvm_vcpu as they are used to configure those structs, i.e. can't be easily converted to e.g. vcpu_ioctl().
--- 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 23/144 KVM: selftests: Drop @test param from kvm_create_device()
In reply to Sean ChristophersonRemove the two calls that pass @test=true to kvm_create_device() and drop the @test param entirely. The two removed calls don't check the return value of kvm_create_device(), so other than verifying KVM doesn't explode, which is extremely unlikely given that the non-test variant was _just_ called, they are pointless and provide no validation coverage.
--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 14 ++++++-------- .../testing/selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 12 ++++-------- 3 files changed, 11 insertions(+), 17 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
@@ -485,7 +485,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/kvm_util.c +4 -8
@@ -1642,18 +1642,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 24/144 KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper
In reply to Sean ChristophersonMove KVM_CREATE_DEVICE_TEST to its own helper, identifying "real" versus "test" device creation based on a hardcoded boolean buried in the middle of a param list is painful for readers.
--- .../testing/selftests/kvm/aarch64/vgic_init.c | 10 ++++---- .../selftests/kvm/include/kvm_util_base.h | 3 ++- .../testing/selftests/kvm/lib/aarch64/vgic.c | 3 +-- tools/testing/selftests/kvm/lib/kvm_util.c | 23 ++++++++++++++----- 4 files changed, 25 insertions(+), 14 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
@@ -484,7 +484,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/aarch64/vgic.c +1 -2
@@ -51,8 +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 */ -if (_kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , - false, &gic_fd) !=0 ) +if (__kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , &gic_fd))return -1 ; kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
tools/testing/selftests/kvm/lib/kvm_util.c +17 -6
@@ -1629,14 +1629,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;
@@ -1646,7 +1657,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 25/144 KVM: selftests: Multiplex return code and fd in __kvm_create_device()
In reply to Sean ChristophersonMultiplex the return value and fd (on success) in __kvm_create_device() to mimic common library helpers that return file descriptors, e.g. open().
--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 6 +++--- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/aarch64/vgic.c | 5 +++-- tools/testing/selftests/kvm/lib/kvm_util.c | 16 +++++++--------- 4 files changed, 14 insertions(+), 15 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
@@ -485,7 +485,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/aarch64/vgic.c +3 -2
@@ -51,8 +51,9 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs, nr_vcpus, nr_vcpus_created);/* Distributor setup */ -if (__kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , &gic_fd)) -return -1 ; + gic_fd =__kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 ); +if (gic_fd <0 ) +return gic_fd;kvm_device_access (gic_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 , &nr_irqs, true);
tools/testing/selftests/kvm/lib/kvm_util.c +7 -9
@@ -1639,27 +1639,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 26/144 KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency
In reply to Sean ChristophersonRename kvm_device_check_attr() and its variants to kvm_has_device_attr() to be consistent with the ioctl names and with other helpers in the KVM selftests framework.
--- 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
@@ -482,8 +482,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);
@@ -494,7 +494,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
@@ -1610,7 +1610,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,
@@ -1621,9 +1621,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;
@@ -1686,18 +1686,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 27/144 KVM: selftests: Drop 'int' return from asserting *_has_device_attr()
In reply to Sean ChristophersonDrop 'int' returns from *_device_has_attr() helpers that assert the return is '0', there's no point in returning '0' and "requiring" the caller to perform a redundant assertion.
--- .../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
@@ -483,7 +483,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);
@@ -496,8 +503,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
@@ -1621,14 +1621,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 = {
@@ -1694,15 +1686,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 28/144 KVM: selftests: Split get/set device_attr helpers
In reply to Sean ChristophersonSplit the get/set device_attr helpers instead of using a boolean param to select between get and set. Duplicating upper level wrappers is a very, very small price to pay for improved readability, and having constant (at compile time) inputs will allow the selftests framework to sanity check ioctl() invocations.
--- .../selftests/kvm/aarch64/arch_timer.c | 8 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 246 +++++++++--------- .../selftests/kvm/include/kvm_util_base.h | 91 ++++--- .../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 | 62 +++-- .../kvm/system_counter_offset_test.c | 4 +- 7 files changed, 233 insertions(+), 213 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 +59 -32
106 lines not on this page · raw message
tools/testing/selftests/kvm/lib/aarch64/vgic.c +15 -16
@@ -55,27 +55,26 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs,if (gic_fd <0 )return gic_fd; -kvm_device_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; }
@@ -88,14 +87,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; }
@@ -155,9 +154,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 +30 -32
89 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 29/144 KVM: selftests: Add a VM backpointer to 'struct vcpu'
In reply to Sean ChristophersonAdd a backpointer to 'struct vcpu' so that tests can get at the owning VM when passing around a vCPU object. Long term, this will be little more than a nice-to-have feature, but in the short term it is a critical step toward purging the VM+vcpu_id ioctl mess without introducing even more churn.
--- 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
@@ -1099,6 +1099,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 30/144 KVM: selftests: Consolidate KVM_ENABLE_CAP usage
In reply to Sean ChristophersonAdd __vm_enable_cap() and use it for negative tests that expect KVM_ENABLE_CAP to fail. Opportunistically clean up the MAX_VCPU_ID test error messages.
--- .../selftests/kvm/include/kvm_util_base.h | 4 + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +- .../kvm/x86_64/max_vcpuid_cap_test.c | 19 ++--- .../selftests/kvm/x86_64/sev_migrate_tests.c | 78 +++++++++---------- 4 files changed, 52 insertions(+), 51 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +4 -0
@@ -231,6 +231,10 @@ static inline int vm_check_cap(struct kvm_vm *vm, long cap)return ret; } +static inline int __vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap) +{ +return __vm_ioctl (vm,KVM_ENABLE_CAP , cap); +}static inline void vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap) {vm_ioctl (vm,KVM_ENABLE_CAP , cap);
tools/testing/selftests/kvm/lib/x86_64/vmx.c +1 -1
@@ -51,7 +51,7 @@ int vcpu_enable_evmcs(struct kvm_vm *vm, int vcpu_id) .args[0] = (unsigned long)&evmcs_ver }; -vcpu_ioctl (vm, vcpu_id,KVM_ENABLE_CAP , &enable_evmcs_cap); +vcpu_enable_cap (vm, vcpu_id, &enable_evmcs_cap);/* KVM should return supported EVMCS version range */ TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&
tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c +8 -11
@@ -25,28 +25,25 @@ int main(int argc, char *argv[])/* Try to set KVM_CAP_MAX_VCPU_ID beyond KVM cap */ cap.cap =KVM_CAP_MAX_VCPU_ID ; cap.args[0 ] = ret +1 ; - ret =ioctl (vm->fd,KVM_ENABLE_CAP , &cap); + ret =__vm_enable_cap (vm, &cap);TEST_ASSERT (ret <0 , -"Unexpected success to enable KVM_CAP_MAX_VCPU_ID" -"beyond KVM cap!\n" ); +"Setting KVM_CAP_MAX_VCPU_ID beyond KVM cap should fail" );/* Set KVM_CAP_MAX_VCPU_ID */ cap.cap =KVM_CAP_MAX_VCPU_ID ; cap.args[0 ] =MAX_VCPU_ID ; - ret =ioctl (vm->fd,KVM_ENABLE_CAP , &cap); -TEST_ASSERT (ret ==0 , -"Unexpected failure to enable KVM_CAP_MAX_VCPU_ID!\n" ); +vm_enable_cap (vm, &cap); +/* Try to set KVM_CAP_MAX_VCPU_ID again */ cap.args[0 ] =MAX_VCPU_ID +1 ; - ret =ioctl (vm->fd,KVM_ENABLE_CAP , &cap); + ret =__vm_enable_cap (vm, &cap);TEST_ASSERT (ret <0 , -"Unexpected success to enable KVM_CAP_MAX_VCPU_ID again\n" ); +"Setting KVM_CAP_MAX_VCPU_ID multiple times should fail" );/* Create vCPU with id beyond KVM_CAP_MAX_VCPU_ID cap*/ - ret =ioctl (vm->fd,KVM_CREATE_VCPU ,MAX_VCPU_ID ); -TEST_ASSERT (ret <0 , -"Unexpected success in creating a vCPU with VCPU ID out of range\n" ); + ret =__vm_ioctl (vm,KVM_CREATE_VCPU , (void *)MAX_VCPU_ID ); +TEST_ASSERT (ret <0 ,"Creating vCPU with ID > MAX_VCPU_ID should fail" );kvm_vm_free (vm);return 0 ;
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +39 -39
217 lines not on this page · raw message
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 31/144 KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs
In reply to Sean ChristophersonRework the KVM_ENABLE_CAP helpers to take the cap and arg0; literally every current user, and likely every future user, wants to set 0 or 1 arguments and nothing else.
--- .../testing/selftests/kvm/aarch64/psci_test.c | 11 +------ .../selftests/kvm/dirty_log_perf_test.c | 9 ++---- tools/testing/selftests/kvm/dirty_log_test.c | 5 +-- .../selftests/kvm/include/kvm_util_base.h | 18 +++++++---- tools/testing/selftests/kvm/lib/kvm_util.c | 6 +--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 8 ++--- .../kvm/x86_64/emulator_error_test.c | 6 +--- .../selftests/kvm/x86_64/fix_hypercall_test.c | 6 ++-- .../selftests/kvm/x86_64/hyperv_features.c | 16 ++-------- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +-- .../kvm/x86_64/max_vcpuid_cap_test.c | 12 ++----- .../selftests/kvm/x86_64/platform_info_test.c | 14 ++------- .../kvm/x86_64/pmu_event_filter_test.c | 5 +-- .../selftests/kvm/x86_64/sev_migrate_tests.c | 14 ++------- .../kvm/x86_64/triple_fault_event_test.c | 7 +---- .../kvm/x86_64/userspace_msr_exit_test.c | 31 +++++++------------ 16 files changed, 47 insertions(+), 126 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -10
@@ -156,15 +156,6 @@ static void host_test_cpu_on(void)kvm_vm_free (vm); } -static void enable_system_suspend (struct kvm_vm *vm) -{ -struct kvm_enable_cap cap = { - .cap =KVM_CAP_ARM_SYSTEM_SUSPEND , - }; - -vm_enable_cap (vm, &cap); -} -static void guest_test_system_suspend (void ) {uint64_t ret;
@@ -183,7 +174,7 @@ static void host_test_system_suspend(void)struct kvm_vm *vm; vm =setup_vm (guest_test_system_suspend); -enable_system_suspend (vm); +vm_enable_cap (vm,KVM_CAP_ARM_SYSTEM_SUSPEND ,0 );vcpu_power_off (vm,VCPU_ID_TARGET ); run =vcpu_state (vm,VCPU_ID_SOURCE );
tools/testing/selftests/kvm/dirty_log_perf_test.c +3 -6
@@ -213,7 +213,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)struct timespec get_dirty_log_total = (struct timespec ){0 };struct timespec vcpu_dirty_total = (struct timespec ){0 };struct timespec avg; -struct kvm_enable_cap cap = {};struct timespec clear_dirty_log_total = (struct timespec ){0 }; vm = perf_test_create_vm(mode, nr_vcpus, guest_percpu_mem_size,
@@ -229,11 +228,9 @@ static void run_test(enum vm_guest_mode mode, void *arg) bitmaps =alloc_bitmaps (p->slots, pages_per_slot); -if (dirty_log_manual_caps) { - cap.cap =KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 ; - cap.args[0 ] = dirty_log_manual_caps; -vm_enable_cap (vm, &cap); - } +if (dirty_log_manual_caps) +vm_enable_cap (vm,KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 , + dirty_log_manual_caps);arch_setup_vm (vm, nr_vcpus);
tools/testing/selftests/kvm/dirty_log_test.c +1 -4
@@ -217,16 +217,13 @@ static bool clear_log_supported(void)static void clear_log_create_vm_done (struct kvm_vm *vm) { -struct kvm_enable_cap cap = {};u64 manual_caps; manual_caps =kvm_check_cap (KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 );TEST_ASSERT (manual_caps,"MANUAL_CAPS is zero!" ); manual_caps &= (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE |KVM_DIRTY_LOG_INITIALLY_SET ); - cap.cap =KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 ; - cap.args[0 ] = manual_caps; -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 , manual_caps); } static void dirty_log_collect_dirty_pages(struct kvm_vm *vm, int slot,
tools/testing/selftests/kvm/include/kvm_util_base.h +12 -6
@@ -231,13 +231,17 @@ static inline int vm_check_cap(struct kvm_vm *vm, long cap)return ret; } -static inline int __vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap) +static inline int __vm_enable_cap (struct kvm_vm *vm,uint32_t cap,uint64_t arg0) { -return __vm_ioctl (vm,KVM_ENABLE_CAP , cap); +struct kvm_enable_cap enable_cap = { .cap = cap, .args = { arg0 } }; + +return __vm_ioctl (vm,KVM_ENABLE_CAP , &enable_cap); } -static inline void vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap) +static inline void vm_enable_cap (struct kvm_vm *vm,uint32_t cap,uint64_t arg0) { -vm_ioctl (vm,KVM_ENABLE_CAP , cap); +struct kvm_enable_cap enable_cap = { .cap = cap, .args = { arg0 } }; + +vm_ioctl (vm,KVM_ENABLE_CAP , &enable_cap); }void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size);
@@ -363,9 +367,11 @@ 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);static inline void vcpu_enable_cap (struct kvm_vm *vm,uint32_t vcpu_id, -struct kvm_enable_cap *cap) +uint32_t cap,uint64_t arg0) { -vcpu_ioctl (vm, vcpu_id,KVM_ENABLE_CAP , cap); +struct kvm_enable_cap enable_cap = { .cap = cap, .args = { arg0 } }; + +vcpu_ioctl (vm, vcpu_id,KVM_ENABLE_CAP , &enable_cap); } static inline void vcpu_set_guest_debug(struct kvm_vm *vm, uint32_t vcpuid,
tools/testing/selftests/kvm/lib/kvm_util.c +1 -5
@@ -85,11 +85,7 @@ int kvm_check_cap(long cap)void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size) { -struct kvm_enable_cap cap = {0 }; - - cap.cap =KVM_CAP_DIRTY_LOG_RING ; - cap.args[0 ] = ring_size; -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_DIRTY_LOG_RING , ring_size); vm->dirty_ring_size = ring_size; }
tools/testing/selftests/kvm/lib/x86_64/vmx.c +2 -6
@@ -46,12 +46,8 @@ int vcpu_enable_evmcs(struct kvm_vm *vm, int vcpu_id) {uint16_t evmcs_ver; -struct kvm_enable_cap enable_evmcs_cap = { - .cap =KVM_CAP_HYPERV_ENLIGHTENED_VMCS , - .args[0 ] = (unsigned long )&evmcs_ver - }; - -vcpu_enable_cap (vm, vcpu_id, &enable_evmcs_cap); +vcpu_enable_cap (vm, vcpu_id,KVM_CAP_HYPERV_ENLIGHTENED_VMCS , + (unsigned long )&evmcs_ver);/* KVM should return supported EVMCS version range */ TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&
tools/testing/selftests/kvm/x86_64/emulator_error_test.c +1 -5
@@ -161,10 +161,6 @@ static uint64_t process_ucall(struct kvm_vm *vm)int main (int argc,char *argv[]) { -struct kvm_enable_cap emul_failure_cap = { - .cap =KVM_CAP_EXIT_ON_EMULATION_FAILURE , - .args[0 ] =1 , - };struct kvm_cpuid_entry2 *entry;struct kvm_cpuid2 *cpuid;struct kvm_vm *vm;
@@ -192,7 +188,7 @@ int main(int argc, char *argv[]) rc =kvm_check_cap (KVM_CAP_EXIT_ON_EMULATION_FAILURE );TEST_ASSERT (rc,"KVM_CAP_EXIT_ON_EMULATION_FAILURE is unavailable" ); -vm_enable_cap (vm, &emul_failure_cap); +vm_enable_cap (vm,KVM_CAP_EXIT_ON_EMULATION_FAILURE ,1 ); vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, MEM_REGION_GPA, MEM_REGION_SLOT,
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +2 -4
@@ -140,15 +140,13 @@ static void test_fix_hypercall(void)static void test_fix_hypercall_disabled (void ) { -struct kvm_enable_cap cap = {0 };struct kvm_vm *vm; vm =vm_create_default (VCPU_ID ,0 , guest_main);setup_ud_vector (vm); - cap.cap =KVM_CAP_DISABLE_QUIRKS2 ; - cap.args[0 ] =KVM_X86_QUIRK_FIX_HYPERCALL_INSN ; -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_DISABLE_QUIRKS2 , +KVM_X86_QUIRK_FIX_HYPERCALL_INSN ); ud_expected = true;sync_global_to_guest (vm, ud_expected);
tools/testing/selftests/kvm/x86_64/hyperv_features.c +3 -13
@@ -182,10 +182,6 @@ static void guest_test_msrs_access(void) };struct kvm_cpuid2 *best;vm_vaddr_t msr_gva; -struct kvm_enable_cap cap = { - .cap =KVM_CAP_HYPERV_ENFORCE_CPUID , - .args = {1 } - };struct msr_data *msr;while (true) {
@@ -196,7 +192,7 @@ static void guest_test_msrs_access(void) msr =addr_gva2hva (vm, msr_gva);vcpu_args_set (vm,VCPU_ID ,1 , msr_gva); -vcpu_enable_cap (vm,VCPU_ID , &cap); +vcpu_enable_cap (vm,VCPU_ID ,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 );vcpu_set_hv_cpuid (vm,VCPU_ID );
@@ -337,9 +333,7 @@ static void guest_test_msrs_access(void)* Remains unavailable even with KVM_CAP_HYPERV_SYNIC2 * capability enabled and guest visible CPUID bit unset. */ - cap.cap =KVM_CAP_HYPERV_SYNIC2 ; - cap.args[0 ] =0 ; -vcpu_enable_cap (vm,VCPU_ID , &cap); +vcpu_enable_cap (vm,VCPU_ID ,KVM_CAP_HYPERV_SYNIC2 ,0 );break ;case 22 : feat.eax |=HV_MSR_SYNIC_AVAILABLE ;
@@ -518,10 +512,6 @@ static void guest_test_hcalls_access(void)struct kvm_cpuid_entry2 dbg = { .function =HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES }; -struct kvm_enable_cap cap = { - .cap =KVM_CAP_HYPERV_ENFORCE_CPUID , - .args = {1 } - };vm_vaddr_t hcall_page, hcall_params;struct hcall_data *hcall;struct kvm_cpuid2 *best;
@@ -542,7 +532,7 @@ static void guest_test_hcalls_access(void)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_enable_cap (vm,VCPU_ID ,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 );vcpu_set_hv_cpuid (vm,VCPU_ID );
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -4
@@ -206,7 +206,6 @@ static void enter_guest(struct kvm_vm *vm)int main (void ) { -struct kvm_enable_cap cap = {0 };struct kvm_cpuid2 *best;struct kvm_vm *vm;
@@ -217,9 +216,7 @@ int main(void) vm =vm_create_default (VCPU_ID ,0 , 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 ,KVM_CAP_ENFORCE_PV_FEATURE_CPUID ,1 ); best =kvm_get_supported_cpuid ();clear_kvm_cpuid_features (best);
tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c +3 -9
@@ -14,7 +14,6 @@int main (int argc,char *argv[]) {struct kvm_vm *vm; -struct kvm_enable_cap cap = {0 };int ret; vm =vm_create (0 );
@@ -23,21 +22,16 @@ int main(int argc, char *argv[]) ret =vm_check_cap (vm,KVM_CAP_MAX_VCPU_ID );/* Try to set KVM_CAP_MAX_VCPU_ID beyond KVM cap */ - cap.cap =KVM_CAP_MAX_VCPU_ID ; - cap.args[0 ] = ret +1 ; - ret =__vm_enable_cap (vm, &cap); + ret =__vm_enable_cap (vm,KVM_CAP_MAX_VCPU_ID , ret +1 );TEST_ASSERT (ret <0 ,"Setting KVM_CAP_MAX_VCPU_ID beyond KVM cap should fail" );/* Set KVM_CAP_MAX_VCPU_ID */ - cap.cap =KVM_CAP_MAX_VCPU_ID ; - cap.args[0 ] =MAX_VCPU_ID ; -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_MAX_VCPU_ID ,MAX_VCPU_ID );/* Try to set KVM_CAP_MAX_VCPU_ID again */ - cap.args[0 ] =MAX_VCPU_ID +1 ; - ret =__vm_enable_cap (vm, &cap); + ret =__vm_enable_cap (vm,KVM_CAP_MAX_VCPU_ID ,MAX_VCPU_ID +1 );TEST_ASSERT (ret <0 ,"Setting KVM_CAP_MAX_VCPU_ID multiple times should fail" );
tools/testing/selftests/kvm/x86_64/platform_info_test.c +2 -12
@@ -35,22 +35,12 @@ static void guest_code(void) } } -static void set_msr_platform_info_enabled (struct kvm_vm *vm,bool enable) -{ -struct kvm_enable_cap cap = {}; - - cap.cap =KVM_CAP_MSR_PLATFORM_INFO ; - cap.flags =0 ; - cap.args[0 ] = (int )enable; -vm_enable_cap (vm, &cap); -} -static void test_msr_platform_info_enabled (struct kvm_vm *vm) {struct kvm_run *run =vcpu_state (vm,VCPU_ID );struct ucall uc; -set_msr_platform_info_enabled (vm, true); +vm_enable_cap (vm,KVM_CAP_MSR_PLATFORM_INFO , true);vcpu_run (vm,VCPU_ID ); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Exit_reason other than KVM_EXIT_IO: %u (%s),\n",
@@ -69,7 +59,7 @@ static void test_msr_platform_info_disabled(struct kvm_vm *vm) {struct kvm_run *run =vcpu_state (vm,VCPU_ID ); -set_msr_platform_info_enabled (vm, false); +vm_enable_cap (vm,KVM_CAP_MSR_PLATFORM_INFO , false);vcpu_run (vm,VCPU_ID ); TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN, "Exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n",
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -4
@@ -334,7 +334,6 @@ static void test_pmu_config_disable(void (*guest_code)(void)) {int r;struct kvm_vm *vm; -struct kvm_enable_cap cap = {0 }; r =kvm_check_cap (KVM_CAP_PMU_CAPABILITY );if (!(r &KVM_PMU_CAP_DISABLE ))
@@ -342,9 +341,7 @@ static void test_pmu_config_disable(void (*guest_code)(void)) vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); - cap.cap =KVM_CAP_PMU_CAPABILITY ; - cap.args[0 ] =KVM_PMU_CAP_DISABLE ; -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE );vm_vcpu_add_default (vm,VCPU_ID , guest_code);vm_init_descriptor_tables (vm);
tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +2 -12
@@ -82,12 +82,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)static int __sev_migrate_from (struct kvm_vm *dst,struct kvm_vm *src) { -struct kvm_enable_cap cap = { - .cap =KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM , - .args = { src->fd } - }; - -return __vm_enable_cap (dst, &cap); +return __vm_enable_cap (dst,KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM , src->fd); }
@@ -223,12 +218,7 @@ static void test_sev_migrate_parameters(void)static int __sev_mirror_create (struct kvm_vm *dst,struct kvm_vm *src) { -struct kvm_enable_cap cap = { - .cap =KVM_CAP_VM_COPY_ENC_CONTEXT_FROM , - .args = { src->fd } - }; - -return __vm_enable_cap (dst, &cap); +return __vm_enable_cap (dst,KVM_CAP_VM_COPY_ENC_CONTEXT_FROM , src->fd); }
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +1 -6
@@ -46,11 +46,6 @@ int main(void)vm_vaddr_t vmx_pages_gva;struct ucall uc; -struct kvm_enable_cap cap = { - .cap =KVM_CAP_X86_TRIPLE_FAULT_EVENT , - .args = {1 } - }; -if (!nested_vmx_supported ()) {print_skip ("Nested VMX not supported" );exit (KSFT_SKIP );
@@ -62,7 +57,7 @@ int main(void) } vm =vm_create_default (VCPU_ID ,0 , (void *) l1_guest_code); -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_X86_TRIPLE_FAULT_EVENT ,1 ); run =vcpu_state (vm,VCPU_ID );vcpu_alloc_vmx (vm, &vmx_pages_gva);
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +11 -20
@@ -550,11 +550,8 @@ static void run_guest_then_process_ucall_done(struct kvm_vm *vm)process_ucall_done (vm); } -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 , - }; +static void test_msr_filter_allow (void ) +{struct kvm_vm *vm;int rc;
@@ -564,7 +561,7 @@ static void test_msr_filter_allow(void) { rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" ); -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_X86_USER_SPACE_MSR ,KVM_MSR_EXIT_REASON_FILTER ); rc =kvm_check_cap (KVM_CAP_X86_MSR_FILTER );TEST_ASSERT (rc,"KVM_CAP_X86_MSR_FILTER is available" );
@@ -673,13 +670,8 @@ static void handle_wrmsr(struct kvm_run *run) } } -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 , - }; +static void test_msr_filter_deny (void ) +{struct kvm_vm *vm;struct kvm_run *run;int rc;
@@ -691,7 +683,9 @@ static void test_msr_filter_deny(void) { rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" ); -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_X86_USER_SPACE_MSR ,KVM_MSR_EXIT_REASON_INVAL | +KVM_MSR_EXIT_REASON_UNKNOWN | +KVM_MSR_EXIT_REASON_FILTER ); rc =kvm_check_cap (KVM_CAP_X86_MSR_FILTER );TEST_ASSERT (rc,"KVM_CAP_X86_MSR_FILTER is available" );
@@ -726,11 +720,8 @@ static void test_msr_filter_deny(void) {kvm_vm_free (vm); } -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 , - }; +static void test_msr_permission_bitmap (void ) +{struct kvm_vm *vm;int rc;
@@ -740,7 +731,7 @@ static void test_msr_permission_bitmap(void) { rc =kvm_check_cap (KVM_CAP_X86_USER_SPACE_MSR );TEST_ASSERT (rc,"KVM_CAP_X86_USER_SPACE_MSR is available" ); -vm_enable_cap (vm, &cap); +vm_enable_cap (vm,KVM_CAP_X86_USER_SPACE_MSR ,KVM_MSR_EXIT_REASON_FILTER ); rc =kvm_check_cap (KVM_CAP_X86_MSR_FILTER );TEST_ASSERT (rc,"KVM_CAP_X86_MSR_FILTER is available" );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 32/144 KVM: selftests: Cache list of MSRs to save/restore
In reply to Sean ChristophersonCache the list of MSRs to save restore, mostly to justify not freeing the list in the caller, which simplifies consumption of the list.
Opportunistically move the XSS test's so called is_supported_msr() to common code as kvm_msr_is_in_save_restore_list(). The XSS is "supported" by KVM, it's simply not in the save/restore list because KVM doesn't yet allow a non-zero value.
--- .../selftests/kvm/include/x86_64/processor.h | 4 +- .../selftests/kvm/lib/x86_64/processor.c | 83 +++++++++---------- .../selftests/kvm/x86_64/xss_msr_test.c | 27 ++---- 3 files changed, 46 insertions(+), 68 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +3 -1
@@ -427,8 +427,10 @@ void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_x86_state *state);void kvm_x86_state_cleanup (struct kvm_x86_state *state); -struct kvm_msr_list *kvm_get_msr_index_list (void ); +const struct kvm_msr_list *kvm_get_msr_index_list (void ); +bool kvm_msr_is_in_save_restore_list (uint32_t msr_index);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);
tools/testing/selftests/kvm/lib/x86_64/processor.c +37 -46
135 lines not on this page · raw message
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +6 -21
@@ -17,28 +17,11 @@#define X86_FEATURE_XSAVES (1<<3) -bool is_supported_msr (u32 msr_index) -{ -struct kvm_msr_list *list; -bool found = false; -int i; - - list =kvm_get_msr_index_list (); -for (i =0 ; i < list->nmsrs; ++i) { -if (list->indices[i] == msr_index) { - found = true; -break ; - } - } - -free (list); -return found; -} -int main (int argc,char *argv[]) {struct kvm_cpuid_entry2 *entry;bool xss_supported = false; +bool xss_in_msr_list;struct kvm_vm *vm;uint64_t xss_val;int i, r;
@@ -64,12 +47,14 @@ int main(int argc, char *argv[])* 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. * Also, in the future when a non-zero value succeeds check that -* IA32_XSS is in the KVM_GET_MSR_INDEX_LIST. +* IA32_XSS is in the list of MSRs to save/restore. */ + xss_in_msr_list =kvm_msr_is_in_save_restore_list (MSR_IA32_XSS );for (i =0 ; i <MSR_BITS ; ++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" ); + +TEST_ASSERT (r ==0 || xss_in_msr_list, +"IA32_XSS was able to be set, but was not in save/restore list" ); }kvm_vm_free (vm);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 33/144 KVM: selftests: Harden and comment XSS / KVM_SET_MSRS interaction
In reply to Sean ChristophersonAssert that KVM_SET_MSRS returns '0' or '1' when setting XSS to a non-zero value. The ioctl() itself should "succeed", its only the setting of the XSS MSR that should fail/fault.
--- tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +6 -1
@@ -53,7 +53,12 @@ int main(int argc, char *argv[])for (i =0 ; i <MSR_BITS ; ++i) { r =_vcpu_set_msr (vm,VCPU_ID ,MSR_IA32_XSS ,1ull << i); -TEST_ASSERT (r ==0 || xss_in_msr_list, +/* +* Setting a list of MSRs returns the entry that "faulted", or +* the last entry +1 if all MSRs were successfully written. +*/ +TEST_ASSERT (!r || r ==1 ,KVM_IOCTL_ERROR (KVM_SET_MSRS , r)); +TEST_ASSERT (r !=1 || xss_in_msr_list,"IA32_XSS was able to be set, but was not in save/restore list" ); }
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 34/144 KVM: selftests: Dedup MSR index list helpers, simplify dedicated test
In reply to Sean ChristophersonConsolidate the helper for retrieving the list of save/restore MSRs and the list of feature MSRs, and use the common helpers in the related get_msr_index_features test. Switching to the common helpers eliminates the testcase that KVM returns the same -E2BIG result if the input number of MSRs is '1' versus '0', but considered that testcase isn't very interesting, e.g. '0' and '1' are equally arbitrary, and certainly not worth the additional code.
--- .../selftests/kvm/include/x86_64/processor.h | 1 + .../selftests/kvm/lib/x86_64/processor.c | 39 ++++-- .../kvm/x86_64/get_msr_index_features.c | 112 +++--------------- 3 files changed, 46 insertions(+), 106 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
@@ -428,6 +428,7 @@ void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,void kvm_x86_state_cleanup (struct kvm_x86_state *state);const struct kvm_msr_list *kvm_get_msr_index_list (void ); +const struct kvm_msr_list *kvm_get_feature_msr_index_list (void );bool kvm_msr_is_in_save_restore_list (uint32_t msr_index);uint64_t kvm_get_feature_msr (uint64_t msr_index);
tools/testing/selftests/kvm/lib/x86_64/processor.c +31 -8
@@ -892,19 +892,20 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent)sregs_dump (stream, &sregs, indent +4 ); } -const struct kvm_msr_list *kvm_get_msr_index_list (void ) +static struct kvm_msr_list *__kvm_get_msr_index_list (bool feature_msrs) { -static struct kvm_msr_list *list; +struct kvm_msr_list *list;struct kvm_msr_list nmsrs;int kvm_fd, r; -if (list) -return list; - kvm_fd =open_kvm_dev_path_or_exit (); nmsrs.nmsrs =0 ; - r =__kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , &nmsrs); +if (!feature_msrs) + r =__kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , &nmsrs); +else + r =__kvm_ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , &nmsrs); +TEST_ASSERT (r ==-1 && errno ==E2BIG ,"Expected -E2BIG, got rc: %i errno: %i (%s)" , r, errno,strerror (errno));
@@ -913,15 +914,37 @@ const struct kvm_msr_list *kvm_get_msr_index_list(void)TEST_ASSERT (list,"-ENOMEM when allocating MSR index list" ); list->nmsrs = nmsrs.nmsrs; -kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list); +if (!feature_msrs) +kvm_ioctl (kvm_fd,KVM_GET_MSR_INDEX_LIST , list); +else +kvm_ioctl (kvm_fd,KVM_GET_MSR_FEATURE_INDEX_LIST , list);close (kvm_fd);TEST_ASSERT (list->nmsrs == nmsrs.nmsrs, -"Number of save/restore MSRs changed, was %d, now %d" , +"Number of MSRs in list changed, was %d, now %d" , nmsrs.nmsrs, list->nmsrs);return list; } +const struct kvm_msr_list *kvm_get_msr_index_list (void ) +{ +static const struct kvm_msr_list *list; + +if (!list) + list =__kvm_get_msr_index_list (false); +return list; +} + + +const struct kvm_msr_list *kvm_get_feature_msr_index_list (void ) +{ +static const struct kvm_msr_list *list; + +if (!list) + list =__kvm_get_msr_index_list (true); +return list; +} +bool kvm_msr_is_in_save_restore_list (uint32_t msr_index) {const struct kvm_msr_list *list =kvm_get_msr_index_list ();
tools/testing/selftests/kvm/x86_64/get_msr_index_features.c +14 -98
122 lines not on this page · raw message
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 35/144 KVM: selftests: Rename MP_STATE and GUEST_DEBUG helpers for consistency
In reply to Sean ChristophersonMove the get/set part of the MP_STATE and GUEST_DEBUG helpers to the end to align with the many other ioctl() wrappers/helpers. Note, this is not an endorsement of the predominant style, the goal is purely to provide consistency in the selftests.
--- tools/testing/selftests/kvm/aarch64/psci_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util_base.h | 9 +++++++-- tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- tools/testing/selftests/kvm/x86_64/debug_regs.c | 2 +- .../selftests/kvm/x86_64/svm_nested_soft_inject_test.c | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -1
@@ -70,7 +70,7 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) .mp_state = KVM_MP_STATE_STOPPED, }; -vcpu_set_mp_state (vm, vcpuid, &mp_state); +vcpu_mp_state_set (vm, vcpuid, &mp_state); }static struct kvm_vm *setup_vm (void *guest_code)
tools/testing/selftests/kvm/include/kvm_util_base.h +7 -2
@@ -374,13 +374,18 @@ static inline void vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id,vcpu_ioctl (vm, vcpu_id,KVM_ENABLE_CAP , &enable_cap); } -static inline void vcpu_set_guest_debug (struct kvm_vm *vm,uint32_t vcpuid, +static inline void vcpu_guest_debug_set (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, +static inline void vcpu_mp_state_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_mp_state *mp_state) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_MP_STATE , mp_state); +} +static inline void vcpu_mp_state_set (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_mp_state *mp_state) {vcpu_ioctl (vm, vcpuid,KVM_SET_MP_STATE , mp_state);
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
@@ -655,7 +655,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)/* Setup the MP state */ mp_state.mp_state =0 ; -vcpu_set_mp_state (vm, vcpuid, &mp_state); +vcpu_mp_state_set (vm, vcpuid, &mp_state); }/*
tools/testing/selftests/kvm/x86_64/debug_regs.c +1 -1
@@ -67,7 +67,7 @@ static void guest_code(void) }#define CLEAR_DEBUG () memset(&debug, 0, sizeof(debug)) -#define APPLY_DEBUG () vcpu_set_guest_debug(vm, VCPU_ID, &debug) +#define APPLY_DEBUG () vcpu_guest_debug_set(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); \
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +1 -1
@@ -166,7 +166,7 @@ static void run_test(bool is_nmi)vcpu_args_set (vm,VCPU_ID ,3 , svm_gva, (uint64_t )is_nmi, (uint64_t )idt_alt_vm);memset (&debug,0 ,sizeof (debug)); -vcpu_set_guest_debug (vm,VCPU_ID , &debug); +vcpu_guest_debug_set (vm,VCPU_ID , &debug);struct kvm_run *run =vcpu_state (vm,VCPU_ID );struct ucall uc;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 36/144 KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
In reply to Sean ChristophersonAdd helpers for the various one-off helpers used by x86's vCPU state save/restore helpers, and convert the other open coded ioctl()s to use existing helpers.
--- .../selftests/kvm/include/x86_64/processor.h | 54 ++++++++ .../selftests/kvm/lib/x86_64/processor.c | 126 +++++------------- 2 files changed, 91 insertions(+), 89 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +54 -0
@@ -432,6 +432,60 @@ const struct kvm_msr_list *kvm_get_feature_msr_index_list(void);bool kvm_msr_is_in_save_restore_list (uint32_t msr_index);uint64_t kvm_get_feature_msr (uint64_t msr_index); +static inline void vcpu_msrs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_GET_MSRS , msrs); + +TEST_ASSERT (r == msrs->nmsrs, +"KVM_GET_MSRS failed, r: %i (failed on MSR %x)" , + r, r <0 || r >= msrs->nmsrs ?-1 : msrs->entries[r].index); +} +static inline void vcpu_msrs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_SET_MSRS , msrs); + +TEST_ASSERT (r == msrs->nmsrs, +"KVM_GET_MSRS failed, r: %i (failed on MSR %x)" , + r, r <0 || r >= msrs->nmsrs ?-1 : msrs->entries[r].index); +} +static inline void vcpu_debugregs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_debugregs *debugregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_DEBUGREGS , debugregs); +} +static inline void vcpu_debugregs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_debugregs *debugregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_DEBUGREGS , debugregs); +} +static inline void vcpu_xsave_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XSAVE , xsave); +} +static inline void vcpu_xsave2_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XSAVE2 , xsave); +} +static inline void vcpu_xsave_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_XSAVE , xsave); +} +static inline void vcpu_xcrs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xcrs *xcrs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XCRS , xcrs); +} +static inline void vcpu_xcrs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xcrs *xcrs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_XCRS , xcrs); +} +struct kvm_cpuid2 *kvm_get_supported_cpuid (void );struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid);
tools/testing/selftests/kvm/lib/x86_64/processor.c +37 -89
180 lines not on this page · raw message
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 036/144] KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
Quoted 24 lines · Sean Christopherson
Add helpers for the various one-off helpers used by x86's vCPU state save/restore helpers, and convert the other open coded ioctl()s to use existing helpers.
Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/include/x86_64/processor.h | 54 ++++++++ .../selftests/kvm/lib/x86_64/processor.c | 126 +++++------------- 2 files changed, 91 insertions(+), 89 deletions(-)tools/testing/selftests/kvm/include/x86_64/processor.h +6
-0@@ -432,6 +432,60 @@ const struct kvm_msr_list *kvm_get_feature_msr_index_list(void);bool kvm_msr_is_in_save_restore_list (uint32_t msr_index);uint64_t kvm_get_feature_msr (uint64_t msr_index); +static inline void vcpu_msrs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_GET_MSRS , msrs); + + TEST_ASSERT(r == msrs->nmsrs,
tools/testing/selftests/kvm/include/x86_64/processor.h const struct kvm_msr_list *kvm_get_feature_msr_index_list(void); · line 450
Quoted 10 lines
tools/testing/selftests/kvm/include/x86_64/processor.h +10
-0+"KVM_GET_MSRS failed, r: %i (failed on MSR %x)" , + r, r < 0 || r >= msrs->nmsrs ? -1 : msrs->entries[r].index); +} +static inline void vcpu_msrs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_SET_MSRS , msrs); + + TEST_ASSERT(r == msrs->nmsrs, + "KVM_GET_MSRS failed, r: %i (failed on MSR %x)",
Hi, Sean, this should be the "KVM_SET_MSRS failed", right?
Quoted 228 lines
tools/testing/selftests/kvm/include/x86_64/processor.h +38
-0+ r, r < 0 || r >= msrs->nmsrs ? -1 : msrs->entries[r].index); +} +static inline void vcpu_debugregs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_debugregs *debugregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_DEBUGREGS , debugregs); +} +static inline void vcpu_debugregs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_debugregs *debugregs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_DEBUGREGS , debugregs); +} +static inline void vcpu_xsave_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XSAVE , xsave); +} +static inline void vcpu_xsave2_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XSAVE2 , xsave); +} +static inline void vcpu_xsave_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xsave *xsave) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_XSAVE , xsave); +} +static inline void vcpu_xcrs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xcrs *xcrs) +{ +vcpu_ioctl (vm, vcpuid,KVM_GET_XCRS , xcrs); +} +static inline void vcpu_xcrs_set (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_xcrs *xcrs) +{ +vcpu_ioctl (vm, vcpuid,KVM_SET_XCRS , xcrs); +} +struct kvm_cpuid2 *kvm_get_supported_cpuid (void );struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid);tools/testing/selftests/kvm/lib/x86_64/processor.c +37
-89@@ -815,13 +815,11 @@ uint64_t vcpu_get_msr(struct kvm_vm *vm, uint32_t vcpuid, uint64_t msr_index)struct kvm_msrs header;struct kvm_msr_entry entry; } buffer = {}; -int r; buffer.header.nmsrs =1 ; buffer.entry.index = msr_index; - r =__vcpu_ioctl (vm, vcpuid,KVM_GET_MSRS , &buffer.header); -TEST_ASSERT (r ==1 ,KVM_IOCTL_ERROR (KVM_GET_MSRS , r)); +vcpu_msrs_get (vm, vcpuid, &buffer.header);return buffer.entry.data; }@@ -958,28 +956,26 @@ bool kvm_msr_is_in_save_restore_list(uint32_t msr_index)return false; } -static int vcpu_save_xsave_state (struct kvm_vm *vm,struct vcpu *vcpu, -struct kvm_x86_state *state) +static void vcpu_save_xsave_state (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_x86_state *state) { -int size; +int size =vm_check_cap (vm,KVM_CAP_XSAVE2 ); - size =vm_check_cap (vm,KVM_CAP_XSAVE2 ); -if (!size) - size =sizeof (struct kvm_xsave ); - - state->xsave =malloc (size); -if (size ==sizeof (struct kvm_xsave )) -return ioctl (vcpu->fd,KVM_GET_XSAVE , state->xsave); -else -return ioctl (vcpu->fd,KVM_GET_XSAVE2 , state->xsave); +if (size) { + state->xsave =malloc (size); +vcpu_xsave2_get (vm, vcpuid, state->xsave); + }else { + state->xsave =malloc (sizeof (struct kvm_xsave )); +vcpu_xsave_get (vm, vcpuid, state->xsave); + } }struct kvm_x86_state *vcpu_save_state (struct kvm_vm *vm,uint32_t vcpuid) {const struct kvm_msr_list *msr_list =kvm_get_msr_index_list (); -struct vcpu *vcpu =vcpu_get (vm, vcpuid);struct kvm_x86_state *state; -int r, i; +int i; +static int nested_size =-1 ;if (nested_size ==-1 ) {@@ -998,102 +994,54 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid)vcpu_run_complete_io (vm, vcpuid); state =malloc (sizeof (*state) + msr_list->nmsrs *sizeof (state->msrs.entries[0 ])); - r =ioctl (vcpu->fd,KVM_GET_VCPU_EVENTS , &state->events); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_VCPU_EVENTS, r: %i" , - r); - r =ioctl (vcpu->fd,KVM_GET_MP_STATE , &state->mp_state); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_MP_STATE, r: %i" , - r); +vcpu_events_get (vm, vcpuid, &state->events); +vcpu_mp_state_get (vm, vcpuid, &state->mp_state); +vcpu_regs_get (vm, vcpuid, &state->regs); +vcpu_save_xsave_state (vm, vcpuid, state); - r =ioctl (vcpu->fd,KVM_GET_REGS , &state->regs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_REGS, r: %i" , - r); +if (kvm_check_cap (KVM_CAP_XCRS )) +vcpu_xcrs_get (vm, vcpuid, &state->xcrs); - r =vcpu_save_xsave_state (vm, vcpu, state); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_XSAVE, r: %i" , - r); - -if (kvm_check_cap (KVM_CAP_XCRS )) { - r =ioctl (vcpu->fd,KVM_GET_XCRS , &state->xcrs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_XCRS, r: %i" , - r); - } - - r =ioctl (vcpu->fd,KVM_GET_SREGS , &state->sregs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_SREGS, r: %i" , - r); +vcpu_sregs_get (vm, vcpuid, &state->sregs);if (nested_size) { state->nested.size =sizeof (state->nested_); - r =ioctl (vcpu->fd,KVM_GET_NESTED_STATE , &state->nested); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_NESTED_STATE, r: %i" , - r); + +vcpu_nested_state_get (vm, vcpuid, &state->nested);TEST_ASSERT (state->nested.size <= nested_size,"Nested state size too big, %i (KVM_CHECK_CAP gave %i)" , state->nested.size, nested_size); - }else + }else { state->nested.size =0 ; + } state->msrs.nmsrs = msr_list->nmsrs;for (i =0 ; i < msr_list->nmsrs; i++) state->msrs.entries[i].index = msr_list->indices[i]; - r =ioctl (vcpu->fd,KVM_GET_MSRS , &state->msrs); -TEST_ASSERT (r == msr_list->nmsrs,"Unexpected result from KVM_GET_MSRS, r: %i (failed MSR was 0x%x)" , - r, r == msr_list->nmsrs ?-1 : msr_list->indices[r]); +vcpu_msrs_get (vm, vcpuid, &state->msrs); - r =ioctl (vcpu->fd,KVM_GET_DEBUGREGS , &state->debugregs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_DEBUGREGS, r: %i" , - r); +vcpu_debugregs_get (vm, vcpuid, &state->debugregs);return state; }void vcpu_load_state (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_x86_state *state) { -struct vcpu *vcpu =vcpu_get (vm, vcpuid); -int r; +vcpu_sregs_set (vm, vcpuid, &state->sregs); +vcpu_msrs_set (vm, vcpuid, &state->msrs); - r =ioctl (vcpu->fd,KVM_SET_SREGS , &state->sregs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_SREGS, r: %i" , - r); +if (kvm_check_cap (KVM_CAP_XCRS )) +vcpu_xcrs_set (vm, vcpuid, &state->xcrs); - r =ioctl (vcpu->fd,KVM_SET_MSRS , &state->msrs); -TEST_ASSERT (r == state->msrs.nmsrs, -"Unexpected result from KVM_SET_MSRS, r: %i (failed at %x)" , - r, r == state->msrs.nmsrs ?-1 : state->msrs.entries[r].index); +vcpu_xsave_set (vm, vcpuid, state->xsave); +vcpu_events_set (vm, vcpuid, &state->events); +vcpu_mp_state_set (vm, vcpuid, &state->mp_state); +vcpu_debugregs_set (vm, vcpuid, &state->debugregs); +vcpu_regs_set (vm, vcpuid, &state->regs); -if (kvm_check_cap (KVM_CAP_XCRS )) { - r =ioctl (vcpu->fd,KVM_SET_XCRS , &state->xcrs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_XCRS, r: %i" , - r); - } - - r =ioctl (vcpu->fd,KVM_SET_XSAVE , state->xsave); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_XSAVE, r: %i" , - r); - - r =ioctl (vcpu->fd,KVM_SET_VCPU_EVENTS , &state->events); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_VCPU_EVENTS, r: %i" , - r); - - r =ioctl (vcpu->fd,KVM_SET_MP_STATE , &state->mp_state); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_MP_STATE, r: %i" , - r); - - r =ioctl (vcpu->fd,KVM_SET_DEBUGREGS , &state->debugregs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_DEBUGREGS, r: %i" , - r); - - r =ioctl (vcpu->fd,KVM_SET_REGS , &state->regs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_REGS, r: %i" , - r); - -if (state->nested.size) { - r =ioctl (vcpu->fd,KVM_SET_NESTED_STATE , &state->nested); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_NESTED_STATE, r: %i" , - r); - } +if (state->nested.size) +vcpu_nested_state_set (vm, vcpuid, &state->nested); }void kvm_x86_state_cleanup (struct kvm_x86_state *state)
Sean Christopherson
reviewerRe: [PATCH v2 036/144] KVM: selftest: Add proper helpers for x86-specific save/restore ioctls
Quoted 30 lines · Lei
Quoted 28 lines · Sean Christopherson
Add helpers for the various one-off helpers used by x86's vCPU state save/restore helpers, and convert the other open coded ioctl()s to use existing helpers.
Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/include/x86_64/processor.h | 54 ++++++++ .../selftests/kvm/lib/x86_64/processor.c | 126 +++++------------- 2 files changed, 91 insertions(+), 89 deletions(-)tools/testing/selftests/kvm/include/x86_64/processor.h +10
-0@@ -432,6 +432,60 @@ const struct kvm_msr_list *kvm_get_feature_msr_index_list(void);bool kvm_msr_is_in_save_restore_list (uint32_t msr_index);uint64_t kvm_get_feature_msr (uint64_t msr_index); +static inline void vcpu_msrs_get (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_GET_MSRS , msrs); + +TEST_ASSERT (r == msrs->nmsrs, +"KVM_GET_MSRS failed, r: %i (failed on MSR %x)" , + r, r <0 || r >= msrs->nmsrs ?-1 : msrs->entries[r].index); +} +static inline void vcpu_msrs_set(struct kvm_vm *vm, uint32_t vcpuid,
Quoted 8 lines
tools/testing/selftests/kvm/include/x86_64/processor.h const struct kvm_msr_list *kvm_get_feature_msr_index_list(void); · line 450
Quoted 6 lines
tools/testing/selftests/kvm/include/x86_64/processor.h +6
-0+ struct kvm_msrs *msrs) +{ +int r =__vcpu_ioctl (vm, vcpuid,KVM_SET_MSRS , msrs); + + TEST_ASSERT(r == msrs->nmsrs, + "KVM_GET_MSRS failed, r: %i (failed on MSR %x)",Hi, Sean, this should be the "
KVM_SET_MSRSfailed", right?
Yep. I wish I could say I was cleverly justifying use of macro magic, but it was just a copy+paste goof.
Sean Christopherson
reviewerPATCH v2 37/144 KVM: selftests: Add vm_create_*() variants to expose/return 'struct vcpu'
In reply to Sean ChristophersonAdd VM creation helpers to expose/return 'struct vcpu' so that tests don't have to hardcode a VCPU_ID or make assumptions about what vCPU ID is used by the framework just to retrieve a vCPU the test created.
--- .../selftests/kvm/include/kvm_util_base.h | 16 ++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+)
tools/testing/selftests/kvm/include/kvm_util_base.h +16 -0
@@ -628,6 +628,22 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,/* Create a default VM without any vcpus. */ struct kvm_vm *vm_create_without_vcpus (enum vm_guest_mode mode,uint64_t pages); +/* +* 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
@@ -369,6 +369,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 *
@@ -403,6 +413,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 38/144 KVM: selftests: Push vm_adjust_num_guest_pages() into "w/o vCPUs" helper
In reply to Sean ChristophersonMove the call to vm_adjust_num_guest_pages() from vm_create_with_vcpus() down into vm_create_without_vcpus(). This will allow a future patch to make the "w/o vCPUs" variant the common inner helper, e.g. so that the "with_vcpus" helper calls the "without_vcpus" helper, instead of having them be separate paths.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +2 -2
@@ -282,6 +282,8 @@ struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) {struct kvm_vm *vm; + pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); + vm =__vm_create (mode, pages);kvm_vm_elf_load (vm, program_invocation_name);
@@ -341,8 +343,6 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,"nr_vcpus = %d too large for host, max-vcpus = %d" , nr_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); - pages =vm_adjust_num_guest_pages (mode, pages); - vm =vm_create_without_vcpus (mode, pages);for (i =0 ; i < nr_vcpus; ++i) {
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 038/144] KVM: selftests: Push vm_adjust_num_guest_pages() into "w/o vCPUs" helper
Quoted 16 lines · Sean Christopherson
Move the call to
vm_adjust_num_guest_pages()fromvm_create_with_vcpus()down intovm_create_without_vcpus(). This will allow a future patch to make the "w/o vCPUs" variant the common inner helper, e.g. so that the "with_vcpus" helper calls the "without_vcpus" helper, instead of having them be separate paths.Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +0
-0
tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) · line 285
Quoted 4 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1
-0@@ -282,6 +282,8 @@ struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) {struct kvm_vm *vm; + pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages);
Hi Sean,
We should pass 'mode' here.
Thanks,
drew
Quoted 16 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1
-2+ vm =__vm_create (mode, pages);kvm_vm_elf_load (vm, program_invocation_name);@@ -341,8 +343,6 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,"nr_vcpus = %d too large for host, max-vcpus = %d" , nr_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); - pages =vm_adjust_num_guest_pages (mode, pages); - vm =vm_create_without_vcpus (mode, pages);for (i =0 ; i < nr_vcpus; ++i) {Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerRe: [PATCH v2 038/144] KVM: selftests: Push vm_adjust_num_guest_pages() into "w/o vCPUs" helper
Quoted 20 lines · Andrew Jones
Quoted 19 lines · Sean Christopherson
Move the call to
vm_adjust_num_guest_pages()fromvm_create_with_vcpus()down intovm_create_without_vcpus(). This will allow a future patch to make the "w/o vCPUs" variant the common inner helper, e.g. so that the "with_vcpus" helper calls the "without_vcpus" helper, instead of having them be separate paths.Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +0
-0@@ -282,6 +282,8 @@ struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) {struct kvm_vm *vm;
Quoted 5 lines
tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *vm_create_without_vcpus(enum vm_guest_mode mode, uint64_t pages) · line 285
Quoted 1 line
tools/testing/selftests/kvm/lib/kvm_util.c +1
-0+ pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages);Hi Sean,
We should pass 'mode' here.
Ouch. Very nice catch! Lucky for me, the resulting conflicts later in the series are obvious and straightfoward.
Thanks much!
Sean Christopherson
reviewerPATCH v2 39/144 KVM: selftests: Use vm_create_without_vcpus() in set_boot_cpu_id
In reply to Sean ChristophersonUse vm_create_without_vcpus() in set_boot_cpu_id instead of open coding the equivlant now that the "without_vcpus" variant does vm_adjust_num_guest_pages().
--- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -8
@@ -82,18 +82,11 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)static struct kvm_vm *create_vm (void ) { -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 pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; - pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); - vm =vm_create (pages); - -kvm_vm_elf_load (vm, program_invocation_name); -vm_create_irqchip (vm); - -return vm; +return vm_create_without_vcpus (VM_MODE_DEFAULT , pages); }static void add_x86_vcpu (struct kvm_vm *vm,uint32_t vcpuid,bool bsp_code)
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 40/144 KVM: selftests: Use vm_create_without_vcpus() in dirty_log_test
In reply to Sean ChristophersonUse vm_create_without_vcpus() instead of open coding a rough equivalent.
--- tools/testing/selftests/kvm/dirty_log_test.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +2 -5
@@ -674,11 +674,8 @@ 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); -kvm_vm_elf_load (vm, program_invocation_name); -#ifdef __x86_64__ -vm_create_irqchip (vm); -#endif + vm =vm_create_without_vcpus (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages); +log_mode_create_vm_done (vm);vm_vcpu_add_default (vm, vcpuid, guest_code);return vm;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 41/144 KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test
In reply to Sean ChristophersonUse vm_create_without_vcpus() instead of open coding a rough equivalent in hardware_disable_test.
--- tools/testing/selftests/kvm/hardware_disable_test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/testing/selftests/kvm/hardware_disable_test.c +1 -3
@@ -104,9 +104,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set); - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); -kvm_vm_elf_load (vm, program_invocation_name); -vm_create_irqchip (vm); + vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) {
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test
Quoted 13 lines · Sean Christopherson
Use
vm_create_without_vcpus()instead of open coding a rough equivalent inhardware_disable_test.Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/hardware_disable_test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tools/testing/selftests/kvm/hardware_disable_test.c +0
-0
tools/testing/selftests/kvm/hardware_disable_test.c static void run_test(uint32_t run) · line 107
Quoted 7 lines
tools/testing/selftests/kvm/hardware_disable_test.c +1
-3@@ -104,9 +104,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set); - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); -kvm_vm_elf_load (vm, program_invocation_name); -vm_create_irqchip (vm); + vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );
nit: ^ extra space
Quoted 6 lines
tools/testing/selftests/kvm/hardware_disable_test.c +0
-0pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) {Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerRe: [PATCH v2 041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test
Quoted 17 lines · Andrew Jones
Quoted 16 lines · Sean Christopherson
Use
vm_create_without_vcpus()instead of open coding a rough equivalent inhardware_disable_test.Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/hardware_disable_test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tools/testing/selftests/kvm/hardware_disable_test.c +0
-0@@ -104,9 +104,7 @@ static void run_test(uint32_t run)for (i =0 ; i <VCPU_NUM ; i++)CPU_SET (i, &cpu_set);
Quoted 5 lines
tools/testing/selftests/kvm/hardware_disable_test.c static void run_test(uint32_t run) · line 107
Quoted 4 lines
tools/testing/selftests/kvm/hardware_disable_test.c +1
-3- vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); -kvm_vm_elf_load (vm, program_invocation_name); -vm_create_irqchip (vm); + vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );nit: ^ extra space
Heh, and I managed to carry that to the end of the series. At least I'm consistent?
Sean Christopherson
reviewerPATCH v2 42/144 KVM: selftests: Use vm_create_without_vcpus() in psci_test
In reply to Sean ChristophersonUse vm_create_without_vcpus() instead of open coding a rough equivalent in psci_test.
--- tools/testing/selftests/kvm/aarch64/psci_test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -2
@@ -78,8 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)struct kvm_vcpu_init init;struct kvm_vm *vm; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); -kvm_vm_elf_load (vm, program_invocation_name); + vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );ucall_init (vm,NULL );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 43/144 KVM: selftests: Rename vm_create() => vm_create_barebones(), drop param
In reply to Sean ChristophersonRename vm_create() to vm_create_barebones() and drop the @phys_pages param. Pass '0' for the number of pages even though some callers pass 'DEFAULT_GUEST_PHY_PAGES', as the intent behind creating truly barebones VMs is purely to create a VM, i.e. there aren't vCPUs, there's no guest code loaded, etc..., and so there is nothing that will ever need or consume guest memory.
Freeing up the name vm_create() will allow using the name for an inner helper to the other VM creators, which need a "full" VM.
Opportunisticaly rewrite the function comment for addr_gpa2alias() to focus on what the _function_ does, not what its _sole caller_ does.
--- .../selftests/kvm/aarch64/get-reg-list.c | 2 +- .../selftests/kvm/aarch64/vcpu_width_config.c | 6 ++-- .../selftests/kvm/include/kvm_util_base.h | 6 +++- .../selftests/kvm/kvm_binary_stats_test.c | 2 +- .../selftests/kvm/kvm_create_max_vcpus.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 29 +++---------------- .../selftests/kvm/set_memory_region_test.c | 4 +-- .../kvm/x86_64/max_vcpuid_cap_test.c | 2 +- .../selftests/kvm/x86_64/set_sregs_test.c | 2 +- .../selftests/kvm/x86_64/sev_migrate_tests.c | 8 ++--- 10 files changed, 23 insertions(+), 40 deletions(-)
tools/testing/selftests/kvm/aarch64/get-reg-list.c +1 -1
@@ -416,7 +416,7 @@ static void run_test(struct vcpu_config *c)check_supported (c); - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();prepare_vcpu_init (c, &init);aarch64_vcpu_add_default (vm,0 , &init,NULL );finalize_vcpu (vm,0 , c);
tools/testing/selftests/kvm/aarch64/vcpu_width_config.c +3 -3
@@ -24,7 +24,7 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();vm_vcpu_add (vm,0 ); ret =__vcpu_ioctl (vm,0 ,KVM_ARM_VCPU_INIT , init1);
@@ -49,7 +49,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1,struct kvm_vm *vm;int ret; - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();vm_vcpu_add (vm,0 );vm_vcpu_add (vm,1 );
@@ -86,7 +86,7 @@ int main(void) }/* Get the preferred target type and copy that to init2 for later use */ - vm =vm_create (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init1);kvm_vm_free (vm); init2 = init1;
tools/testing/selftests/kvm/include/kvm_util_base.h +5 -1
@@ -248,7 +248,6 @@ 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 (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);
@@ -596,6 +595,11 @@ 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); +static inline struct kvm_vm *vm_create_barebones (void ) +{ +return __vm_create (VM_MODE_DEFAULT ,0 ); +} +/* * Create a VM with reasonable defaults *
tools/testing/selftests/kvm/kvm_binary_stats_test.c +1 -1
@@ -221,7 +221,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 (DEFAULT_GUEST_PHY_PAGES ); + vms[i] =vm_create_barebones ();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 (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();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 +4 -25
@@ -258,26 +258,6 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t phy_pages)return vm; } -/* -* VM Create -* -* Input Args: -* phy_pages - Physical memory pages -* -* Output Args: None -* -* Return: -* Pointer to opaque structure that describes the created VM. -* -* Creates a VM with the default physical/virtual address widths and page size. -* When phy_pages is non-zero, a memory region of phy_pages physical pages -* is created and mapped starting at guest physical address 0. -*/ -struct kvm_vm *vm_create (uint64_t phy_pages) -{ -return __vm_create (VM_MODE_DEFAULT , phy_pages); -} -struct kvm_vm *vm_create_without_vcpus (enum vm_guest_mode mode,uint64_t pages) {struct kvm_vm *vm;
@@ -1421,11 +1401,10 @@ vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva)* (without failing the test) if the guest memory is not shared (so * no alias exists). * -* When vm_create() and related functions are called with a shared memory -* src_type, we also create a writable, shared alias mapping of the -* underlying guest memory. This allows the host to manipulate guest memory -* without mapping that memory in the guest's address space. And, for -* userfaultfd-based demand paging, we can do so without triggering userfaults. +* Create a writable, shared virtual=>physical alias for the specific GPA. +* The primary use case is to allow the host selftest to manipulate guest +* memory without mapping said memory in the guest's address space. And, for +* userfaultfd-based demand paging, to do so without triggering userfaults. */ void *addr_gpa2alias (struct kvm_vm *vm,vm_paddr_t gpa) {
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 (0 ); + vm =vm_create_barebones ();vm_vcpu_add (vm,VCPU_ID );vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul );
@@ -353,7 +353,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 (0 ); + vm =vm_create_barebones ();/* 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/max_vcpuid_cap_test.c +1 -1
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])struct kvm_vm *vm;int ret; - vm =vm_create (0 ); + vm =vm_create_barebones ();/* Get KVM_CAP_MAX_VCPU_ID cap supported in KVM */ ret =vm_check_cap (vm,KVM_CAP_MAX_VCPU_ID );
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 (DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create_barebones ();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
@@ -53,7 +53,7 @@ static struct kvm_vm *sev_vm_create(bool es)struct kvm_sev_launch_start start = {0 };int i; - vm =vm_create (0 ); + vm =vm_create_barebones ();sev_ioctl (vm->fd, es ?KVM_SEV_ES_INIT :KVM_SEV_INIT ,NULL );for (i =0 ; i <NR_MIGRATE_TEST_VCPUS ; ++i)vm_vcpu_add (vm, i);
@@ -70,7 +70,7 @@ static struct kvm_vm *aux_vm_create(bool with_vcpus)struct kvm_vm *vm;int i; - vm =vm_create (0 ); + vm =vm_create_barebones ();if (!with_vcpus)return vm;
@@ -168,7 +168,7 @@ static void test_sev_migrate_parameters(void) *sev_es_vm_no_vmsa;int ret; - vm_no_vcpu =vm_create (0 ); + vm_no_vcpu =vm_create_barebones (); vm_no_sev =aux_vm_create (true); ret =__sev_migrate_from (vm_no_vcpu, vm_no_sev); TEST_ASSERT(ret == -1 && errno == EINVAL,
@@ -180,7 +180,7 @@ static void test_sev_migrate_parameters(void) sev_vm =sev_vm_create (/* es= */ false); sev_es_vm =sev_vm_create (/* es= */ true); - sev_es_vm_no_vmsa =vm_create (0 ); + sev_es_vm_no_vmsa =vm_create_barebones ();sev_ioctl (sev_es_vm_no_vmsa->fd,KVM_SEV_ES_INIT ,NULL );vm_vcpu_add (sev_es_vm_no_vmsa,1 );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 44/144 KVM: selftests: Rename vm_create_without_vcpus() => vm_create()
In reply to Sean ChristophersonRename vm_create_without_vcpus() to vm_create() so that it's not misconstrued as helper that creates a VM that can never have vCPUs, as opposed to a helper that "just" creates a VM without vCPUs added at time zero.
--- tools/testing/selftests/kvm/aarch64/psci_test.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/hardware_disable_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++-- tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 2 +- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -1
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)struct kvm_vcpu_init init;struct kvm_vm *vm; - vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );ucall_init (vm,NULL );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init);
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -674,7 +674,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_without_vcpus (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages); + vm =vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);log_mode_create_vm_done (vm);vm_vcpu_add_default (vm, vcpuid, guest_code);
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_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) {
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -630,7 +630,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, uint32_t vcpuids[]);/* Create a default VM without any vcpus. */ -struct kvm_vm *vm_create_without_vcpus (enum vm_guest_mode mode,uint64_t pages); +struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t pages);/* * Create a VM with a single vCPU with reasonable defaults and @extra_mem_pages
tools/testing/selftests/kvm/lib/kvm_util.c +2 -2
@@ -258,7 +258,7 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t phy_pages)return vm; } -struct kvm_vm *vm_create_without_vcpus (enum vm_guest_mode mode,uint64_t pages) +struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t pages) {struct kvm_vm *vm;
@@ -323,7 +323,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,"nr_vcpus = %d too large for host, max-vcpus = %d" , nr_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); - vm =vm_create_without_vcpus (mode, pages); + vm =vm_create (mode, pages);for (i =0 ; i < nr_vcpus; ++i) {uint32_t vcpuid = vcpuids ? vcpuids[i] : i;
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -339,7 +339,7 @@ static void test_pmu_config_disable(void (*guest_code)(void))if (!(r &KVM_PMU_CAP_DISABLE ))return ; - vm =vm_create_without_vcpus (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES );vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE );
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -86,7 +86,7 @@ static struct kvm_vm *create_vm(void)uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE *N_VCPU ;uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; -return vm_create_without_vcpus (VM_MODE_DEFAULT , pages); +return vm_create (VM_MODE_DEFAULT , pages); }static void add_x86_vcpu (struct kvm_vm *vm,uint32_t vcpuid,bool bsp_code)
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 45/144 KVM: selftests: Make vm_create() a wrapper that specifies VM_MODE_DEFAULT
In reply to Sean ChristophersonAdd ____vm_create() to be the innermost helper, and turn vm_create() into a wrapper the specifies VM_MODE_DEFAULT. Most of the vm_create() callers just want the default mode, or more accurately, don't care about the mode.
--- .../testing/selftests/kvm/aarch64/psci_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 | 18 +++++++++++++----- tools/testing/selftests/kvm/lib/kvm_util.c | 16 ++++++++-------- .../kvm/x86_64/pmu_event_filter_test.c | 2 +- .../selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- 7 files changed, 26 insertions(+), 18 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -1
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code)struct kvm_vcpu_init init;struct kvm_vm *vm; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );ucall_init (vm,NULL );vm_ioctl (vm,KVM_ARM_PREFERRED_TARGET , &init);
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -674,7 +674,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);log_mode_create_vm_done (vm);vm_vcpu_add_default (vm, vcpuid, guest_code);
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 );pr_debug ("%s: [%d] start vcpus\n" , __func__, run);for (i =0 ; i <VCPU_NUM ; ++i) {
tools/testing/selftests/kvm/include/kvm_util_base.h +13 -5
@@ -247,7 +247,6 @@ static inline void vm_enable_cap(struct kvm_vm *vm, uint32_t cap, uint64_t arg0)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);void kvm_vm_free (struct kvm_vm *vmp);void kvm_vm_restart (struct kvm_vm *vmp);void kvm_vm_release (struct kvm_vm *vmp);
@@ -595,9 +594,21 @@ 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); +/* +* ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also +* loads the test binary into guest memory and creates an IRQ chip (x86 only). +*/ +struct kvm_vm *____vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +static inline struct kvm_vm *vm_create_barebones (void ) { -return __vm_create (VM_MODE_DEFAULT ,0 ); +return ____vm_create (VM_MODE_DEFAULT ,0 ); +} + +static inline struct kvm_vm *vm_create (uint64_t nr_pages) +{ +return __vm_create (VM_MODE_DEFAULT , nr_pages); }/*
@@ -629,9 +640,6 @@ 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 default VM without any vcpus. */ -struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t pages); -/* * 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).
tools/testing/selftests/kvm/lib/kvm_util.c +8 -8
@@ -149,12 +149,12 @@ const struct vm_guest_mode_params vm_guest_mode_params[] = {_Static_assert (sizeof (vm_guest_mode_params)/sizeof (struct vm_guest_mode_params ) ==NUM_VM_MODES ,"Missing new mode params?" ); -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 nr_pages) {struct kvm_vm *vm;pr_debug ("%s: mode='%s' pages='%ld'\n" , __func__, -vm_guest_mode_string (mode), phy_pages); +vm_guest_mode_string (mode), nr_pages); vm =calloc (1 ,sizeof (*vm));TEST_ASSERT (vm !=NULL ,"Insufficient Memory" );
@@ -251,20 +251,20 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t phy_pages)/* Allocate and setup memory for guest. */ vm->vpages_mapped =sparsebit_alloc (); -if (phy_pages !=0 ) +if (nr_pages !=0 )vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS , -0 ,0 , phy_pages,0 ); +0 ,0 , nr_pages,0 );return vm; } -struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t pages) +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages) {struct kvm_vm *vm; - pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); + nr_pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , nr_pages); - vm =__vm_create (mode, pages); + vm =____vm_create (mode, nr_pages);kvm_vm_elf_load (vm, program_invocation_name);
@@ -323,7 +323,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,"nr_vcpus = %d too large for host, max-vcpus = %d" , nr_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS)); - vm =vm_create (mode, pages); + vm =__vm_create (mode, pages);for (i =0 ; i < nr_vcpus; ++i) {uint32_t vcpuid = vcpuids ? vcpuids[i] : i;
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -1
@@ -339,7 +339,7 @@ static void test_pmu_config_disable(void (*guest_code)(void))if (!(r &KVM_PMU_CAP_DISABLE ))return ; - vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ); + vm =vm_create (DEFAULT_GUEST_PHY_PAGES );vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE );
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -86,7 +86,7 @@ static struct kvm_vm *create_vm(void)uint64_t extra_pg_pages = vcpu_pages /PTES_PER_MIN_PAGE *N_VCPU ;uint64_t pages =DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; -return vm_create (VM_MODE_DEFAULT , pages); +return vm_create (pages); }static void add_x86_vcpu (struct kvm_vm *vm,uint32_t vcpuid,bool bsp_code)
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 045/144] KVM: selftests: Make vm_create() a wrapper that specifies VM_MODE_DEFAULT
On Fri, Jun 03, 2022 at 12:41:52AM +0000, Sean Christopherson wrote:
...
tools/testing/selftests/kvm/include/kvm_util_base.h vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, · line 608
Quoted 13 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +10
-1+/* +* ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also +* loads the test binary into guest memory and creates an IRQ chip (x86 only). +*/ +struct kvm_vm *____vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +static inline struct kvm_vm *vm_create_barebones (void ) { -return __vm_create (VM_MODE_DEFAULT ,0 ); +return ____vm_create (VM_MODE_DEFAULT ,0 ); +} +
I don't [overly] mind the "____helperhelper" naming style, but in this case wouldn't __vm_create_barebones() also be a reasonable name?
Thanks,
drew
Sean Christopherson
reviewerRe: [PATCH v2 045/144] KVM: selftests: Make vm_create() a wrapper that specifies VM_MODE_DEFAULT
Quoted 18 lines · Andrew Jones
On Fri, Jun 03, 2022 at 12:41:52AM +0000, Sean Christopherson wrote:
...tools/testing/selftests/kvm/include/kvm_util_base.h vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, · line 608
Quoted 13 lines
tools/testing/selftests/kvm/include/kvm_util_base.h +10
-1+/* +* ____vm_create() does KVM_CREATE_VM and little else. __vm_create() also +* loads the test binary into guest memory and creates an IRQ chip (x86 only). +*/ +struct kvm_vm *____vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +struct kvm_vm *__vm_create (enum vm_guest_mode mode,uint64_t nr_pages); +static inline struct kvm_vm *vm_create_barebones (void ) { -return __vm_create (VM_MODE_DEFAULT ,0 ); +return ____vm_create (VM_MODE_DEFAULT ,0 ); +} +I don't [overly] mind the "
____helperhelper" naming style, but in this case wouldn't__vm_create_barebones()also be a reasonable name?
I don't love the four underscores, but I want to use the "barebones" name only for cases where the intent is to truly create a barebones VM, i.e. I want to avoid the common path taking a dependency on "barebones".
Sean Christopherson
reviewerPATCH v2 46/144 KVM: selftests: Rename xAPIC state test's vcpu struct
In reply to Sean ChristophersonRename xapic_state_test's kvm_vcpu struct to xapic_vcpu to avoid a collision when the common 'struct vcpu' is renamed to 'struct kvm_vcpu' in a future patch.
--- tools/testing/selftests/kvm/x86_64/xapic_state_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/x86_64/xapic_state_test.c +5 -5
@@ -11,7 +11,7 @@#include "processor.h" #include "test_util.h" -struct kvm_vcpu { +struct xapic_vcpu {uint32_t id;bool is_x2apic; };
@@ -47,7 +47,7 @@ static void x2apic_guest_code(void) }while (1 ); } -static void ____test_icr (struct kvm_vm *vm,struct kvm_vcpu *vcpu,uint64_t val) +static void ____test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu,uint64_t val) {struct kvm_lapic_state xapic;struct ucall uc;
@@ -75,13 +75,13 @@ static void ____test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu, uint64_t val)ASSERT_EQ (icr, val & ~APIC_ICR_BUSY ); } -static void __test_icr (struct kvm_vm *vm,struct kvm_vcpu *vcpu,uint64_t val) +static void __test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu,uint64_t val) {____test_icr (vm, vcpu, val |APIC_ICR_BUSY );____test_icr (vm, vcpu, val & ~(u64 )APIC_ICR_BUSY ); } -static void test_icr (struct kvm_vm *vm,struct kvm_vcpu *vcpu) +static void test_icr (struct kvm_vm *vm,struct xapic_vcpu *vcpu) {uint64_t icr, i, j;
@@ -116,7 +116,7 @@ static void test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu)int main (int argc,char *argv[]) { -struct kvm_vcpu vcpu = { +struct xapic_vcpu vcpu = { .id =0 , .is_x2apic = true, };
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 47/144 KVM: selftests: Rename vcpu.state => vcpu.run
In reply to Sean ChristophersonRename the "state" field of 'struct vcpu' to "run". KVM calls it "run", the struct name is "kvm_run", etc...
--- .../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
@@ -514,7 +514,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,__KVM_SYSCALL_ERROR ("munmap()" , ret)); ret =close (vcpu->fd);
@@ -1081,13 +1081,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));
@@ -1098,12 +1092,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 , +TEST_ASSERT (vcpu->run !=MAP_FAILED ,__KVM_SYSCALL_ERROR ("mmap()" , (int )(unsigned long )MAP_FAILED ));/* Add to linked-list of VCPUs. */
@@ -1460,7 +1454,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; }/*
@@ -1502,9 +1496,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 48/144 KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
In reply to Sean ChristophersonRename 'struct vcpu' to 'struct kvm_vcpu' to align with 'struct kvm_vm' in the selftest, and to give readers a hint that the struct is specific to KVM.
--- .../selftests/kvm/include/kvm_util_base.h | 11 +++--- tools/testing/selftests/kvm/lib/kvm_util.c | 36 +++++++++---------- .../selftests/kvm/lib/s390x/processor.c | 2 +- 3 files changed, 24 insertions(+), 25 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
@@ -644,17 +645,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 +17 -19
@@ -349,7 +349,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) {
@@ -393,7 +393,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);
@@ -472,23 +472,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; }
@@ -504,7 +504,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;
@@ -526,7 +526,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)
@@ -1078,7 +1078,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);
@@ -1452,7 +1452,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; }
@@ -1493,7 +1493,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 ;
@@ -1537,7 +1537,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); }
@@ -1552,7 +1552,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" );
@@ -1684,9 +1684,7 @@ void vcpu_device_attr_set(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_has_device_attr (vcpu->fd, group, attr); +return __kvm_has_device_attr (vcpu_get (vm, vcpuid)->fd, group, attr); }/*
@@ -1779,7 +1777,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);
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 048/144] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
Quoted 3 lines · Sean Christopherson
Rename 'struct vcpu' to 'struct
kvm_vcpu' to align with 'structkvm_vm' in the selftest, and to give readers a hint that the struct is specific to KVM.
I'm not completely sold on this change. I don't mind that the selftest vcpu struct isn't named the same as the KVM vcpu struct, since they're different structs. I also don't mind avoiding 'kvm_' prefixes in "KVM selftests" (indeed I wonder if we really need the kvm_ prefix for the vm struct). If we do need prefixes for the kvm selftest framework code to avoid collisions with test code, then maybe we should invent something else, rather than use the somewhat ambiguous 'kvm', which could also collide with stuff in the kvm uapi.
Thanks,
drew
Sean Christopherson
reviewerRe: [PATCH v2 048/144] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
Quoted 8 lines · Andrew Jones
Quoted 3 lines · Sean Christopherson
Rename 'struct vcpu' to 'struct
kvm_vcpu' to align with 'structkvm_vm' in the selftest, and to give readers a hint that the struct is specific to KVM.I'm not completely sold on this change. I don't mind that the selftest vcpu struct isn't named the same as the KVM vcpu struct, since they're different structs.
I don't care about about matching KVM's internal naming exactly, but I do care about not having a bare "vcpu", it makes searching for usage a pain because it's impossible to differentiate between instances of the struct and variables of the same name without additional qualifiers.
Quoted 2 lines
I also don't mind avoiding '
kvm_' prefixes in "KVM selftests" (indeed I wonder if we really need thekvm_prefix for the vm struct).
Same as above, "struct vm *vm" will drive me bonkers :-)
Quoted 4 lines
If we do need prefixes for the kvm selftest framework code to avoid collisions with test code, then maybe we should invent something else, rather than use the somewhat ambiguous 'kvm', which could also collide with stuff in the kvm uapi.
Potential collisions with the KVM uAPI is a feature of sorts, e.g. tests shouldn't be redefining kvm_* structures (I'd prefer _tests_ not use kvm_* at all, and only use kvm_* in the library), and I gotta imagine KVM would break at least one real world userspace if it defined "kvm_vcpu".
That said, I don't have a super strong preference for kvm_ versus something else, though I think it will be difficult to come up with something that's unique, intuitive, and doesn't look like a typo.
Re: [PATCH v2 048/144] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
Quoted 15 lines · Sean Christopherson
Quoted 8 lines · Andrew Jones
Quoted 3 lines · Sean Christopherson
Rename 'struct vcpu' to 'struct
kvm_vcpu' to align with 'structkvm_vm' in the selftest, and to give readers a hint that the struct is specific to KVM.I'm not completely sold on this change. I don't mind that the selftest vcpu struct isn't named the same as the KVM vcpu struct, since they're different structs.
I don't care about about matching KVM's internal naming exactly, but I do care about not having a bare "vcpu", it makes searching for usage a pain because it's impossible to differentiate between instances of the struct and variables of the same name without additional qualifiers.
Quoted 4 lines
Quoted 2 lines
I also don't mind avoiding '
kvm_' prefixes in "KVM selftests" (indeed I wonder if we really need thekvm_prefix for the vm struct).Same as above, "struct vm *vm" will drive me bonkers :-)
Yes, that is a good point.
Quoted 6 lines
Quoted 5 lines
If we do need prefixes for the kvm selftest framework code to avoid collisions with test code, then maybe we should invent something else, rather than use the somewhat ambiguous 'kvm', which could also collide with stuff in the kvm uapi.
Quoted 9 lines
Potential collisions with the KVM uAPI is a feature of sorts, e.g. tests shouldn't be redefining kvm_* structures (I'd prefer _tests_ not use kvm_* at all, and only use kvm_* in the library), and I gotta imagine KVM would break at least one real world userspace if it defined "
kvm_vcpu".That said, I don't have a super strong preference for
kvm_versus something else, though I think it will be difficult to come up with something that's unique, intuitive, and doesn't look like a typo.
Maybe just abbreviated "Kvm Selftests", i.e. 'ks_'? I won't harp on this any longer though, so if that doesn't look good, then we can proceed with 'kvm_'.
Thanks,
drew
Sean Christopherson
reviewerRe: [PATCH v2 048/144] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu'
Quoted 12 lines · Andrew Jones
Quoted 11 lines · Sean Christopherson
Quoted 4 lines · Andrew Jones
If we do need prefixes for the kvm selftest framework code to avoid collisions with test code, then maybe we should invent something else, rather than use the somewhat ambiguous 'kvm', which could also collide with stuff in the kvm uapi.
Potential collisions with the KVM uAPI is a feature of sorts, e.g. tests shouldn't be redefining kvm_* structures (I'd prefer _tests_ not use kvm_* at all, and only use kvm_* in the library), and I gotta imagine KVM would break at least one real world userspace if it defined "
kvm_vcpu".
Quoted 8 lines
Quoted 4 lines
That said, I don't have a super strong preference for
kvm_versus something else, though I think it will be difficult to come up with something that's unique, intuitive, and doesn't look like a typo.Maybe just abbreviated "Kvm Selftests", i.e. '
ks_'? I won't harp on this any longer though, so if that doesn't look good, then we can proceed with 'kvm_'.
ks_ was the best I could come up with too. But looking at it in code, I find it more distracting than helpful. It's kind of like the uncanny valley effect, where ks_ *just* close enough to kvm_ that it makes me think something is wrong.
struct kvm_sregs sregs; struct kvm_regs regs; struct ks_vcpu *vcpu; struct kvm_run *run;
Sean Christopherson
reviewerPATCH v2 49/144 KVM: selftests: Return the created vCPU from vm_vcpu_add()
In reply to Sean ChristophersonReturn the created vCPU from vm_vcpu_add() so that callers don't need to manually retrieve the vCPU that was just added. Opportunistically drop the "heavy" function comment, it adds a lot of lines of "code" but not much value, e.g. it's pretty obvious that @vm is a virtual machine...
--- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 27 +++++++------------ 2 files changed, 10 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -1
@@ -324,7 +324,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 +9 -18
@@ -397,8 +397,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 ); }/*
@@ -1063,33 +1062,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 "
@@ -1102,6 +1091,8 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)/* Add to linked-list of VCPUs. */ list_add (&vcpu->list, &vm->vcpus); + +return vcpu; }/*
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Re: [PATCH v2 049/144] KVM: selftests: Return the created vCPU from vm_vcpu_add()
Quoted 4 lines · Sean Christopherson
Return the created vCPU from
vm_vcpu_add()so that callers don't need to manually retrieve the vCPU that was just added. Opportunistically drop the "heavy" function comment, it adds a lot of lines of "code" but not much value, e.g. it's pretty obvious that @vm is a virtual machine...
I agree and would like to see all the heavy function comments reduced. Maybe you do that somewhere in next 100 patches :-)
Thanks,
drew
Sean Christopherson
reviewerPATCH v2 50/144 KVM: selftests: Convert memslot_perf_test away from VCPU_ID
In reply to Sean ChristophersonConvert memslot_perf_test to use __vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. This is the first of many, many steps towards eliminating VCPU_ID from all KVM selftests, and towards eventually purging the VM+vcpu_id mess.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 51/144 KVM: selftests: Convert rseq_test away from VCPU_ID
In reply to Sean ChristophersonConvert rseq_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 52/144 KVM: selftests: Convert xss_msr_test away from VCPU_ID
In reply to Sean ChristophersonConvert xss_msr_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/x86_64/xss_msr_test.c +6 -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)
@@ -23,11 +22,12 @@ int main(int argc, char *argv[])bool xss_supported = false;bool xss_in_msr_list;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 );
@@ -38,11 +38,12 @@ 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.
@@ -51,7 +52,7 @@ int main(int argc, char *argv[])*/ xss_in_msr_list =kvm_msr_is_in_save_restore_list (MSR_IA32_XSS );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);/* * Setting a list of MSRs returns the entry that "faulted", or
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 53/144 KVM: selftests: Convert vmx_preemption_timer_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_preemption_timer_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 54/144 KVM: selftests: Convert vmx_pmu_msrs_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_pmu_msrs_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c +12 -13
@@ -17,8 +17,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
@@ -61,6 +59,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;
@@ -69,7 +68,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 ) {
@@ -88,27 +87,27 @@ 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 */ /* Note, on Arch LBR capable platforms, LBR_FMT in perf capability msr is 0x3f, * to avoid the failure, use a true invalid format 0x30 for the test. */ - ret =_vcpu_set_msr (vm,0 ,MSR_IA32_PERF_CAPABILITIES ,0x30 ); + ret =_vcpu_set_msr (vm, vcpu->id,MSR_IA32_PERF_CAPABILITIES ,0x30 );TEST_ASSERT (ret ==0 ,"Bad PERF_CAPABILITIES didn't fail." );printf ("Completed perf capability tests.\n" );
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 55/144 KVM: selftests: Convert vmx_set_nested_state_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_set_nested_state_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 56/144 KVM: selftests: Convert vmx_tsc_adjust_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_tsc_adjust_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +6 -7
@@ -32,8 +32,6 @@#define MSR_IA32_TSC_ADJUST 0x3b#endif -#define VCPU_ID 5 -#define TSC_ADJUST_VALUE (1ll << 32)#define TSC_OFFSET_VALUE -(1ll << 48)
@@ -127,26 +125,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 57/144 KVM: selftests: Convert mmu_role_test away from VCPU_ID
In reply to Sean ChristophersonConvert mmu_role_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run() plus an open coded assert that KVM_RUN succeeded.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 58/144 KVM: selftests: Convert pmu_event_filter_test away from VCPU_ID
In reply to Sean ChristophersonConvert pmu_event_filter_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Rename run_vm_to_sync() to run_vcpu_to_sync() accordingly.
--- .../kvm/x86_64/pmu_event_filter_test.c | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-)
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +36 -33
@@ -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",
@@ -332,6 +331,7 @@ static void test_not_member_allow_list(struct kvm_vm *vm)*/ static void test_pmu_config_disable (void (*guest_code)(void )) { +struct kvm_vcpu *vcpu;int r;struct kvm_vm *vm;
@@ -343,11 +343,13 @@ static void test_pmu_config_disable(void (*guest_code)(void))vm_enable_cap (vm,KVM_CAP_PMU_CAPABILITY ,KVM_PMU_CAP_DISABLE ); -vm_vcpu_add_default (vm,VCPU_ID , guest_code); +vm_vcpu_add_default (vm,0 , guest_code);vm_init_descriptor_tables (vm); -vcpu_init_descriptor_tables (vm,VCPU_ID ); -TEST_ASSERT (!sanity_check_pmu (vm), + vcpu =vcpu_get (vm,0 ); +vcpu_init_descriptor_tables (vm, vcpu->id); + +TEST_ASSERT (!sanity_check_pmu (vcpu),"Guest should not be able to use disabled PMU." );kvm_vm_free (vm);
@@ -418,6 +420,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;
@@ -440,21 +443,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 59/144 KVM: selftests: Convert smm_test away from VCPU_ID
In reply to Sean ChristophersonConvert smm_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- 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 SMRAM_SIZE 65536#define SMRAM_MEMSLOT ((1 << 16) | 1)#define SMRAM_PAGES (SMRAM_SIZE / PAGE_SIZE)
@@ -116,22 +114,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;
@@ -139,9 +138,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 );
@@ -152,7 +151,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 ())
@@ -164,17 +163,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 ;
@@ -191,7 +190,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 ; }
@@ -200,15 +199,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 60/144 KVM: selftests: Convert state_test away from VCPU_ID
In reply to Sean ChristophersonConvert state_test to use vm_create_with_one_vcpu() and vm_recreate_with_one_vcpu(), and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 61/144 KVM: selftests: Convert svm_int_ctl_test away from VCPU_ID
In reply to Sean ChristophersonConvert svm_int_ctl_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically make the "vm" variable a local function variable, there are no users outside of main().
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 62/144 KVM: selftests: Convert svm_vmcall_test away from VCPU_ID
In reply to Sean ChristophersonConvert svm_vmcall_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 63/144 KVM: selftests: Convert sync_regs_test away from VCPU_ID
In reply to Sean ChristophersonConvert sync_regs_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 64/144 KVM: selftests: Convert hyperv_cpuid away from VCPU_ID
In reply to Sean ChristophersonConvert hyperv_cpuid to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/x86_64/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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 65/144 KVM: selftests: Convert kvm_pv_test away from VCPU_ID
In reply to Sean ChristophersonConvert kvm_pv_test to use vm_create_with_one_vcpu() and pass arounda 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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 ;
@@ -207,6 +201,7 @@ static void enter_guest(struct kvm_vm *vm)int main (void ) {struct kvm_cpuid2 *best; +struct kvm_vcpu *vcpu;struct kvm_vm *vm;if (!kvm_check_cap (KVM_CAP_ENFORCE_PV_FEATURE_CPUID )) {
@@ -214,18 +209,18 @@ int main(void)exit (KSFT_SKIP ); } - vm =vm_create_default (VCPU_ID ,0 , guest_main); + vm =vm_create_with_one_vcpu (&vcpu, guest_main); -vcpu_enable_cap (vm,VCPU_ID ,KVM_CAP_ENFORCE_PV_FEATURE_CPUID ,1 ); +vcpu_enable_cap (vm, vcpu->id,KVM_CAP_ENFORCE_PV_FEATURE_CPUID ,1 ); 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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 66/144 KVM: selftests: Convert platform_info_test away from VCPU_ID
In reply to Sean ChristophersonConvert platform_info_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/x86_64/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 )
@@ -35,18 +34,18 @@ static void guest_code(void) } } -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; -vm_enable_cap (vm,KVM_CAP_MSR_PLATFORM_INFO , true); -vcpu_run (vm,VCPU_ID ); +vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , 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) ==
@@ -55,12 +54,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; -vm_enable_cap (vm,KVM_CAP_MSR_PLATFORM_INFO , false); -vcpu_run (vm,VCPU_ID ); +vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , 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,
@@ -69,6 +68,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;
@@ -82,14 +82,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 67/144 KVM: selftests: Convert vmx_nested_tsc_scaling_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_nested_tsc_scaling_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 68/144 KVM: selftests: Convert set_sregs_test away from VCPU_ID
In reply to Sean ChristophersonConvert set_sregs_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/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_barebones (); -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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 69/144 KVM: selftests: Convert vmx_dirty_log_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_dirty_log_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 70/144 KVM: selftests: Convert vmx_close_while_nested_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_close_while_nested_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically make the "vm" variable local, it is unused outside of main().
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 71/144 KVM: selftests: Convert vmx_apic_access_test away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_apic_access_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically make the "vm" variable local, it is unused outside of main().
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 72/144 KVM: selftests: Convert userspace_msr_exit_test away from VCPU_ID
In reply to Sean ChristophersonConvert userspace_msr_exit_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded. Fix minor coding style violations too.
--- .../kvm/x86_64/userspace_msr_exit_test.c | 156 ++++++++---------- 1 file changed, 72 insertions(+), 84 deletions(-)
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +72 -84
@@ -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,38 +516,39 @@ 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 ) { +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" );
@@ -569,43 +560,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" ); }
@@ -613,16 +604,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 ;
@@ -672,14 +663,13 @@ static void handle_wrmsr(struct kvm_run *run)static void test_msr_filter_deny (void ) { +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" );
@@ -694,9 +684,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 :
@@ -706,7 +694,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 ; }
@@ -722,12 +710,11 @@ static void test_msr_filter_deny(void)static void test_msr_permission_bitmap (void ) { +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" );
@@ -737,11 +724,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 73/144 KVM: selftests: Convert vmx_exception_with_invalid_guest_state away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_exception_with_invalid_guest_state to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 74/144 KVM: selftests: Convert tsc_msrs_test away from VCPU_ID
In reply to Sean ChristophersonConvert tsc_msrs_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../selftests/kvm/x86_64/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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 75/144 KVM: selftests: Convert kvm_clock_test away from VCPU_ID
In reply to Sean ChristophersonConvert kvm_clock_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 76/144 KVM: selftests: Convert hyperv_svm_test away from VCPU_ID
In reply to Sean ChristophersonConvert hyperv_svm_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- .../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 {
@@ -122,6 +121,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;
@@ -132,20 +132,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 77/144 KVM: selftests: Convert hyperv_features away from VCPU_ID
In reply to Sean ChristophersonConvert hyperv_features to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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 };
@@ -185,24 +185,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 ,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); +vcpu_args_set (vm, vcpu->id,1 , msr_gva); +vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); -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 :
@@ -333,7 +333,7 @@ static void guest_test_msrs_access(void)* Remains unavailable even with KVM_CAP_HYPERV_SYNIC2 * capability enabled and guest visible CPUID bit unset. */ -vcpu_enable_cap (vm,VCPU_ID ,KVM_CAP_HYPERV_SYNIC2 ,0 ); +vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_SYNIC2 ,0 );break ;case 22 : feat.eax |=HV_MSR_SYNIC_AVAILABLE ;
@@ -463,7 +463,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,
@@ -471,13 +471,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",
@@ -498,10 +497,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
@@ -517,10 +517,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 */
@@ -531,14 +531,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 ,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); +vcpu_args_set (vm, vcpu->id,2 ,addr_gva2gpa (vm, hcall_page), hcall_params); +vcpu_enable_cap (vm, vcpu->id,KVM_CAP_HYPERV_ENFORCE_CPUID ,1 ); -vcpu_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 :
@@ -633,7 +633,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,
@@ -641,13 +641,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 78/144 KVM: selftests: Convert hyperv_clock away from VCPU_ID
In reply to Sean ChristophersonConvert hyperv_clock to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 79/144 KVM: selftests: Convert evmcs_test away from VCPU_ID
In reply to Sean ChristophersonConvert evmcs_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- .../testing/selftests/kvm/x86_64/evmcs_test.c | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-)
tools/testing/selftests/kvm/x86_64/evmcs_test.c +26 -26
@@ -18,8 +18,6 @@#include "vmx.h" -#define VCPU_ID 5 -static int ud_count;static void guest_ud_handler (struct ex_regs *regs)
@@ -159,55 +157,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) ||
@@ -216,28 +215,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 ]);
@@ -255,12 +255,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); }/*
@@ -270,7 +270,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 80/144 KVM: selftests: Convert emulator_error_test away from VCPU_ID
In reply to Sean ChristophersonConvert emulator_error_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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 MAXPHYADDR 36#define MEM_REGION_GVA 0x0000123456789000
@@ -27,14 +26,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)".
@@ -56,9 +47,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;
@@ -92,50 +83,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,
@@ -143,14 +133,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" );
@@ -163,6 +153,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;
@@ -171,20 +162,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" );
@@ -199,14 +190,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 81/144 KVM: selftests: Convert debug_regs away from VCPU_ID
In reply to Sean ChristophersonConvert debug_regs to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunstically drop the CLEAR_DEBUG/APPLY_DEBUG macros as they only obfuscate the code, e.g. operating on local variables not "passed" to the macro is all kinds of confusing.
--- .../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_guest_debug_set(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_guest_debug_set (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_guest_debug_set (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_guest_debug_set (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_guest_debug_set (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_guest_debug_set (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_guest_debug_set (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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 82/144 KVM: selftests: Add proper helper for advancing RIP in debug_regs
In reply to Sean ChristophersonReplace MOVE_RIP+SET_RIP with a proper helper, vcpu_skip_insn(), that is more descriptive, doesn't subtly access local variables, and provides type safety.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 83/144 KVM: selftests: Convert amx_test away from VCPU_ID
In reply to Sean ChristophersonConvert amx_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.o
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- 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)
@@ -319,6 +318,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;
@@ -331,7 +331,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 )) {
@@ -350,12 +350,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 */
@@ -369,16 +369,16 @@ int main(int argc, char *argv[])/* xsave data for guest_code */ xsavedata =vm_vaddr_alloc_pages (vm,3 );memset (addr_gva2hva (vm, xsavedata),0 ,3 *getpagesize ()); -vcpu_args_set (vm,VCPU_ID ,3 , amx_cfg, tiledata, xsavedata); +vcpu_args_set (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 ]);
@@ -403,7 +403,7 @@ int main(int argc, char *argv[])* size subtract 8K amx size. */ amx_offset = xsave_restore_size -NUM_TILES *TILE_SIZE ; - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (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 */
@@ -424,22 +424,21 @@ int main(int argc, char *argv[])TEST_FAIL ("Unknown ucall %lu" , uc.cmd); } - state =vcpu_save_state (vm,VCPU_ID ); + state =vcpu_save_state (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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 84/144 KVM: selftests: Convert cr4_cpuid_sync_test away from VCPU_ID
In reply to Sean ChristophersonConvert cr4_cpuid_sync_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 85/144 KVM: selftests: Convert cpuid_test away from VCPU_ID
In reply to Sean ChristophersonConvert cpuid_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
Opportunistically use vcpu_run() instead of _vcpu_run(), the test expects KVM_RUN to succeed.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 86/144 KVM: selftests: Convert userspace_io_test away from VCPU_ID
In reply to Sean ChristophersonConvert userspace_io_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==1. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically use vcpu_run() instead of _vcpu_run() with an open coded assert that KVM_RUN succeeded.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 87/144 KVM: selftests: Convert vmx_invalid_nested_guest_state away from VCPU_ID
In reply to Sean ChristophersonConvert vmx_invalid_nested_guest_state to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.
--- .../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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 88/144 KVM: selftests: Convert xen_vmcall_test away from VCPU_ID
In reply to Sean ChristophersonConvert xen_vmcall_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
Opportunistically make the "vm" variable local, it is unused outside of main().
--- .../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,13 +11,9 @@#include "kvm_util.h" #include "processor.h" -#define VCPU_ID 5 -#define HCALL_REGION_GPA 0xc0000000ULL#define HCALL_REGION_SLOT 10 -static struct kvm_vm *vm; -#define INPUTVALUE 17#define ARGVALUE (x) (0xdeadbeef5a5a0000UL + x)#define RETVALUE 0xcafef00dfbfbffffUL
@@ -84,14 +80,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 ,
@@ -105,10 +104,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 );
@@ -130,7 +129,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 89/144 KVM: selftests: Convert xen_shinfo_test away from VCPU_ID
In reply to Sean ChristophersonConvert xen_shinfo_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/x86_64/xen_shinfo_test.c | 62 +++++++++---------- 1 file changed, 30 insertions(+), 32 deletions(-)
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +30 -32
@@ -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
@@ -42,8 +40,6 @@#define EVTCHN_TEST2 66#define EVTCHN_TIMER 13 -static struct kvm_vm *vm; -#define XEN_HYPERCALL_MSR 0x40000000#define MIN_STEAL_TIME 50000
@@ -344,19 +340,22 @@ static int cmp_timespec(struct timespec *a, struct timespec *b)else return 0 ; } -struct vcpu_info *vinfo; + +static struct vcpu_info *vinfo; +static struct kvm_vcpu *vcpu;static void handle_alrm (int sig) {if (vinfo)printf ("evtchn_upcall_pending 0x%x\n" , vinfo->evtchn_upcall_pending); -vcpu_dump (stdout, vm,VCPU_ID ,0 ); +vcpu_dump (stdout, vcpu->vm, vcpu->id,0 );TEST_FAIL ("IRQ delivery timed out" ); }int main (int argc,char *argv[]) {struct timespec min_ts, max_ts, vm_ts; +struct kvm_vm *vm;bool verbose; verbose = argc > 1 && (!strncmp(argv[1], "-v", 3) ||
@@ -374,8 +373,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,
@@ -425,13 +423,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 ,
@@ -440,7 +438,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) {
@@ -448,7 +446,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 };
@@ -468,13 +466,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 =EVTCHN_TEST1 ; - 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 =EVTCHN_TEST2 ; - 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);
@@ -508,14 +506,14 @@ int main(int argc, char *argv[]) .u.evtchn.type = EVTCHNSTAT_interdomain, .u.evtchn.flags = 0, .u.evtchn.deliver.port.port = EVTCHN_TEST1, - .u.evtchn.deliver.port.vcpu = VCPU_ID + 1, + .u.evtchn.deliver.port.vcpu = vcpu->id + 1, .u.evtchn.deliver.port.priority = KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL, };vm_ioctl (vm,KVM_XEN_HVM_SET_ATTR , &inj);/* Test migration to a different vCPU */ inj.u.evtchn.flags =KVM_XEN_EVTCHN_UPDATE ; - inj.u.evtchn.deliver.port.vcpu =VCPU_ID ; + inj.u.evtchn.deliver.port.vcpu = vcpu->id;vm_ioctl (vm,KVM_XEN_HVM_SET_ATTR , &inj); inj.u.evtchn.send_port =197 ;
@@ -524,7 +522,7 @@ int main(int argc, char *argv[]) inj.u.evtchn.flags =0 ;vm_ioctl (vm,KVM_XEN_HVM_SET_ATTR , &inj); -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &tmr); } vinfo =addr_gpa2hva (vm,VCPU_INFO_VADDR ); vinfo->evtchn_upcall_pending =0 ;
@@ -535,17 +533,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 */
@@ -574,7 +572,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 :
@@ -589,7 +587,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 :
@@ -601,7 +599,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 :
@@ -660,7 +658,7 @@ int main(int argc, char *argv[])struct kvm_irq_routing_xen_evtchn e; e.port =EVTCHN_TEST2 ; - e.vcpu =VCPU_ID ; + e.vcpu = vcpu->id; e.priority =KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL ;vm_ioctl (vm,KVM_XEN_HVM_EVTCHN_SEND , &e);
@@ -702,7 +700,7 @@ int main(int argc, char *argv[])case 14 :memset (&tmr,0 ,sizeof (tmr)); tmr.type =KVM_XEN_VCPU_ATTR_TYPE_TIMER ; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_GET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_GET_ATTR , &tmr);TEST_ASSERT (tmr.u.timer.port ==EVTCHN_TIMER ,"Timer port not returned" ); TEST_ASSERT(tmr.u.timer.priority == KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL,
@@ -722,7 +720,7 @@ int main(int argc, char *argv[])printf ("Testing restored oneshot timer\n" ); tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &tmr); evtchn_irq_expected = true;alarm (1 );break ;
@@ -749,7 +747,7 @@ int main(int argc, char *argv[])printf ("Testing SCHEDOP_poll wake on masked event\n" ); tmr.u.timer.expires_ns = rs->state_entry_time +100000000 , -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &tmr);alarm (1 );break ;
@@ -760,11 +758,11 @@ int main(int argc, char *argv[]) evtchn_irq_expected = true; tmr.u.timer.expires_ns = rs->state_entry_time +100000000 ; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &tmr);/* Read it back and check the pending time is reported correctly */ tmr.u.timer.expires_ns =0 ; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_GET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_GET_ATTR , &tmr);TEST_ASSERT (tmr.u.timer.expires_ns == rs->state_entry_time +100000000 ,"Timer not reported pending" );alarm (1 );
@@ -774,7 +772,7 @@ int main(int argc, char *argv[])TEST_ASSERT (!evtchn_irq_expected,"Expected event channel IRQ but it didn't happen" );/* Read timer and check it is no longer pending */ -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_GET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_GET_ATTR , &tmr);TEST_ASSERT (!tmr.u.timer.expires_ns,"Timer still reported pending" ); shinfo->evtchn_pending[0 ] =0 ;
@@ -783,7 +781,7 @@ int main(int argc, char *argv[]) evtchn_irq_expected = true; tmr.u.timer.expires_ns = rs->state_entry_time -100000000ULL ; -vcpu_ioctl (vm,VCPU_ID ,KVM_XEN_VCPU_SET_ATTR , &tmr); +vcpu_ioctl (vm, vcpu->id,KVM_XEN_VCPU_SET_ATTR , &tmr);alarm (1 );break ;
@@ -853,7 +851,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.36.1.255.ge46751e96f-goog
Sean Christopherson
reviewerPATCH v2 90/144 KVM: selftests: Convert dirty_log_test away from VCPU_ID
In reply to Sean ChristophersonConvert dirty_log_test to pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==5. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
The test still hardcodes usage of vcpu_id==0, but only for a few lines. That wart will be removed in the not-too-distant future.
--- 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
@@ -226,17 +224,17 @@ static void clear_log_create_vm_done(struct kvm_vm *vm)vm_enable_cap (vm,KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 , manual_caps); } -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 */
@@ -250,14 +248,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));
@@ -328,7 +326,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 */
@@ -348,10 +346,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 "
@@ -366,12 +364,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 ||
@@ -405,10 +403,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] = { {
@@ -470,22 +468,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 )
@@ -507,7 +505,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)
@@ -522,7 +521,7 @@ static void *vcpu_worker(void *data) sigmask->len =8 ;pthread_sigmask (0 ,NULL , sigset);sigdelset (sigset,SIG_IPI ); -vcpu_ioctl (vm,VCPU_ID ,KVM_SET_SIGNAL_MASK , sigmask); +vcpu_ioctl (vm, vcpu->id,KVM_SET_SIGNAL_MASK , sigmask);sigemptyset (sigset);sigaddset (sigset,SIG_IPI );
@@ -534,13 +533,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);
@@ -693,6 +692,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;
@@ -710,9 +710,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);/*
@@ -773,12 +774,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.36.1.255.ge46751e96f-goog