Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 390e96ec authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-metadata-direct-access' 



Daniel Borkmann says:

====================
BPF metadata for direct access

This work enables generic transfer of metadata from XDP into skb,
meaning the packet has a flexible and programmable room for meta
data, which can later be used by BPF to set various skb members
when passing up the stack. For details, please see second patch.
Support has been implemented and tested with two drivers, and
should be straight forward to add to other drivers as well which
properly support head adjustment already.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3bd3b9ed 366a88fe

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 


	xdp.data_hard_start = *data_ptr - offset;

	xdp.data = *data_ptr;

	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = *data_ptr + *len;

	orig_data = xdp.data;

	mapping = rx_buf->mapping - bp->rx_dma_offset;

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

+1 −0
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 


	xdp.data_hard_start = page_address(page);

	xdp.data = (void *)cpu_addr;

	xdp_set_data_meta_invalid(&xdp);

	xdp.data_end = xdp.data + len;

	orig_data = xdp.data;

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −0
Original line number Diff line number Diff line
@@ -2107,6 +2107,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
		if (!skb) {

			xdp.data = page_address(rx_buffer->page) +

				   rx_buffer->page_offset;

			xdp_set_data_meta_invalid(&xdp);

			xdp.data_hard_start = xdp.data -

					      i40e_rx_offset(rx_ring);

			xdp.data_end = xdp.data + size;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+26 −3
Original line number Diff line number Diff line
@@ -2133,6 +2133,21 @@ static struct sk_buff *ixgbe_construct_skb(struct ixgbe_ring *rx_ring, 
#if L1_CACHE_BYTES < 128

	prefetch(xdp->data + L1_CACHE_BYTES);

#endif

	/* Note, we get here by enabling legacy-rx via:

	 *

	 *    ethtool --set-priv-flags <dev> legacy-rx on

	 *

	 * In this mode, we currently get 0 extra XDP headroom as

	 * opposed to having legacy-rx off, where we process XDP

	 * packets going to stack via ixgbe_build_skb(). The latter

	 * provides us currently with 192 bytes of headroom.

	 *

	 * For ixgbe_construct_skb() mode it means that the

	 * xdp->data_meta will always point to xdp->data, since

	 * the helper cannot expand the head. Should this ever

	 * change in future for legacy-rx mode on, then lets also

	 * add xdp->data_meta handling here.

	 */



	/* allocate a skb to store the frags */

	skb = napi_alloc_skb(&rx_ring->q_vector->napi, IXGBE_RX_HDR_SIZE);
@@ -2165,6 +2180,7 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
				       struct xdp_buff *xdp,

				       union ixgbe_adv_rx_desc *rx_desc)

{

	unsigned int metasize = xdp->data - xdp->data_meta;

#if (PAGE_SIZE < 8192)

	unsigned int truesize = ixgbe_rx_pg_size(rx_ring) / 2;

#else
@@ -2174,10 +2190,14 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
#endif

	struct sk_buff *skb;



	/* prefetch first cache line of first page */

	prefetch(xdp->data);

	/* Prefetch first cache line of first page. If xdp->data_meta

	 * is unused, this points extactly as xdp->data, otherwise we

	 * likely have a consumer accessing first few bytes of meta

	 * data, and then actual data.

	 */

	prefetch(xdp->data_meta);

#if L1_CACHE_BYTES < 128

	prefetch(xdp->data + L1_CACHE_BYTES);

	prefetch(xdp->data_meta + L1_CACHE_BYTES);

#endif



	/* build an skb to around the page buffer */
@@ -2188,6 +2208,8 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
	/* update pointers within the skb to store the data */

	skb_reserve(skb, xdp->data - xdp->data_hard_start);

	__skb_put(skb, xdp->data_end - xdp->data);

	if (metasize)

		skb_metadata_set(skb, metasize);



	/* record DMA address if this is the start of a chain of buffers */

	if (!ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_EOP))
@@ -2326,6 +2348,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
		if (!skb) {

			xdp.data = page_address(rx_buffer->page) +

				   rx_buffer->page_offset;

			xdp.data_meta = xdp.data;

			xdp.data_hard_start = xdp.data -

					      ixgbe_rx_offset(rx_ring);

			xdp.data_end = xdp.data + size;

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 


			xdp.data_hard_start = va - frags[0].page_offset;

			xdp.data = va;

			xdp_set_data_meta_invalid(&xdp);

			xdp.data_end = xdp.data + length;

			orig_data = xdp.data;