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

Commit d0c2c997 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

net: use core MTU range checking in virt drivers 



hyperv_net:
- set min/max_mtu, per Haiyang, after rndis_filter_device_add

virtio_net:
- set min/max_mtu
- remove virtnet_change_mtu

vmxnet3:
- set min/max_mtu

xen-netback:
- min_mtu = 0, max_mtu = 65517

xen-netfront:
- min_mtu = 0, max_mtu = 65535

unisys/visor:
- clean up defines a little to not clash with network core or add
  redundat definitions

CC: netdev@vger.kernel.org
CC: virtualization@lists.linux-foundation.org
CC: "K. Y. Srinivasan" <kys@microsoft.com>
CC: Haiyang Zhang <haiyangz@microsoft.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
CC: Shrikrishna Khare <skhare@vmware.com>
CC: "VMware, Inc." <pv-drivers@vmware.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Paul Durrant <paul.durrant@citrix.com>
CC: David Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91572088

drivers/net/hyperv/hyperv_net.h

+2 −2
Original line number Diff line number Diff line
@@ -606,8 +606,8 @@ struct nvsp_message { 
} __packed;





#define NETVSC_MTU 65536

#define NETVSC_MTU_MIN 68

#define NETVSC_MTU 65535

#define NETVSC_MTU_MIN ETH_MIN_MTU



#define NETVSC_RECEIVE_BUFFER_SIZE		(1024*1024*16)	/* 16MB */

#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY	(1024*1024*15)  /* 15MB */

drivers/net/hyperv/netvsc_drv.c

+7 −7
Original line number Diff line number Diff line
@@ -872,19 +872,12 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu) 
	struct netvsc_device *nvdev = ndevctx->nvdev;

	struct hv_device *hdev = ndevctx->device_ctx;

	struct netvsc_device_info device_info;

	int limit = ETH_DATA_LEN;

	u32 num_chn;

	int ret = 0;



	if (ndevctx->start_remove || !nvdev || nvdev->destroy)

		return -ENODEV;



	if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)

		limit = NETVSC_MTU - ETH_HLEN;



	if (mtu < NETVSC_MTU_MIN || mtu > limit)

		return -EINVAL;



	ret = netvsc_close(ndev);

	if (ret)

		goto out;
@@ -1402,6 +1395,13 @@ static int netvsc_probe(struct hv_device *dev, 
	netif_set_real_num_tx_queues(net, nvdev->num_chn);

	netif_set_real_num_rx_queues(net, nvdev->num_chn);



	/* MTU range: 68 - 1500 or 65521 */

	net->min_mtu = NETVSC_MTU_MIN;

	if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)

		net->max_mtu = NETVSC_MTU - ETH_HLEN;

	else

		net->max_mtu = ETH_DATA_LEN;



	ret = register_netdev(net);

	if (ret != 0) {

		pr_err("Unable to register netdev.\n");

drivers/net/virtio_net.c

+10 −13
Original line number Diff line number Diff line
@@ -1419,17 +1419,6 @@ static const struct ethtool_ops virtnet_ethtool_ops = { 
	.set_settings = virtnet_set_settings,

};



#define MIN_MTU 68

#define MAX_MTU 65535



static int virtnet_change_mtu(struct net_device *dev, int new_mtu)

{

	if (new_mtu < MIN_MTU || new_mtu > MAX_MTU)

		return -EINVAL;

	dev->mtu = new_mtu;

	return 0;

}



static const struct net_device_ops virtnet_netdev = {

	.ndo_open            = virtnet_open,

	.ndo_stop   	     = virtnet_close,
@@ -1437,7 +1426,6 @@ static const struct net_device_ops virtnet_netdev = { 
	.ndo_validate_addr   = eth_validate_addr,

	.ndo_set_mac_address = virtnet_set_mac_address,

	.ndo_set_rx_mode     = virtnet_set_rx_mode,

	.ndo_change_mtu	     = virtnet_change_mtu,

	.ndo_get_stats64     = virtnet_stats,

	.ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid,
@@ -1748,6 +1736,9 @@ static bool virtnet_validate_features(struct virtio_device *vdev) 
	return true;

}



#define MIN_MTU ETH_MIN_MTU

#define MAX_MTU ETH_MAX_MTU



static int virtnet_probe(struct virtio_device *vdev)

{

	int i, err;
@@ -1821,6 +1812,10 @@ static int virtnet_probe(struct virtio_device *vdev) 


	dev->vlan_features = dev->features;



	/* MTU range: 68 - 65535 */

	dev->min_mtu = MIN_MTU;

	dev->max_mtu = MAX_MTU;



	/* Configuration may specify what MAC to use.  Otherwise random. */

	if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC))

		virtio_cread_bytes(vdev,
@@ -1875,8 +1870,10 @@ static int virtnet_probe(struct virtio_device *vdev) 
		mtu = virtio_cread16(vdev,

				     offsetof(struct virtio_net_config,

					      mtu));

		if (virtnet_change_mtu(dev, mtu))

		if (mtu < dev->min_mtu || mtu > dev->max_mtu)

			__virtio_clear_bit(vdev, VIRTIO_NET_F_MTU);

		else

			dev->mtu = mtu;

	}



	if (vi->any_header_sg)

drivers/net/vmxnet3/vmxnet3_drv.c

+4 −3
Original line number Diff line number Diff line
@@ -2969,9 +2969,6 @@ vmxnet3_change_mtu(struct net_device *netdev, int new_mtu) 
	struct vmxnet3_adapter *adapter = netdev_priv(netdev);

	int err = 0;



	if (new_mtu < VMXNET3_MIN_MTU || new_mtu > VMXNET3_MAX_MTU)

		return -EINVAL;



	netdev->mtu = new_mtu;



	/*
@@ -3428,6 +3425,10 @@ vmxnet3_probe_device(struct pci_dev *pdev, 
	vmxnet3_set_ethtool_ops(netdev);

	netdev->watchdog_timeo = 5 * HZ;



	/* MTU range: 60 - 9000 */

	netdev->min_mtu = VMXNET3_MIN_MTU;

	netdev->max_mtu = VMXNET3_MAX_MTU;



	INIT_WORK(&adapter->work, vmxnet3_reset_work);

	set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);

drivers/net/xen-netback/interface.c

+4 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int xenvif_close(struct net_device *dev) 
static int xenvif_change_mtu(struct net_device *dev, int mtu)

{

	struct xenvif *vif = netdev_priv(dev);

	int max = vif->can_sg ? 65535 - VLAN_ETH_HLEN : ETH_DATA_LEN;

	int max = vif->can_sg ? ETH_MAX_MTU - VLAN_ETH_HLEN : ETH_DATA_LEN;



	if (mtu > max)

		return -EINVAL;
@@ -471,6 +471,9 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, 


	dev->tx_queue_len = XENVIF_QUEUE_LENGTH;



	dev->min_mtu = 0;

	dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;



	/*

	 * Initialise a dummy MAC address. We choose the numerically

	 * largest non-broadcast address to prevent the address getting