From: Alexei Starovoitov <ast@kernel.org>
Date: Tue, 6 Oct 2020 18:10:20 +0000 (-0700)
Subject: Merge branch 'Fix pining maps after reuse map fd'
X-Git-Tag: v5.10.7~1401^2~16^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd08f944e0c49b26ee80b87e3c7dc0aa4f045ef3;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'Fix pining maps after reuse map fd'

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>
---

fd08f944e0c49b26ee80b87e3c7dc0aa4f045ef3