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

net, xdp: Introduce xdp_init_buff utility routine 



Introduce xdp_init_buff utility routine to initialize xdp_buff fields
const over NAPI iterations (e.g. frame_sz or rxq pointer). Rely on
xdp_init_buff in all XDP capable drivers.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarShay Agroskin <shayagr@amazon.com>
Acked-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Acked-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Acked-by: default avatarMarcin Wojtas <mw@semihalf.com>
Link: https://lore.kernel.org/bpf/7f8329b6da1434dc2b05a77f2e800b29628a8913.1608670965.git.lorenzo@kernel.org


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

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −2
Original line number Diff line number Diff line
@@ -1634,8 +1634,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, 
	netif_dbg(rx_ring->adapter, rx_status, rx_ring->netdev,

		  "%s qid %d\n", __func__, rx_ring->qid);

	res_budget = budget;

	xdp.rxq = &rx_ring->xdp_rxq;

	xdp.frame_sz = ENA_PAGE_SIZE;

	xdp_init_buff(&xdp, ENA_PAGE_SIZE, &rx_ring->xdp_rxq);



	do {

		xdp_verdict = XDP_PASS;

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+2 −2
Original line number Diff line number Diff line
@@ -133,12 +133,12 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 
	dma_sync_single_for_cpu(&pdev->dev, mapping + offset, *len, bp->rx_dir);



	txr = rxr->bnapi->tx_ring;

	/* BNXT_RX_PAGE_MODE(bp) when XDP enabled */

	xdp_init_buff(&xdp, PAGE_SIZE, &rxr->xdp_rxq);

	xdp.data_hard_start = *data_ptr - offset;

	xdp.data = *data_ptr;

	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = *data_ptr + *len;

	xdp.rxq = &rxr->xdp_rxq;

	xdp.frame_sz = PAGE_SIZE; /* BNXT_RX_PAGE_MODE(bp) when XDP enabled */

	orig_data = xdp.data;



	rcu_read_lock();

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+2 −2
Original line number Diff line number Diff line
@@ -547,12 +547,12 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
	cpu_addr = (u64)phys_to_virt(cpu_addr);

	page = virt_to_page((void *)cpu_addr);



	xdp_init_buff(&xdp, RCV_FRAG_LEN + XDP_PACKET_HEADROOM,

		      &rq->xdp_rxq);

	xdp.data_hard_start = page_address(page);

	xdp.data = (void *)cpu_addr;

	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = xdp.data + len;

	xdp.rxq = &rq->xdp_rxq;

	xdp.frame_sz = RCV_FRAG_LEN + XDP_PACKET_HEADROOM;

	orig_data = xdp.data;



	rcu_read_lock();

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -2532,12 +2532,12 @@ static u32 dpaa_run_xdp(struct dpaa_priv *priv, struct qm_fd *fd, void *vaddr, 
		return XDP_PASS;

	}



	xdp_init_buff(&xdp, DPAA_BP_RAW_SIZE - DPAA_TX_PRIV_DATA_SIZE,

		      &dpaa_fq->xdp_rxq);

	xdp.data = vaddr + fd_off;

	xdp.data_meta = xdp.data;

	xdp.data_hard_start = xdp.data - XDP_PACKET_HEADROOM;

	xdp.data_end = xdp.data + qm_fd_get_length(fd);

	xdp.frame_sz = DPAA_BP_RAW_SIZE - DPAA_TX_PRIV_DATA_SIZE;

	xdp.rxq = &dpaa_fq->xdp_rxq;



	/* We reserve a fixed headroom of 256 bytes under the erratum and we

	 * offer it all to XDP programs to use. If no room is left for the

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

+4 −4
Original line number Diff line number Diff line
@@ -358,14 +358,14 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv, 
	if (!xdp_prog)

		goto out;



	xdp_init_buff(&xdp,

		      DPAA2_ETH_RX_BUF_RAW_SIZE -

		      (dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM),

		      &ch->xdp_rxq);

	xdp.data = vaddr + dpaa2_fd_get_offset(fd);

	xdp.data_end = xdp.data + dpaa2_fd_get_len(fd);

	xdp.data_hard_start = xdp.data - XDP_PACKET_HEADROOM;

	xdp_set_data_meta_invalid(&xdp);

	xdp.rxq = &ch->xdp_rxq;



	xdp.frame_sz = DPAA2_ETH_RX_BUF_RAW_SIZE -

		(dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM);



	xdp_act = bpf_prog_run_xdp(xdp_prog, &xdp);