Commit 613d6118 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Capture per-vCPU GPA in perf_test_vcpu_args 



Capture the per-vCPU GPA in perf_test_vcpu_args so that tests can get
the GPA without having to calculate the GPA on their own.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20211111000310.1435032-7-dmatlack@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b65e1051

tools/testing/selftests/kvm/include/perf_test_util.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define PERF_TEST_MEM_SLOT_INDEX	1



struct perf_test_vcpu_args {

	uint64_t gpa;

	uint64_t gva;

	uint64_t pages;

tools/testing/selftests/kvm/lib/perf_test_util.c

+4 −5
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ void perf_test_setup_vcpus(struct kvm_vm *vm, int vcpus, 
			   bool partition_vcpu_memory_access)

{

	struct perf_test_args *pta = &perf_test_args;

	vm_paddr_t vcpu_gpa;

	struct perf_test_vcpu_args *vcpu_args;

	int vcpu_id;
@@ -149,19 +148,19 @@ void perf_test_setup_vcpus(struct kvm_vm *vm, int vcpus, 
					 (vcpu_id * vcpu_memory_bytes);

			vcpu_args->pages = vcpu_memory_bytes /

					   pta->guest_page_size;

			vcpu_gpa = guest_test_phys_mem +

			vcpu_args->gpa = guest_test_phys_mem +

					 (vcpu_id * vcpu_memory_bytes);

		} else {

			vcpu_args->gva = guest_test_virt_mem;

			vcpu_args->pages = (vcpus * vcpu_memory_bytes) /

					   pta->guest_page_size;

			vcpu_gpa = guest_test_phys_mem;

			vcpu_args->gpa = guest_test_phys_mem;

		}



		vcpu_args_set(vm, vcpu_id, 1, vcpu_id);



		pr_debug("Added VCPU %d with test mem gpa [%lx, %lx)\n",

			 vcpu_id, vcpu_gpa, vcpu_gpa +

			 vcpu_id, vcpu_args->gpa, vcpu_args->gpa +

			 (vcpu_args->pages * pta->guest_page_size));

	}

}