Commit 6f96628f authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Convert vmx_nested_tsc_scaling_test away from VCPU_ID 



Convert 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.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1cc1a9f3

tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c

+8 −10
Original line number Diff line number Diff line
@@ -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: