Commit bba71cac authored by Ong Boon Leong's avatar Ong Boon Leong Committed by David S. Miller
Browse files

net: stmmac: Refactor __stmmac_xdp_run_prog for XDP ZC 



Prepare stmmac_xdp_run_prog() for AF_XDP zero-copy support which will be
added by upcoming patches by splitting out the XDP verdict processing
into __stmmac_xdp_run_prog() and it callable for XDP ZC path which does
not need to verify bpf_prog is not NULL.

The stmmac_xdp_run_prog() is used for regular XDP Rx path which requires
bpf_prog to be verified.

Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de0b90e5

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+23 −12
Original line number Diff line number Diff line
@@ -4408,20 +4408,13 @@ static int stmmac_xdp_xmit_back(struct stmmac_priv *priv, 
	return res;

}



static struct sk_buff *stmmac_xdp_run_prog(struct stmmac_priv *priv,

/* This function assumes rcu_read_lock() is held by the caller. */

static int __stmmac_xdp_run_prog(struct stmmac_priv *priv,

				 struct bpf_prog *prog,

				 struct xdp_buff *xdp)

{

	struct bpf_prog *prog;

	int res;

	u32 act;



	rcu_read_lock();



	prog = READ_ONCE(priv->xdp_prog);

	if (!prog) {

		res = STMMAC_XDP_PASS;

		goto unlock;

	}

	int res;



	act = bpf_prog_run_xdp(prog, xdp);

	switch (act) {
@@ -4448,6 +4441,24 @@ static struct sk_buff *stmmac_xdp_run_prog(struct stmmac_priv *priv, 
		break;

	}



	return res;

}



static struct sk_buff *stmmac_xdp_run_prog(struct stmmac_priv *priv,

					   struct xdp_buff *xdp)

{

	struct bpf_prog *prog;

	int res;



	rcu_read_lock();



	prog = READ_ONCE(priv->xdp_prog);

	if (!prog) {

		res = STMMAC_XDP_PASS;

		goto unlock;

	}



	res = __stmmac_xdp_run_prog(priv, prog, xdp);

unlock:

	rcu_read_unlock();

	return ERR_PTR(-res);