Skip to content

Commit 60f0779

Browse files
paravmellanoxmstsirkin
authored andcommitted
virtio: Improve vq->broken access to avoid any compiler optimization
Currently vq->broken field is read by virtqueue_is_broken() in busy loop in one context by virtnet_send_command(). vq->broken is set to true in other process context by virtio_break_device(). Reader and writer are accessing it without any synchronization. This may lead to a compiler optimization which may result to optimize reading vq->broken only once. Hence, force reading vq->broken on each invocation of virtqueue_is_broken() and also force writing it so that such update is visible to the readers. It is a theoretical fix that isn't yet encountered in the field. Signed-off-by: Parav Pandit <parav@nvidia.com> Link: https://lore.kernel.org/r/20210721142648.1525924-2-parav@nvidia.com Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 36a21d5 commit 60f0779

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/virtio/virtio_ring.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,7 @@ bool virtqueue_is_broken(struct virtqueue *_vq)
23732373
{
23742374
struct vring_virtqueue *vq = to_vvq(_vq);
23752375

2376-
return vq->broken;
2376+
return READ_ONCE(vq->broken);
23772377
}
23782378
EXPORT_SYMBOL_GPL(virtqueue_is_broken);
23792379

@@ -2387,7 +2387,9 @@ void virtio_break_device(struct virtio_device *dev)
23872387

23882388
list_for_each_entry(_vq, &dev->vqs, list) {
23892389
struct vring_virtqueue *vq = to_vvq(_vq);
2390-
vq->broken = true;
2390+
2391+
/* Pairs with READ_ONCE() in virtqueue_is_broken(). */
2392+
WRITE_ONCE(vq->broken, true);
23912393
}
23922394
}
23932395
EXPORT_SYMBOL_GPL(virtio_break_device);

0 commit comments

Comments
 (0)