Commit 7b1b62bc authored by Marek Behún's avatar Marek Behún Committed by David S. Miller
Browse files

net: marvell: mvpp2: increase MTU limit when XDP enabled 



Currently mvpp2_xdp_setup won't allow attaching XDP program if
  mtu > ETH_DATA_LEN (1500).

The mvpp2_change_mtu on the other hand checks whether
  MVPP2_RX_PKT_SIZE(mtu) > MVPP2_BM_LONG_PKT_SIZE.

These two checks are semantically different.

Moreover this limit can be increased to MVPP2_MAX_RX_BUF_SIZE, since in
mvpp2_rx we have
  xdp.data = data + MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM;
  xdp.frame_sz = PAGE_SIZE;

Change the checks to check whether
  mtu > MVPP2_MAX_RX_BUF_SIZE

Fixes: 07dd0a7a ("mvpp2: add basic XDP support")
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4e9bfb7

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+8 −6
Original line number Diff line number Diff line
@@ -5017,11 +5017,13 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) 
		mtu = ALIGN(MVPP2_RX_PKT_SIZE(mtu), 8);

	}



	if (MVPP2_RX_PKT_SIZE(mtu) > MVPP2_BM_LONG_PKT_SIZE) {

		if (port->xdp_prog) {

			netdev_err(dev, "Jumbo frames are not supported with XDP\n");

	if (port->xdp_prog && mtu > MVPP2_MAX_RX_BUF_SIZE) {

		netdev_err(dev, "Illegal MTU value %d (> %d) for XDP mode\n",

			   mtu, (int)MVPP2_MAX_RX_BUF_SIZE);

		return -EINVAL;

	}



	if (MVPP2_RX_PKT_SIZE(mtu) > MVPP2_BM_LONG_PKT_SIZE) {

		if (priv->percpu_pools) {

			netdev_warn(dev, "mtu %d too high, switching to shared buffers", mtu);

			mvpp2_bm_switch_buffers(priv, false);
@@ -5307,8 +5309,8 @@ static int mvpp2_xdp_setup(struct mvpp2_port *port, struct netdev_bpf *bpf) 
	bool running = netif_running(port->dev);

	bool reset = !prog != !port->xdp_prog;



	if (port->dev->mtu > ETH_DATA_LEN) {

		NL_SET_ERR_MSG_MOD(bpf->extack, "XDP is not supported with jumbo frames enabled");

	if (port->dev->mtu > MVPP2_MAX_RX_BUF_SIZE) {

		NL_SET_ERR_MSG_MOD(bpf->extack, "MTU too large for XDP");

		return -EOPNOTSUPP;

	}