Commit 2aa4a337 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 



Daniel Borkmann says:

====================
pull-request: bpf-next 2018-07-15

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) Various different arm32 JIT improvements in order to optimize code emission
   and make the JIT code itself more robust, from Russell.

2) Support simultaneous driver and offloaded XDP in order to allow for advanced
   use-cases where some work is offloaded to the NIC and some to the host. Also
   add ability for bpftool to load programs and maps beyond just the cgroup case,
   from Jakub.

3) Add BPF JIT support in nfp for multiplication as well as division. For the
   latter in particular, it uses the reciprocal algorithm to emulate it, from Jiong.

4) Add BTF pretty print functionality to bpftool in plain and JSON output
   format, from Okash.

5) Add build and installation to the BPF helper man page into bpftool, from Quentin.

6) Add a TCP BPF callback for listening sockets which is triggered right after
   the socket transitions to TCP_LISTEN state, from Andrey.

7) Add a new cgroup tree command to bpftool which iterates over the whole cgroup
   tree and prints all attached programs, from Roman.

8) Improve xdp_redirect_cpu sample to support parsing of double VLAN tagged
   packets, from Jesper.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5c64e56 13f7432b

arch/arm/net/bpf_jit_32.c

+576 −486

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/net/bpf_jit_32.h

+20 −22
Original line number Diff line number Diff line
@@ -77,11 +77,14 @@ 
#define ARM_INST_EOR_R		0x00200000

#define ARM_INST_EOR_I		0x02200000



#define ARM_INST_LDRB_I		0x05d00000

#define ARM_INST_LDST__U	0x00800000

#define ARM_INST_LDST__IMM12	0x00000fff

#define ARM_INST_LDRB_I		0x05500000

#define ARM_INST_LDRB_R		0x07d00000

#define ARM_INST_LDRH_I		0x01d000b0

#define ARM_INST_LDRD_I		0x014000d0

#define ARM_INST_LDRH_I		0x015000b0

#define ARM_INST_LDRH_R		0x019000b0

#define ARM_INST_LDR_I		0x05900000

#define ARM_INST_LDR_I		0x05100000

#define ARM_INST_LDR_R		0x07900000



#define ARM_INST_LDM		0x08900000
@@ -124,9 +127,10 @@ 
#define ARM_INST_SBC_R		0x00c00000

#define ARM_INST_SBCS_R		0x00d00000



#define ARM_INST_STR_I		0x05800000

#define ARM_INST_STRB_I		0x05c00000

#define ARM_INST_STRH_I		0x01c000b0

#define ARM_INST_STR_I		0x05000000

#define ARM_INST_STRB_I		0x05400000

#define ARM_INST_STRD_I		0x014000f0

#define ARM_INST_STRH_I		0x014000b0



#define ARM_INST_TST_R		0x01100000

#define ARM_INST_TST_I		0x03100000
@@ -183,17 +187,18 @@ 
#define ARM_EOR_R(rd, rn, rm)	_AL3_R(ARM_INST_EOR, rd, rn, rm)

#define ARM_EOR_I(rd, rn, imm)	_AL3_I(ARM_INST_EOR, rd, rn, imm)



#define ARM_LDR_I(rt, rn, off)	(ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \

				 | ((off) & 0xfff))

#define ARM_LDR_R(rt, rn, rm)	(ARM_INST_LDR_R | (rt) << 12 | (rn) << 16 \

#define ARM_LDR_R(rt, rn, rm)	(ARM_INST_LDR_R | ARM_INST_LDST__U \

				 | (rt) << 12 | (rn) << 16 \

				 | (rm))

#define ARM_LDRB_I(rt, rn, off)	(ARM_INST_LDRB_I | (rt) << 12 | (rn) << 16 \

				 | (off))

#define ARM_LDRB_R(rt, rn, rm)	(ARM_INST_LDRB_R | (rt) << 12 | (rn) << 16 \

#define ARM_LDR_R_SI(rt, rn, rm, type, imm) \

				(ARM_INST_LDR_R | ARM_INST_LDST__U \

				 | (rt) << 12 | (rn) << 16 \

				 | (imm) << 7 | (type) << 5 | (rm))

#define ARM_LDRB_R(rt, rn, rm)	(ARM_INST_LDRB_R | ARM_INST_LDST__U \

				 | (rt) << 12 | (rn) << 16 \

				 | (rm))

#define ARM_LDRH_I(rt, rn, off)	(ARM_INST_LDRH_I | (rt) << 12 | (rn) << 16 \

				 | (((off) & 0xf0) << 4) | ((off) & 0xf))

#define ARM_LDRH_R(rt, rn, rm)	(ARM_INST_LDRH_R | (rt) << 12 | (rn) << 16 \

#define ARM_LDRH_R(rt, rn, rm)	(ARM_INST_LDRH_R | ARM_INST_LDST__U \

				 | (rt) << 12 | (rn) << 16 \

				 | (rm))



#define ARM_LDM(rn, regs)	(ARM_INST_LDM | (rn) << 16 | (regs))
@@ -254,13 +259,6 @@ 
#define ARM_SUBS_I(rd, rn, imm)	_AL3_I(ARM_INST_SUBS, rd, rn, imm)

#define ARM_SBC_I(rd, rn, imm)	_AL3_I(ARM_INST_SBC, rd, rn, imm)



#define ARM_STR_I(rt, rn, off)	(ARM_INST_STR_I | (rt) << 12 | (rn) << 16 \

				 | ((off) & 0xfff))

#define ARM_STRH_I(rt, rn, off)	(ARM_INST_STRH_I | (rt) << 12 | (rn) << 16 \

				 | (((off) & 0xf0) << 4) | ((off) & 0xf))

#define ARM_STRB_I(rt, rn, off)	(ARM_INST_STRB_I | (rt) << 12 | (rn) << 16 \

				 | (((off) & 0xf0) << 4) | ((off) & 0xf))



#define ARM_TST_R(rn, rm)	_AL3_R(ARM_INST_TST, 0, rn, rm)

#define ARM_TST_I(rn, imm)	_AL3_I(ARM_INST_TST, 0, rn, imm)

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

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
		rc = bnxt_xdp_set(bp, xdp->prog);

		break;

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!bp->xdp_prog;

		xdp->prog_id = bp->xdp_prog ? bp->xdp_prog->aux->id : 0;

		rc = 0;

		break;

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

+0 −1
Original line number Diff line number Diff line
@@ -1848,7 +1848,6 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_bpf *xdp) 
	case XDP_SETUP_PROG:

		return nicvf_xdp_setup(nic, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!nic->xdp_prog;

		xdp->prog_id = nic->xdp_prog ? nic->xdp_prog->aux->id : 0;

		return 0;

	default:

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

+0 −1
Original line number Diff line number Diff line
@@ -11841,7 +11841,6 @@ static int i40e_xdp(struct net_device *dev, 
	case XDP_SETUP_PROG:

		return i40e_xdp_setup(vsi, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = i40e_enabled_xdp_vsi(vsi);

		xdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0;

		return 0;

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE