Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3358507 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

virtio-net: drop legacy features in virtio 1 mode 



Virtio 1.0 spec says VIRTIO_F_ANY_LAYOUT and VIRTIO_NET_F_GSO are
legacy-only feature bits. Do not negotiate them in virtio 1 mode.  Note
this is a spec violation so we need to backport it to stable/downstream
kernels.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d41ce29

drivers/net/virtio_net.c

+20 −10
Original line number Diff line number Diff line
@@ -2038,23 +2038,33 @@ static struct virtio_device_id id_table[] = { 
	{ 0 },

};



#define VIRTNET_FEATURES \

	VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, \

	VIRTIO_NET_F_MAC, \

	VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, \

	VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, \

	VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO, \

	VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ, \

	VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \

	VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \

	VIRTIO_NET_F_CTRL_MAC_ADDR, \

	VIRTIO_NET_F_MTU



static unsigned int features[] = {

	VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM,

	VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC,

	VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6,

	VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,

	VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,

	VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,

	VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,

	VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ,

	VIRTIO_NET_F_CTRL_MAC_ADDR,

	VIRTNET_FEATURES,

};



static unsigned int features_legacy[] = {

	VIRTNET_FEATURES,

	VIRTIO_NET_F_GSO,

	VIRTIO_F_ANY_LAYOUT,

	VIRTIO_NET_F_MTU,

};



static struct virtio_driver virtio_net_driver = {

	.feature_table = features,

	.feature_table_size = ARRAY_SIZE(features),

	.feature_table_legacy = features_legacy,

	.feature_table_size_legacy = ARRAY_SIZE(features_legacy),

	.driver.name =	KBUILD_MODNAME,

	.driver.owner =	THIS_MODULE,

	.id_table =	id_table,