From: Sean Christopherson Date: Fri, 16 May 2025 21:35:40 +0000 (-0700) Subject: KVM: Assert that slots_lock is held when resetting per-vCPU dirty rings X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=614fb9d1479b1d90721ca70da8b7c55f69fe9ad2;p=thirdparty%2Fkernel%2Flinux.git KVM: Assert that slots_lock is held when resetting per-vCPU dirty rings Assert that slots_lock is held in kvm_dirty_ring_reset() and add a comment to explain _why_ slots needs to be held for the duration of the reset. Link: https://lore.kernel.org/all/aCSns6Q5oTkdXUEe@google.com Suggested-by: James Houghton Reviewed-by: Yan Zhao Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/20250516213540.2546077-7-seanjc@google.com Signed-off-by: Sean Christopherson --- diff --git a/virt/kvm/dirty_ring.c b/virt/kvm/dirty_ring.c index 4caa63e610d26..02bc6b00d76cb 100644 --- a/virt/kvm/dirty_ring.c +++ b/virt/kvm/dirty_ring.c @@ -122,6 +122,14 @@ int kvm_dirty_ring_reset(struct kvm *kvm, struct kvm_dirty_ring *ring, unsigned long mask = 0; struct kvm_dirty_gfn *entry; + /* + * Ensure concurrent calls to KVM_RESET_DIRTY_RINGS are serialized, + * e.g. so that KVM fully resets all entries processed by a given call + * before returning to userspace. Holding slots_lock also protects + * the various memslot accesses. + */ + lockdep_assert_held(&kvm->slots_lock); + while (likely((*nr_entries_reset) < INT_MAX)) { if (signal_pending(current)) return -EINTR;