mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:41:44 +00:00
478a535ae5
When pinning programs/objects under PATH (eg: during "bpftool prog
loadall") the bpffs is mounted on the parent dir of PATH in the
following situations:
- the given dir exists but it is not bpffs.
- the given dir doesn't exist and the parent dir is not bpffs.
Mounting on the parent dir can also have the unintentional side-
effect of hiding other files located under the parent dir.
If the given dir exists but is not bpffs, then the bpffs should
be mounted on the given dir and not its parent dir.
Similarly, if the given dir doesn't exist and its parent dir is not
bpffs, then the given dir should be created and the bpffs should be
mounted on this new dir.
Fixes: 2a36c26fe3 ("bpftool: Support bpffs mountpoint as pin path for prog loadall")
Signed-off-by: Sahil Siddiq <icegambit91@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/2da44d24-74ae-a564-1764-afccf395eeec@isovalent.com/T/#t
Link: https://lore.kernel.org/bpf/20240404192219.52373-1-icegambit91@gmail.com
Closes: https://github.com/libbpf/bpftool/issues/100
Changes since v1:
- Split "mount_bpffs_for_pin" into two functions.
This is done to improve maintainability and readability.
Changes since v2:
- mount_bpffs_for_pin: rename to "create_and_mount_bpffs_dir".
- mount_bpffs_given_file: rename to "mount_bpffs_given_file".
- create_and_mount_bpffs_dir:
- introduce "dir_exists" boolean.
- remove new dir if "mnt_fs" fails.
- improve error handling and error messages.
Changes since v3:
- Rectify function name.
- Improve error messages and formatting.
- mount_bpffs_for_file:
- Check if dir exists before block_mount check.
Changes since v4:
- Use strdup instead of strcpy.
- create_and_mount_bpffs_dir:
- Use S_IRWXU instead of 0700.
- Improve error handling and formatting.
124 lines
2.3 KiB
C
124 lines
2.3 KiB
C
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
|
// Copyright (C) 2020 Facebook
|
|
|
|
#ifndef _GNU_SOURCE
|
|
#define _GNU_SOURCE
|
|
#endif
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <linux/err.h>
|
|
#include <bpf/libbpf.h>
|
|
|
|
#include "main.h"
|
|
|
|
static int do_pin(int argc, char **argv)
|
|
{
|
|
DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, iter_opts);
|
|
union bpf_iter_link_info linfo;
|
|
const char *objfile, *path;
|
|
struct bpf_program *prog;
|
|
struct bpf_object *obj;
|
|
struct bpf_link *link;
|
|
int err = -1, map_fd = -1;
|
|
|
|
if (!REQ_ARGS(2))
|
|
usage();
|
|
|
|
objfile = GET_ARG();
|
|
path = GET_ARG();
|
|
|
|
/* optional arguments */
|
|
if (argc) {
|
|
if (is_prefix(*argv, "map")) {
|
|
NEXT_ARG();
|
|
|
|
if (!REQ_ARGS(2)) {
|
|
p_err("incorrect map spec");
|
|
return -1;
|
|
}
|
|
|
|
map_fd = map_parse_fd(&argc, &argv);
|
|
if (map_fd < 0)
|
|
return -1;
|
|
|
|
memset(&linfo, 0, sizeof(linfo));
|
|
linfo.map.map_fd = map_fd;
|
|
iter_opts.link_info = &linfo;
|
|
iter_opts.link_info_len = sizeof(linfo);
|
|
}
|
|
}
|
|
|
|
obj = bpf_object__open(objfile);
|
|
if (!obj) {
|
|
err = -errno;
|
|
p_err("can't open objfile %s", objfile);
|
|
goto close_map_fd;
|
|
}
|
|
|
|
err = bpf_object__load(obj);
|
|
if (err) {
|
|
p_err("can't load objfile %s", objfile);
|
|
goto close_obj;
|
|
}
|
|
|
|
prog = bpf_object__next_program(obj, NULL);
|
|
if (!prog) {
|
|
err = -errno;
|
|
p_err("can't find bpf program in objfile %s", objfile);
|
|
goto close_obj;
|
|
}
|
|
|
|
link = bpf_program__attach_iter(prog, &iter_opts);
|
|
if (!link) {
|
|
err = -errno;
|
|
p_err("attach_iter failed for program %s",
|
|
bpf_program__name(prog));
|
|
goto close_obj;
|
|
}
|
|
|
|
err = mount_bpffs_for_file(path);
|
|
if (err)
|
|
goto close_link;
|
|
|
|
err = bpf_link__pin(link, path);
|
|
if (err) {
|
|
p_err("pin_iter failed for program %s to path %s",
|
|
bpf_program__name(prog), path);
|
|
goto close_link;
|
|
}
|
|
|
|
close_link:
|
|
bpf_link__destroy(link);
|
|
close_obj:
|
|
bpf_object__close(obj);
|
|
close_map_fd:
|
|
if (map_fd >= 0)
|
|
close(map_fd);
|
|
return err;
|
|
}
|
|
|
|
static int do_help(int argc, char **argv)
|
|
{
|
|
fprintf(stderr,
|
|
"Usage: %1$s %2$s pin OBJ PATH [map MAP]\n"
|
|
" %1$s %2$s help\n"
|
|
"\n"
|
|
" " HELP_SPEC_MAP "\n"
|
|
" " HELP_SPEC_OPTIONS " }\n"
|
|
"",
|
|
bin_name, "iter");
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct cmd cmds[] = {
|
|
{ "help", do_help },
|
|
{ "pin", do_pin },
|
|
{ 0 }
|
|
};
|
|
|
|
int do_iter(int argc, char **argv)
|
|
{
|
|
return cmd_select(cmds, argc, argv, do_help);
|
|
}
|