[v2,112/144] KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers

Message ID	20220603004331.1523888-113-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:42:59 +0000 In-Reply-To: <20220603004331.1523888-1-seanjc@google.com> Message-Id: <20220603004331.1523888-113-seanjc@google.com> Mime-Version: 1.0 References: <20220603004331.1523888-1-seanjc@google.com> Subject: [PATCH v2 112/144] KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers 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/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c index b69db0942169..2fe13e117dba 100644 --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c @@ -242,7 +242,7 @@ static int debug_version(struct kvm_vcpu *vcpu) { uint64_t id_aa64dfr0; - get_reg(vcpu->vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); + vcpu_get_reg(vcpu->vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); return id_aa64dfr0 & 0xf; } diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c index a8558e462efb..e004afc29387 100644 --- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c +++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c @@ -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, &reg); + ret = __vcpu_get_reg(vm, 0, reg_list->reg[i], &addr); if (ret) { printf("%s: Failed to get ", config_name(c)); print_reg(c, reg.id); diff --git a/tools/testing/selftests/kvm/aarch64/hypercalls.c b/tools/testing/selftests/kvm/aarch64/hypercalls.c index 1eb9738453b4..b1f99e786d05 100644 --- a/tools/testing/selftests/kvm/aarch64/hypercalls.c +++ b/tools/testing/selftests/kvm/aarch64/hypercalls.c @@ -141,26 +141,6 @@ static void guest_code(void) GUEST_DONE(); } -static int set_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t val) -{ - struct kvm_one_reg reg = { - .id = id, - .addr = (uint64_t)&val, - }; - - return __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg); -} - -static void get_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t *addr) -{ - struct kvm_one_reg reg = { - .id = id, - .addr = (uint64_t)addr, - }; - - vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, &reg); -} - struct st_time { uint32_t rev; uint32_t attr; @@ -196,18 +176,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm) const struct kvm_fw_reg_info *reg_info = &fw_reg_info[i]; /* First 'read' should be an upper limit of the features supported */ - get_fw_reg(vm, reg_info->reg, &val); + vcpu_get_reg(vm, 0, reg_info->reg, &val); TEST_ASSERT(val == FW_REG_ULIMIT_VAL(reg_info->max_feat_bit), "Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx\n", reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit), val); /* Test a 'write' by disabling all the features of the register map */ - ret = set_fw_reg(vm, reg_info->reg, 0); + ret = __vcpu_set_reg(vm, 0, reg_info->reg, 0); TEST_ASSERT(ret == 0, "Failed to clear all the features of reg: 0x%lx; ret: %d\n", reg_info->reg, errno); - get_fw_reg(vm, reg_info->reg, &val); + vcpu_get_reg(vm, 0, reg_info->reg, &val); TEST_ASSERT(val == 0, "Expected all the features to be cleared for reg: 0x%lx\n", reg_info->reg); @@ -216,7 +196,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vm *vm) * Avoid this check if all the bits are occupied. */ if (reg_info->max_feat_bit < 63) { - ret = set_fw_reg(vm, reg_info->reg, BIT(reg_info->max_feat_bit + 1)); + ret = __vcpu_set_reg(vm, 0, reg_info->reg, BIT(reg_info->max_feat_bit + 1)); TEST_ASSERT(ret != 0 && errno == EINVAL, "Unexpected behavior or return value (%d) while setting an unsupported feature for reg: 0x%lx\n", errno, reg_info->reg); @@ -237,7 +217,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm) * Before starting the VM, the test clears all the bits. * Check if that's still the case. */ - get_fw_reg(vm, reg_info->reg, &val); + vcpu_get_reg(vm, 0, reg_info->reg, &val); TEST_ASSERT(val == 0, "Expected all the features to be cleared for reg: 0x%lx\n", reg_info->reg); @@ -247,7 +227,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm) * the registers and should return EBUSY. Set the registers and check for * the expected errno. */ - ret = set_fw_reg(vm, reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit)); + ret = __vcpu_set_reg(vm, 0, reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit)); TEST_ASSERT(ret != 0 && errno == EBUSY, "Unexpected behavior or return value (%d) while setting a feature while VM is running for reg: 0x%lx\n", errno, reg_info->reg); diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index d9695a939cc9..f4f73934351f 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c @@ -102,8 +102,8 @@ static void assert_vcpu_reset(struct kvm_vcpu *vcpu) { uint64_t obs_pc, obs_x0; - get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.pc), &obs_pc); - get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.regs[0]), &obs_x0); + vcpu_get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.pc), &obs_pc); + vcpu_get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.regs[0]), &obs_x0); TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, "unexpected target cpu pc: %lx (expected: %lx)", @@ -143,7 +143,7 @@ static void host_test_cpu_on(void) */ vcpu_power_off(target); - get_reg(vm, target->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &target_mpidr); + vcpu_get_reg(vm, target->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &target_mpidr); vcpu_args_set(vm, source->id, 1, target_mpidr & MPIDR_HWID_BITMASK); enter_guest(source); diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index f774609f7848..ba3e9066d990 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -19,7 +19,7 @@ /* * KVM_ARM64_SYS_REG(sys_reg_id): Helper macro to convert * SYS_* register definitions in asm/sysreg.h to use in KVM - * calls such as get_reg() and set_reg(). + * calls such as vcpu_get_reg() and vcpu_set_reg(). */ #define KVM_ARM64_SYS_REG(sys_reg_id) \ ARM64_SYS_REG(sys_reg_Op0(sys_reg_id), \ @@ -47,22 +47,6 @@ #define MPIDR_HWID_BITMASK (0xff00fffffful) -static inline void get_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, uint64_t *addr) -{ - struct kvm_one_reg reg; - reg.id = id; - reg.addr = (uint64_t)addr; - vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, &reg); -} - -static inline void set_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, uint64_t val) -{ - struct kvm_one_reg reg; - reg.id = id; - reg.addr = (uint64_t)&val; - vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, &reg); -} - void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_init *init); struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, struct kvm_vcpu_init *init, void *guest_code); diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index c0b2158a53d5..9c29b6797ce8 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -374,16 +374,36 @@ static inline void vcpu_fpu_set(struct kvm_vm *vm, uint32_t vcpuid, { vcpu_ioctl(vm, vcpuid, KVM_SET_FPU, fpu); } + +static inline int __vcpu_get_reg(struct kvm_vm *vm, uint32_t vcpuid, + uint64_t reg_id, void *addr) +{ + struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t)addr }; + + return __vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, &reg); +} +static inline int __vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, + uint64_t reg_id, uint64_t val) +{ + struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t)&val }; + + return __vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, &reg); +} static inline void vcpu_get_reg(struct kvm_vm *vm, uint32_t vcpuid, - struct kvm_one_reg *reg) + uint64_t reg_id, void *addr) { - vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, reg); + struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t)addr }; + + vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, &reg); } static inline void vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, - struct kvm_one_reg *reg) + uint64_t reg_id, uint64_t val) { - vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, reg); + struct kvm_one_reg reg = { .id = reg_id, .addr = (uint64_t)&val }; + + vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, &reg); } + #ifdef __KVM_HAVE_VCPU_EVENTS static inline void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_events *events) diff --git a/tools/testing/selftests/kvm/include/riscv/processor.h b/tools/testing/selftests/kvm/include/riscv/processor.h index 4fcfd1c0389d..d00d213c3805 100644 --- a/tools/testing/selftests/kvm/include/riscv/processor.h +++ b/tools/testing/selftests/kvm/include/riscv/processor.h @@ -38,26 +38,6 @@ static inline uint64_t __kvm_reg_id(uint64_t type, uint64_t idx, KVM_REG_RISCV_TIMER_REG(name), \ KVM_REG_SIZE_U64) -static inline void get_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, - unsigned long *addr) -{ - struct kvm_one_reg reg; - - reg.id = id; - reg.addr = (unsigned long)addr; - vcpu_get_reg(vm, vcpuid, &reg); -} - -static inline void set_reg(struct kvm_vm *vm, uint32_t vcpuid, uint64_t id, - unsigned long val) -{ - struct kvm_one_reg reg; - - reg.id = id; - reg.addr = (unsigned long)&val; - vcpu_set_reg(vm, vcpuid, &reg); -} - /* L3 index Bit[47:39] */ #define PGTBL_L3_INDEX_MASK 0x0000FF8000000000ULL #define PGTBL_L3_INDEX_SHIFT 39 diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 5b95fa2cce18..d158d5aa26e6 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -232,10 +232,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_init * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 * registers, which the variable argument list macros do. */ - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_CPACR_EL1), 3 << 20); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_CPACR_EL1), 3 << 20); - get_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), &sctlr_el1); - get_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TCR_EL1), &tcr_el1); + vcpu_get_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), &sctlr_el1); + vcpu_get_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TCR_EL1), &tcr_el1); /* Configure base granule size */ switch (vm->mode) { @@ -296,19 +296,19 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_vcpu_init tcr_el1 |= (1 << 8) | (1 << 10) | (3 << 12); tcr_el1 |= (64 - vm->va_bits) /* T0SZ */; - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), sctlr_el1); - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TCR_EL1), tcr_el1); - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), vm->pgd); - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TPIDR_EL1), vcpuid); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), sctlr_el1); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TCR_EL1), tcr_el1); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), vm->pgd); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TPIDR_EL1), vcpuid); } void vcpu_arch_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) { uint64_t pstate, pc; - get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pstate), &pstate); - get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &pc); + vcpu_get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pstate), &pstate); + vcpu_get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &pc); fprintf(stream, "%*spstate: 0x%.16lx pc: 0x%.16lx\n", indent, "", pstate, pc); @@ -326,8 +326,8 @@ struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, aarch64_vcpu_setup(vm, vcpu_id, init); - set_reg(vm, vcpu_id, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size); - set_reg(vm, vcpu_id, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code); + vcpu_set_reg(vm, vcpu_id, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size); + vcpu_set_reg(vm, vcpu_id, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code); return vcpu; } @@ -349,7 +349,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...) va_start(ap, num); for (i = 0; i < num; i++) { - set_reg(vm, vcpuid, ARM64_CORE_REG(regs.regs[i]), + vcpu_set_reg(vm, vcpuid, ARM64_CORE_REG(regs.regs[i]), va_arg(ap, uint64_t)); } @@ -389,7 +389,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) { extern char vectors; - set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_VBAR_EL1), (uint64_t)&vectors); + vcpu_set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_VBAR_EL1), (uint64_t)&vectors); } void route_exception(struct ex_regs *regs, int vector) diff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c index ba5761843c76..edbdc7bef05b 100644 --- a/tools/testing/selftests/kvm/lib/riscv/processor.c +++ b/tools/testing/selftests/kvm/lib/riscv/processor.c @@ -198,46 +198,46 @@ void riscv_vcpu_mmu_setup(struct kvm_vm *vm, int vcpuid) satp = (vm->pgd >> PGTBL_PAGE_SIZE_SHIFT) & SATP_PPN; satp |= SATP_MODE_48; - set_reg(vm, vcpuid, RISCV_CSR_REG(satp), satp); + vcpu_set_reg(vm, vcpuid, RISCV_CSR_REG(satp), satp); } void vcpu_arch_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) { struct kvm_riscv_core core; - get_reg(vm, vcpuid, RISCV_CORE_REG(mode), &core.mode); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.pc), &core.regs.pc); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.ra), &core.regs.ra); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.sp), &core.regs.sp); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.gp), &core.regs.gp); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.tp), &core.regs.tp); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t0), &core.regs.t0); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t1), &core.regs.t1); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t2), &core.regs.t2); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s0), &core.regs.s0); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s1), &core.regs.s1); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a0), &core.regs.a0); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a1), &core.regs.a1); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a2), &core.regs.a2); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a3), &core.regs.a3); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a4), &core.regs.a4); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a5), &core.regs.a5); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a6), &core.regs.a6); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a7), &core.regs.a7); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s2), &core.regs.s2); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s3), &core.regs.s3); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s4), &core.regs.s4); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s5), &core.regs.s5); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s6), &core.regs.s6); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s7), &core.regs.s7); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s8), &core.regs.s8); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s9), &core.regs.s9); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s10), &core.regs.s10); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s11), &core.regs.s11); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t3), &core.regs.t3); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t4), &core.regs.t4); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t5), &core.regs.t5); - get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t6), &core.regs.t6); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(mode), &core.mode); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.pc), &core.regs.pc); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.ra), &core.regs.ra); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.sp), &core.regs.sp); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.gp), &core.regs.gp); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.tp), &core.regs.tp); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t0), &core.regs.t0); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t1), &core.regs.t1); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t2), &core.regs.t2); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s0), &core.regs.s0); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s1), &core.regs.s1); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a0), &core.regs.a0); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a1), &core.regs.a1); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a2), &core.regs.a2); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a3), &core.regs.a3); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a4), &core.regs.a4); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a5), &core.regs.a5); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a6), &core.regs.a6); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.a7), &core.regs.a7); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s2), &core.regs.s2); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s3), &core.regs.s3); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s4), &core.regs.s4); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s5), &core.regs.s5); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s6), &core.regs.s6); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s7), &core.regs.s7); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s8), &core.regs.s8); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s9), &core.regs.s9); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s10), &core.regs.s10); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.s11), &core.regs.s11); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t3), &core.regs.t3); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t4), &core.regs.t4); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t5), &core.regs.t5); + vcpu_get_reg(vm, vcpuid, RISCV_CORE_REG(regs.t6), &core.regs.t6); fprintf(stream, " MODE: 0x%lx\n", core.mode); @@ -302,17 +302,17 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id, /* Setup global pointer of guest to be same as the host */ asm volatile ( "add %0, gp, zero" : "=r" (current_gp) : : "memory"); - set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.gp), current_gp); + vcpu_set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.gp), current_gp); /* Setup stack pointer and program counter of guest */ - set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.sp), - stack_vaddr + stack_size); - set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.pc), - (unsigned long)guest_code); + vcpu_set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.sp), + stack_vaddr + stack_size); + vcpu_set_reg(vm, vcpu_id, RISCV_CORE_REG(regs.pc), + (unsigned long)guest_code); /* Setup default exception vector of guest */ - set_reg(vm, vcpu_id, RISCV_CSR_REG(stvec), - (unsigned long)guest_unexp_trap); + vcpu_set_reg(vm, vcpu_id, RISCV_CSR_REG(stvec), + (unsigned long)guest_unexp_trap); return vcpu; } @@ -355,7 +355,7 @@ void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...) id = RISCV_CORE_REG(regs.a7); break; } - set_reg(vm, vcpuid, id, va_arg(ap, uint64_t)); + vcpu_set_reg(vm, vcpuid, id, va_arg(ap, uint64_t)); } va_end(ap); diff --git a/tools/testing/selftests/kvm/s390x/resets.c b/tools/testing/selftests/kvm/s390x/resets.c index cc4b7c86d69f..a62de5351d7b 100644 --- a/tools/testing/selftests/kvm/s390x/resets.c +++ b/tools/testing/selftests/kvm/s390x/resets.c @@ -60,12 +60,9 @@ static void guest_code_initial(void) static void test_one_reg(uint64_t id, uint64_t value) { - struct kvm_one_reg reg; uint64_t eval_reg; - reg.addr = (uintptr_t)&eval_reg; - reg.id = id; - vcpu_get_reg(vm, VCPU_ID, &reg); + vcpu_get_reg(vm, VCPU_ID, id, &eval_reg); TEST_ASSERT(eval_reg == value, "value == 0x%lx", value); }

[v2,112/144] KVM: selftests: Consolidate KVM_{G,S}ET_ONE_REG helpers

Commit Message

Patch