linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarod Wilson <jarod@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jarod Wilson <jarod@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	netdev@vger.kernel.org
Subject: [PATCH v2 net-next 1/2] net: centralize net_device min/max MTU checking
Date: Wed, 28 Sep 2016 18:20:52 -0400	[thread overview]
Message-ID: <20160928222053.33697-2-jarod@redhat.com> (raw)
In-Reply-To: <20160928222053.33697-1-jarod@redhat.com>

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().

In theory, there should be zero functional change with this patch, it just
puts the infrastructure in place. Subsequent patches will attempt to start
using said infrastructure, with theoretically zero change in
functionality.

CC: "David S. Miller" <davem@davemloft.net>
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 include/linux/netdevice.h |  4 ++++
 net/core/dev.c            | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 136ae6bb..fbdf923 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1506,6 +1506,8 @@ enum netdev_priv_flags {
  *	@if_port:	Selectable AUI, TP, ...
  *	@dma:		DMA channel
  *	@mtu:		Interface MTU value
+ *	@min_mtu:	Interface Minimum MTU value
+ *	@max_mtu:	Interface Maximum MTU value
  *	@type:		Interface hardware type
  *	@hard_header_len: Maximum hardware header length.
  *
@@ -1726,6 +1728,8 @@ struct net_device {
 	unsigned char		dma;
 
 	unsigned int		mtu;
+	unsigned int		min_mtu;
+	unsigned int		max_mtu;
 	unsigned short		type;
 	unsigned short		hard_header_len;
 
diff --git a/net/core/dev.c b/net/core/dev.c
index c0c291f..5343799 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6493,9 +6493,17 @@ int dev_set_mtu(struct net_device *dev, int new_mtu)
 	if (new_mtu == dev->mtu)
 		return 0;
 
-	/*	MTU must be positive.	 */
-	if (new_mtu < 0)
+	if (new_mtu < dev->min_mtu) {
+		net_err_ratelimited("%s: Invalid MTU %d requested, hw min %d\n",
+				    dev->name, new_mtu, dev->min_mtu);
 		return -EINVAL;
+	}
+
+	if (dev->max_mtu > 0 && new_mtu > dev->max_mtu) {
+		net_err_ratelimited("%s: Invalid MTU %d requested, hw max %d\n",
+				    dev->name, new_mtu, dev->min_mtu);
+		return -EINVAL;
+	}
 
 	if (!netif_device_present(dev))
 		return -ENODEV;
-- 
2.10.0

  reply	other threads:[~2016-09-28 22:21 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-12 20:11 [PATCH net-next 0/2] net: centralize net_device MTU bounds checking Jarod Wilson
2016-09-12 20:11 ` [PATCH net-next 1/2] net: centralize net_device min/max MTU checking Jarod Wilson
2016-09-12 20:11 ` [PATCH net-next 2/2] net: deprecate eth_change_mtu, remove usage Jarod Wilson
2016-09-13 21:59   ` kbuild test robot
2016-09-14 18:45     ` Jarod Wilson
2016-09-28 21:17 ` [PATCH v2 net-next 0/2] net: centralize net_device MTU bounds checking Jarod Wilson
2016-09-28 21:17   ` [PATCH v2 net-next 1/2] net: centralize net_device min/max MTU checking Jarod Wilson
2016-09-28 21:17   ` [PATCH v2 net-next 2/2] net: deprecate eth_change_mtu, remove usage Jarod Wilson
2016-09-28 22:20 ` [PATCH v2 net-next 0/2] net: centralize net_device MTU bounds checking Jarod Wilson
2016-09-28 22:20   ` Jarod Wilson [this message]
2016-09-30  9:37     ` [PATCH v2 net-next 1/2] net: centralize net_device min/max MTU checking Jakub Sitnicki
2016-10-03  2:43       ` David Miller
2016-10-03 17:46         ` Jarod Wilson
2016-10-08  2:04         ` [PATCH v3 net-next 0/2] net: centralize net_device MTU bounds checking Jarod Wilson
2016-10-08  2:04           ` [PATCH v3 net-next 1/2] net: centralize net_device min/max MTU checking Jarod Wilson
2016-10-08  2:04           ` [PATCH v3 net-next 2/2] net: deprecate eth_change_mtu, remove usage Jarod Wilson
2016-10-17 16:20             ` Jakub Kicinski
2016-10-17 16:49               ` David Miller
2016-10-17 17:00                 ` Jakub Kicinski
2016-10-17 17:04                   ` Jakub Kicinski
2016-10-17 17:15                   ` David Miller
2016-10-17 17:20                     ` Jakub Kicinski
2016-10-17 17:25                       ` David Miller
2016-10-17 20:07                         ` Jarod Wilson
2016-10-17 20:22                           ` Jarod Wilson
2016-10-13 13:37           ` [PATCH v3 net-next 0/2] net: centralize net_device MTU bounds checking David Miller
2016-09-28 22:20   ` [PATCH v2 net-next 2/2] net: deprecate eth_change_mtu, remove usage Jarod Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160928222053.33697-2-jarod@redhat.com \
    --to=jarod@redhat.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).