diff options
| author |   Stanislav Fomichev <sdf@google.com> | 2018-11-09 08:21:42 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2018-11-10 15:56:10 -0800 |
| commit | fd734c5cca62b7630703244d3613be135d646a0e (patch) | |
| tree | 0546f050a5173c376a319e7fff09dae12abf535a /tools/lib/bpf/libbpf.c | |
| parent | libbpf: cleanup after partial failure in bpf_object__pin (diff) | |
| download | linux-dev-fd734c5cca62b7630703244d3613be135d646a0e.tar.xz linux-dev-fd734c5cca62b7630703244d3613be135d646a0e.zip | |
libbpf: bpf_program__pin: add special case for instances.nr == 1
When bpf_program has only one instance, don't create a subdirectory with
per-instance pin files (<prog>/0). Instead, just create a single pin file
for that single instance. This simplifies object pinning by not creating
unnecessary subdirectories.
This can potentially break existing users that depend on the case
where '/0' is always created. However, I couldn't find any serious
usage of bpf_program__pin inside the kernel tree and I suppose there
should be none outside.
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 341008f47c8a..97ce9f214002 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1761,6 +1761,11 @@ int bpf_program__pin(struct bpf_program *prog, const char *path) return -EINVAL; } + if (prog->instances.nr == 1) { + /* don't create subdirs when pinning single instance */ + return bpf_program__pin_instance(prog, path, 0); + } + err = make_dir(path); if (err) return err; @@ -1823,6 +1828,11 @@ int bpf_program__unpin(struct bpf_program *prog, const char *path) return -EINVAL; } + if (prog->instances.nr == 1) { + /* don't create subdirs when pinning single instance */ + return bpf_program__unpin_instance(prog, path, 0); + } + for (i = 0; i < prog->instances.nr; i++) { char buf[PATH_MAX]; int len; |