From: Camelia Groza <camelia.groza@nxp.com>
To: kuba@kernel.org, maciej.fijalkowski@intel.com, brouer@redhat.com,
saeed@kernel.org, davem@davemloft.net
Cc: madalin.bucur@oss.nxp.com, ioana.ciornei@nxp.com,
netdev@vger.kernel.org, Camelia Groza <camelia.groza@nxp.com>
Subject: [PATCH net-next v4 3/7] dpaa_eth: limit the possible MTU range when XDP is enabled
Date: Mon, 23 Nov 2020 19:36:21 +0200 [thread overview]
Message-ID: <654d6300001825e542341bc052c31433b48b1913.1606150838.git.camelia.groza@nxp.com> (raw)
In-Reply-To: <cover.1606150838.git.camelia.groza@nxp.com>
In-Reply-To: <cover.1606150838.git.camelia.groza@nxp.com>
Implement the ndo_change_mtu callback to prevent users from setting an
MTU that would permit processing of S/G frames. The maximum MTU size
is dependent on the buffer size.
Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
---
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 40 ++++++++++++++++++++------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 8acce62..ee076f4 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2756,23 +2756,44 @@ static int dpaa_eth_stop(struct net_device *net_dev)
return err;
}
+static bool xdp_validate_mtu(struct dpaa_priv *priv, int mtu)
+{
+ int max_contig_data = priv->dpaa_bp->size - priv->rx_headroom;
+
+ /* We do not support S/G fragments when XDP is enabled.
+ * Limit the MTU in relation to the buffer size.
+ */
+ if (mtu + VLAN_ETH_HLEN + ETH_FCS_LEN > max_contig_data) {
+ dev_warn(priv->net_dev->dev.parent,
+ "The maximum MTU for XDP is %d\n",
+ max_contig_data - VLAN_ETH_HLEN - ETH_FCS_LEN);
+ return false;
+ }
+
+ return true;
+}
+
+static int dpaa_change_mtu(struct net_device *net_dev, int new_mtu)
+{
+ struct dpaa_priv *priv = netdev_priv(net_dev);
+
+ if (priv->xdp_prog && !xdp_validate_mtu(priv, new_mtu))
+ return -EINVAL;
+
+ net_dev->mtu = new_mtu;
+ return 0;
+}
+
static int dpaa_setup_xdp(struct net_device *net_dev, struct bpf_prog *prog)
{
struct dpaa_priv *priv = netdev_priv(net_dev);
struct bpf_prog *old_prog;
- int err, max_contig_data;
+ int err;
bool up;
- max_contig_data = priv->dpaa_bp->size - priv->rx_headroom;
-
/* S/G fragments are not supported in XDP-mode */
- if (prog &&
- (net_dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN > max_contig_data)) {
- dev_warn(net_dev->dev.parent,
- "The maximum MTU for XDP is %d\n",
- max_contig_data - VLAN_ETH_HLEN - ETH_FCS_LEN);
+ if (prog && !xdp_validate_mtu(priv, net_dev->mtu))
return -EINVAL;
- }
up = netif_running(net_dev);
@@ -2870,6 +2891,7 @@ static int dpaa_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd)
.ndo_set_rx_mode = dpaa_set_rx_mode,
.ndo_do_ioctl = dpaa_ioctl,
.ndo_setup_tc = dpaa_setup_tc,
+ .ndo_change_mtu = dpaa_change_mtu,
.ndo_bpf = dpaa_xdp,
};
--
1.9.1
next prev parent reply other threads:[~2020-11-23 17:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 17:36 [PATCH net-next v4 0/7] dpaa_eth: add XDP support Camelia Groza
2020-11-23 17:36 ` [PATCH net-next v4 1/7] dpaa_eth: add struct for software backpointers Camelia Groza
2020-11-23 17:36 ` [PATCH net-next v4 2/7] dpaa_eth: add basic XDP support Camelia Groza
2020-11-24 13:51 ` Maciej Fijalkowski
2020-11-24 16:11 ` Camelia Alexandra Groza
2020-11-23 17:36 ` Camelia Groza [this message]
2020-11-24 19:11 ` [PATCH net-next v4 3/7] dpaa_eth: limit the possible MTU range when XDP is enabled Maciej Fijalkowski
2020-11-25 15:47 ` Camelia Alexandra Groza
2020-11-23 17:36 ` [PATCH net-next v4 4/7] dpaa_eth: add XDP_TX support Camelia Groza
2020-11-24 19:52 ` Maciej Fijalkowski
2020-11-25 15:49 ` Camelia Alexandra Groza
2020-11-27 14:29 ` Maciej Fijalkowski
2020-11-27 16:33 ` Camelia Alexandra Groza
2020-11-23 17:36 ` [PATCH net-next v4 5/7] dpaa_eth: add XDP_REDIRECT support Camelia Groza
2020-11-24 20:07 ` Maciej Fijalkowski
2020-11-23 17:36 ` [PATCH net-next v4 6/7] dpaa_eth: rename current skb A050385 erratum workaround Camelia Groza
2020-11-23 17:36 ` [PATCH net-next v4 7/7] dpaa_eth: implement the A050385 erratum workaround for XDP Camelia Groza
2020-11-24 20:50 ` Maciej Fijalkowski
2020-11-25 15:52 ` Camelia Alexandra Groza
2020-11-27 14:44 ` Maciej Fijalkowski
2020-11-27 17:35 ` Camelia Alexandra Groza
2020-11-28 23:02 ` Maciej Fijalkowski
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=654d6300001825e542341bc052c31433b48b1913.1606150838.git.camelia.groza@nxp.com \
--to=camelia.groza@nxp.com \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=ioana.ciornei@nxp.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=madalin.bucur@oss.nxp.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@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).