From: Andrew Jones <drjones@redhat.com>
To: Peter Xu <peterx@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
"Michael S . Tsirkin" <mst@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Yan Zhao <yan.y.zhao@intel.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Christophe de Dinechin <dinechin@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Alex Williamson <alex.williamson@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Kevin Tian <kevin.tian@intel.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v7 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty log test
Date: Thu, 19 Mar 2020 08:50:05 +0100 [thread overview]
Message-ID: <20200319075005.hdddb4xiqzuxcqbn@kamzik.brq.redhat.com> (raw)
In-Reply-To: <20200318163720.93929-12-peterx@redhat.com>
On Wed, Mar 18, 2020 at 12:37:17PM -0400, Peter Xu wrote:
> 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 | 41 ++++++++++++++------
> 1 file changed, 30 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
> index 139ccb550618..94122c2e0185 100644
> --- a/tools/testing/selftests/kvm/dirty_log_test.c
> +++ b/tools/testing/selftests/kvm/dirty_log_test.c
> @@ -178,6 +178,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;
> /* Return true if this mode is supported, otherwise false */
> @@ -187,16 +196,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",
> .collect_dirty_pages = dirty_log_collect_dirty_pages,
> + .after_vcpu_run = default_after_vcpu_run,
> },
> {
> .name = "clear-log",
> .supported = clear_log_supported,
> .create_vm_done = clear_log_create_vm_done,
> .collect_dirty_pages = clear_log_collect_dirty_pages,
> + .after_vcpu_run = default_after_vcpu_run,
> },
> };
>
> @@ -247,6 +260,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;
> @@ -261,25 +282,23 @@ static void *vcpu_worker(void *data)
> struct kvm_vm *vm = data;
> uint64_t *guest_array;
> uint64_t pages_count = 0;
> - struct kvm_run *run;
> + struct sigaction sigact;
>
> - run = vcpu_state(vm, VCPU_ID);
> + current_vm = vm;
> + vcpu_fd = vcpu_get_fd(vm, VCPU_ID);
You don't add this call until 13/14, which means bisection is broken.
Please test the series with 'git rebase -i -x make'.
> + memset(&sigact, 0, sizeof(sigact));
> + sigact.sa_handler = vcpu_sig_handler;
> + sigaction(SIG_IPI, &sigact, NULL);
>
> 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);
> + pages_count += 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_FAIL("Invalid guest sync status: "
> - "exit_reason=%s\n",
> - exit_reason_str(run->exit_reason));
> - }
> + log_mode_after_vcpu_run(vm);
> }
>
> pr_info("Dirtied %"PRIu64" pages\n", pages_count);
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-03-19 7:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 16:37 [PATCH v7 00/14] KVM: Dirty ring interface Peter Xu
2020-03-18 16:37 ` [PATCH v7 01/14] KVM: X86: Change parameter for fast_page_fault tracepoint Peter Xu
2020-03-18 16:37 ` [PATCH v7 02/14] KVM: Cache as_id in kvm_memory_slot Peter Xu
2020-03-18 16:37 ` [PATCH v7 03/14] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2020-03-21 19:22 ` Sean Christopherson
2020-03-23 14:58 ` Peter Xu
2020-03-23 15:42 ` Sean Christopherson
2020-03-23 16:26 ` Peter Xu
2020-03-23 16:55 ` Sean Christopherson
2020-03-23 17:13 ` Peter Xu
2020-03-18 16:37 ` [PATCH v7 04/14] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-03-18 16:37 ` [PATCH v7 05/14] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2020-03-18 16:37 ` [PATCH v7 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2020-03-21 19:12 ` Sean Christopherson
2020-03-23 16:16 ` Peter Xu
2020-03-18 16:37 ` [PATCH v7 07/14] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2020-03-18 16:37 ` [PATCH v7 08/14] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2020-03-18 16:37 ` [PATCH v7 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Peter Xu
2020-03-18 16:37 ` [PATCH v7 10/14] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2020-03-19 7:44 ` Andrew Jones
2020-03-18 16:37 ` [PATCH v7 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2020-03-19 7:50 ` Andrew Jones [this message]
2020-03-19 16:37 ` Peter Xu
2020-03-18 16:37 ` [PATCH v7 12/14] KVM: selftests: Add dirty ring buffer test Peter Xu
2020-03-19 17:02 ` Peter Xu
2020-03-18 16:37 ` [PATCH v7 13/14] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2020-03-18 16:37 ` [PATCH v7 14/14] KVM: selftests: Add "-c" parameter to dirty log test Peter Xu
2020-03-19 7:54 ` 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=20200319075005.hdddb4xiqzuxcqbn@kamzik.brq.redhat.com \
--to=drjones@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dinechin@redhat.com \
--cc=jasowang@redhat.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=yan.y.zhao@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).