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

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

ethernet: use net core MTU range checking in more drivers 



Somehow, I missed a healthy number of ethernet drivers in the last pass.
Most of these drivers either were in need of an updated max_mtu to make
jumbo frames possible to enable again. In a few cases, also setting a
different min_mtu to match previous lower bounds. There are also a few
drivers that had no upper bounds checking, so they're getting a brand new
ETH_MAX_MTU that is identical to IP_MAX_MTU, but accessible by includes
all ethernet and ethernet-like drivers all have already.

acenic:
- min_mtu = 0, max_mtu = 9000

amazon/ena:
- min_mtu = 128, max_mtu = adapter->max_mtu

amd/xgbe:
- min_mtu = 0, max_mtu = 9000

sb1250:
- min_mtu = 0, max_mtu = 1518

cxgb3:
- min_mtu = 81, max_mtu = 65535

cxgb4:
- min_mtu = 81, max_mtu = 9600

cxgb4vf:
- min_mtu = 81, max_mtu = 65535

benet:
- min_mtu = 256, max_mtu = 9000

ibmveth:
- min_mtu = 68, max_mtu = 65535

ibmvnic:
- min_mtu = adapter->min_mtu, max_mtu = adapter->max_mtu
- remove now redundant ibmvnic_change_mtu

jme:
- min_mtu = 1280, max_mtu = 9202

mv643xx_eth:
- min_mtu = 64, max_mtu = 9500

mlxsw:
- min_mtu = 0, max_mtu = 65535
- Basically bypassing the core checks, and instead relying on dynamic
  checks in the respective switch drivers' ndo_change_mtu functions

ns83820:
- min_mtu = 0
- remove redundant ns83820_change_mtu, only checked for mtu > 1500

netxen:
- min_mtu = 0, max_mtu = 8000 (P2), max_mtu = 9600 (P3)

qlge:
- min_mtu = 1500, max_mtu = 9000
- driver only supports setting mtu to 1500 or 9000, so the core check only
  rules out < 1500 and > 9000, qlge_change_mtu still needs to check that
  the value is 1500 or 9000

qualcomm/emac:
- min_mtu = 46, max_mtu = 9194

xilinx_axienet:
- min_mtu = 64, max_mtu = 9000

Fixes: 61e84623 ("net: centralize net_device min/max MTU checking")
CC: netdev@vger.kernel.org
CC: Jes Sorensen <jes@trained-monkey.org>
CC: Netanel Belgazal <netanel@annapurnalabs.com>
CC: Tom Lendacky <thomas.lendacky@amd.com>
CC: Santosh Raspatur <santosh@chelsio.com>
CC: Hariprasad S <hariprasad@chelsio.com>
CC: Sathya Perla <sathya.perla@broadcom.com>
CC: Ajit Khaparde <ajit.khaparde@broadcom.com>
CC: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
CC: Somnath Kotur <somnath.kotur@broadcom.com>
CC: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
CC: John Allen <jallen@linux.vnet.ibm.com>
CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
CC: Jiri Pirko <jiri@mellanox.com>
CC: Ido Schimmel <idosch@mellanox.com>
CC: Manish Chopra <manish.chopra@qlogic.com>
CC: Sony Chacko <sony.chacko@qlogic.com>
CC: Rajesh Borundia <rajesh.borundia@qlogic.com>
CC: Timur Tabi <timur@codeaurora.org>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a61a8f1

drivers/net/ethernet/alteon/acenic.c

+2 −3
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ static int acenic_probe_one(struct pci_dev *pdev, 
	dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;



	dev->watchdog_timeo = 5*HZ;

	dev->min_mtu = 0;

	dev->max_mtu = ACE_JUMBO_MTU;



	dev->netdev_ops = &ace_netdev_ops;

	dev->ethtool_ops = &ace_ethtool_ops;
@@ -2548,9 +2550,6 @@ static int ace_change_mtu(struct net_device *dev, int new_mtu) 
	struct ace_private *ap = netdev_priv(dev);

	struct ace_regs __iomem *regs = ap->regs;



	if (new_mtu > ACE_JUMBO_MTU)

		return -EINVAL;



	writel(new_mtu + ETH_HLEN + 4, &regs->IfMtu);

	dev->mtu = new_mtu;

drivers/net/ethernet/amazon/ena/ena_netdev.c

+2 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu) 
	struct ena_adapter *adapter = netdev_priv(dev);

	int ret;



	if ((new_mtu > adapter->max_mtu) || (new_mtu < ENA_MIN_MTU)) {

		netif_err(adapter, drv, dev,

			  "Invalid MTU setting. new_mtu: %d\n", new_mtu);



		return -EINVAL;

	}



	ret = ena_com_set_dev_mtu(adapter->ena_dev, new_mtu);

	if (!ret) {

		netif_dbg(adapter, drv, dev, "set MTU to %d\n", new_mtu);
@@ -2755,6 +2748,8 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter, 
	ena_set_dev_offloads(feat, netdev);



	adapter->max_mtu = feat->dev_attr.max_mtu;

	netdev->max_mtu = adapter->max_mtu;

	netdev->min_mtu = ENA_MIN_MTU;

}



static int ena_rss_init_default(struct ena_adapter *adapter)

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+0 −5
Original line number Diff line number Diff line
@@ -257,11 +257,6 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu) 
{

	unsigned int rx_buf_size;



	if (mtu > XGMAC_JUMBO_PACKET_MTU) {

		netdev_alert(netdev, "MTU exceeds maximum supported value\n");

		return -EINVAL;

	}



	rx_buf_size = mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

	rx_buf_size = clamp_val(rx_buf_size, XGBE_RX_MIN_BUF_SIZE, PAGE_SIZE);

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+2 −0
Original line number Diff line number Diff line
@@ -738,6 +738,8 @@ static int xgbe_probe(struct platform_device *pdev) 
	pdata->netdev_features = netdev->features;



	netdev->priv_flags |= IFF_UNICAST_FLT;

	netdev->min_mtu = 0;

	netdev->max_mtu = XGMAC_JUMBO_PACKET_MTU;



	/* Use default watchdog timeout */

	netdev->watchdog_timeo = 0;

drivers/net/ethernet/broadcom/sb1250-mac.c

+2 −10
Original line number Diff line number Diff line
@@ -2147,15 +2147,6 @@ static void sbmac_setmulti(struct sbmac_softc *sc) 
	}

}



static int sb1250_change_mtu(struct net_device *_dev, int new_mtu)

{

	if (new_mtu >  ENET_PACKET_SIZE)

		return -EINVAL;

	_dev->mtu = new_mtu;

	pr_info("changing the mtu to %d\n", new_mtu);

	return 0;

}



static const struct net_device_ops sbmac_netdev_ops = {

	.ndo_open		= sbmac_open,

	.ndo_stop		= sbmac_close,
@@ -2163,7 +2154,6 @@ static const struct net_device_ops sbmac_netdev_ops = { 
	.ndo_set_rx_mode	= sbmac_set_rx_mode,

	.ndo_tx_timeout		= sbmac_tx_timeout,

	.ndo_do_ioctl		= sbmac_mii_ioctl,

	.ndo_change_mtu		= sb1250_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -2229,6 +2219,8 @@ static int sbmac_init(struct platform_device *pldev, long long base) 


	dev->netdev_ops = &sbmac_netdev_ops;

	dev->watchdog_timeo = TX_TIMEOUT;

	dev->max_mtu = 0;

	dev->max_mtu = ENET_PACKET_SIZE;



	netif_napi_add(dev, &sc->napi, sbmac_poll, 16);