From: Maxim Levitsky <mlevitsk@redhat.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Xu <peterx@redhat.com>
Subject: Re: [PATCH 12/20] KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test
Date: Tue, 17 Dec 2024 19:01:40 -0500 [thread overview]
Message-ID: <44e222665405cd334e3da170c076de704084054e.camel@redhat.com> (raw)
In-Reply-To: <20241214010721.2356923-13-seanjc@google.com>
On Fri, 2024-12-13 at 17:07 -0800, Sean Christopherson wrote:
> When verifying pages in dirty_log_test, immediately continue on all "pass"
> scenarios to make the logic consistent in how it handles pass vs. fail.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> tools/testing/selftests/kvm/dirty_log_test.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
> index 8544e8425f9c..d7cf1840bd80 100644
> --- a/tools/testing/selftests/kvm/dirty_log_test.c
> +++ b/tools/testing/selftests/kvm/dirty_log_test.c
> @@ -510,8 +510,6 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap)
> }
>
> if (__test_and_clear_bit_le(page, bmap)) {
> - bool matched;
> -
> nr_dirty_pages++;
>
> /*
> @@ -519,9 +517,10 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap)
> * the corresponding page should be either the
> * previous iteration number or the current one.
> */
> - matched = (val == iteration || val == iteration - 1);
> + if (val == iteration || val == iteration - 1)
> + continue;
>
> - if (host_log_mode == LOG_MODE_DIRTY_RING && !matched) {
> + if (host_log_mode == LOG_MODE_DIRTY_RING) {
> if (val == iteration - 2 && min_iter <= iteration - 2) {
> /*
> * Short answer: this case is special
> @@ -567,10 +566,8 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap)
> }
> }
>
> - TEST_ASSERT(matched,
> - "Set page %"PRIu64" value %"PRIu64
> - " incorrect (iteration=%"PRIu64")",
> - page, val, iteration);
> + TEST_FAIL("Dirty page %lu value (%lu) != iteration (%lu)",
> + page, val, iteration);
> } else {
> nr_clean_pages++;
> /*
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2024-12-18 0:01 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-14 1:07 [PATCH 00/20] KVM: selftests: Fixes and cleanups for dirty_log_test Sean Christopherson
2024-12-14 1:07 ` [PATCH 01/20] KVM: selftests: Support multiple write retires in dirty_log_test Sean Christopherson
2024-12-14 1:07 ` [PATCH 02/20] KVM: selftests: Sync dirty_log_test iteration to guest *before* resuming Sean Christopherson
2024-12-17 23:58 ` Maxim Levitsky
2024-12-18 21:36 ` Sean Christopherson
2024-12-19 15:11 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 03/20] KVM: selftests: Drop signal/kick from dirty ring testcase Sean Christopherson
2024-12-14 1:07 ` [PATCH 04/20] KVM: selftests: Drop stale srandom() initialization from dirty_log_test Sean Christopherson
2024-12-17 23:59 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 05/20] KVM: selftests: Precisely track number of dirty/clear pages for each iteration Sean Christopherson
2024-12-17 23:59 ` Maxim Levitsky
2024-12-18 21:37 ` Sean Christopherson
2024-12-14 1:07 ` [PATCH 06/20] KVM: selftests: Read per-page value into local var when verifying dirty_log_test Sean Christopherson
2024-12-17 23:59 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 07/20] KVM: selftests: Continuously reap dirty ring while vCPU is running Sean Christopherson
2024-12-18 0:00 ` Maxim Levitsky
2024-12-19 1:50 ` Sean Christopherson
2024-12-14 1:07 ` [PATCH 08/20] KVM: selftests: Limit dirty_log_test's s390x workaround to s390x Sean Christopherson
2024-12-14 1:07 ` [PATCH 09/20] KVM: selftests: Honor "stop" request in dirty ring test Sean Christopherson
2024-12-18 0:00 ` Maxim Levitsky
2024-12-19 2:00 ` Sean Christopherson
2024-12-19 15:07 ` Maxim Levitsky
2024-12-19 15:23 ` Sean Christopherson
2024-12-19 15:57 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 10/20] KVM: selftests: Keep dirty_log_test vCPU in guest until it needs to stop Sean Christopherson
2024-12-18 0:01 ` Maxim Levitsky
2024-12-19 15:59 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 11/20] KVM: selftests: Post to sem_vcpu_stop if and only if vcpu_stop is true Sean Christopherson
2024-12-18 0:01 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 12/20] KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test Sean Christopherson
2024-12-18 0:01 ` Maxim Levitsky [this message]
2024-12-14 1:07 ` [PATCH 13/20] KVM: selftests: Print (previous) last_page on dirty page value mismatch Sean Christopherson
2024-12-18 0:01 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 14/20] KVM: selftests: Collect *all* dirty entries in each dirty_log_test iteration Sean Christopherson
2024-12-18 0:02 ` Maxim Levitsky
2024-12-19 2:13 ` Sean Christopherson
2024-12-19 12:55 ` Paolo Bonzini
2024-12-19 15:01 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 15/20] KVM: sefltests: Verify value of dirty_log_test last page isn't bogus Sean Christopherson
2024-12-18 0:02 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 16/20] KVM: selftests: Ensure guest writes min number of pages in dirty_log_test Sean Christopherson
2024-12-18 0:02 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 17/20] KVM: selftests: Tighten checks around prev iter's last dirty page in ring Sean Christopherson
2024-12-18 0:03 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 18/20] KVM: selftests: Set per-iteration variables at the start of each iteration Sean Christopherson
2024-12-14 1:07 ` [PATCH 19/20] KVM: selftests: Fix an off-by-one in the number of dirty_log_test iterations Sean Christopherson
2024-12-18 0:03 ` Maxim Levitsky
2024-12-14 1:07 ` [PATCH 20/20] KVM: selftests: Allow running a single iteration of dirty_log_test Sean Christopherson
2024-12-18 0:03 ` Maxim Levitsky
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=44e222665405cd334e3da170c076de704084054e.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.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).