]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test
authorSean Christopherson <seanjc@google.com>
Sat, 11 Jan 2025 00:29:56 +0000 (16:29 -0800)
committerSean Christopherson <seanjc@google.com>
Wed, 12 Feb 2025 17:00:55 +0000 (09:00 -0800)
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.

Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20250111003004.1235645-13-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
tools/testing/selftests/kvm/dirty_log_test.c

index 8544e8425f9c3cec7c17e0c2dcfd4800e22708d6..d7cf1840bd806e98f52e8fc857a8623fd347cc91 100644 (file)
@@ -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++;
                        /*