From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 3/7] vhost: restore avail index from vring used index on disconnection
Date: Fri, 1 Dec 2017 19:08:46 +0200 [thread overview]
Message-ID: <1512148088-28733-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1512148088-28733-1-git-send-email-mst@redhat.com>
From: Maxime Coquelin <maxime.coquelin@redhat.com>
vhost_virtqueue_stop() gets avail index value from the backend,
except if the backend is not responding.
It happens when the backend crashes, and in this case, internal
state of the virtio queue is inconsistent, making packets
to corrupt the vring state.
With a Linux guest, it results in following error message on
backend reconnection:
[ 22.444905] virtio_net virtio0: output.0:id 0 is not a head!
[ 22.446746] net enp0s3: Unexpected TXQ (0) queue failure: -5
[ 22.476360] net enp0s3: Unexpected TXQ (0) queue failure: -5
Fixes: 283e2c2adcb8 ("net: virtio-net discards TX data after link down")
Cc: qemu-stable@nongnu.org
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/vhost.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index ddc42f0..5404194 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1138,6 +1138,10 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
r = dev->vhost_ops->vhost_get_vring_base(dev, &state);
if (r < 0) {
VHOST_OPS_DEBUG("vhost VQ %d ring restore failed: %d", idx, r);
+ /* Connection to the backend is broken, so let's sync internal
+ * last avail idx to the device used idx.
+ */
+ virtio_queue_restore_last_avail_idx(vdev, idx);
} else {
virtio_queue_set_last_avail_idx(vdev, idx, state.num);
}
--
MST
next prev parent reply other threads:[~2017-12-01 17:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 17:08 [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3 Michael S. Tsirkin
2017-12-01 17:08 ` [Qemu-devel] [PULL 1/7] i386/msi: Correct mask of destination ID in MSI address Michael S. Tsirkin
2017-12-01 17:08 ` [Qemu-devel] [PULL 2/7] virtio: Add queue interface to restore avail index from vring used index Michael S. Tsirkin
2017-12-01 17:08 ` Michael S. Tsirkin [this message]
2017-12-01 17:08 ` [Qemu-devel] [PULL 4/7] dump-guest-memory.py: fix No symbol "vmcoreinfo_find" Michael S. Tsirkin
2017-12-01 17:08 ` [Qemu-devel] [PULL 5/7] vhost: fix error check in vhost_verify_ring_mappings() Michael S. Tsirkin
2017-12-01 17:08 ` [Qemu-devel] [PULL 6/7] virtio: check VirtQueue Vring object is set Michael S. Tsirkin
2017-12-01 17:09 ` [Qemu-devel] [PULL 7/7] pc: fix crash on attempted cpu unplug Michael S. Tsirkin
2017-12-01 18:05 ` [Qemu-devel] [PULL 0/7] pc, pci, virtio: fixes for rc3 Peter Maydell
2017-12-03 4:56 ` Michael S. Tsirkin
2017-12-04 10:16 ` Peter Maydell
2017-12-04 17:18 ` Peter Maydell
2017-12-05 0:56 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1512148088-28733-4-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=maxime.coquelin@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).