Commit 28d137cc authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

dpaa2-eth: rename dpaa2_eth_xdp_release_buf into dpaa2_eth_recycle_buf 



Rename the dpaa2_eth_xdp_release_buf function into dpaa2_eth_recycle_buf
since in the next patches we'll be using the same recycle mechanism for
the normal stack path beside for XDP_DROP.

Also, rename the array which holds the buffers to be recycled so that it
does not have any reference to XDP.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e8db636

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+13 −13
Original line number Diff line number Diff line
@@ -223,31 +223,31 @@ static void dpaa2_eth_free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, 
	}

}



static void dpaa2_eth_xdp_release_buf(struct dpaa2_eth_priv *priv,

static void dpaa2_eth_recycle_buf(struct dpaa2_eth_priv *priv,

				  struct dpaa2_eth_channel *ch,

				  dma_addr_t addr)

{

	int retries = 0;

	int err;



	ch->xdp.drop_bufs[ch->xdp.drop_cnt++] = addr;

	if (ch->xdp.drop_cnt < DPAA2_ETH_BUFS_PER_CMD)

	ch->recycled_bufs[ch->recycled_bufs_cnt++] = addr;

	if (ch->recycled_bufs_cnt < DPAA2_ETH_BUFS_PER_CMD)

		return;



	while ((err = dpaa2_io_service_release(ch->dpio, priv->bpid,

					       ch->xdp.drop_bufs,

					       ch->xdp.drop_cnt)) == -EBUSY) {

					       ch->recycled_bufs,

					       ch->recycled_bufs_cnt)) == -EBUSY) {

		if (retries++ >= DPAA2_ETH_SWP_BUSY_RETRIES)

			break;

		cpu_relax();

	}



	if (err) {

		dpaa2_eth_free_bufs(priv, ch->xdp.drop_bufs, ch->xdp.drop_cnt);

		ch->buf_count -= ch->xdp.drop_cnt;

		dpaa2_eth_free_bufs(priv, ch->recycled_bufs, ch->recycled_bufs_cnt);

		ch->buf_count -= ch->recycled_bufs_cnt;

	}



	ch->xdp.drop_cnt = 0;

	ch->recycled_bufs_cnt = 0;

}



static int dpaa2_eth_xdp_flush(struct dpaa2_eth_priv *priv,
@@ -300,7 +300,7 @@ static void dpaa2_eth_xdp_tx_flush(struct dpaa2_eth_priv *priv, 
		ch->stats.xdp_tx++;

	}

	for (i = enqueued; i < fq->xdp_tx_fds.num; i++) {

		dpaa2_eth_xdp_release_buf(priv, ch, dpaa2_fd_get_addr(&fds[i]));

		dpaa2_eth_recycle_buf(priv, ch, dpaa2_fd_get_addr(&fds[i]));

		percpu_stats->tx_errors++;

		ch->stats.xdp_tx_err++;

	}
@@ -382,7 +382,7 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv, 
		trace_xdp_exception(priv->net_dev, xdp_prog, xdp_act);

		fallthrough;

	case XDP_DROP:

		dpaa2_eth_xdp_release_buf(priv, ch, addr);

		dpaa2_eth_recycle_buf(priv, ch, addr);

		ch->stats.xdp_drop++;

		break;

	case XDP_REDIRECT:
@@ -403,7 +403,7 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv, 
				free_pages((unsigned long)vaddr, 0);

			} else {

				ch->buf_count++;

				dpaa2_eth_xdp_release_buf(priv, ch, addr);

				dpaa2_eth_recycle_buf(priv, ch, addr);

			}

			ch->stats.xdp_drop++;

		} else {

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h

+4 −2
Original line number Diff line number Diff line
@@ -438,8 +438,6 @@ struct dpaa2_eth_fq { 


struct dpaa2_eth_ch_xdp {

	struct bpf_prog *prog;

	u64 drop_bufs[DPAA2_ETH_BUFS_PER_CMD];

	int drop_cnt;

	unsigned int res;

};
@@ -457,6 +455,10 @@ struct dpaa2_eth_channel { 
	struct dpaa2_eth_ch_xdp xdp;

	struct xdp_rxq_info xdp_rxq;

	struct list_head *rx_list;



	/* Buffers to be recycled back in the buffer pool */

	u64 recycled_bufs[DPAA2_ETH_BUFS_PER_CMD];

	int recycled_bufs_cnt;

};



struct dpaa2_eth_dist_fields {