From: Peter Xu <peterx@redhat.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Sean Christopherson <sean.j.christopherson@intel.com>,
peterx@redhat.com, Andrew Jones <drjones@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v15 14/14] KVM: selftests: Add "-c" parameter to dirty log test
Date: Fri, 23 Oct 2020 14:33:58 -0400 [thread overview]
Message-ID: <20201023183358.50607-15-peterx@redhat.com> (raw)
In-Reply-To: <20201023183358.50607-1-peterx@redhat.com>
It's only used to override the existing dirty ring size/count. If
with a bigger ring count, we test async of dirty ring. If with a
smaller ring count, we test ring full code path. Async is default.
It has no use for non-dirty-ring tests.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tools/testing/selftests/kvm/dirty_log_test.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index 913583cb22b8..c2cf11e24e0a 100644
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -182,6 +182,7 @@ static enum log_mode_t host_log_mode_option = LOG_MODE_ALL;
/* Logging mode for current run */
static enum log_mode_t host_log_mode;
static pthread_t vcpu_thread;
+static uint32_t test_dirty_ring_count = TEST_DIRTY_RING_COUNT;
/* Only way to pass this to the signal handler */
static struct kvm_vm *current_vm;
@@ -264,7 +265,7 @@ static void dirty_ring_create_vm_done(struct kvm_vm *vm)
* Switch to dirty ring mode after VM creation but before any
* of the vcpu creation.
*/
- vm_enable_dirty_ring(vm, TEST_DIRTY_RING_COUNT *
+ vm_enable_dirty_ring(vm, test_dirty_ring_count *
sizeof(struct kvm_dirty_gfn));
}
@@ -286,7 +287,7 @@ static uint32_t dirty_ring_collect_one(struct kvm_dirty_gfn *dirty_gfns,
uint32_t count = 0;
while (true) {
- cur = &dirty_gfns[*fetch_index % TEST_DIRTY_RING_COUNT];
+ cur = &dirty_gfns[*fetch_index % test_dirty_ring_count];
if (!dirty_gfn_is_dirtied(cur))
break;
TEST_ASSERT(cur->slot == slot, "Slot number didn't match: "
@@ -789,6 +790,9 @@ static void help(char *name)
printf("usage: %s [-h] [-i iterations] [-I interval] "
"[-p offset] [-m mode]\n", name);
puts("");
+ printf(" -c: specify dirty ring size, in number of entries\n");
+ printf(" (only useful for dirty-ring test; default: %"PRIu32")\n",
+ TEST_DIRTY_RING_COUNT);
printf(" -i: specify iteration counts (default: %"PRIu64")\n",
TEST_HOST_LOOP_N);
printf(" -I: specify interval in ms (default: %"PRIu64" ms)\n",
@@ -844,8 +848,11 @@ int main(int argc, char *argv[])
guest_mode_init(VM_MODE_P40V48_4K, true, true);
#endif
- while ((opt = getopt(argc, argv, "hi:I:p:m:M:")) != -1) {
+ while ((opt = getopt(argc, argv, "c:hi:I:p:m:M:")) != -1) {
switch (opt) {
+ case 'c':
+ test_dirty_ring_count = strtol(optarg, NULL, 10);
+ break;
case 'i':
iterations = strtol(optarg, NULL, 10);
break;
--
2.26.2
prev parent reply other threads:[~2020-10-23 18:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 18:33 [PATCH v15 00/14] KVM: Dirty ring interface Peter Xu
2020-10-23 18:33 ` [PATCH v15 01/14] KVM: Documentation: Update entry for KVM_X86_SET_MSR_FILTER Peter Xu
2020-10-23 18:33 ` [PATCH v15 02/14] KVM: Documentation: Update entry for KVM_CAP_ENFORCE_PV_CPUID Peter Xu
2020-10-23 18:33 ` [PATCH v15 03/14] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2020-10-23 18:33 ` [PATCH v15 04/14] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-10-23 18:33 ` [PATCH v15 05/14] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2020-10-23 18:33 ` [PATCH v15 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2020-10-23 18:33 ` [PATCH v15 07/14] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2020-10-23 18:33 ` [PATCH v15 08/14] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2020-10-23 18:33 ` [PATCH v15 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Peter Xu
2020-10-23 18:33 ` [PATCH v15 10/14] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2020-10-23 18:33 ` [PATCH v15 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2020-10-23 18:33 ` [PATCH v15 12/14] KVM: selftests: Add dirty ring buffer test Peter Xu
2020-10-23 18:33 ` [PATCH v15 13/14] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2020-10-23 18:33 ` Peter Xu [this message]
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=20201023183358.50607-15-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=dgilbert@redhat.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.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;
as well as URLs for NNTP newsgroup(s).