[v2,031/144] KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs

Message ID	20220603004331.1523888-32-seanjc@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Reply-To: Sean Christopherson <seanjc@google.com> Date: Fri, 3 Jun 2022 00:41:38 +0000 In-Reply-To: <20220603004331.1523888-1-seanjc@google.com> Message-Id: <20220603004331.1523888-32-seanjc@google.com> Mime-Version: 1.0 References: <20220603004331.1523888-1-seanjc@google.com> Subject: [PATCH v2 031/144] KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs From: Sean Christopherson <seanjc@google.com> To: Paolo Bonzini <pbonzini@redhat.com> Cc: kvm@vger.kernel.org, Vitaly Kuznetsov <vkuznets@redhat.com>, Andrew Jones <drjones@redhat.com>, David Matlack <dmatlack@google.com>, Ben Gardon <bgardon@google.com>, Oliver Upton <oupton@google.com>, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KVM: selftests: Overhaul APIs, purge VCPU_ID \| expand [v2,000/144] KVM: selftests: Overhaul APIs, purge VCPU_ID [v2,001/144] KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT [v2,002/144] KVM: selftests: Fix buggy-but-benign check in test_v3_new_redist_regions() [v2,003/144] KVM: selftests: Fix typo in vgic_init test [v2,004/144] KVM: selftests: Drop stale declarations from kvm_util_base.h [v2,005/144] KVM: selftests: Always open VM file descriptors with O_RDWR [v2,006/144] KVM: selftests: Add another underscore to inner ioctl() helpers [v2,007/144] KVM: selftests: Make vcpu_ioctl() a wrapper to pretty print ioctl name [v2,008/144] KVM: selftests: Drop @mode from common vm_create() helper [v2,009/144] KVM: selftests: Split vcpu_set_nested_state() into two helpers [v2,010/144] KVM: sefltests: Use vcpu_ioctl() and __vcpu_ioctl() helpers [v2,011/144] KVM: selftests: Add __vcpu_run() helper [v2,012/144] KVM: selftests: Use vcpu_access_device_attr() in arm64 code [v2,013/144] KVM: selftests: Remove vcpu_get_fd() [v2,014/144] KVM: selftests: Add vcpu_get() to retrieve and assert on vCPU existence [v2,015/144] KVM: selftests: Make vm_ioctl() a wrapper to pretty print ioctl name [v2,016/144] KVM: sefltests: Use vm_ioctl() and __vm_ioctl() helpers [v2,017/144] KVM: selftests: Make kvm_ioctl() a wrapper to pretty print ioctl name [v2,018/144] KVM: selftests: Use kvm_ioctl() helpers [v2,019/144] KVM: selftests: Use __KVM_SYSCALL_ERROR() to handle non-KVM syscall errors [v2,020/144] KVM: selftests: Make x86-64's register dump helpers static [v2,021/144] KVM: selftests: Get rid of kvm_util_internal.h [v2,022/144] KVM: selftests: Use KVM_IOCTL_ERROR() for one-off arm64 ioctls [v2,023/144] KVM: selftests: Drop @test param from kvm_create_device() [v2,024/144] KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper [v2,025/144] KVM: selftests: Multiplex return code and fd in __kvm_create_device() [v2,026/144] KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency [v2,027/144] KVM: selftests: Drop 'int' return from asserting _has_device_attr() [v2,028/144] KVM: selftests: Split get/set device_attr helpers [v2,029/144] KVM: selftests: Add a VM backpointer to 'struct vcpu' [v2,030/144] KVM: selftests: Consolidate KVM_ENABLE_CAP usage [v2,031/144] KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs [v2,032/144] KVM: selftests: Cache list of MSRs to save/restore [v2,033/144] KVM: selftests: Harden and comment XSS / KVM_SET_MSRS interaction [v2,034/144] KVM: selftests: Dedup MSR index list helpers, simplify dedicated test [v2,035/144] KVM: selftests: Rename MP_STATE and GUEST_DEBUG helpers for consistency [v2,036/144] KVM: selftest: Add proper helpers for x86-specific save/restore ioctls [v2,037/144] KVM: selftests: Add vm_create_() variants to expose/return 'struct vcpu' [v2,038/144] KVM: selftests: Push vm_adjust_num_guest_pages() into "w/o vCPUs" helper [v2,039/144] KVM: selftests: Use vm_create_without_vcpus() in set_boot_cpu_id [v2,040/144] KVM: selftests: Use vm_create_without_vcpus() in dirty_log_test [v2,041/144] KVM: selftests: Use vm_create_without_vcpus() in hardware_disable_test [v2,042/144] KVM: selftests: Use vm_create_without_vcpus() in psci_test [v2,043/144] KVM: selftests: Rename vm_create() => vm_create_barebones(), drop param [v2,044/144] KVM: selftests: Rename vm_create_without_vcpus() => vm_create() [v2,045/144] KVM: selftests: Make vm_create() a wrapper that specifies VM_MODE_DEFAULT [v2,046/144] KVM: selftests: Rename xAPIC state test's vcpu struct [v2,047/144] KVM: selftests: Rename vcpu.state => vcpu.run [v2,048/144] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu' [v2,049/144] KVM: selftests: Return the created vCPU from vm_vcpu_add() [v2,050/144] KVM: selftests: Convert memslot_perf_test away from VCPU_ID [v2,051/144] KVM: selftests: Convert rseq_test away from VCPU_ID [v2,052/144] KVM: selftests: Convert xss_msr_test away from VCPU_ID [v2,053/144] KVM: selftests: Convert vmx_preemption_timer_test away from VCPU_ID [v2,054/144] KVM: selftests: Convert vmx_pmu_msrs_test away from VCPU_ID [v2,055/144] KVM: selftests: Convert vmx_set_nested_state_test away from VCPU_ID [v2,056/144] KVM: selftests: Convert vmx_tsc_adjust_test away from VCPU_ID [v2,057/144] KVM: selftests: Convert mmu_role_test away from VCPU_ID [v2,058/144] KVM: selftests: Convert pmu_event_filter_test away from VCPU_ID [v2,059/144] KVM: selftests: Convert smm_test away from VCPU_ID [v2,060/144] KVM: selftests: Convert state_test away from VCPU_ID [v2,061/144] KVM: selftests: Convert svm_int_ctl_test away from VCPU_ID [v2,062/144] KVM: selftests: Convert svm_vmcall_test away from VCPU_ID [v2,063/144] KVM: selftests: Convert sync_regs_test away from VCPU_ID [v2,064/144] KVM: selftests: Convert hyperv_cpuid away from VCPU_ID [v2,065/144] KVM: selftests: Convert kvm_pv_test away from VCPU_ID [v2,066/144] KVM: selftests: Convert platform_info_test away from VCPU_ID [v2,067/144] KVM: selftests: Convert vmx_nested_tsc_scaling_test away from VCPU_ID [v2,068/144] KVM: selftests: Convert set_sregs_test away from VCPU_ID [v2,069/144] KVM: selftests: Convert vmx_dirty_log_test away from VCPU_ID [v2,070/144] KVM: selftests: Convert vmx_close_while_nested_test away from VCPU_ID [v2,071/144] KVM: selftests: Convert vmx_apic_access_test away from VCPU_ID [v2,072/144] KVM: selftests: Convert userspace_msr_exit_test away from VCPU_ID [v2,073/144] KVM: selftests: Convert vmx_exception_with_invalid_guest_state away from VCPU_ID [v2,074/144] KVM: selftests: Convert tsc_msrs_test away from VCPU_ID [v2,075/144] KVM: selftests: Convert kvm_clock_test away from VCPU_ID [v2,076/144] KVM: selftests: Convert hyperv_svm_test away from VCPU_ID [v2,077/144] KVM: selftests: Convert hyperv_features away from VCPU_ID [v2,078/144] KVM: selftests: Convert hyperv_clock away from VCPU_ID [v2,079/144] KVM: selftests: Convert evmcs_test away from VCPU_ID [v2,080/144] KVM: selftests: Convert emulator_error_test away from VCPU_ID [v2,081/144] KVM: selftests: Convert debug_regs away from VCPU_ID [v2,082/144] KVM: selftests: Add proper helper for advancing RIP in debug_regs [v2,083/144] KVM: selftests: Convert amx_test away from VCPU_ID [v2,084/144] KVM: selftests: Convert cr4_cpuid_sync_test away from VCPU_ID [v2,085/144] KVM: selftests: Convert cpuid_test away from VCPU_ID [v2,086/144] KVM: selftests: Convert userspace_io_test away from VCPU_ID [v2,087/144] KVM: selftests: Convert vmx_invalid_nested_guest_state away from VCPU_ID [v2,088/144] KVM: selftests: Convert xen_vmcall_test away from VCPU_ID [v2,089/144] KVM: selftests: Convert xen_shinfo_test away from VCPU_ID [v2,090/144] KVM: selftests: Convert dirty_log_test away from VCPU_ID [v2,091/144] KVM: selftests: Convert set_memory_region_test away from VCPU_ID [v2,092/144] KVM: selftests: Convert system_counter_offset_test away from VCPU_ID [v2,093/144] KVM: selftests: Track kvm_vcpu object in tsc_scaling_sync [v2,094/144] KVM: selftests: Convert xapic_state_test away from hardcoded vCPU ID [v2,095/144] KVM: selftests: Convert debug-exceptions away from VCPU_ID [v2,096/144] KVM: selftests: Convert fix_hypercall_test away from VCPU_ID [v2,097/144] KVM: selftests: Convert vgic_irq away from VCPU_ID [v2,098/144] KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only [v2,099/144] KVM: selftests: Move vm_is_unrestricted_guest() to x86-64 [v2,100/144] KVM: selftests: Add "arch" to common utils that have arch implementations [v2,101/144] KVM: selftests: Return created vcpu from vm_vcpu_add_default() [v2,102/144] KVM: selftests: Rename vm_vcpu_add* helpers to better show relationships [v2,103/144] KVM: selftests: Convert set_boot_cpu_id away from global VCPU_IDs [v2,104/144] KVM: selftests: Convert psci_test away from VCPU_ID [v2,105/144] KVM: selftests: Convert hardware_disable_test to pass around vCPU objects [v2,106/144] KVM: selftests: Add VM creation helper that "returns" vCPUs [v2,107/144] KVM: selftests: Convert steal_time away from VCPU_ID [v2,108/144] KVM: selftests: Convert arch_timer away from VCPU_ID [v2,109/144] KVM: selftests: Convert svm_nested_soft_inject_test away from VCPU_ID [v2,110/144] KVM: selftests: Convert triple_fault_event_test away from VCPU_ID [v2,111/144] KVM: selftests: Convert vgic_init away from vm_create_default_with_vcpus() [v2,112/144] KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers [v2,113/144] KVM: selftests: Sync stage before VM is freed in hypercalls test [v2,114/144] KVM: selftests: Convert hypercalls test away from vm_create_default() [v2,115/144] KVM: selftests: Convert xapic_ipi_test away from _VCPU_ID [v2,116/144] KVM: selftests: Convert sync_regs_test away from VCPU_ID [v2,117/144] KVM: selftests: Convert s390's "resets" test away from VCPU_ID [v2,118/144] KVM: selftests: Convert memop away from VCPU_ID [v2,119/144] KVM: selftests: Convert s390x/diag318_test_handler away from VCPU_ID [v2,120/144] KVM: selftests: Convert tprot away from VCPU_ID [v2,121/144] KVM: selftests: Use vm_create() in tsc_scaling_sync [v2,122/144] KVM: selftests: Use vm_create_with_vcpus() in max_guest_memory_test [v2,123/144] KVM: selftests: Drop vm_create_default helpers [v2,124/144] KVM: selftests: Drop @vcpuids param from VM creators [v2,125/144] KVM: selftests: Convert kvm_page_table_test away from reliance on vcpu_id [v2,126/144] KVM: selftests: Convert kvm_binary_stats_test away from vCPU IDs [v2,127/144] KVM: selftests: Convert get-reg-list away from its "VCPU_ID" [v2,128/144] KVM: selftests: Stop hardcoding vCPU IDs in vcpu_width_config [v2,129/144] KVM: selftests: Stop conflating vCPU index and ID in perf tests [v2,130/144] KVM: selftests: Remove vcpu_get() usage from dirty_log_test [v2,131/144] KVM: selftests: Require vCPU output array when creating VM with vCPUs [v2,133/144] KVM: selftests: Drop vcpu_get(), rename vcpu_find() => vcpu_exists() [v2,134/144] KVM: selftests: Remove vcpu_state() helper [v2,135/144] KVM: selftests: Open code and drop 'struct kvm_vm' accessors [v2,136/144] KVM: selftests: Drop @slot0_mem_pages from __vm_create_with_vcpus() [v2,137/144] KVM: selftests: Drop @num_percpu_pages from __vm_create_with_vcpus() [v2,138/144] KVM: selftests: Move per-VM/per-vCPU nr pages calculation to __vm_create() [v2,139/144] KVM: selftests: Trust that MAXPHYADDR > memslot0 in vmx_apic_access_test [v2,140/144] KVM: selftests: Drop DEFAULT_GUEST_PHY_PAGES, open code the magic number [v2,141/144] KVM: selftests: Return an 'unsigned int' from kvm_check_cap() [v2,142/144] KVM: selftests: Add kvm_has_cap() to provide syntactic sugar [v2,143/144] KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste [v2,144/144] KVM: selftests: Sanity check input to ioctls() at build time

diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index 024a84064f1f..1a351f3f443d 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index 7b47ae4f952e..c9acf0c3f016 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index 5752486764c9..9dfc861a3cf3 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -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, diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index f0afc1dce8ba..c9d94c9f2031 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -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, diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 2d82b5720737..8f670cef6faa 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -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; } diff --git a/tools/testing/selftests/kvm/lib/x86_64/vmx.c b/tools/testing/selftests/kvm/lib/x86_64/vmx.c index 14a9a0fd2e50..2ab3f13e221d 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/vmx.c +++ b/tools/testing/selftests/kvm/lib/x86_64/vmx.c @@ -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)) && diff --git a/tools/testing/selftests/kvm/x86_64/emulator_error_test.c b/tools/testing/selftests/kvm/x86_64/emulator_error_test.c index aeb3850f81bd..9c156f9cfa15 100644 --- a/tools/testing/selftests/kvm/x86_64/emulator_error_test.c +++ b/tools/testing/selftests/kvm/x86_64/emulator_error_test.c @@ -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, diff --git a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c index 1f5c32146f3d..81f9f5b1f655 100644 --- a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +++ b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c index 672915ce73d8..7ff6e4d70333 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c b/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c index 04ed975662c9..5eea3ac7958e 100644 --- a/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +++ b/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c b/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c index c6fd36a31c8c..7211fd8d5d24 100644 --- a/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c +++ b/tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c @@ -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"); diff --git a/tools/testing/selftests/kvm/x86_64/platform_info_test.c b/tools/testing/selftests/kvm/x86_64/platform_info_test.c index 1e89688cbbbf..e79c04581ca8 100644 --- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c +++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c @@ -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", diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c index 269033af43ce..4f4519c0cdb1 100644 --- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c index f127f2fccca6..e814748bf7ba 100644 --- a/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +++ b/tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c @@ -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); } diff --git a/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c b/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c index 66378140764d..68e0f1c5ec5a 100644 --- a/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +++ b/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c @@ -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); diff --git a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c index e3e20e8848d0..23e9292580c9 100644 --- a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +++ b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c @@ -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");

[v2,031/144] KVM: selftests: Simplify KVM_ENABLE_CAP helper APIs

Commit Message

Patch