From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Sean Christopherson <seanjc@google.com>,
Ben Gardon <bgardon@google.com>,
Yanan Wang <wangyanan55@huawei.com>,
Andrew Jones <drjones@redhat.com>, Peter Xu <peterx@redhat.com>,
Aaron Lewis <aaronlewis@google.com>
Subject: [PATCH 06/15] KVM: selftests: Use shorthand local var to access struct perf_tests_args
Date: Wed, 10 Feb 2021 15:06:16 -0800 [thread overview]
Message-ID: <20210210230625.550939-7-seanjc@google.com> (raw)
In-Reply-To: <20210210230625.550939-1-seanjc@google.com>
Use 'pta' as a local pointer to the global perf_tests_args in order to
shorten line lengths and make the code borderline readable.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
.../selftests/kvm/lib/perf_test_util.c | 36 ++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c
index f187b86f2e14..73b0fccc28b9 100644
--- a/tools/testing/selftests/kvm/lib/perf_test_util.c
+++ b/tools/testing/selftests/kvm/lib/perf_test_util.c
@@ -23,7 +23,8 @@ static uint64_t guest_test_virt_mem = DEFAULT_GUEST_TEST_MEM;
*/
static void guest_code(uint32_t vcpu_id)
{
- struct perf_test_vcpu_args *vcpu_args = &perf_test_args.vcpu_args[vcpu_id];
+ struct perf_test_args *pta = &perf_test_args;
+ struct perf_test_vcpu_args *vcpu_args = &pta->vcpu_args[vcpu_id];
uint64_t gva;
uint64_t pages;
int i;
@@ -36,9 +37,9 @@ static void guest_code(uint32_t vcpu_id)
while (true) {
for (i = 0; i < pages; i++) {
- uint64_t addr = gva + (i * perf_test_args.guest_page_size);
+ uint64_t addr = gva + (i * pta->guest_page_size);
- if (i % perf_test_args.wr_fract == 0)
+ if (i % pta->wr_fract == 0)
*(uint64_t *)addr = 0x0123456789ABCDEF;
else
READ_ONCE(*(uint64_t *)addr);
@@ -52,32 +53,32 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,
uint64_t vcpu_memory_bytes,
enum vm_mem_backing_src_type backing_src)
{
+ struct perf_test_args *pta = &perf_test_args;
struct kvm_vm *vm;
uint64_t guest_num_pages;
pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode));
- perf_test_args.host_page_size = getpagesize();
+ pta->host_page_size = getpagesize();
/*
* Snapshot the non-huge page size. This is used by the guest code to
* access/dirty pages at the logging granularity.
*/
- perf_test_args.guest_page_size = vm_guest_mode_params[mode].page_size;
+ pta->guest_page_size = vm_guest_mode_params[mode].page_size;
guest_num_pages = vm_adjust_num_guest_pages(mode,
- (vcpus * vcpu_memory_bytes) / perf_test_args.guest_page_size);
+ (vcpus * vcpu_memory_bytes) / pta->guest_page_size);
- TEST_ASSERT(vcpu_memory_bytes % perf_test_args.host_page_size == 0,
+ TEST_ASSERT(vcpu_memory_bytes % pta->host_page_size == 0,
"Guest memory size is not host page size aligned.");
- TEST_ASSERT(vcpu_memory_bytes % perf_test_args.guest_page_size == 0,
+ TEST_ASSERT(vcpu_memory_bytes % pta->guest_page_size == 0,
"Guest memory size is not guest page size aligned.");
vm = vm_create_with_vcpus(mode, vcpus,
- (vcpus * vcpu_memory_bytes) / perf_test_args.guest_page_size,
+ (vcpus * vcpu_memory_bytes) / pta->guest_page_size,
0, guest_code, NULL);
-
- perf_test_args.vm = vm;
+ pta->vm = vm;
/*
* If there should be more memory in the guest test region than there
@@ -90,8 +91,8 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,
vcpu_memory_bytes);
guest_test_phys_mem = (vm_get_max_gfn(vm) - guest_num_pages) *
- perf_test_args.guest_page_size;
- guest_test_phys_mem &= ~(perf_test_args.host_page_size - 1);
+ pta->guest_page_size;
+ guest_test_phys_mem &= ~(pta->host_page_size - 1);
if (backing_src == VM_MEM_SRC_ANONYMOUS_THP ||
backing_src == VM_MEM_SRC_ANONYMOUS_HUGETLB)
guest_test_phys_mem &= ~(KVM_UTIL_HUGEPAGE_ALIGNMENT - 1);
@@ -125,30 +126,31 @@ void perf_test_setup_vcpus(struct kvm_vm *vm, int vcpus,
uint64_t vcpu_memory_bytes,
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;
for (vcpu_id = 0; vcpu_id < vcpus; vcpu_id++) {
- vcpu_args = &perf_test_args.vcpu_args[vcpu_id];
+ vcpu_args = &pta->vcpu_args[vcpu_id];
vcpu_args->vcpu_id = vcpu_id;
if (partition_vcpu_memory_access) {
vcpu_args->gva = guest_test_virt_mem +
(vcpu_id * vcpu_memory_bytes);
vcpu_args->pages = vcpu_memory_bytes /
- perf_test_args.guest_page_size;
+ pta->guest_page_size;
vcpu_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) /
- perf_test_args.guest_page_size;
+ pta->guest_page_size;
vcpu_gpa = guest_test_phys_mem;
}
pr_debug("Added VCPU %d with test mem gpa [%lx, %lx)\n",
vcpu_id, vcpu_gpa, vcpu_gpa +
- (vcpu_args->pages * perf_test_args.guest_page_size));
+ (vcpu_args->pages * pta->guest_page_size));
}
}
--
2.30.0.478.g8a0d178c01-goog
next prev parent reply other threads:[~2021-02-10 23:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 23:06 [PATCH 00/15] VM: selftests: Hugepage fixes and cleanups Sean Christopherson
2021-02-10 23:06 ` [PATCH 01/15] KVM: selftests: Explicitly state indicies for vm_guest_mode_params array Sean Christopherson
2021-02-11 0:50 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 02/15] KVM: selftests: Expose align() helpers to tests Sean Christopherson
2021-02-11 0:49 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 03/15] KVM: selftests: Align HVA for HugeTLB-backed memslots Sean Christopherson
2021-02-11 0:52 ` Ben Gardon
2021-02-25 7:40 ` wangyanan (Y)
2021-03-13 0:17 ` Sean Christopherson
2021-02-10 23:06 ` [PATCH 04/15] KVM: selftests: Force stronger HVA alignment (1gb) for hugepages Sean Christopherson
2021-02-25 7:57 ` wangyanan (Y)
2021-03-13 0:26 ` Sean Christopherson
2021-02-10 23:06 ` [PATCH 05/15] KVM: selftests: Require GPA to be aligned when backed by hugepages Sean Christopherson
2021-02-11 1:01 ` Ben Gardon
2021-02-10 23:06 ` Sean Christopherson [this message]
2021-02-11 1:09 ` [PATCH 06/15] KVM: selftests: Use shorthand local var to access struct perf_tests_args Ben Gardon
2021-02-10 23:06 ` [PATCH 07/15] KVM: selftests: Capture per-vCPU GPA in perf_test_vcpu_args Sean Christopherson
2021-02-11 1:24 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 08/15] KVM: selftests: Use perf util's per-vCPU GPA/pages in demand paging test Sean Christopherson
2021-02-11 1:23 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 09/15] KVM: selftests: Move per-VM GPA into perf_test_args Sean Christopherson
2021-02-11 1:22 ` Ben Gardon
2021-02-11 1:56 ` Sean Christopherson
2021-02-11 13:12 ` Paolo Bonzini
2021-02-11 15:57 ` Sean Christopherson
2021-02-11 17:33 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 10/15] KVM: selftests: Remove perf_test_args.host_page_size Sean Christopherson
2021-02-11 1:26 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 11/15] KVM: selftests: Create VM with adjusted number of guest pages for perf tests Sean Christopherson
2021-02-11 1:32 ` Ben Gardon
2021-02-10 23:06 ` [PATCH 12/15] KVM: selftests: Fill per-vCPU struct during "perf_test" VM creation Sean Christopherson
2021-02-10 23:06 ` [PATCH 13/15] KVM: selftests: Sync perf_test_args to guest during " Sean Christopherson
2021-02-10 23:06 ` [PATCH 14/15] KVM: selftests: Track size of per-VM memslot in perf_test_args Sean Christopherson
2021-02-10 23:06 ` [PATCH 15/15] KVM: selftests: Get rid of gorilla math in memslots modification test Sean Christopherson
2021-02-11 11:58 ` [PATCH 00/15] VM: selftests: Hugepage fixes and cleanups Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210210230625.550939-7-seanjc@google.com \
--to=seanjc@google.com \
--cc=aaronlewis@google.com \
--cc=bgardon@google.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=wangyanan55@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox