Merge branch 'Fix pining maps after reuse map fd'

Browse source

Hangbin Liu says:

====================
When a user reuse map fd after creating a map manually and set the
pin_path, then load the object via libbpf. bpf_object__create_maps()
will skip pinning map if map fd exist. Fix it by add moving bpf creation
to else condition and go on checking map pin_path after that.

v3:
for selftest: use CHECK() for bpf_object__open_file() and close map fd on error

v2:
a) close map fd if init map slots failed
b) add bpf selftest for this scenario
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2020-10-06 11:10:20 -07:00

parent dca4121cdc 44c4aa2bd1

commit fd08f944e0

2 changed files with 94 additions and 35 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

82

tools/lib/bpf/libbpf.c

View file

49

tools/testing/selftests/bpf/prog_tests/pinning.c

View file