leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dpaa_eth: limit the possible MTU range when XDP is enabled

Browse Source 
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>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Camelia Groza 2020-11-25 18:53:32 +02:00 committed by Jakub Kicinski
parent 86c0c196cb
commit 828eadbacc
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View File

@ -2756,22 +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 netdev_bpf *bpf)
{
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 (bpf->prog &&
(net_dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN > max_contig_data)) {
if (bpf->prog && !xdp_validate_mtu(priv, net_dev->mtu)) {
NL_SET_ERR_MSG_MOD(bpf->extack, "MTU too large for XDP");
dev_warn(net_dev->dev.parent,
"The maximum MTU for XDP is %d\n",
max_contig_data - VLAN_ETH_HLEN - ETH_FCS_LEN);
return -EINVAL;
}
@ -2871,6 +2893,7 @@ static const struct net_device_ops dpaa_ops = {
.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,
};