Commit 3c30819d authored by David S. Miller's avatar David S. Miller
Browse files

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



Daniel Borkmann says:

====================
pull-request: bpf 2019-09-27

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

The main changes are:

1) Fix libbpf's BTF dumper to not skip anonymous enum definitions, from Andrii.

2) Fix BTF verifier issues when handling the BTF of vmlinux, from Alexei.

3) Fix nested calls into bpf_event_output() from TCP sockops BPF
   programs, from Allan.

4) Fix NULL pointer dereference in AF_XDP's xsk map creation when
   allocation fails, from Jonathan.

5) Remove unneeded 64 byte alignment requirement of the AF_XDP UMEM
   headroom, from Bjorn.

6) Remove unused XDP_OPTIONS getsockopt() call which results in an error
   on older kernels, from Toke.

7) Fix a client/server race in tcp_rtt BPF kselftest case, from Stanislav.

8) Fix indentation issue in BTF's btf_enum_check_kflag_member(), from Colin.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5c7ff181 768fb61f

include/uapi/linux/btf.h

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ struct btf_header { 
};



/* Max # of type identifier */

#define BTF_MAX_TYPE	0x0000ffff

#define BTF_MAX_TYPE	0x000fffff

/* Max offset into the string section */

#define BTF_MAX_NAME_OFFSET	0x0000ffff

#define BTF_MAX_NAME_OFFSET	0x00ffffff

/* Max # of struct/union/enum members or func args */

#define BTF_MAX_VLEN	0xffff

kernel/bpf/btf.c

+3 −4
Original line number Diff line number Diff line
@@ -2377,9 +2377,8 @@ static s32 btf_enum_check_meta(struct btf_verifier_env *env, 
		return -EINVAL;

	}



	if (t->size != sizeof(int)) {

		btf_verifier_log_type(env, t, "Expected size:%zu",

				      sizeof(int));

	if (t->size > 8 || !is_power_of_2(t->size)) {

		btf_verifier_log_type(env, t, "Unexpected size");

		return -EINVAL;

	}

kernel/bpf/xskmap.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct xsk_map_node *xsk_map_node_alloc(struct xsk_map *map, 


	node = kzalloc(sizeof(*node), GFP_ATOMIC | __GFP_NOWARN);

	if (!node)

		return NULL;

		return ERR_PTR(-ENOMEM);



	err = xsk_map_inc(map);

	if (err) {

kernel/trace/bpf_trace.c

+21 −5
Original line number Diff line number Diff line
@@ -500,14 +500,17 @@ static const struct bpf_func_proto bpf_perf_event_output_proto = { 
	.arg5_type	= ARG_CONST_SIZE_OR_ZERO,

};



static DEFINE_PER_CPU(struct pt_regs, bpf_pt_regs);

static DEFINE_PER_CPU(struct perf_sample_data, bpf_misc_sd);

static DEFINE_PER_CPU(int, bpf_event_output_nest_level);

struct bpf_nested_pt_regs {

	struct pt_regs regs[3];

};

static DEFINE_PER_CPU(struct bpf_nested_pt_regs, bpf_pt_regs);

static DEFINE_PER_CPU(struct bpf_trace_sample_data, bpf_misc_sds);



u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,

		     void *ctx, u64 ctx_size, bpf_ctx_copy_t ctx_copy)

{

	struct perf_sample_data *sd = this_cpu_ptr(&bpf_misc_sd);

	struct pt_regs *regs = this_cpu_ptr(&bpf_pt_regs);

	int nest_level = this_cpu_inc_return(bpf_event_output_nest_level);

	struct perf_raw_frag frag = {

		.copy		= ctx_copy,

		.size		= ctx_size,
@@ -522,12 +525,25 @@ u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size, 
			.data	= meta,

		},

	};

	struct perf_sample_data *sd;

	struct pt_regs *regs;

	u64 ret;



	if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(bpf_misc_sds.sds))) {

		ret = -EBUSY;

		goto out;

	}

	sd = this_cpu_ptr(&bpf_misc_sds.sds[nest_level - 1]);

	regs = this_cpu_ptr(&bpf_pt_regs.regs[nest_level - 1]);



	perf_fetch_caller_regs(regs);

	perf_sample_data_init(sd, 0, 0);

	sd->raw = &raw;



	return __bpf_perf_event_output(regs, map, flags, sd);

	ret = __bpf_perf_event_output(regs, map, flags, sd);

out:

	this_cpu_dec(bpf_event_output_nest_level);

	return ret;

}



BPF_CALL_0(bpf_get_current_task)

net/xdp/xdp_umem.c

+0 −2
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) 
			return -EINVAL;

	}



	headroom = ALIGN(headroom, 64);



	size_chk = chunk_size - headroom - XDP_PACKET_HEADROOM;

	if (size_chk < 0)

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE