Commit c2eb6d07 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 2017-12-02

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

The main changes are:

1) Fix a compilation warning in xdp redirect tracepoint due to
   missing bpf.h include that pulls in struct bpf_map, from Xie.

2) Limit the maximum number of attachable BPF progs for a given
   perf event as long as uabi is not frozen yet. The hard upper
   limit is now 64 and therefore the same as with BPF multi-prog
   for cgroups. Also add related error checking for the sample
   BPF loader when enabling and attaching to the perf event, from
   Yonghong.

3) Specifically set the RLIMIT_MEMLOCK for the test_verifier_log
   case, so that the test case can always pass and not fail in
   some environments due to too low default limit, also from
   Yonghong.

4) Fix up a missing license header comment for kernel/bpf/offload.c,
   from Jakub.

5) Several fixes for bpftool, among others a crash on incorrect
   arguments when json output is used, error message handling
   fixes on unknown options and proper destruction of json writer
   for some exit cases, all from Quentin.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e4485c74 0ec9552b

include/trace/events/xdp.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/netdevice.h>

#include <linux/filter.h>

#include <linux/tracepoint.h>

#include <linux/bpf.h>



#define __XDP_ACT_MAP(FN)	\

	FN(ABORTED)		\

kernel/bpf/core.c

+2 −1
Original line number Diff line number Diff line
@@ -1447,6 +1447,7 @@ int bpf_prog_array_length(struct bpf_prog_array __rcu *progs) 
	rcu_read_lock();

	prog = rcu_dereference(progs)->progs;

	for (; *prog; prog++)

		if (*prog != &dummy_bpf_prog.prog)

			cnt++;

	rcu_read_unlock();

	return cnt;

kernel/bpf/offload.c

+15 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Netronome Systems, Inc.

 *

 * This software is licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree.

 *

 * THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"

 * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,

 * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

 * FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE

 * OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME

 * THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

 */



#include <linux/bpf.h>

#include <linux/bpf_verifier.h>

#include <linux/bug.h>

kernel/trace/bpf_trace.c

+8 −0
Original line number Diff line number Diff line
@@ -759,6 +759,8 @@ const struct bpf_prog_ops perf_event_prog_ops = { 


static DEFINE_MUTEX(bpf_event_mutex);



#define BPF_TRACE_MAX_PROGS 64



int perf_event_attach_bpf_prog(struct perf_event *event,

			       struct bpf_prog *prog)

{
@@ -772,6 +774,12 @@ int perf_event_attach_bpf_prog(struct perf_event *event, 
		goto unlock;



	old_array = event->tp_event->prog_array;

	if (old_array &&

	    bpf_prog_array_length(old_array) >= BPF_TRACE_MAX_PROGS) {

		ret = -E2BIG;

		goto unlock;

	}



	ret = bpf_prog_array_copy(old_array, NULL, prog, &new_array);

	if (ret < 0)

		goto unlock;

samples/bpf/bpf_load.c

+12 −2
Original line number Diff line number Diff line
@@ -193,8 +193,18 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) 
		return -1;

	}

	event_fd[prog_cnt - 1] = efd;

	ioctl(efd, PERF_EVENT_IOC_ENABLE, 0);

	ioctl(efd, PERF_EVENT_IOC_SET_BPF, fd);

	err = ioctl(efd, PERF_EVENT_IOC_ENABLE, 0);

	if (err < 0) {

		printf("ioctl PERF_EVENT_IOC_ENABLE failed err %s\n",

		       strerror(errno));

		return -1;

	}

	err = ioctl(efd, PERF_EVENT_IOC_SET_BPF, fd);

	if (err < 0) {

		printf("ioctl PERF_EVENT_IOC_SET_BPF failed err %s\n",

		       strerror(errno));

		return -1;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE