Merge branch 'bpf-libbpf-num-cpus'

Browse source

Hechao Li says:

====================
Getting number of possible CPUs is commonly used for per-CPU BPF maps
and perf_event_maps. Add a new API libbpf_num_possible_cpus() that
helps user with per-CPU related operations and remove duplicate
implementations in bpftool and selftests.

v2: Save errno before calling pr_warning in case it is changed.
v3: Make sure libbpf_num_possible_cpus never returns 0 so that user only
    has to check if ret value < 0.
v4: Fix error code when reading 0 bytes from possible CPU file.
v5: Fix selftests compliation issue.
v6: Split commit to reuse libbpf_num_possible_cpus() into two commits:
    One commit to remove bpf_util.h from test BPF C programs.
    One commit to reuse libbpf_num_possible_cpus() in bpftools
    and bpf_util.h.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2019-06-11 10:36:03 +02:00

parent 89cceaa939 4c587c196d

commit 5e2ac390fb

10 changed files with 90 additions and 84 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

53

tools/bpf/bpftool/common.c

View file

57

tools/lib/bpf/libbpf.c

View file

16

tools/lib/bpf/libbpf.h

View file

1

tools/lib/bpf/libbpf.map

View file

1

tools/testing/selftests/bpf/bpf_endian.h

View file

37

tools/testing/selftests/bpf/bpf_util.h

View file

1

tools/testing/selftests/bpf/progs/sockmap_parse_prog.c

View file

2

tools/testing/selftests/bpf/progs/sockmap_tcp_msg_prog.c

View file

1

tools/testing/selftests/bpf/progs/sockmap_verdict_prog.c

View file

5

tools/testing/selftests/bpf/progs/test_sysctl_prog.c

View file