From: Peter Xu <peterx@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson <sean.j.christopherson@intel.com>, Paolo Bonzini <pbonzini@redhat.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, peterx@redhat.com, Vitaly Kuznetsov <vkuznets@redhat.com> Subject: [PATCH RFC 11/15] KVM: selftests: Introduce after_vcpu_run hook for dirty log test Date: Fri, 29 Nov 2019 16:35:01 -0500 Message-ID: <20191129213505.18472-12-peterx@redhat.com> (raw) In-Reply-To: <20191129213505.18472-1-peterx@redhat.com> Provide a hook for the checks after vcpu_run() completes. Preparation for the dirty ring test because we'll need to take care of another exit reason. Since at it, drop the pages_count because after all we have a better summary right now with statistics, and clean it up a bit. Signed-off-by: Peter Xu <peterx@redhat.com> --- tools/testing/selftests/kvm/dirty_log_test.c | 39 ++++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index a8ae8c0042a8..3542311f56ff 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -168,6 +168,15 @@ static void clear_log_collect_dirty_pages(struct kvm_vm *vm, int slot, kvm_vm_clear_dirty_log(vm, slot, bitmap, 0, num_pages); } +static void default_after_vcpu_run(struct kvm_vm *vm) +{ + struct kvm_run *run = vcpu_state(vm, VCPU_ID); + + TEST_ASSERT(get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC, + "Invalid guest sync status: exit_reason=%s\n", + exit_reason_str(run->exit_reason)); +} + struct log_mode { const char *name; /* Hook when the vm creation is done (before vcpu creation) */ @@ -175,16 +184,20 @@ struct log_mode { /* Hook to collect the dirty pages into the bitmap provided */ void (*collect_dirty_pages) (struct kvm_vm *vm, int slot, void *bitmap, uint32_t num_pages); + /* Hook to call when after each vcpu run */ + void (*after_vcpu_run)(struct kvm_vm *vm); } log_modes[LOG_MODE_NUM] = { { .name = "dirty-log", .create_vm_done = NULL, .collect_dirty_pages = dirty_log_collect_dirty_pages, + .after_vcpu_run = default_after_vcpu_run, }, { .name = "clear-log", .create_vm_done = clear_log_create_vm_done, .collect_dirty_pages = clear_log_collect_dirty_pages, + .after_vcpu_run = default_after_vcpu_run, }, }; @@ -224,6 +237,14 @@ static void log_mode_collect_dirty_pages(struct kvm_vm *vm, int slot, mode->collect_dirty_pages(vm, slot, bitmap, num_pages); } +static void log_mode_after_vcpu_run(struct kvm_vm *vm) +{ + struct log_mode *mode = &log_modes[host_log_mode]; + + if (mode->after_vcpu_run) + mode->after_vcpu_run(vm); +} + static void generate_random_array(uint64_t *guest_array, uint64_t size) { uint64_t i; @@ -237,31 +258,17 @@ static void *vcpu_worker(void *data) int ret; struct kvm_vm *vm = data; uint64_t *guest_array; - uint64_t pages_count = 0; - struct kvm_run *run; - - run = vcpu_state(vm, VCPU_ID); guest_array = addr_gva2hva(vm, (vm_vaddr_t)random_array); - generate_random_array(guest_array, TEST_PAGES_PER_LOOP); while (!READ_ONCE(host_quit)) { + generate_random_array(guest_array, TEST_PAGES_PER_LOOP); /* Let the guest dirty the random pages */ ret = _vcpu_run(vm, VCPU_ID); TEST_ASSERT(ret == 0, "vcpu_run failed: %d\n", ret); - if (get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC) { - pages_count += TEST_PAGES_PER_LOOP; - generate_random_array(guest_array, TEST_PAGES_PER_LOOP); - } else { - TEST_ASSERT(false, - "Invalid guest sync status: " - "exit_reason=%s\n", - exit_reason_str(run->exit_reason)); - } + log_mode_after_vcpu_run(vm); } - DEBUG("Dirtied %"PRIu64" pages\n", pages_count); - return NULL; } -- 2.21.0
next prev parent reply index Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-29 21:34 [PATCH RFC 00/15] KVM: Dirty ring interface Peter Xu 2019-11-29 21:34 ` [PATCH RFC 01/15] KVM: Move running VCPU from ARM to common code Peter Xu 2019-12-03 19:01 ` Sean Christopherson 2019-12-04 9:42 ` Paolo Bonzini 2019-12-09 22:05 ` Peter Xu 2019-11-29 21:34 ` [PATCH RFC 02/15] KVM: Add kvm/vcpu argument to mark_dirty_page_in_slot Peter Xu 2019-12-02 19:32 ` Sean Christopherson 2019-12-02 20:49 ` Peter Xu 2019-11-29 21:34 ` [PATCH RFC 03/15] KVM: Add build-time error check on kvm_run size Peter Xu 2019-12-02 19:30 ` Sean Christopherson 2019-12-02 20:53 ` Peter Xu 2019-12-02 22:19 ` Sean Christopherson 2019-12-02 22:40 ` Peter Xu 2019-12-03 5:50 ` Sean Christopherson 2019-12-03 13:41 ` Paolo Bonzini 2019-12-03 17:04 ` Peter Xu 2019-11-29 21:34 ` [PATCH RFC 04/15] KVM: Implement ring-based dirty memory tracking Peter Xu 2019-12-02 20:10 ` Sean Christopherson 2019-12-02 21:16 ` Peter Xu 2019-12-02 21:50 ` Sean Christopherson 2019-12-02 23:09 ` Peter Xu 2019-12-03 13:48 ` Paolo Bonzini 2019-12-03 18:46 ` Sean Christopherson 2019-12-04 10:05 ` Paolo Bonzini 2019-12-07 0:29 ` Sean Christopherson 2019-12-09 9:37 ` Paolo Bonzini 2019-12-09 21:54 ` Peter Xu 2019-12-10 10:07 ` Paolo Bonzini 2019-12-10 15:52 ` Peter Xu 2019-12-10 17:09 ` Paolo Bonzini 2019-12-15 17:21 ` Peter Xu 2019-12-16 10:08 ` Paolo Bonzini 2019-12-16 18:54 ` Peter Xu 2019-12-17 9:01 ` Paolo Bonzini 2019-12-17 16:24 ` Peter Xu 2019-12-17 16:28 ` Paolo Bonzini 2019-12-18 21:58 ` Peter Xu 2019-12-18 22:24 ` Sean Christopherson 2019-12-18 22:37 ` Paolo Bonzini 2019-12-18 22:49 ` Peter Xu 2019-12-17 2:28 ` Tian, Kevin 2019-12-17 16:18 ` Alex Williamson 2019-12-17 16:30 ` Paolo Bonzini 2019-12-18 0:29 ` Tian, Kevin [not found] ` <AADFC41AFE54684AB9EE6CBC0274A5D19D645E5F@SHSMSX104.ccr.corp.intel.com> 2019-12-17 5:17 ` Tian, Kevin 2019-12-17 5:25 ` Yan Zhao 2019-12-17 16:24 ` Alex Williamson 2019-12-03 19:13 ` Sean Christopherson 2019-12-04 10:14 ` Paolo Bonzini 2019-12-04 14:33 ` Sean Christopherson 2019-12-04 10:38 ` Jason Wang 2019-12-04 11:04 ` Paolo Bonzini 2019-12-04 19:52 ` Peter Xu 2019-12-05 6:51 ` Jason Wang 2019-12-05 12:08 ` Peter Xu 2019-12-05 13:12 ` Jason Wang 2019-12-10 13:25 ` Michael S. Tsirkin 2019-12-10 13:31 ` Paolo Bonzini 2019-12-10 16:02 ` Peter Xu 2019-12-10 21:53 ` Michael S. Tsirkin 2019-12-11 9:05 ` Paolo Bonzini 2019-12-11 13:04 ` Michael S. Tsirkin 2019-12-11 14:54 ` Peter Xu 2019-12-10 21:48 ` Michael S. Tsirkin 2019-12-11 12:53 ` Michael S. Tsirkin 2019-12-11 14:14 ` Paolo Bonzini 2019-12-11 20:59 ` Peter Xu 2019-12-11 22:57 ` Michael S. Tsirkin 2019-12-12 0:08 ` Paolo Bonzini 2019-12-12 7:36 ` Michael S. Tsirkin 2019-12-12 8:12 ` Paolo Bonzini 2019-12-12 10:38 ` Michael S. Tsirkin 2019-12-15 17:33 ` Peter Xu 2019-12-16 9:47 ` Michael S. Tsirkin 2019-12-16 15:07 ` Peter Xu 2019-12-16 15:33 ` Michael S. Tsirkin 2019-12-16 15:47 ` Peter Xu 2019-12-11 17:24 ` Christophe de Dinechin 2019-12-13 20:23 ` Peter Xu 2019-12-14 7:57 ` Paolo Bonzini 2019-12-14 16:26 ` Peter Xu 2019-12-16 9:29 ` Paolo Bonzini 2019-12-16 15:26 ` Peter Xu 2019-12-16 15:31 ` Paolo Bonzini 2019-12-16 15:43 ` Peter Xu 2019-12-17 12:16 ` Christophe de Dinechin 2019-12-17 12:19 ` Paolo Bonzini 2019-12-17 15:38 ` Peter Xu 2019-12-17 16:31 ` Paolo Bonzini 2019-12-17 16:42 ` Peter Xu 2019-12-17 16:48 ` Paolo Bonzini 2019-12-17 19:41 ` Peter Xu 2019-12-18 0:33 ` Paolo Bonzini 2019-12-18 16:32 ` Peter Xu 2019-12-18 16:41 ` Paolo Bonzini 2019-12-20 18:19 ` Peter Xu 2019-11-29 21:34 ` [PATCH RFC 05/15] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu 2019-11-29 21:34 ` [PATCH RFC 06/15] KVM: Introduce dirty ring wait queue Peter Xu 2019-11-29 21:34 ` [PATCH RFC 07/15] KVM: X86: Implement ring-based dirty memory tracking Peter Xu 2019-11-29 21:34 ` [PATCH RFC 08/15] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu 2019-11-29 21:34 ` [PATCH RFC 09/15] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Peter Xu 2019-11-29 21:35 ` [PATCH RFC 10/15] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu 2019-11-29 21:35 ` Peter Xu [this message] 2019-11-29 21:35 ` [PATCH RFC 12/15] KVM: selftests: Add dirty ring buffer test Peter Xu 2019-11-29 21:35 ` [PATCH RFC 13/15] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu 2019-11-29 21:35 ` [PATCH RFC 14/15] KVM: selftests: Add "-c" parameter to dirty log test Peter Xu 2019-11-29 21:35 ` [PATCH RFC 15/15] KVM: selftests: Test dirty ring waitqueue Peter Xu 2019-11-30 8:29 ` [PATCH RFC 00/15] KVM: Dirty ring interface Paolo Bonzini 2019-12-02 2:13 ` Peter Xu 2019-12-03 13:59 ` Paolo Bonzini 2019-12-05 19:30 ` Peter Xu 2019-12-05 19:59 ` Paolo Bonzini 2019-12-05 20:52 ` Peter Xu 2019-12-02 20:21 ` Sean Christopherson 2019-12-02 20:43 ` Peter Xu 2019-12-04 10:39 ` Jason Wang 2019-12-04 19:33 ` Peter Xu 2019-12-05 6:49 ` Jason Wang 2019-12-11 13:41 ` Christophe de Dinechin 2019-12-11 14:16 ` Paolo Bonzini 2019-12-11 17:15 ` Peter Xu
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=20191129213505.18472-12-peterx@redhat.com \ --to=peterx@redhat.com \ --cc=dgilbert@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=sean.j.christopherson@intel.com \ --cc=vkuznets@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: link
KVM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \ kvm@vger.kernel.org public-inbox-index kvm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.kvm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git