From: David Matlack <dmatlack@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, Andrew Jones <drjones@redhat.com>,
Ben Gardon <bgardon@google.com>,
Axel Rasmussen <axelrasmussen@google.com>,
Yanan Wang <wangyanan55@huawei.com>,
David Matlack <dmatlack@google.com>
Subject: [PATCH 3/3] KVM: selftests: Fix dirty bitmap offset calculation
Date: Wed, 15 Sep 2021 21:30:34 +0000 [thread overview]
Message-ID: <20210915213034.1613552-4-dmatlack@google.com> (raw)
In-Reply-To: <20210915213034.1613552-1-dmatlack@google.com>
The calculation to get the per-slot dirty bitmap was incorrect leading
to a buffer overrun. Fix it by dividing the number of pages by
BITS_PER_LONG, since each element of the bitmap is a long and there is
one bit per page.
Fixes: 609e6202ea5f ("KVM: selftests: Support multiple slots in dirty_log_perf_test")
Signed-off-by: David Matlack <dmatlack@google.com>
---
tools/testing/selftests/kvm/dirty_log_perf_test.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c
index 5ad9f2bc7369..0dd4626571e9 100644
--- a/tools/testing/selftests/kvm/dirty_log_perf_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c
@@ -118,6 +118,12 @@ static inline void disable_dirty_logging(struct kvm_vm *vm, int slots)
toggle_dirty_logging(vm, slots, false);
}
+static unsigned long *get_slot_bitmap(unsigned long *bitmap, uint64_t page_offset)
+{
+ /* Guaranteed to be evenly divisible by the TEST_ASSERT in run_test. */
+ return &bitmap[page_offset / BITS_PER_LONG];
+}
+
static void get_dirty_log(struct kvm_vm *vm, int slots, unsigned long *bitmap,
uint64_t nr_pages)
{
@@ -126,7 +132,8 @@ static void get_dirty_log(struct kvm_vm *vm, int slots, unsigned long *bitmap,
for (i = 0; i < slots; i++) {
int slot = PERF_TEST_MEM_SLOT_INDEX + i;
- unsigned long *slot_bitmap = bitmap + i * slot_pages;
+ uint64_t page_offset = slot_pages * i;
+ unsigned long *slot_bitmap = get_slot_bitmap(bitmap, page_offset);
kvm_vm_get_dirty_log(vm, slot, slot_bitmap);
}
@@ -140,7 +147,8 @@ static void clear_dirty_log(struct kvm_vm *vm, int slots, unsigned long *bitmap,
for (i = 0; i < slots; i++) {
int slot = PERF_TEST_MEM_SLOT_INDEX + i;
- unsigned long *slot_bitmap = bitmap + i * slot_pages;
+ uint64_t page_offset = slot_pages * i;
+ unsigned long *slot_bitmap = get_slot_bitmap(bitmap, page_offset);
kvm_vm_clear_dirty_log(vm, slot, slot_bitmap, 0, slot_pages);
}
@@ -172,6 +180,9 @@ static void run_test(enum vm_guest_mode mode, void *arg)
guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages);
host_num_pages = vm_num_host_pages(mode, guest_num_pages);
bmap = bitmap_alloc(host_num_pages);
+ TEST_ASSERT((host_num_pages / p->slots) % BITS_PER_LONG == 0,
+ "The number of pages per slot must be divisible by %d.",
+ BITS_PER_LONG);
if (dirty_log_manual_caps) {
cap.cap = KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2;
--
2.33.0.309.g3052b89438-goog
next prev parent reply other threads:[~2021-09-15 21:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 21:30 [PATCH 0/3] KVM: selftests: Small fixes for dirty_log_perf_test David Matlack
2021-09-15 21:30 ` [PATCH 1/3] KVM: selftests: Change backing_src flag to -s in demand_paging_test David Matlack
2021-09-15 21:56 ` Ben Gardon
2021-09-16 8:34 ` Andrew Jones
2021-09-15 21:30 ` [PATCH 2/3] KVM: selftests: Refactor help message for -s backing_src David Matlack
2021-09-15 21:55 ` Ben Gardon
2021-09-16 8:41 ` Andrew Jones
2021-09-16 16:24 ` David Matlack
2021-09-15 21:30 ` David Matlack [this message]
2021-09-15 21:55 ` [PATCH 3/3] KVM: selftests: Fix dirty bitmap offset calculation Ben Gardon
2021-09-16 8:49 ` Andrew Jones
2021-09-16 16:37 ` David Matlack
2021-09-22 11:09 ` Paolo Bonzini
2021-09-22 11:19 ` 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=20210915213034.1613552-4-dmatlack@google.com \
--to=dmatlack@google.com \
--cc=axelrasmussen@google.com \
--cc=bgardon@google.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@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