Commit beb73559 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 



Alexei Starovoitov says:

====================
pull-request: bpf-next 2019-02-01

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

The main changes are:

1) introduce bpf_spin_lock, from Alexei.

2) convert xdp samples to libbpf, from Maciej.

3) skip verifier tests for unsupported program/map types, from Stanislav.

4) powerpc64 JIT support for BTF line info, from Sandipan.

5) assorted fixed, from Valdis, Jesper, Jiong.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6b0a01f 5974b7c1

arch/powerpc/net/bpf_jit_comp64.c

+1 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ skip_codegen_passes: 


	bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + (bpf_hdr->pages * PAGE_SIZE));

	if (!fp->is_func || extra_pass) {

		bpf_prog_fill_jited_linfo(fp, addrs);

out_addrs:

		kfree(addrs);

		kfree(jit_data);

drivers/net/ethernet/netronome/nfp/bpf/jit.c

+82 −10
Original line number Diff line number Diff line
@@ -1967,6 +1967,9 @@ static int neg_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
 */

static int __shl_imm64(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (!shift_amt)

		return 0;



	if (shift_amt < 32) {

		emit_shf(nfp_prog, reg_both(dst + 1), reg_a(dst + 1),

			 SHF_OP_NONE, reg_b(dst), SHF_SC_R_DSHF,
@@ -2079,6 +2082,9 @@ static int shl_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
 */

static int __shr_imm64(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (!shift_amt)

		return 0;



	if (shift_amt < 32) {

		emit_shf(nfp_prog, reg_both(dst), reg_a(dst + 1), SHF_OP_NONE,

			 reg_b(dst), SHF_SC_R_DSHF, shift_amt);
@@ -2180,6 +2186,9 @@ static int shr_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
 */

static int __ashr_imm64(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (!shift_amt)

		return 0;



	if (shift_amt < 32) {

		emit_shf(nfp_prog, reg_both(dst), reg_a(dst + 1), SHF_OP_NONE,

			 reg_b(dst), SHF_SC_R_DSHF, shift_amt);
@@ -2388,10 +2397,13 @@ static int neg_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 


static int __ashr_imm(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (shift_amt) {

		/* Set signedness bit (MSB of result). */

	emit_alu(nfp_prog, reg_none(), reg_a(dst), ALU_OP_OR, reg_imm(0));

	emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_ASHR, reg_b(dst),

		 SHF_SC_R_SHF, shift_amt);

		emit_alu(nfp_prog, reg_none(), reg_a(dst), ALU_OP_OR,

			 reg_imm(0));

		emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_ASHR,

			 reg_b(dst), SHF_SC_R_SHF, shift_amt);

	}

	wrp_immed(nfp_prog, reg_both(dst + 1), 0);



	return 0;
@@ -2429,18 +2441,75 @@ static int ashr_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	return __ashr_imm(nfp_prog, dst, insn->imm);

}



static int __shr_imm(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (shift_amt)

		emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE,

			 reg_b(dst), SHF_SC_R_SHF, shift_amt);

	wrp_immed(nfp_prog, reg_both(dst + 1), 0);

	return 0;

}



static int shr_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;

	u8 dst = insn->dst_reg * 2;



	return __shr_imm(nfp_prog, dst, insn->imm);

}



static int shr_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;

	u64 umin, umax;

	u8 dst, src;



	dst = insn->dst_reg * 2;

	umin = meta->umin_src;

	umax = meta->umax_src;

	if (umin == umax)

		return __shr_imm(nfp_prog, dst, umin);



	src = insn->src_reg * 2;

	emit_alu(nfp_prog, reg_none(), reg_a(src), ALU_OP_OR, reg_imm(0));

	emit_shf_indir(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE,

		       reg_b(dst), SHF_SC_R_SHF);

	wrp_immed(nfp_prog, reg_both(dst + 1), 0);

	return 0;

}



static int __shl_imm(struct nfp_prog *nfp_prog, u8 dst, u8 shift_amt)

{

	if (shift_amt)

		emit_shf(nfp_prog, reg_both(dst), reg_none(), SHF_OP_NONE,

			 reg_b(dst), SHF_SC_L_SHF, shift_amt);

	wrp_immed(nfp_prog, reg_both(dst + 1), 0);

	return 0;

}



static int shl_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;

	u8 dst = insn->dst_reg * 2;



	if (!insn->imm)

		return 1; /* TODO: zero shift means indirect */

	return __shl_imm(nfp_prog, dst, insn->imm);

}



	emit_shf(nfp_prog, reg_both(insn->dst_reg * 2),

		 reg_none(), SHF_OP_NONE, reg_b(insn->dst_reg * 2),

		 SHF_SC_L_SHF, insn->imm);

	wrp_immed(nfp_prog, reg_both(insn->dst_reg * 2 + 1), 0);

static int shl_reg(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)

{

	const struct bpf_insn *insn = &meta->insn;

	u64 umin, umax;

	u8 dst, src;



	dst = insn->dst_reg * 2;

	umin = meta->umin_src;

	umax = meta->umax_src;

	if (umin == umax)

		return __shl_imm(nfp_prog, dst, umin);



	src = insn->src_reg * 2;

	shl_reg64_lt32_low(nfp_prog, dst, src);

	wrp_immed(nfp_prog, reg_both(dst + 1), 0);

	return 0;

}
@@ -3350,7 +3419,10 @@ static const instr_cb_t instr_cb[256] = { 
	[BPF_ALU | BPF_DIV | BPF_X] =	div_reg,

	[BPF_ALU | BPF_DIV | BPF_K] =	div_imm,

	[BPF_ALU | BPF_NEG] =		neg_reg,

	[BPF_ALU | BPF_LSH | BPF_X] =	shl_reg,

	[BPF_ALU | BPF_LSH | BPF_K] =	shl_imm,

	[BPF_ALU | BPF_RSH | BPF_X] =	shr_reg,

	[BPF_ALU | BPF_RSH | BPF_K] =	shr_imm,

	[BPF_ALU | BPF_ARSH | BPF_X] =	ashr_reg,

	[BPF_ALU | BPF_ARSH | BPF_K] =	ashr_imm,

	[BPF_ALU | BPF_END | BPF_X] =	end_reg32,

include/linux/bpf-cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int cgroup_bpf_inherit(struct cgroup *cgrp); 
int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog,

			enum bpf_attach_type type, u32 flags);

int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog,

			enum bpf_attach_type type, u32 flags);

			enum bpf_attach_type type);

int __cgroup_bpf_query(struct cgroup *cgrp, const union bpf_attr *attr,

		       union bpf_attr __user *uattr);

include/linux/bpf.h

+36 −3
Original line number Diff line number Diff line
@@ -72,14 +72,15 @@ struct bpf_map { 
	u32 value_size;

	u32 max_entries;

	u32 map_flags;

	u32 pages;

	int spin_lock_off; /* >=0 valid offset, <0 error */

	u32 id;

	int numa_node;

	u32 btf_key_type_id;

	u32 btf_value_type_id;

	struct btf *btf;

	u32 pages;

	bool unpriv_array;

	/* 55 bytes hole */

	/* 51 bytes hole */



	/* The 3rd and 4th cacheline with misc members to avoid false sharing

	 * particularly with refcounting.
@@ -91,6 +92,36 @@ struct bpf_map { 
	char name[BPF_OBJ_NAME_LEN];

};



static inline bool map_value_has_spin_lock(const struct bpf_map *map)

{

	return map->spin_lock_off >= 0;

}



static inline void check_and_init_map_lock(struct bpf_map *map, void *dst)

{

	if (likely(!map_value_has_spin_lock(map)))

		return;

	*(struct bpf_spin_lock *)(dst + map->spin_lock_off) =

		(struct bpf_spin_lock){};

}



/* copy everything but bpf_spin_lock */

static inline void copy_map_value(struct bpf_map *map, void *dst, void *src)

{

	if (unlikely(map_value_has_spin_lock(map))) {

		u32 off = map->spin_lock_off;



		memcpy(dst, src, off);

		memcpy(dst + off + sizeof(struct bpf_spin_lock),

		       src + off + sizeof(struct bpf_spin_lock),

		       map->value_size - off - sizeof(struct bpf_spin_lock));

	} else {

		memcpy(dst, src, map->value_size);

	}

}

void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,

			   bool lock_src);



struct bpf_offload_dev;

struct bpf_offloaded_map;
@@ -162,6 +193,7 @@ enum bpf_arg_type { 
	ARG_PTR_TO_CTX,		/* pointer to context */

	ARG_ANYTHING,		/* any (initialized) argument is ok */

	ARG_PTR_TO_SOCKET,	/* pointer to bpf_sock */

	ARG_PTR_TO_SPIN_LOCK,	/* pointer to bpf_spin_lock */

};



/* type of values returned from helper functions */
@@ -879,7 +911,8 @@ extern const struct bpf_func_proto bpf_msg_redirect_hash_proto; 
extern const struct bpf_func_proto bpf_msg_redirect_map_proto;

extern const struct bpf_func_proto bpf_sk_redirect_hash_proto;

extern const struct bpf_func_proto bpf_sk_redirect_map_proto;



extern const struct bpf_func_proto bpf_spin_lock_proto;

extern const struct bpf_func_proto bpf_spin_unlock_proto;

extern const struct bpf_func_proto bpf_get_local_storage_proto;



/* Shared helpers among cBPF and eBPF. */

include/linux/bpf_types.h

+2 −0
Original line number Diff line number Diff line
@@ -6,9 +6,11 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_SOCKET_FILTER, sk_filter) 
BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_CLS, tc_cls_act)

BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_ACT, tc_cls_act)

BPF_PROG_TYPE(BPF_PROG_TYPE_XDP, xdp)

#ifdef CONFIG_CGROUP_BPF

BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SKB, cg_skb)

BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK, cg_sock)

BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, cg_sock_addr)

#endif

BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_IN, lwt_in)

BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_OUT, lwt_out)

BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_XMIT, lwt_xmit)

CRA Git | Maintained and supported by SUSTech CRA and CCSE