Skip to content

Commit 5a8a635

Browse files
paravmellanoxgregkh
authored andcommitted
virtio: Improve vq->broken access to avoid any compiler optimization
[ Upstream commit 60f0779862e4ab943810187752c462e85f5fa371 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 68e616e commit 5a8a635

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/virtio/virtio_ring.c

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

1153-
return vq->broken;
1153+
return READ_ONCE(vq->broken);
11541154
}
11551155
EXPORT_SYMBOL_GPL(virtqueue_is_broken);
11561156

@@ -1164,7 +1164,9 @@ void virtio_break_device(struct virtio_device *dev)
11641164

11651165
list_for_each_entry(_vq, &dev->vqs, list) {
11661166
struct vring_virtqueue *vq = to_vvq(_vq);
1167-
vq->broken = true;
1167+
1168+
/* Pairs with READ_ONCE() in virtqueue_is_broken(). */
1169+
WRITE_ONCE(vq->broken, true);
11681170
}
11691171
}
11701172
EXPORT_SYMBOL_GPL(virtio_break_device);

0 commit comments

Comments
 (0)