Commit bbca931f authored by Paolo Abeni's avatar Paolo Abeni
Browse files

vhost/net: enable gso over UDP tunnel support. 



Vhost net need to know the exact virtio net hdr size to be able
to copy such header correctly. Teach it about the newly defined
UDP tunnel-related option and update the hdr size computation
accordingly.

Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 288f3043

drivers/vhost/net.c

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static const u64 vhost_net_features[VIRTIO_FEATURES_DWORDS] = { 
	(1ULL << VIRTIO_NET_F_MRG_RXBUF) |

	(1ULL << VIRTIO_F_ACCESS_PLATFORM) |

	(1ULL << VIRTIO_F_RING_RESET),

	VIRTIO_BIT(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO) |

	VIRTIO_BIT(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO),

};



enum {
@@ -1624,6 +1626,12 @@ static int vhost_net_set_features(struct vhost_net *n, const u64 *features) 
		  sizeof(struct virtio_net_hdr_mrg_rxbuf) :

		  sizeof(struct virtio_net_hdr);



	if (virtio_features_test_bit(features,

				     VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO) ||

	    virtio_features_test_bit(features,

				     VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO))

		hdr_len = sizeof(struct virtio_net_hdr_v1_hash_tunnel);



	if (virtio_features_test_bit(features, VHOST_NET_F_VIRTIO_NET_HDR)) {

		/* vhost provides vnet_hdr */

		vhost_hlen = hdr_len;