Commit e121d270 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Alexei Starovoitov
Browse files

net: mvneta: enable jumbo frames if the loaded XDP program support frags 



Enable the capability to receive jumbo frames even if the interface is
running in XDP mode if the loaded program declare to properly support
xdp frags. At same time reject a xdp program not supporting xdp frags
if the driver is running in xdp frags mode.

Acked-by: default avatarToke Hoiland-Jorgensen <toke@redhat.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/6909f81a3cbb8fb6b88e914752c26395771b882a.1642758637.git.lorenzo@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c2f2cdbe

drivers/net/ethernet/marvell/mvneta.c

+9 −4
Original line number Diff line number Diff line
@@ -3778,6 +3778,7 @@ static void mvneta_percpu_disable(void *arg) 
static int mvneta_change_mtu(struct net_device *dev, int mtu)

{

	struct mvneta_port *pp = netdev_priv(dev);

	struct bpf_prog *prog = pp->xdp_prog;

	int ret;



	if (!IS_ALIGNED(MVNETA_RX_PKT_SIZE(mtu), 8)) {
@@ -3786,8 +3787,11 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu) 
		mtu = ALIGN(MVNETA_RX_PKT_SIZE(mtu), 8);

	}



	if (pp->xdp_prog && mtu > MVNETA_MAX_RX_BUF_SIZE) {

		netdev_info(dev, "Illegal MTU value %d for XDP mode\n", mtu);

	if (prog && !prog->aux->xdp_has_frags &&

	    mtu > MVNETA_MAX_RX_BUF_SIZE) {

		netdev_info(dev, "Illegal MTU %d for XDP prog without frags\n",

			    mtu);



		return -EINVAL;

	}
@@ -4528,8 +4532,9 @@ static int mvneta_xdp_setup(struct net_device *dev, struct bpf_prog *prog, 
	struct mvneta_port *pp = netdev_priv(dev);

	struct bpf_prog *old_prog;



	if (prog && dev->mtu > MVNETA_MAX_RX_BUF_SIZE) {

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

	if (prog && !prog->aux->xdp_has_frags &&

	    dev->mtu > MVNETA_MAX_RX_BUF_SIZE) {

		NL_SET_ERR_MSG_MOD(extack, "prog does not support XDP frags");

		return -EOPNOTSUPP;

	}