Commit 14cfbdac 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-05-06

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

The main changes are:

1) Two AF_XDP libbpf fixes for socket teardown; first one an invalid
   munmap and the other one an invalid skmap cleanup, both from Björn.

2) More graceful CONFIG_DEBUG_INFO_BTF handling when pahole is not
   present in the system to generate vmlinux btf info, from Andrii.

3) Fix libbpf and thus fix perf build error with uClibc on arc
   architecture, from Vineet.

4) Fix missing libbpf_util.h header install in libbpf, from William.

5) Exclude bash-completion/bpftool from .gitignore pattern, from Masahiro.

6) Fix up rlimit in test_libbpf_open kselftest test case, from Yonghong.

7) Minor misc cleanups.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 54516da1 d24ed99b

net/core/bpf_sk_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int bpf_fd_sk_storage_update_elem(struct bpf_map *map, void *key, 
	if (sock) {

		sdata = sk_storage_update(sock->sk, map, value, map_flags);

		sockfd_put(sock);

		return IS_ERR(sdata) ? PTR_ERR(sdata) : 0;

		return PTR_ERR_OR_ZERO(sdata);

	}



	return err;

scripts/link-vmlinux.sh

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ gen_btf() 
{

	local pahole_ver;



	if ! [ -x "$(command -v ${PAHOLE})" ]; then

		info "BTF" "${1}: pahole (${PAHOLE}) is not available"

		return 0

	fi



	pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')

	if [ "${pahole_ver}" -lt "113" ]; then

		info "BTF" "${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13"

tools/bpf/bpftool/.gitignore

+1 −1
Original line number Diff line number Diff line 
*.d

bpftool

/bpftool

bpftool*.8

bpf-helpers.*

FEATURE-DUMP.bpftool

tools/lib/bpf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ install_headers: 
		$(call do_install,bpf.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf.h,$(prefix)/include/bpf,644); \

		$(call do_install,btf.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \

		$(call do_install,xsk.h,$(prefix)/include/bpf,644);



install_pkgconfig: $(PC_FILE)

tools/lib/bpf/bpf.c

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#  define __NR_bpf 349

# elif defined(__s390__)

#  define __NR_bpf 351

# elif defined(__arc__)

#  define __NR_bpf 280

# else

#  error __NR_bpf not defined. libbpf does not support your arch.

# endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE