[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/22] virtio-net: correctly drop truncated packets
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 22/22] virtio-net: correctly drop truncated packets |
Date: |
Thu, 24 Sep 2015 16:21:07 +0300 |
From: Jason Wang <address@hidden>
When packet is truncated during receiving, we drop the packets but
neither discard the descriptor nor add and signal used
descriptor. This will lead several issues:
- sg mappings are leaked
- rx will be stalled if a lots of packets were truncated
In order to be consistent with vhost, fix by discarding the descriptor
in this case.
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/net/virtio-net.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index d388c55..a877614 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1094,13 +1094,7 @@ static ssize_t virtio_net_receive(NetClientState *nc,
const uint8_t *buf, size_t
* must have consumed the complete packet.
* Otherwise, drop it. */
if (!n->mergeable_rx_bufs && offset < size) {
-#if 0
- error_report("virtio-net truncated non-mergeable packet: "
- "i %zd mergeable %d offset %zd, size %zd, "
- "guest hdr len %zd, host hdr len %zd",
- i, n->mergeable_rx_bufs,
- offset, size, n->guest_hdr_len, n->host_hdr_len);
-#endif
+ virtqueue_discard(q->rx_vq, &elem, total);
return size;
}
--
MST
- [Qemu-devel] [PULL 05/22] pc: Introduce pc-*-2.5 machine classes, (continued)
- [Qemu-devel] [PULL 05/22] pc: Introduce pc-*-2.5 machine classes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 06/22] virtio: ring sizes vs. reset, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 07/22] virtio-ccw: support ring size changes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 08/22] virtio-ccw: feature bits > 31 handling, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 09/22] virtio-ccw: enable virtio-1, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 10/22] vhost-user: use VHOST_USER_XXX macro for switch statement, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 11/22] vhost-user: add protocol feature negotiation, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 19/22] MAINTAINERS: add more devices to the PCI section, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 21/22] virtio: introduce virtqueue_discard(), Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 22/22] virtio-net: correctly drop truncated packets,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg(), Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 14/22] vhost: introduce vhost_backend_get_vq_index method, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 18/22] MAINTAINERS: add more devices to the PC section, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 15/22] vhost-user: add multiple queue support, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 17/22] intel_iommu: Add support for translation for devices behind bridges, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 01/22] virtio: right size for virtio_queue_get_avail_size, Michael S. Tsirkin, 2015/09/24