diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-07-20 13:41:31 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-07-21 10:23:31 +0300 |
| commit | c047e5f3170c2595e66ed67f87cec01afd717212 (patch) | |
| tree | 5e48ab84e14e4380b8409e646f086143c1769f5d /drivers/vhost | |
| parent | b834226b04d6fb51178a64e98872856986c71474 (diff) | |
| download | blackbird-op-linux-c047e5f3170c2595e66ed67f87cec01afd717212.tar.gz blackbird-op-linux-c047e5f3170c2595e66ed67f87cec01afd717212.zip | |
vhost-net: update used ring on backend change
On backend change, we flushed out outstanding skbs
but forgot to update the used ring, so that
done entries were left in the ubuf_info ring.
As a result we lose heads or complete incorrect ones,
crashing the guest or leaking memory.
Fix by updating the used ring.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/net.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 70ac60437d17..248b25008d1a 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -711,8 +711,12 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) mutex_unlock(&vq->mutex); - if (oldubufs) + if (oldubufs) { vhost_ubuf_put_and_wait(oldubufs); + mutex_lock(&vq->mutex); + vhost_zerocopy_signal_used(vq); + mutex_unlock(&vq->mutex); + } if (oldsock) { vhost_net_flush_vq(n, index); |
