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

net, xdp: Introduce xdp_prepare_buff utility routine 



Introduce xdp_prepare_buff utility routine to initialize per-descriptor
xdp_buff fields (e.g. xdp_buff pointers). Rely on xdp_prepare_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/45f46f12295972a97da8ca01990b3e71501e9d89.1608670965.git.lorenzo@kernel.org


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

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

+3 −4
Original line number Diff line number Diff line
@@ -1585,10 +1585,9 @@ static int ena_xdp_handle_buff(struct ena_ring *rx_ring, struct xdp_buff *xdp) 
	int ret;



	rx_info = &rx_ring->rx_buffer_info[rx_ring->ena_bufs[0].req_id];

	xdp->data = page_address(rx_info->page) + rx_info->page_offset;

	xdp_set_data_meta_invalid(xdp);

	xdp->data_hard_start = page_address(rx_info->page);

	xdp->data_end = xdp->data + rx_ring->ena_bufs[0].len;

	xdp_prepare_buff(xdp, page_address(rx_info->page),

			 rx_info->page_offset,

			 rx_ring->ena_bufs[0].len, false);

	/* If for some reason we received a bigger packet than

	 * we expect, then we simply drop it

	 */

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

+1 −4
Original line number Diff line number Diff line
@@ -135,10 +135,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 
	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_prepare_buff(&xdp, *data_ptr - offset, offset, *len, false);

	orig_data = xdp.data;



	rcu_read_lock();

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

+4 −4
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
				struct cqe_rx_t *cqe_rx, struct snd_queue *sq,

				struct rcv_queue *rq, struct sk_buff **skb)

{

	unsigned char *hard_start, *data;

	struct xdp_buff xdp;

	struct page *page;

	u32 action;
@@ -549,10 +550,9 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 


	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;

	hard_start = page_address(page);

	data = (unsigned char *)cpu_addr;

	xdp_prepare_buff(&xdp, hard_start, data - hard_start, len, false);

	orig_data = xdp.data;



	rcu_read_lock();

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

+2 −4
Original line number Diff line number Diff line
@@ -2534,10 +2534,8 @@ static u32 dpaa_run_xdp(struct dpaa_priv *priv, struct qm_fd *fd, void *vaddr, 


	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_prepare_buff(&xdp, vaddr + fd_off - XDP_PACKET_HEADROOM,

			 XDP_PACKET_HEADROOM, qm_fd_get_length(fd), true);



	/* 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

+5 −9
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv, 
	struct bpf_prog *xdp_prog;

	struct xdp_buff xdp;

	u32 xdp_act = XDP_PASS;

	int err;

	int err, offset;



	rcu_read_lock();
@@ -358,14 +358,10 @@ 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);

	offset = dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM;

	xdp_init_buff(&xdp, DPAA2_ETH_RX_BUF_RAW_SIZE - offset, &ch->xdp_rxq);

	xdp_prepare_buff(&xdp, vaddr + offset, XDP_PACKET_HEADROOM,

			 dpaa2_fd_get_len(fd), false);



	xdp_act = bpf_prog_run_xdp(xdp_prog, &xdp);