A vCPU's dirty ring indices are accessed concurrently by two tasks: the vCPU pushes entries and updates dirty_index, while KVM_RESET_DIRTY_RINGS updates reset_index, and can run at any time (VMMs commonly reap the ring from a separate thread while the vCPU is running). Use WRITE_ONCE() to update reset_index, which the vCPU reads with READ_ONCE() in kvm_dirty_ring_used(). KCSAN doesn't assume that a plain read-modify-write is atomic, so it can report the increment as a data race. Use READ_ONCE() to read the other task's index in the kvm_dirty_ring_push and kvm_dirty_ring_reset tracepoints, so that the compiler can't tear or refetch the loads. The values are only used for tracing, but the indices are part of the ring's concurrency design, so mark the reads the same way as kvm_dirty_ring_used(). Signed-off-by: James Houghton --- include/trace/events/kvm.h | 4 ++-- virt/kvm/dirty_ring.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index 07013f88e655..477a9d3705ed 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h @@ -316,7 +316,7 @@ TRACE_EVENT(kvm_dirty_ring_push, TP_fast_assign( __entry->index = ring->index; __entry->dirty_index = ring->dirty_index; - __entry->reset_index = ring->reset_index; + __entry->reset_index = READ_ONCE(ring->reset_index); __entry->slot = slot; __entry->offset = offset; ), @@ -340,7 +340,7 @@ TRACE_EVENT(kvm_dirty_ring_reset, TP_fast_assign( __entry->index = ring->index; - __entry->dirty_index = ring->dirty_index; + __entry->dirty_index = READ_ONCE(ring->dirty_index); __entry->reset_index = ring->reset_index; ), diff --git a/virt/kvm/dirty_ring.c b/virt/kvm/dirty_ring.c index d0693ef6e479..cd52f136fdf8 100644 --- a/virt/kvm/dirty_ring.c +++ b/virt/kvm/dirty_ring.c @@ -156,7 +156,7 @@ int kvm_dirty_ring_reset(struct kvm *kvm, struct kvm_dirty_ring *ring, /* Update the flags to reflect that this GFN is reset */ kvm_dirty_gfn_set_invalid(entry); - ring->reset_index++; + WRITE_ONCE(ring->reset_index, ring->reset_index + 1); (*nr_entries_reset)++; if (mask) { -- 2.56.1.708.g77570a6a1d-goog