vsock/virtio: fix multiple packet delivery to monitoring devices (a78d1639) · Commits · 戴 / test

In virtio_transport.c, if the virtqueue is full, the transmitting packet is queued up and it will be sent in the next iteration. This causes the same packet to be delivered multiple times to monitoring devices. We want to continue to deliver packets to monitoring devices before it is put in the virtqueue, to avoid that replies can appear in the packet capture before the transmitted packet. This patch fixes the issue, adding a new flag (tap_delivered) in struct virtio_vsock_pkt, to check if the packet is already delivered to monitoring devices. In vhost/vsock.c, we are splitting packets, so we must set 'tap_delivered' to false when we queue up the same virtio_vsock_pkt to handle the remaining bytes. Signed-off-by:

Stefano Garzarella <sgarzare@redhat.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/vhost/vsock.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,12 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
		* to send it with the next available buffer.
		*/
		if (pkt->off < pkt->len) {
		/* We are queueing the same virtio_vsock_pkt to handle
		* the remaining bytes, and we want to deliver it
		* to monitoring devices in the next iteration.
		*/
		pkt->tap_delivered = false;

		spin_lock_bh(&vsock->send_pkt_list_lock);
		list_add(&pkt->list, &vsock->send_pkt_list);
		spin_unlock_bh(&vsock->send_pkt_list_lock);

include/linux/virtio_vsock.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ struct virtio_vsock_pkt {
		u32 len;
		u32 off;
		bool reply;
		bool tap_delivered;
		};

		struct virtio_vsock_pkt_info {

net/vmw_vsock/virtio_transport_common.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -157,7 +157,11 @@ static struct sk_buff virtio_transport_build_skb(void opaque)

		void virtio_transport_deliver_tap_pkt(struct virtio_vsock_pkt *pkt)
		{
		if (pkt->tap_delivered)
		return;

		vsock_deliver_tap(virtio_transport_build_skb, pkt);
		pkt->tap_delivered = true;
		}
		EXPORT_SYMBOL_GPL(virtio_transport_deliver_tap_pkt);

Admin message