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

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



Alexei Starovoitov says:

====================
pull-request: bpf 2019-12-05

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

We've added 6 non-merge commits during the last 1 day(s) which contain
a total of 14 files changed, 116 insertions(+), 37 deletions(-).

The main changes are:

1) three selftests fixes, from Stanislav.

2) one samples fix, from Jesper.

3) one verifier fix, from Yonghong.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0033b34a 8f9081c9

kernel/bpf/verifier.c

+4 −1
Original line number Diff line number Diff line
@@ -9636,6 +9636,9 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) 
				ret = -EINVAL;

				goto out;

			}

			if (subprog == 0)

				addr = (long) tgt_prog->bpf_func;

			else

				addr = (long) tgt_prog->aux->func[subprog]->bpf_func;

		} else {

			addr = kallsyms_lookup_name(tname);

samples/bpf/xdp_rxq_info_user.c

+3 −3
Original line number Diff line number Diff line
@@ -489,9 +489,9 @@ int main(int argc, char **argv) 
	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

		return EXIT_FAIL;



	map = bpf_map__next(NULL, obj);

	stats_global_map = bpf_map__next(map, obj);

	rx_queue_index_map = bpf_map__next(stats_global_map, obj);

	map =  bpf_object__find_map_by_name(obj, "config_map");

	stats_global_map = bpf_object__find_map_by_name(obj, "stats_global_map");

	rx_queue_index_map = bpf_object__find_map_by_name(obj, "rx_queue_index_map");

	if (!map || !stats_global_map || !rx_queue_index_map) {

		printf("finding a map in obj file failed\n");

		return EXIT_FAIL;

tools/lib/bpf/.gitignore

+0 −1
Original line number Diff line number Diff line 
libbpf_version.h

libbpf.pc

FEATURE-DUMP.libbpf

test_libbpf

libbpf.so.*

TAGS

tags

tools/lib/bpf/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ 
VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \

			      grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)



CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) $(OUTPUT)test_libbpf

CMD_TARGETS = $(LIB_TARGET) $(PC_FILE)



all: fixdep

	$(Q)$(MAKE) all_cmd
@@ -196,9 +196,6 @@ $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN_SHARED) 
$(OUTPUT)libbpf.a: $(BPF_IN_STATIC)

	$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^



$(OUTPUT)test_libbpf: test_libbpf.c $(OUTPUT)libbpf.a

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $^ -lelf -o $@



$(OUTPUT)libbpf.pc:

	$(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \

		-e "s|@LIBDIR@|$(libdir_SQ)|" \

tools/testing/selftests/bpf/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ libbpf.so.* 
test_hashmap

test_btf_dump

xdping

test_cpp

/no_alu32

/bpf_gcc

CRA Git | Maintained and supported by SUSTech CRA and CCSE