Skip to content

Commit

Permalink
bpftool: Mount bpffs when pinmaps path not under the bpffs
Browse files Browse the repository at this point in the history
As Quentin said [0], BPF map pinning will fail if the pinmaps path is not
under the bpffs, like:

  libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
  Error: failed to pin all maps

  [0] #146

Fixes: 3767a94b3253 ("bpftool: add pinmaps argument to the load/loadall")
Signed-off-by: Tao Chen <chen.dylane@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Quentin Monnet <qmo@kernel.org>
Reviewed-by: Quentin Monnet <qmo@kernel.org>
Link: https://lore.kernel.org/bpf/20240702131150.15622-1-chen.dylane@gmail.com
  • Loading branch information
chentao-kernel authored and qmonnet committed Jul 16, 2024
1 parent 5c95af2 commit 6bcdeb8
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/prog.c
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
}

if (pinmaps) {
err = create_and_mount_bpffs_dir(pinmaps);
if (err)
goto err_unpin;

err = bpf_object__pin_maps(obj, pinmaps);
if (err) {
p_err("failed to pin all maps");
Expand Down

0 comments on commit 6bcdeb8

Please sign in to comment.