| Message ID | 20210210230625.550939-8-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | VM: selftests: Hugepage fixes and cleanups | expand |
On Wed, Feb 10, 2021 at 3:06 PM Sean Christopherson <seanjc@google.com> wrote: > > 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: Sean Christopherson <seanjc@google.com> Reviewed-by: Ben Gardon <bgardon@google.com> > --- > tools/testing/selftests/kvm/include/perf_test_util.h | 1 + > tools/testing/selftests/kvm/lib/perf_test_util.c | 9 ++++----- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h > index 005f2143adeb..4d53238b139f 100644 > --- a/tools/testing/selftests/kvm/include/perf_test_util.h > +++ b/tools/testing/selftests/kvm/include/perf_test_util.h > @@ -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; > > diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c > index 73b0fccc28b9..f22ce1836547 100644 > --- a/tools/testing/selftests/kvm/lib/perf_test_util.c > +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c > @@ -127,7 +127,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; > > @@ -140,17 +139,17 @@ 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_id * vcpu_memory_bytes); > + 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; > } > > 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)); > } > } > -- > 2.30.0.478.g8a0d178c01-goog >
diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h index 005f2143adeb..4d53238b139f 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -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; diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c index 73b0fccc28b9..f22ce1836547 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -127,7 +127,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; @@ -140,17 +139,17 @@ 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_id * vcpu_memory_bytes); + 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; } 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)); } }
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: Sean Christopherson <seanjc@google.com> --- tools/testing/selftests/kvm/include/perf_test_util.h | 1 + tools/testing/selftests/kvm/lib/perf_test_util.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-)