Vipin Sharma <vipinsh@xxxxxxxxxx> writes: > hypercall() can be used by other hyperv tests, move it to hyperv.h. > A similar patch is pending in my TLB flush series: https://lore.kernel.org/kvm/20221101145426.251680-33-vkuznets@xxxxxxxxxx/ > Signed-off-by: Vipin Sharma <vipinsh@xxxxxxxxxx> > --- > .../selftests/kvm/include/x86_64/hyperv.h | 17 +++++++++++++++++ > .../selftests/kvm/x86_64/hyperv_features.c | 17 ----------------- > 2 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/x86_64/hyperv.h b/tools/testing/selftests/kvm/include/x86_64/hyperv.h > index 9d8c325af1d9..87d8d9e444f7 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/hyperv.h > +++ b/tools/testing/selftests/kvm/include/x86_64/hyperv.h > @@ -199,4 +199,21 @@ static inline uint64_t hv_linux_guest_id(void) > ((uint64_t)LINUX_VERSION_CODE << 16); > } > > +static inline uint8_t hypercall(u64 control, vm_vaddr_t input_address, > + vm_vaddr_t output_address, uint64_t *hv_status) > +{ > + uint8_t vector; > + > + /* Note both the hypercall and the "asm safe" clobber r9-r11. */ > + asm volatile("mov %[output_address], %%r8\n\t" > + KVM_ASM_SAFE("vmcall") > + : "=a" (*hv_status), > + "+c" (control), "+d" (input_address), > + KVM_ASM_SAFE_OUTPUTS(vector) > + : [output_address] "r"(output_address), > + "a" (-EFAULT) > + : "cc", "memory", "r8", KVM_ASM_SAFE_CLOBBERS); > + return vector; > +} > + > #endif /* !SELFTEST_KVM_HYPERV_H */ > diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c > index b5a42cf1ad9d..31b22ee07dfb 100644 > --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c > +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c > @@ -13,23 +13,6 @@ > #include "processor.h" > #include "hyperv.h" > > -static inline uint8_t hypercall(u64 control, vm_vaddr_t input_address, > - vm_vaddr_t output_address, uint64_t *hv_status) > -{ > - uint8_t vector; > - > - /* Note both the hypercall and the "asm safe" clobber r9-r11. */ > - asm volatile("mov %[output_address], %%r8\n\t" > - KVM_ASM_SAFE("vmcall") > - : "=a" (*hv_status), > - "+c" (control), "+d" (input_address), > - KVM_ASM_SAFE_OUTPUTS(vector) > - : [output_address] "r"(output_address), > - "a" (-EFAULT) > - : "cc", "memory", "r8", KVM_ASM_SAFE_CLOBBERS); > - return vector; > -} > - > struct msr_data { > uint32_t idx; > bool available; -- Vitaly
