From: Gavin Shan <gshan@redhat.com> To: kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, maz@kernel.org, linux-kernel@vger.kernel.org, zhenyzha@redhat.com, shan.gavin@gmail.com, pbonzini@redhat.com, maciej.szmigiero@oracle.com, shuah@kernel.org, kvmarm@lists.cs.columbia.edu, ajones@ventanamicro.com Subject: [PATCH 2/6] KVM: selftests: memslot_perf_test: Consolidate loop conditions in prepare_vm() Date: Fri, 14 Oct 2022 15:19:10 +0800 [thread overview] Message-ID: <20221014071914.227134-3-gshan@redhat.com> (raw) In-Reply-To: <20221014071914.227134-1-gshan@redhat.com> There are two loops in prepare_vm(), which have different conditions. 'slot' is treated as meory slot index in the first loop, but index of the host virtual address array in the second loop. It makes it a bit hard to understand the code. Change the usage of 'slot' in the second loop, to treat it as the memory slot index either. No functional change intended. Signed-off-by: Gavin Shan <gshan@redhat.com> --- tools/testing/selftests/kvm/memslot_perf_test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c index 231cc8449c2e..dcb492b3f27b 100644 --- a/tools/testing/selftests/kvm/memslot_perf_test.c +++ b/tools/testing/selftests/kvm/memslot_perf_test.c @@ -297,21 +297,20 @@ static bool prepare_vm(struct vm_data *data, int nslots, uint64_t *maxslots, } *slot_runtime = timespec_elapsed(tstart); - for (slot = 0, guest_addr = MEM_GPA; slot < data->nslots; slot++) { + for (slot = 1, guest_addr = MEM_GPA; slot <= data->nslots; slot++) { uint64_t npages; uint64_t gpa; npages = data->pages_per_slot; - if (slot == data->nslots - 1) + if (slot == data->nslots) npages += rempages; - gpa = vm_phy_pages_alloc(data->vm, npages, guest_addr, - slot + 1); + gpa = vm_phy_pages_alloc(data->vm, npages, guest_addr, slot); TEST_ASSERT(gpa == guest_addr, "vm_phy_pages_alloc() failed\n"); - data->hva_slots[slot] = addr_gpa2hva(data->vm, guest_addr); - memset(data->hva_slots[slot], 0, npages * 4096); + data->hva_slots[slot - 1] = addr_gpa2hva(data->vm, guest_addr); + memset(data->hva_slots[slot - 1], 0, npages * 4096); guest_addr += npages * 4096; } -- 2.23.0 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Gavin Shan <gshan@redhat.com> To: kvmarm@lists.linux.dev Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, ajones@ventanamicro.com, pbonzini@redhat.com, maz@kernel.org, shuah@kernel.org, oliver.upton@linux.dev, seanjc@google.com, peterx@redhat.com, maciej.szmigiero@oracle.com, ricarkol@google.com, zhenyzha@redhat.com, shan.gavin@gmail.com Subject: [PATCH 2/6] KVM: selftests: memslot_perf_test: Consolidate loop conditions in prepare_vm() Date: Fri, 14 Oct 2022 15:19:10 +0800 [thread overview] Message-ID: <20221014071914.227134-3-gshan@redhat.com> (raw) Message-ID: <20221014071910.yWzPQ7B-RzUftOIe5RUYTUBFL4zMuU4P7Ct5ll1yp8U@z> (raw) In-Reply-To: <20221014071914.227134-1-gshan@redhat.com> There are two loops in prepare_vm(), which have different conditions. 'slot' is treated as meory slot index in the first loop, but index of the host virtual address array in the second loop. It makes it a bit hard to understand the code. Change the usage of 'slot' in the second loop, to treat it as the memory slot index either. No functional change intended. Signed-off-by: Gavin Shan <gshan@redhat.com> --- tools/testing/selftests/kvm/memslot_perf_test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c index 231cc8449c2e..dcb492b3f27b 100644 --- a/tools/testing/selftests/kvm/memslot_perf_test.c +++ b/tools/testing/selftests/kvm/memslot_perf_test.c @@ -297,21 +297,20 @@ static bool prepare_vm(struct vm_data *data, int nslots, uint64_t *maxslots, } *slot_runtime = timespec_elapsed(tstart); - for (slot = 0, guest_addr = MEM_GPA; slot < data->nslots; slot++) { + for (slot = 1, guest_addr = MEM_GPA; slot <= data->nslots; slot++) { uint64_t npages; uint64_t gpa; npages = data->pages_per_slot; - if (slot == data->nslots - 1) + if (slot == data->nslots) npages += rempages; - gpa = vm_phy_pages_alloc(data->vm, npages, guest_addr, - slot + 1); + gpa = vm_phy_pages_alloc(data->vm, npages, guest_addr, slot); TEST_ASSERT(gpa == guest_addr, "vm_phy_pages_alloc() failed\n"); - data->hva_slots[slot] = addr_gpa2hva(data->vm, guest_addr); - memset(data->hva_slots[slot], 0, npages * 4096); + data->hva_slots[slot - 1] = addr_gpa2hva(data->vm, guest_addr); + memset(data->hva_slots[slot - 1], 0, npages * 4096); guest_addr += npages * 4096; } -- 2.23.0
next prev parent reply other threads:[~2022-10-14 7:20 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-14 7:19 [PATCH 0/6] KVM: selftests: memslot_perf_test: aarch64 cleanup/fixes Gavin Shan 2022-10-14 7:19 ` Gavin Shan 2022-10-14 7:19 ` [PATCH 1/6] KVM: selftests: memslot_perf_test: Use data->nslots in prepare_vm() Gavin Shan 2022-10-14 7:19 ` Gavin Shan 2022-10-14 7:19 ` Gavin Shan [this message] 2022-10-14 7:19 ` [PATCH 2/6] KVM: selftests: memslot_perf_test: Consolidate loop conditions " Gavin Shan 2022-10-14 7:19 ` [PATCH 3/6] KVM: selftests: memslot_perf_test: Probe memory slots for once Gavin Shan 2022-10-14 7:19 ` Gavin Shan 2022-10-17 17:34 ` Maciej S. Szmigiero 2022-10-17 17:34 ` Maciej S. Szmigiero 2022-10-17 22:18 ` Gavin Shan 2022-10-17 22:18 ` Gavin Shan 2022-10-14 7:19 ` [PATCH 4/6] KVM: selftests: memslot_perf_test: Support variable guest page size Gavin Shan 2022-10-14 7:19 ` Gavin Shan 2022-10-17 21:31 ` Maciej S. Szmigiero 2022-10-17 21:31 ` Maciej S. Szmigiero 2022-10-18 0:46 ` Gavin Shan 2022-10-18 0:46 ` Gavin Shan 2022-10-18 0:51 ` Gavin Shan 2022-10-18 0:51 ` Gavin Shan 2022-10-18 15:56 ` Maciej S. Szmigiero 2022-10-18 15:56 ` Maciej S. Szmigiero 2022-10-19 0:26 ` Gavin Shan 2022-10-19 0:26 ` Gavin Shan 2022-10-19 20:18 ` Maciej S. Szmigiero 2022-10-19 20:18 ` Maciej S. Szmigiero 2022-10-20 7:19 ` Gavin Shan 2022-10-20 7:19 ` Gavin Shan 2022-10-14 7:19 ` [PATCH 5/6] KVM: selftests: memslot_perf_test: Consolidate memory sizes Gavin Shan 2022-10-14 7:19 ` Gavin Shan 2022-10-17 21:36 ` Maciej S. Szmigiero 2022-10-17 21:36 ` Maciej S. Szmigiero 2022-10-17 22:08 ` Sean Christopherson 2022-10-17 22:08 ` Sean Christopherson 2022-10-17 22:51 ` Gavin Shan 2022-10-17 22:51 ` Gavin Shan 2022-10-17 22:56 ` Maciej S. Szmigiero 2022-10-17 22:56 ` Maciej S. Szmigiero 2022-10-17 23:10 ` Gavin Shan 2022-10-17 23:10 ` Gavin Shan 2022-10-17 23:32 ` Sean Christopherson 2022-10-17 23:32 ` Sean Christopherson 2022-10-17 23:39 ` Gavin Shan 2022-10-17 23:39 ` Gavin Shan 2022-10-18 7:47 ` Oliver Upton 2022-10-18 7:47 ` Oliver Upton 2022-10-18 8:48 ` Gavin Shan 2022-10-18 8:48 ` Gavin Shan 2022-10-18 1:13 ` Gavin Shan 2022-10-18 1:13 ` Gavin Shan 2022-10-14 7:19 ` [PATCH 6/6] KVM: selftests: memslot_perf_test: Report optimal memory slots Gavin Shan 2022-10-14 7:19 ` Gavin Shan
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=20221014071914.227134-3-gshan@redhat.com \ --to=gshan@redhat.com \ --cc=ajones@ventanamicro.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=kvmarm@lists.linux.dev \ --cc=linux-kernel@vger.kernel.org \ --cc=maciej.szmigiero@oracle.com \ --cc=maz@kernel.org \ --cc=pbonzini@redhat.com \ --cc=shan.gavin@gmail.com \ --cc=shuah@kernel.org \ --cc=zhenyzha@redhat.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: linkBe 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; as well as URLs for NNTP newsgroup(s).