Merge branch 'centralize-netdevice-mtu-bounds-checking' (0f505b1a) · Commits · 戴 / test

Jarod Wilson says: ==================== net: centralize net_device MTU bounds checking While looking into an MTU issue with sfc, I started noticing that almost every NIC driver with an ndo_change_mtu function implemented almost exactly the same range checks, and in many cases, that was the only practical thing their ndo_change_mtu function was doing. Quite a few drivers have either 68, 64, 60 or 46 as their minimum MTU value checked, and then various sizes from 1500 to 65535 for their maximum MTU value. We can remove a whole lot of redundant code here if we simple store min_mtu and max_mtu in net_device, and check against those in net/core/dev.c's dev_set_mtu(). This pair of patches looks to introduce centralized MTU range checking infrastructure, while maintaining compatibility with all existing drivers, and start to make use of it, converting all eth_change_mtu/ether_setup users over to this new infra. Assuming these pass review muster, I've got a ton of follow-on patches to clean up MTU settings for everything in the kernel with an ndo_change_mtu. This work is all staged in a (rebasing) git tree here: https://github.com/jarodwilson/linux-muck The master branch is based on net-next from Oct 7, and carries these two patches, plus a ton of follow-on patches to eliminate MTU range checks and change_mtu functions where possible. All patches were successfully built across 160 various arch and config combos by the 0-day folks. (Thanks to Andrew Lunn for the suggestion to get that going). ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

arch/m68k/emu/nfeth.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ static const struct net_device_ops nfeth_netdev_ops = {
		.ndo_start_xmit = nfeth_xmit,
		.ndo_tx_timeout = nfeth_tx_timeout,
		.ndo_validate_addr = eth_validate_addr,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_set_mac_address = eth_mac_addr,
		};

drivers/isdn/hysdn/hysdn_net.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -232,7 +232,6 @@ static const struct net_device_ops hysdn_netdev_ops = {
		.ndo_open = net_open,
		.ndo_stop = net_close,
		.ndo_start_xmit = net_send_packet,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_set_mac_address = eth_mac_addr,
		.ndo_validate_addr = eth_validate_addr,
		};

drivers/media/dvb-core/dvb_net.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1198,7 +1198,6 @@ static const struct net_device_ops dvb_netdev_ops = {
		.ndo_start_xmit = dvb_net_tx,
		.ndo_set_rx_mode = dvb_net_set_multicast_list,
		.ndo_set_mac_address = dvb_net_set_mac,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_validate_addr = eth_validate_addr,
		};

		@@ -1209,6 +1208,7 @@ static void dvb_net_setup(struct net_device *dev)
		dev->header_ops = &dvb_header_ops;
		dev->netdev_ops = &dvb_netdev_ops;
		dev->mtu = 4096;
		dev->max_mtu = 4096;

		dev->flags \|= IFF_NOARP;
		}

drivers/net/appletalk/ipddp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ static int ipddp_ioctl(struct net_device dev, struct ifreq ifr, int cmd);
		static const struct net_device_ops ipddp_netdev_ops = {
		.ndo_start_xmit = ipddp_xmit,
		.ndo_do_ioctl = ipddp_ioctl,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_set_mac_address = eth_mac_addr,
		.ndo_validate_addr = eth_validate_addr,
		};

drivers/net/cris/eth_v10.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,6 @@ static const struct net_device_ops e100_netdev_ops = {
		.ndo_do_ioctl = e100_ioctl,
		.ndo_set_mac_address = e100_set_mac_address,
		.ndo_validate_addr = eth_validate_addr,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_set_config = e100_set_config,
		#ifdef CONFIG_NET_POLL_CONTROLLER
		.ndo_poll_controller = e100_netpoll,

Admin message