From: James Houghton <jthoughton@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
syzbot+55eaa971f4924b62c9a5@syzkaller.appspotmail.com
Subject: [PATCH 1/4] KVM: Don't reset dirty ring entries that KVM hasn't pushed
Date: Tue, 17 Nov 2026 21:29:10 +0000 [thread overview]
Message-ID: <20261117212913.3634487-2-jthoughton@google.com> (raw)
In-Reply-To: <20261117212913.3634487-1-jthoughton@google.com>
When resetting a vCPU's dirty ring, stop if reset_index has caught up to
dirty_index instead of relying solely on the RESET flag of the next
entry. The ring is mapped writable into userspace, so userspace can set
KVM_DIRTY_GFN_F_RESET on entries that KVM never pushed, in which case
KVM advances reset_index past dirty_index. The u32 math in
kvm_dirty_ring_used() then underflows, and the next push hits the
WARN_ON_ONCE() in kvm_dirty_ring_push():
WARNING: virt/kvm/dirty_ring.c:225 at kvm_dirty_ring_push+0x2b2/0x5e0
Call Trace:
make_spte+0x71a/0xc80
kvm_tdp_mmu_map+0x140e/0x1f40
kvm_tdp_page_fault+0x2f7/0x3a0
kvm_mmu_page_fault+0x1f8/0xc00
vcpu_run+0x4da1/0x7890
kvm_arch_vcpu_ioctl_run+0xe83/0x18b0
kvm_vcpu_ioctl+0xa61/0xfd0
Userspace that scribbles on its own dirty ring gets to keep the pieces,
but KVM shouldn't WARN, and keeping reset_index from passing dirty_index
is trivial.
To avoid skipping entries that were legitimately harvested while the
vCPU is running, bump dirty_index before publishing the DIRTY flag in
kvm_dirty_ring_push(), and check dirty_index after the load-acquire of
the RESET flag in kvm_dirty_ring_reset(). If KVM observes the RESET
flag for an entry, i.e. userspace observed the DIRTY flag, then KVM is
guaranteed to also observe the updated dirty_index.
Fixes: fb04a1eddb1a ("KVM: X86: Implement ring-based dirty memory tracking")
Reported-by: syzbot+55eaa971f4924b62c9a5@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/6afbad4d.f3cfa7c9.844a4.0002.GAE@google.com
Cc: stable@vger.kernel.org
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: James Houghton <jthoughton@google.com>
---
virt/kvm/dirty_ring.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/virt/kvm/dirty_ring.c b/virt/kvm/dirty_ring.c
index 572b854edf74..8fab75dace76 100644
--- a/virt/kvm/dirty_ring.c
+++ b/virt/kvm/dirty_ring.c
@@ -140,6 +140,16 @@ int kvm_dirty_ring_reset(struct kvm *kvm, struct kvm_dirty_ring *ring,
if (!kvm_dirty_gfn_harvested(entry))
break;
+ /*
+ * Don't reset entries that KVM hasn't pushed, e.g. if userspace
+ * set the RESET flag on an unused entry. Check the number of
+ * used entries after checking the flag, so that dirty_index is
+ * up-to-date for entries that were harvested (pairs with the
+ * ordering in kvm_dirty_ring_push()).
+ */
+ if (!kvm_dirty_ring_used(ring))
+ break;
+
next_slot = READ_ONCE(entry->slot);
next_offset = READ_ONCE(entry->offset);
@@ -229,12 +239,14 @@ void kvm_dirty_ring_push(struct kvm_vcpu *vcpu, u32 slot, u64 offset)
entry->slot = slot;
entry->offset = offset;
/*
- * Make sure the data is filled in before we publish this to
- * the userspace program. There's no paired kernel-side reader.
+ * Bump dirty_index before publishing the entry, so that
+ * kvm_dirty_ring_reset() sees the new dirty_index if it sees the entry
+ * as harvested, and make sure the data is filled in before publishing
+ * the entry to userspace.
*/
+ WRITE_ONCE(ring->dirty_index, ring->dirty_index + 1);
smp_wmb();
kvm_dirty_gfn_set_dirtied(entry);
- ring->dirty_index++;
trace_kvm_dirty_ring_push(ring, slot, offset);
if (kvm_dirty_ring_soft_full(ring))
base-commit: 666539eecdf4db623f5e3c3e55cf9f2dfad24aa4
--
2.56.1.708.g77570a6a1d-goog
next prev parent reply other threads:[~2026-11-17 21:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 21:29 [PATCH 0/4] KVM: Don't let dirty ring resets pass dirty_index James Houghton
2026-11-17 21:29 ` James Houghton [this message]
2026-11-17 21:29 ` [PATCH 2/4] KVM: Use smp_store_release() to mark dirty ring entries as dirtied James Houghton
2026-11-17 21:29 ` [PATCH 3/4] KVM: Annotate concurrent accesses to dirty ring indices James Houghton
2026-11-17 21:29 ` [PATCH 4/4] KVM: selftests: Verify KVM doesn't reset unused dirty ring entries James Houghton
2026-11-17 21:37 ` sashiko-bot
2026-11-17 21:55 ` James Houghton
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=20261117212913.3634487-2-jthoughton@google.com \
--to=jthoughton@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
--cc=syzbot+55eaa971f4924b62c9a5@syzkaller.appspotmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.