Skip to content

Commit

Permalink
virtio: correct the memory barrier in virtqueue_kick_prepare()
Browse files Browse the repository at this point in the history
Use virtio_mb() to make sure the available index to be exposed before
checking the the avail event. Otherwise we may get stale value of
avail event in guest and never kick the host after.

Note: this fixes a bug introduced by ee7cd89.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
  • Loading branch information
Jason Wang authored and Rusty Russell committed Jan 27, 2012
1 parent 4dbc5d9 commit a72caae
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/virtio/virtio_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
bool needs_kick;

START_USE(vq);
/* Descriptors and available array need to be set before we expose the
* new available array entries. */
virtio_wmb(vq);
/* We need to expose available array entries before checking avail
* event. */
virtio_mb(vq);

old = vq->vring.avail->idx - vq->num_added;
new = vq->vring.avail->idx;
Expand Down

0 comments on commit a72caae

Please sign in to comment.