| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20201007204525.GF6026@xz-x1>
Date: Wed, 7 Oct 2020 16:45:25 -0400
From: Peter Xu <peterx@...hat.com>
To: kernel test robot <rong.a.chen@...el.com>
Cc: kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
Andrew Jones <drjones@...hat.com>,
Sean Christopherson <sean.j.christopherson@...el.com>,
Paolo Bonzini <pbonzini@...hat.com>,
"Dr . David Alan Gilbert" <dgilbert@...hat.com>,
0day robot <lkp@...el.com>, lkp@...ts.01.org
Subject: Re: [KVM] 11e2633982: kernel-selftests.kvm.dirty_log_test.fail
On Sun, Oct 04, 2020 at 09:26:31PM +0800, kernel test robot wrote:
> # fetch 0x1fff3 page 13105==== Test Assertion Failure ====
> # dirty_log_test.c:526: test_bit_le(page, bmap)
> # pid=10583 tid=10583 - Invalid argument
> # 1 0x0000000000403294: vm_dirty_log_verify at dirty_log_test.c:523
> # 2 (inlined by) run_test at dirty_log_test.c:743
> # 3 0x00000000004026f4: main at dirty_log_test.c:905 (discriminator 3)
> # 4 0x00007f2d11a2809a: ?? ??:0
> # 5 0x0000000000402809: _start at ??:?
> # Page 131151 should have its dirty bit set in this iteration but it is missing
I think I reproduced this error even on my latest tree. I don't think it's a
kvm bug, instead it's a bug in the test case. Not too surprising considering
that I spent probably more time on the test case than the kernel changes.
KVM dirty ring introduced a chance for spurious dirty bit (safe, but it just
made the test even more tricky) which does not exist for dirty logging. It
happens when the ring gets full and the last PFN written could be spurious,
simply because when kvm noticed that the ring is full, it won't continue the
guest (whose next instruction is to do the real RAM update) but instead it'll
quit to userspace with that page PFN actually set but with old data.
The current test case is very strict on checking stuff. It tries to skip this
magic bit so far by recording it into host_bmap_track so we don't check the
data in this round, but we expect this bit to be set in the next run (because
it's the next guest instruction that gonna happen soon). However I just
noticed that when accidentally the vcpu thread didn't really continue (e.g.,
when the collection thread is too slow, due to when we enabled all debug
prints) then we won't find that special bit in the next iteration of dirty
bitmap simply because the vcpu has already stopped and never go into the next
round.
Anyway, I'm posting the fix here for reference which have worked for me. Below
is the thing I plan to squash into the test patch (probably not the current
one, but previous one):
-------------8<--------------------
diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index 80c42c87265e..aecd0f99f13c 100644
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -146,6 +146,20 @@ static sem_t dirty_ring_vcpu_cont;
* dirty_ring_vcpu_stop and before vcpu continues to run.
*/
static bool dirty_ring_vcpu_ring_full;
+/*
+ * This is only used for verifying the dirty pages. Dirty ring has a very
+ * tricky case when the ring just got full, kvm will do userspace exit due to
+ * ring full. When that happens, the very last PFN is very tricky in that it's
+ * set but actually the data is not changed (the guest WRITE is not really
+ * applied yet), because when we find that the dirty ring is full, we refused
+ * to continue the vcpu, hence we got the dirty gfn recorded without the new
+ * data. For this specific case, it's safe to skip checking this pfn for this
+ * bit, because it's a redundant bit, and when the write happens later the bit
+ * will be set again. We use this variable to always keep track of the latest
+ * dirty gfn we've collected, so that if a mismatch of data found later in the
+ * verifying process, we let it pass.
+ */
+static uint64_t dirty_ring_last_page;
enum log_mode_t {
/* Only use KVM_GET_DIRTY_LOG for logging */
@@ -281,7 +295,8 @@ static uint32_t dirty_ring_collect_one(struct kvm_dirty_gfn *dirty_gfns,
TEST_ASSERT(cur->offset < num_pages, "Offset overflow: "
"0x%llx >= 0x%x", cur->offset, num_pages);
pr_info("fetch 0x%x page %llu\n", *fetch_index, cur->offset);
- set_bit(cur->offset, bitmap);
+ set_bit_le(cur->offset, bitmap);
+ dirty_ring_last_page = cur->offset;
dirty_gfn_set_collected(cur);
(*fetch_index)++;
count++;
@@ -572,16 +587,12 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap)
* (here if we read value on page
* "2R-2" is 1, while iter=3!!!)
*/
- matched = true;
- } else {
+ continue;
+ } else if (page == dirty_ring_last_page) {
/*
- * This is also special for dirty ring
- * when this page is exactly the last
- * page touched before vcpu ring full.
- * If it happens, we should expect the
- * value to change in the next round.
+ * Please refer to comments in
+ * dirty_ring_last_page.
*/
- set_bit_le(page, host_bmap_track);
continue;
}
}
-------------8<--------------------
Majorly what I did is:
- A new variable 'dirty_ring_last_page' is introduced to the test to record
the last dirtied GFN. When verifying the dirty bits, if we found a
spurious dirty bit on this specific GFN, we skip. This should be more
solid than the previous trick to pass it onto host_bmap_track.
- Since at it, I touched up two other places:
- Replaced another set_bit() that I just found, which would otherwise break
ppc I believe (but I must also confess I don't know when ppc will support
dirty ring)
- Change one "matched = true;" into a "continue;". It should do the same
thing, but "continue" is more obvious.
I'll resend the series. I won't touch anything else, but just to (hopefully)
trigger the testbot again on the whole series.
--
Peter Xu
Powered by blists - more mailing lists