[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 7/9] virtio-net: handle virtio_net_flush_tx() err
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH v4 7/9] virtio-net: handle virtio_net_flush_tx() errors |
Date: |
Fri, 30 Sep 2016 17:13:32 +0200 |
User-agent: |
StGit/0.17.1-dirty |
All these errors are caused by a buggy guest: let's switch the device to
the broken state instead of terminating QEMU. Also we detach the element
from the virtqueue and free it.
If this happens, virtio_net_flush_tx() also returns -EINVAL, so that all
callers can stop processing the virtqueue immediatly.
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
v4: - added Stefan's R-b tag
---
hw/net/virtio-net.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 10a4c745f0bd..6eb571616884 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1244,15 +1244,19 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
out_num = elem->out_num;
out_sg = elem->out_sg;
if (out_num < 1) {
- error_report("virtio-net header not in first element");
- exit(1);
+ virtio_error(vdev, "virtio-net header not in first element");
+ virtqueue_detach_element(q->tx_vq, elem, 0);
+ g_free(elem);
+ return -EINVAL;
}
if (n->has_vnet_hdr) {
if (iov_to_buf(out_sg, out_num, 0, &mhdr, n->guest_hdr_len) <
n->guest_hdr_len) {
- error_report("virtio-net header incorrect");
- exit(1);
+ virtio_error(vdev, "virtio-net header incorrect");
+ virtqueue_detach_element(q->tx_vq, elem, 0);
+ g_free(elem);
+ return -EINVAL;
}
if (n->needs_vnet_hdr_swap) {
virtio_net_hdr_swap(vdev, (void *) &mhdr);
@@ -1320,7 +1324,9 @@ static void virtio_net_handle_tx_timer(VirtIODevice
*vdev, VirtQueue *vq)
virtio_queue_set_notification(vq, 1);
timer_del(q->tx_timer);
q->tx_waiting = 0;
- virtio_net_flush_tx(q);
+ if (virtio_net_flush_tx(q) == -EINVAL) {
+ return;
+ }
} else {
timer_mod(q->tx_timer,
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->tx_timeout);
@@ -1391,8 +1397,9 @@ static void virtio_net_tx_bh(void *opaque)
}
ret = virtio_net_flush_tx(q);
- if (ret == -EBUSY) {
- return; /* Notification re-enable handled by tx_complete */
+ if (ret == -EBUSY || ret == -EINVAL) {
+ return; /* Notification re-enable handled by tx_complete or device
+ * broken */
}
/* If we flush a full burst of packets, assume there are
@@ -1407,7 +1414,10 @@ static void virtio_net_tx_bh(void *opaque)
* anything that may have come in while we weren't looking. If
* we find something, assume the guest is still active and reschedule */
virtio_queue_set_notification(q->tx_vq, 1);
- if (virtio_net_flush_tx(q) > 0) {
+ ret = virtio_net_flush_tx(q);
+ if (ret == -EINVAL) {
+ return;
+ } else if (ret > 0) {
virtio_queue_set_notification(q->tx_vq, 0);
qemu_bh_schedule(q->tx_bh);
q->tx_waiting = 1;
- [Qemu-devel] [PATCH v4 0/9] virtio: avoid inappropriate QEMU termination in device code, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 1/9] virtio-9p: add parentheses to sizeof operator, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 2/9] virtio-blk: make some functions static, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 3/9] virtio-9p: handle handle_9p_output() error, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 4/9] virtio-blk: handle virtio_blk_handle_request() errors, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 5/9] virtio-net: handle virtio_net_handle_ctrl() error, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 6/9] virtio-net: handle virtio_net_receive() errors, Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 7/9] virtio-net: handle virtio_net_flush_tx() errors,
Greg Kurz <=
- [Qemu-devel] [PATCH v4 8/9] virtio-scsi: convert virtio_scsi_bad_req() to use virtio_error(), Greg Kurz, 2016/09/30
- [Qemu-devel] [PATCH v4 9/9] virtio-scsi: handle virtio_scsi_set_config() error, Greg Kurz, 2016/09/30
- Re: [Qemu-devel] [PATCH v4 0/9] virtio: avoid inappropriate QEMU termination in device code, no-reply, 2016/09/30