Commit 2c4a1f3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Pull BPF fixes from Alexei Starovoitov

 - Fix libbpf backward compatibility (Andrii Nakryiko)

 - Add Stanislav Fomichev as bpf/net reviewer

 - Fix resolve_btfid build when cross compiling (Suleiman Souhlal)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  MAINTAINERS: Add myself as bpf networking reviewer
  tools/resolve_btfids: Fix build when cross compiling kernel with clang.
  libbpf: Handle unsupported mmap-based /sys/kernel/btf/vmlinux correctly
parents 403d1338 9cf1e250

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org> 
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -4555,6 +4555,7 @@ BPF [NETWORKING] (tcx & tc BPF, sock_addr) 
M:	Martin KaFai Lau <martin.lau@linux.dev>

M:	Daniel Borkmann <daniel@iogearbox.net>

R:	John Fastabend <john.fastabend@gmail.com>

R:	Stanislav Fomichev <sdf@fomichev.me>

L:	bpf@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Maintained
@@ -26967,6 +26968,7 @@ M: David S. Miller <davem@davemloft.net> 
M:	Jakub Kicinski <kuba@kernel.org>

M:	Jesper Dangaard Brouer <hawk@kernel.org>

M:	John Fastabend <john.fastabend@gmail.com>

R:	Stanislav Fomichev <sdf@fomichev.me>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

S:	Supported
@@ -26988,6 +26990,7 @@ M: Björn Töpel <bjorn@kernel.org> 
M:	Magnus Karlsson <magnus.karlsson@intel.com>

M:	Maciej Fijalkowski <maciej.fijalkowski@intel.com>

R:	Jonathan Lemon <jonathan.lemon@gmail.com>

R:	Stanislav Fomichev <sdf@fomichev.me>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

S:	Maintained

tools/bpf/resolve_btfids/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ endif 


# Overrides for the prepare step libraries.

HOST_OVERRIDES := AR="$(HOSTAR)" CC="$(HOSTCC)" LD="$(HOSTLD)" ARCH="$(HOSTARCH)" \

		  CROSS_COMPILE="" EXTRA_CFLAGS="$(HOSTCFLAGS)"

		  CROSS_COMPILE="" CLANG_CROSS_FLAGS="" EXTRA_CFLAGS="$(HOSTCFLAGS)"



RM      ?= rm

HOSTCC  ?= gcc

tools/lib/bpf/btf.c

+3 −3
Original line number Diff line number Diff line
@@ -1384,12 +1384,12 @@ static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf) 


	fd = open(path, O_RDONLY);

	if (fd < 0)

		return libbpf_err_ptr(-errno);

		return ERR_PTR(-errno);



	if (fstat(fd, &st) < 0) {

		err = -errno;

		close(fd);

		return libbpf_err_ptr(err);

		return ERR_PTR(err);

	}



	data = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -1397,7 +1397,7 @@ static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf) 
	close(fd);



	if (data == MAP_FAILED)

		return libbpf_err_ptr(err);

		return ERR_PTR(err);



	btf = btf_new(data, st.st_size, base_btf, true);

	if (IS_ERR(btf))