diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-14 12:42:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-14 12:42:49 +0200 |
| commit | d77f873fdd21912803836da78f627d2efd267082 (patch) | |
| tree | 1a3468c7a10b948ac12bac260004eebdfd3e4a60 /drivers | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | vhost: fix barrier pairing (diff) | |
| download | linux-d77f873fdd21912803836da78f627d2efd267082.tar.xz linux-d77f873fdd21912803836da78f627d2efd267082.zip | |
Merge branch 'net-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/vhost.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index e69d238c5af0..49fa953aaf6e 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1035,7 +1035,12 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) /* This actually signals the guest, using eventfd. */ void vhost_signal(struct vhost_dev *dev, struct vhost_virtqueue *vq) { - __u16 flags = 0; + __u16 flags; + /* Flush out used index updates. This is paired + * with the barrier that the Guest executes when enabling + * interrupts. */ + smp_mb(); + if (get_user(flags, &vq->avail->flags)) { vq_err(vq, "Failed to get flags"); return; |