Commit 17ccf9e3 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 2019-07-09

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

The main changes are:

1) Lots of libbpf improvements: i) addition of new APIs to attach BPF
   programs to tracing entities such as {k,u}probes or tracepoints,
   ii) improve specification of BTF-defined maps by eliminating the
   need for data initialization for some of the members, iii) addition
   of a high-level API for setting up and polling perf buffers for
   BPF event output helpers, all from Andrii.

2) Add "prog run" subcommand to bpftool in order to test-run programs
   through the kernel testing infrastructure of BPF, from Quentin.

3) Improve verifier for BPF sockaddr programs to support 8-byte stores
   for user_ip6 and msg_src_ip6 members given clang tends to generate
   such stores, from Stanislav.

4) Enable the new BPF JIT zero-extension optimization for further
   riscv64 ALU ops, from Luke.

5) Fix a bpftool json JIT dump crash on powerpc, from Jiri.

6) Fix an AF_XDP race in generic XDP's receive path, from Ilya.

7) Various smaller fixes from Ilya, Yue and Arnd.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7650b1a9 bf0bdd13

arch/riscv/net/bpf_jit_comp.c

+8 −8
Original line number Diff line number Diff line
@@ -757,31 +757,31 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, 
	case BPF_ALU | BPF_ADD | BPF_X:

	case BPF_ALU64 | BPF_ADD | BPF_X:

		emit(is64 ? rv_add(rd, rd, rs) : rv_addw(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_SUB | BPF_X:

	case BPF_ALU64 | BPF_SUB | BPF_X:

		emit(is64 ? rv_sub(rd, rd, rs) : rv_subw(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_AND | BPF_X:

	case BPF_ALU64 | BPF_AND | BPF_X:

		emit(rv_and(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_OR | BPF_X:

	case BPF_ALU64 | BPF_OR | BPF_X:

		emit(rv_or(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_XOR | BPF_X:

	case BPF_ALU64 | BPF_XOR | BPF_X:

		emit(rv_xor(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_MUL | BPF_X:
@@ -811,13 +811,13 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, 
	case BPF_ALU | BPF_RSH | BPF_X:

	case BPF_ALU64 | BPF_RSH | BPF_X:

		emit(is64 ? rv_srl(rd, rd, rs) : rv_srlw(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

	case BPF_ALU | BPF_ARSH | BPF_X:

	case BPF_ALU64 | BPF_ARSH | BPF_X:

		emit(is64 ? rv_sra(rd, rd, rs) : rv_sraw(rd, rd, rs), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;
@@ -826,7 +826,7 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, 
	case BPF_ALU64 | BPF_NEG:

		emit(is64 ? rv_sub(rd, RV_REG_ZERO, rd) :

		     rv_subw(rd, RV_REG_ZERO, rd), ctx);

		if (!is64)

		if (!is64 && !aux->verifier_zext)

			emit_zext_32(rd, ctx);

		break;

include/linux/filter.h

+6 −0
Original line number Diff line number Diff line
@@ -747,6 +747,12 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) 
	return size <= size_default && (size & (size - 1)) == 0;

}



#define bpf_ctx_wide_store_ok(off, size, type, field)			\

	(size == sizeof(__u64) &&					\

	off >= offsetof(type, field) &&					\

	off + sizeof(__u64) <= offsetofend(type, field) &&		\

	off % sizeof(__u64) == 0)



#define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))



static inline void bpf_prog_lock_ro(struct bpf_prog *fp)

include/net/tcp.h

+1 −3
Original line number Diff line number Diff line
@@ -2223,9 +2223,7 @@ static inline bool tcp_bpf_ca_needs_ecn(struct sock *sk) 


static inline void tcp_bpf_rtt(struct sock *sk)

{

	struct tcp_sock *tp = tcp_sk(sk);



	if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RTT_CB_FLAG))

	if (BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk), BPF_SOCK_OPS_RTT_CB_FLAG))

		tcp_call_bpf(sk, BPF_SOCK_OPS_RTT_CB, 0, NULL);

}

include/net/xdp_sock.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ struct xdp_sock { 
	 * in the SKB destructor callback.

	 */

	spinlock_t tx_completion_lock;

	/* Protects generic receive. */

	spinlock_t rx_lock;

	u64 rx_dropped;

};

include/uapi/linux/bpf.h

+3 −3
Original line number Diff line number Diff line
@@ -3247,7 +3247,7 @@ struct bpf_sock_addr { 
	__u32 user_ip4;		/* Allows 1,2,4-byte read and 4-byte write.

				 * Stored in network byte order.

				 */

	__u32 user_ip6[4];	/* Allows 1,2,4-byte read an 4-byte write.

	__u32 user_ip6[4];	/* Allows 1,2,4-byte read and 4,8-byte write.

				 * Stored in network byte order.

				 */

	__u32 user_port;	/* Allows 4-byte read and write.
@@ -3256,10 +3256,10 @@ struct bpf_sock_addr { 
	__u32 family;		/* Allows 4-byte read, but no write */

	__u32 type;		/* Allows 4-byte read, but no write */

	__u32 protocol;		/* Allows 4-byte read, but no write */

	__u32 msg_src_ip4;	/* Allows 1,2,4-byte read an 4-byte write.

	__u32 msg_src_ip4;	/* Allows 1,2,4-byte read and 4-byte write.

				 * Stored in network byte order.

				 */

	__u32 msg_src_ip6[4];	/* Allows 1,2,4-byte read an 4-byte write.

	__u32 msg_src_ip6[4];	/* Allows 1,2,4-byte read and 4,8-byte write.

				 * Stored in network byte order.

				 */

	__bpf_md_ptr(struct bpf_sock *, sk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE