Commit 7f3249fb authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-xdp-adjust-tail' 



Nikita V. Shirokov says:

====================
In this patch series i'm add new bpf helper which allow to manupulate
xdp's data_end pointer. right now only "shrinking" (reduce packet's size
by moving pointer) is supported (and i see no use case for "growing").
Main use case for such helper is to be able to generate controll (ICMP)
messages from XDP context. such messages usually contains first N bytes
from original packets as a payload, and this is exactly what this helper
would allow us to do (see patch 3 for sample program, where we generate
ICMP "packet too big" message). This helper could be usefull for load
balancing applications where after additional encapsulation, resulting
packet could be bigger then interface MTU.
Aside from new helper this patch series contains minor changes in device
drivers (for ones which requires), so they would recal packet's length
not only when head pointer was adjusted, but if tail's one as well.

v2->v3:
 * adding missed "signed off by" in v2

v1->v2:
 * fixed kbuild warning
 * made offset eq 0 invalid for xdp_bpf_adjust_tail
 * splitted bpf_prog_test_run fix and selftests in sep commits
 * added SPDX licence where applicable
 * some reshuffling in patches order (tests now in the end)
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 0c90f224 c6ffd1ff

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

+1 −1
Original line number Diff line number Diff line
@@ -113,10 +113,10 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 
	if (tx_avail != bp->tx_ring_size)

		*event &= ~BNXT_RX_EVENT;



	*len = xdp.data_end - xdp.data;

	if (orig_data != xdp.data) {

		offset = xdp.data - xdp.data_hard_start;

		*data_ptr = xdp.data_hard_start + offset;

		*len = xdp.data_end - xdp.data;

	}

	switch (act) {

	case XDP_PASS:

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

+1 −1
Original line number Diff line number Diff line
@@ -538,9 +538,9 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
	action = bpf_prog_run_xdp(prog, &xdp);

	rcu_read_unlock();



	len = xdp.data_end - xdp.data;

	/* Check if XDP program has changed headers */

	if (orig_data != xdp.data) {

		len = xdp.data_end - xdp.data;

		offset = orig_data - xdp.data;

		dma_addr -= offset;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -775,8 +775,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 


			act = bpf_prog_run_xdp(xdp_prog, &xdp);



			if (xdp.data != orig_data) {

			length = xdp.data_end - xdp.data;

			if (xdp.data != orig_data) {

				frags[0].page_offset = xdp.data -

					xdp.data_hard_start;

				va = xdp.data;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget) 


			act = bpf_prog_run_xdp(xdp_prog, &xdp);



			pkt_len -= xdp.data - orig_data;

			pkt_len = xdp.data_end - xdp.data;

			pkt_off += xdp.data - orig_data;



			switch (act) {

drivers/net/tun.c

+2 −1
Original line number Diff line number Diff line
@@ -1696,6 +1696,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, 
			return NULL;

		case XDP_PASS:

			delta = orig_data - xdp.data;

			len = xdp.data_end - xdp.data;

			break;

		default:

			bpf_warn_invalid_xdp_action(act);
@@ -1716,7 +1717,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, 
	}



	skb_reserve(skb, pad - delta);

	skb_put(skb, len + delta);

	skb_put(skb, len);

	get_page(alloc_frag->page);

	alloc_frag->offset += buflen;

CRA Git | Maintained and supported by SUSTech CRA and CCSE