Libbpf object pinning
Subsystems (5)
v3 cover Libbpf object pinning
This series adds pinning functionality for maps, programs, and objects. Library users may call bpf_map__pin(map, path) or bpf_program__pin(prog, path) to pin maps and programs separately, or use bpf_object__pin(obj, path) to pin all maps and programs from the BPF object to the path. The map and program variations require a path where it will be pinned in the filesystem, and the object variation will create named directories for each program with instances within, and mount the maps by name under the path.
For example, with the directory '/sys/fs/bpf/foo' and a BPF object which contains two instances of a program named 'bar', and a map named 'baz':/sys/fs/bpf/foo/bar/0/sys/fs/bpf/foo/bar/1/sys/fs/bpf/foo/baz
---
v3: Split out bpf_program__pin_instance().
Change the paths from PATH/{maps,progs}/foo to the above.
Drop the patches that were applied.
Add a perf test to check that pinning works.
v2: Wang Nan provided improvements to patch 1.
Dropped patch 2 from v1.
Added acks for acked patches.
Split the bpf_obj__pin() to also provide map / program pinning APIs. Allow users to provide full filesystem path (don't autodetect/mount BPFFS).
v1: Initial post.
Joe Stringer (6):
tools lib bpf: Add BPF program pinning APIs. tools lib bpf: Add bpf_map__pin()
tools lib bpf: Add bpf_object__pin() tools perf util: Make rm_rf(path) argument const tools lib api fs: Add bpf_fs filesystem detector perf test: Add libbpf pinning test
tools/lib/api/fs/fs.c | 16 +++++ tools/lib/api/fs/fs.h | 1 + tools/lib/bpf/libbpf.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 5 ++ tools/perf/tests/bpf.c | 42 ++++++++++- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- 7 files changed, 253 insertions(+), 3 deletions(-)
Signature · 1 line
2.11.0
PATCH v3 1/6 tools lib bpf: Add BPF program pinning APIs.
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n) will pin the nth instance of 'prog' to the specified path.bpf_program__pin(prog, path) will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.
---
v3: Add per-instance pinning.
Use path for bpf_program__pin() as directory.
v2: Don't automount BPF filesystem
Split program, map, object pinning into separate APIs and separate patches.
--- tools/lib/bpf/libbpf.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 3 ++ 2 files changed, 115 insertions(+)
tools/lib/bpf/libbpf.c +112 -0
@@ -4,6 +4,7 @@* Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. +* Copyright (C) 2017 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,7 @@#include <stdlib.h> #include <stdio.h> #include <stdarg.h> +#include <libgen.h> #include <inttypes.h> #include <string.h> #include <unistd.h>
@@ -31,7 +33,10 @@#include <linux/err.h> #include <linux/kernel.h> #include <linux/bpf.h> +#include <linux/magic.h> #include <linux/list.h> +#include <linux/limits.h> +#include <sys/vfs.h> #include <libelf.h> #include <gelf.h>
@@ -1237,6 +1242,113 @@ int bpf_object__load(struct bpf_object *obj)return err; } +static int check_path (const char *path) +{ +struct statfs st_fs; +char *dname, *dir; +int err =0 ; + +if (path ==NULL ) +return -EINVAL ; + + dname =strdup (path); + dir =dirname (dname); +if (statfs (dir, &st_fs)) { +pr_warning ("failed to statfs %s: %s\n" , dir,strerror (errno)); + err = -errno; + } +free (dname); + +if (!err && st_fs.f_type !=BPF_FS_MAGIC ) { +pr_warning ("specified path %s is not on BPF FS\n" , path); + err = -EINVAL ; + } + +return err; +} + +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (instance <0 || instance >= prog->instances.nr) { +pr_warning ("invalid prog instance %d of prog %s (max %d)\n" , + instance, prog->section_name, prog->instances.nr); +return -EINVAL ; + } + +if (bpf_obj_pin (prog->instances.fds[instance], path)) { +pr_warning ("failed to pin program: %s\n" ,strerror (errno)); +return -errno; + } +pr_debug ("pinned program '%s'\n" , path); + +return 0 ; +} + +static int make_dir (const char *path) +{ +int err =0 ; + +if (mkdir (path,0700 ) && errno !=EEXIST ) + err = -errno; + +if (err) +pr_warning ("failed to mkdir %s: %s\n" , path,strerror (-err)); +return err; +} + +int bpf_program__pin (struct bpf_program *prog,const char *path) +{ +int i, err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (prog->instances.nr <=0 ) { +pr_warning ("no instances of prog %s to pin\n" , + prog->section_name); +return -EINVAL ; + } + + err =make_dir (path); +if (err) +return err; + +for (i =0 ; i < prog->instances.nr; i++) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); +if (len <0 ) +return -EINVAL ; +else if (len >PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin_instance (prog, buf, i); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +3 -0
@@ -106,6 +106,9 @@ void *bpf_program__priv(struct bpf_program *prog);const char *bpf_program__title (struct bpf_program *prog,bool needs_copy);int bpf_program__fd (struct bpf_program *prog); +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance); +int bpf_program__pin (struct bpf_program *prog,const char *path);struct bpf_insn ;
Signature · 1 line
2.11.0
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Thu, Jan 26, 2017 at 01:19:56PM -0800, Joe Stringer escreveu:
Quoted 11 lines
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n)will pin the nth instance of 'prog' to the specified path.bpf_program__pin(prog, path)will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.Signed-off-by Joe Stringer <[email protected]>
make: Entering directory '/home/acme/git/linux/tools/perf'
BUILD: Doing 'make -j4' parallel build
CC /tmp/build/perf/builtin-record.o
CC /tmp/build/perf/libbpf.o
CC /tmp/build/perf/util/parse-events.o
INSTALL trace_plugins
libbpf.c: In function ‘make_dir’:
libbpf.c:1303:6: error: implicit declaration of function ‘mkdir’ [-Werror=implicit-function-declaration]
if (mkdir(path, 0700) && errno != EEXIST)
^~~~~libbpf.c:1303:2: error: nested extern declaration of ‘mkdir’ [-Werror=nested-externs]
if (mkdir(path, 0700) && errno != EEXIST)
^~
cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/.libbpf.o.tmp': No such file or directory /home/acme/git/linux/tools/build/Makefile.build:101: recipe for target '/tmp/build/perf/libbpf.o' failed
And strdup() is not checked for failure, I'm fixing those,
+++ b/tools/lib/bpf/libbpf.c
@@ -36,6 +36,8 @@
#include <linux/magic.h>
#include <linux/list.h>
#include <linux/limits.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <sys/vfs.h>
- Arnaldo
Quoted 172 lines
---
v3: Add per-instance pinning.
Use path forbpf_program__pin()as directory.
v2: Don't automount BPF filesystem
Split program, map, object pinning into separate APIs and separate patches.--- tools/lib/bpf/libbpf.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 3 ++ 2 files changed, 115 insertions(+)tools/lib/bpf/libbpf.c +112
-0@@ -4,6 +4,7 @@* Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. +* Copyright (C) 2017 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,7 @@#include <stdlib.h> #include <stdio.h> #include <stdarg.h> +#include <libgen.h> #include <inttypes.h> #include <string.h> #include <unistd.h> @@ -31,7 +33,10 @@#include <linux/err.h> #include <linux/kernel.h> #include <linux/bpf.h> +#include <linux/magic.h> #include <linux/list.h> +#include <linux/limits.h> +#include <sys/vfs.h> #include <libelf.h> #include <gelf.h> @@ -1237,6 +1242,113 @@ int bpf_object__load(struct bpf_object *obj)return err; } +static int check_path (const char *path) +{ +struct statfs st_fs; +char *dname, *dir; +int err =0 ; + +if (path ==NULL ) +return -EINVAL ; + + dname =strdup (path); + dir =dirname (dname); +if (statfs (dir, &st_fs)) { +pr_warning ("failed to statfs %s: %s\n" , dir,strerror (errno)); + err = -errno; + } +free (dname); + +if (!err && st_fs.f_type !=BPF_FS_MAGIC ) { +pr_warning ("specified path %s is not on BPF FS\n" , path); + err = -EINVAL ; + } + +return err; +} + +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (instance <0 || instance >= prog->instances.nr) { +pr_warning ("invalid prog instance %d of prog %s (max %d)\n" , + instance, prog->section_name, prog->instances.nr); +return -EINVAL ; + } + +if (bpf_obj_pin (prog->instances.fds[instance], path)) { +pr_warning ("failed to pin program: %s\n" ,strerror (errno)); +return -errno; + } +pr_debug ("pinned program '%s'\n" , path); + +return 0 ; +} + +static int make_dir (const char *path) +{ +int err =0 ; + +if (mkdir (path,0700 ) && errno !=EEXIST ) + err = -errno; + +if (err) +pr_warning ("failed to mkdir %s: %s\n" , path,strerror (-err)); +return err; +} + +int bpf_program__pin (struct bpf_program *prog,const char *path) +{ +int i, err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (prog->instances.nr <=0 ) { +pr_warning ("no instances of prog %s to pin\n" , + prog->section_name); +return -EINVAL ; + } + + err =make_dir (path); +if (err) +return err; + +for (i =0 ; i < prog->instances.nr; i++) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); +if (len <0 ) +return -EINVAL ; +else if (len >PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin_instance (prog, buf, i); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;tools/lib/bpf/libbpf.h +3
-0@@ -106,6 +106,9 @@ void *bpf_program__priv(struct bpf_program *prog);const char *bpf_program__title (struct bpf_program *prog,bool needs_copy);int bpf_program__fd (struct bpf_program *prog); +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance); +int bpf_program__pin (struct bpf_program *prog,const char *path);struct bpf_insn ;Signature · 1 line
2.11.0
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Mon, Jan 30, 2017 at 05:25:06PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 35 lines
Em Thu, Jan 26, 2017 at 01:19:56PM -0800, Joe Stringer escreveu:
Quoted 11 lines
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n)will pin the nth instance of 'prog' to the specified path.bpf_program__pin(prog, path)will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.Signed-off-by Joe Stringer <[email protected]>make: Entering directory '
/home/acme/git/linux/tools/perf'BUILD: Doing 'make -j4' parallel build CC /tmp/build/perf/builtin-record.o CC /tmp/build/perf/libbpf.o CC /tmp/build/perf/util/parse-events.o INSTALL trace_plugins libbpf.c: In function ‘make_dir’: libbpf.c:1303:6: error: implicit declaration of function ‘mkdir’ [-Werror=implicit-function-declaration] if (mkdir(path, 0700) && errno != EEXIST) ^~~~~libbpf.c:1303:2: error: nested extern declaration of ‘mkdir’ [-Werror=nested-externs]
if (mkdir(path, 0700)&& errno != EEXIST)
^~
cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/.libbpf.o.tmp': No such file or directory/home/acme/git/linux/tools/build/Makefile.build:101: recipe for target '/tmp/build/perf/libbpf.o' failedAnd
strdup()is not checked for failure, I'm fixing those,+++
b/tools/lib/bpf/libbpf.c
Review line 41
Quoted 6 lines
(quoted diff) +2
-0@@ -36,6 +36,8 @@ #include <linux/magic.h> #include <linux/list.h> #include <linux/limits.h> +#include <sys/stat.h> +#include <sys/types.h> #include <sys/vfs.h>
This as well:
@@ -1338,7 +1343,7 @@ int bpf_program__pin(struct bpf_program *prog, const char *path)
len = snprintf(buf, PATH_MAX, "%s/%d", path, i);
if (len < 0)
return -EINVAL;
- else if (len > PATH_MAX)
+ else if (len >= PATH_MAX)
return -ENAMETOOLONG;See 'man snprintf', return value:
---
Thus, a return value of size or more means that the output was truncated.
---
Re: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Quoted 30 lines · Arnaldo Carvalho de Melo
Em Mon, Jan 30, 2017 at 05:25:06PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 29 lines
Em Thu, Jan 26, 2017 at 01:19:56PM -0800, Joe Stringer escreveu:
Quoted 11 lines
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n)will pin the nth instance of 'prog' to the specified path.bpf_program__pin(prog, path)will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.Signed-off-by Joe Stringer <[email protected]>make: Entering directory '
/home/acme/git/linux/tools/perf'BUILD: Doing 'make -j4' parallel build CC /tmp/build/perf/builtin-record.o CC /tmp/build/perf/libbpf.o CC /tmp/build/perf/util/parse-events.o INSTALL trace_plugins libbpf.c: In function ‘make_dir’: libbpf.c:1303:6: error: implicit declaration of function ‘mkdir’ [-Werror=implicit-function-declaration] if (mkdir(path, 0700) && errno != EEXIST) ^~~~~libbpf.c:1303:2: error: nested extern declaration of ‘mkdir’ [-Werror=nested-externs]
if (mkdir(path, 0700)&& errno != EEXIST)
^~
cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/.libbpf.o.tmp': No such file or directory/home/acme/git/linux/tools/build/Makefile.build:101: recipe for target '/tmp/build/perf/libbpf.o' failed
Not sure why but I didn't see this. Appreciate the fix.
Quoted 25 lines
Review line 41
Quoted 12 lines
And
strdup()is not checked for failure, I'm fixing those,+++
b/tools/lib/bpf/libbpf.c(quoted diff) +2
-0@@ -36,6 +36,8 @@ #include <linux/magic.h> #include <linux/list.h> #include <linux/limits.h> +#include <sys/stat.h> +#include <sys/types.h> #include <sys/vfs.h>This as well:
(quoted diff) +1
-1@@ -1338,7 +1343,7 @@ int bpf_program__pin(struct bpf_program *prog, const char *path) len = snprintf(buf, PATH_MAX, "%s/%d", path, i); if (len < 0) return -EINVAL; - else if (len > PATH_MAX) + else if (len >= PATH_MAX) return -ENAMETOOLONG;
Quoted 6 lines
See 'man snprintf', return value:
---
Thus, a return value of size or more means that the output was truncated.
---
Good spotting, I looked over the committed versions and tested them, they seem good to me. Thanks!
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Mon, Jan 30, 2017 at 01:16:18PM -0800, Joe Stringer escreveu:
Quoted 8 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
---
Thus, a return value of size or more means that the output was truncated.
---Good spotting, I looked over the committed versions and tested them, they seem good to me. Thanks!
Thanks for checking, will push Ingo's way after a battery of extra tests, tomorrow,
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Mon, Jan 30, 2017 at 09:58:05PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Mon, Jan 30, 2017 at 01:16:18PM -0800, Joe Stringer escreveu:
Quoted 5 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
---
Thus, a return value of size or more means that the output was truncated.
---
Quoted 5 lines
Quoted 2 lines
Good spotting, I looked over the committed versions and tested them, they seem good to me. Thanks!
Thanks for checking, will push Ingo's way after a battery of extra tests, tomorrow,
Which failed for centos:5, centos:6, centos:7, debian:7, debian:8, debian:experimental and others, I stopped the test at this point, working on fixing it.
All seems related to:
libbpf.c:1267: error: 'BPF_FS_MAGIC' undeclared (first use in this function) libbpf.c:1267: error: (Each undeclared identifier is reported only once libbpf.c:1267: error: for each function it appears in.)
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Tue, Jan 31, 2017 at 01:08:27PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 18 lines
Em Mon, Jan 30, 2017 at 09:58:05PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Mon, Jan 30, 2017 at 01:16:18PM -0800, Joe Stringer escreveu:
Quoted 5 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
---
Thus, a return value of size or more means that the output was truncated.
---Quoted 5 lines
Quoted 2 lines
Good spotting, I looked over the committed versions and tested them, they seem good to me. Thanks!
Thanks for checking, will push Ingo's way after a battery of extra tests, tomorrow,
Which failed for centos:5, centos:6, centos:7, debian:7, debian:8, debian:experimental and others, I stopped the test at this point, working on fixing it.
Quoted 5 lines
All seems related to:
libbpf.c:1267: error: '
BPF_FS_MAGIC' undeclared (first use in this function) libbpf.c:1267: error: (Each undeclared identifier is reported only once libbpf.c:1267: error: for each function it appears in.)
We need to carry a tools/include/uapi/linux/magic.c copy, check if it drifts, remove the ifdefs for _FS_MAGIC defines from tools/ and use that instead, etc, till then I'll just add the ifdef to libbpf.c.
[acme@jouet linux]$ grep BPF_FS_MAGIC /usr/include/*/*.h
/usr/include/linux/magic.h:#define BPF_FS_MAGIC 0xcafe4a11
[acme@jouet linux]$ rpm -qf /usr/include/linux/magic.h kernel-headers-4.9.6-200.fc25.x86_64 [acme@jouet linux]$ cat /etc/fedora-release Fedora release 25 (Twenty Five)
[acme@jouet linux]$
But those other distros don't have it.
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCHv3 perf/core 1/6] tools lib bpf: Add BPF program pinning APIs.
Em Tue, Jan 31, 2017 at 01:13:20PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 21 lines
Em Tue, Jan 31, 2017 at 01:08:27PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 20 lines
Em Mon, Jan 30, 2017 at 09:58:05PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Mon, Jan 30, 2017 at 01:16:18PM -0800, Joe Stringer escreveu:
Quoted 5 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
---
Thus, a return value of size or more means that the output was truncated.
---Quoted 5 lines
Quoted 2 lines
Good spotting, I looked over the committed versions and tested them, they seem good to me. Thanks!
Thanks for checking, will push Ingo's way after a battery of extra tests, tomorrow,
Which failed for centos:5, centos:6, centos:7, debian:7, debian:8, debian:experimental and others, I stopped the test at this point, working on fixing it.
All seems related to:
Quoted 7 lines
Quoted 3 lines
libbpf.c:1267: error: '
BPF_FS_MAGIC' undeclared (first use in this function) libbpf.c:1267: error: (Each undeclared identifier is reported only once libbpf.c:1267: error: for each function it appears in.)We need to carry a
tools/include/uapi/linux/magic.ccopy, check if it drifts, remove the ifdefs for_FS_MAGICdefines fromtools/and use that instead, etc, till then I'll just add the ifdef tolibbpf.c.
After also removing that
#include <linux/magic.h>
line, that is not used anywhere else in tools/{perf,include,lib}/ it is going further:
[root@jouet ~]# time dm
1 83.120412349 alpine:3.4: Ok
2 35.486456929 android-ndk:r12b-arm: Ok
3 85.384259996 archlinux:latest: Ok
4 49.518031326 centos:5: Ok
5 70.417375831 centos:6: Ok
6 87.033156092 centos:7: Ok
31 more to go
:-)
- Arnaldo
tip-bot for Joe Stringer
merge bot[tip:perf/core] tools lib bpf: Add BPF program pinning APIs
In reply to Joe Stringertools lib bpf: Add BPF program pinning APIs
Commit-ID: f367540c8c13d65603c431e29a0b87a7db893d6c Gitweb: http://git.kernel.org/tip/f367540c8c13d65603c431e29a0b87a7db893d6c Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:19:56 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:05 -0300
tools lib bpf: Add BPF program pinning APIs
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n) will pin the nth instance of 'prog' to the specified path.
bpf_program__pin(prog, path) will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.
Committer notes:
- Add missing headers for mkdir()
- Check strdup() for failure
- Check snprintf >= size, not >, as == also means truncated, see 'man snprintf', return value.
- Conditionally define BPF_FS_MAGIC, as it isn't in magic.h in older systems and we're not yet having a tools/include/uapi/linux/magic.h copy.
- Do not include linux/magic.h, not present in older distros.
--- tools/lib/bpf/libbpf.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 3 ++ 2 files changed, 123 insertions(+)
tools/lib/bpf/libbpf.c +120 -0
@@ -4,6 +4,7 @@* Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. +* Copyright (C) 2017 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,7 @@#include <stdlib.h> #include <stdio.h> #include <stdarg.h> +#include <libgen.h> #include <inttypes.h> #include <string.h> #include <unistd.h>
@@ -32,6 +34,10 @@#include <linux/kernel.h> #include <linux/bpf.h> #include <linux/list.h> +#include <linux/limits.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/vfs.h> #include <libelf.h> #include <gelf.h>
@@ -42,6 +48,10 @@#define EM_BPF 247#endif +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif +#define __printf (a, b) __attribute__((format(printf, a, b)))__printf (1 ,2 )
@@ -1237,6 +1247,116 @@ out:return err; } +static int check_path (const char *path) +{ +struct statfs st_fs; +char *dname, *dir; +int err =0 ; + +if (path ==NULL ) +return -EINVAL ; + + dname =strdup (path); +if (dname ==NULL ) +return -ENOMEM ; + + dir =dirname (dname); +if (statfs (dir, &st_fs)) { +pr_warning ("failed to statfs %s: %s\n" , dir,strerror (errno)); + err = -errno; + } +free (dname); + +if (!err && st_fs.f_type !=BPF_FS_MAGIC ) { +pr_warning ("specified path %s is not on BPF FS\n" , path); + err = -EINVAL ; + } + +return err; +} + +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (instance <0 || instance >= prog->instances.nr) { +pr_warning ("invalid prog instance %d of prog %s (max %d)\n" , + instance, prog->section_name, prog->instances.nr); +return -EINVAL ; + } + +if (bpf_obj_pin (prog->instances.fds[instance], path)) { +pr_warning ("failed to pin program: %s\n" ,strerror (errno)); +return -errno; + } +pr_debug ("pinned program '%s'\n" , path); + +return 0 ; +} + +static int make_dir (const char *path) +{ +int err =0 ; + +if (mkdir (path,0700 ) && errno !=EEXIST ) + err = -errno; + +if (err) +pr_warning ("failed to mkdir %s: %s\n" , path,strerror (-err)); +return err; +} + +int bpf_program__pin (struct bpf_program *prog,const char *path) +{ +int i, err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (prog->instances.nr <=0 ) { +pr_warning ("no instances of prog %s to pin\n" , + prog->section_name); +return -EINVAL ; + } + + err =make_dir (path); +if (err) +return err; + +for (i =0 ; i < prog->instances.nr; i++) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin_instance (prog, buf, i); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +3 -0
@@ -106,6 +106,9 @@ void *bpf_program__priv(struct bpf_program *prog);const char *bpf_program__title (struct bpf_program *prog,bool needs_copy);int bpf_program__fd (struct bpf_program *prog); +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance); +int bpf_program__pin (struct bpf_program *prog,const char *path);struct bpf_insn ;
PATCH v3 2/6 tools lib bpf: Add bpf_map__pin()
In reply to Joe StringerAdd a new API to pin a BPF map to the filesystem. The user can specify the path full path within a BPF filesystem to pin the map.
---
v3: No change.
v2: Don't automount BPF filesystem
Split program, map, object pinning into separate APIs and separate patches.
--- tools/lib/bpf/libbpf.c | 22 ++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 23 insertions(+)
tools/lib/bpf/libbpf.c +22 -0
@@ -1349,6 +1349,28 @@ int bpf_program__pin(struct bpf_program *prog, const char *path)return 0 ; } +int bpf_map__pin (struct bpf_map *map,const char *path) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (map ==NULL ) { +pr_warning ("invalid map pointer\n" ); +return -EINVAL ; + } + +if (bpf_obj_pin (map->fd, path)) { +pr_warning ("failed to pin map: %s\n" ,strerror (errno)); +return -errno; + } + +pr_debug ("pinned map '%s'\n" , path); +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -236,6 +236,7 @@ typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);int bpf_map__set_priv (struct bpf_map *map,void *priv,bpf_map_clear_priv_t clear_priv);void *bpf_map__priv (struct bpf_map *map); +int bpf_map__pin (struct bpf_map *map,const char *path);long libbpf_get_error (const void *ptr);
Signature · 1 line
2.11.0
tip-bot for Joe Stringer
merge bot[tip:perf/core] tools lib bpf: Add bpf_map__pin()
tools lib bpf: Add bpf_map__pin()
Commit-ID: b6989f35e80bf830f8dc97b74128d619faef0273 Gitweb: http://git.kernel.org/tip/b6989f35e80bf830f8dc97b74128d619faef0273 Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:19:57 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:06 -0300
tools lib bpf: Add bpf_map__pin()
Add a new API to pin a BPF map to the filesystem. The user can specify the path full path within a BPF filesystem to pin the map.
--- tools/lib/bpf/libbpf.c | 22 ++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 23 insertions(+)
tools/lib/bpf/libbpf.c +22 -0
@@ -1357,6 +1357,28 @@ int bpf_program__pin(struct bpf_program *prog, const char *path)return 0 ; } +int bpf_map__pin (struct bpf_map *map,const char *path) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (map ==NULL ) { +pr_warning ("invalid map pointer\n" ); +return -EINVAL ; + } + +if (bpf_obj_pin (map->fd, path)) { +pr_warning ("failed to pin map: %s\n" ,strerror (errno)); +return -errno; + } + +pr_debug ("pinned map '%s'\n" , path); +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -236,6 +236,7 @@ typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);int bpf_map__set_priv (struct bpf_map *map,void *priv,bpf_map_clear_priv_t clear_priv);void *bpf_map__priv (struct bpf_map *map); +int bpf_map__pin (struct bpf_map *map,const char *path);long libbpf_get_error (const void *ptr);
PATCH v3 3/6 tools lib bpf: Add bpf_object__pin()
In reply to Joe StringerAdd a new API to pin a BPF object to the filesystem. The user can specify the path within a BPF filesystem to pin the object. Programs will be pinned under a subdirectory named the same as the program, with each instance appearing as a numbered file under that directory, and maps will be pinned under the path using the name of the map as the file basename.
For example, with the directory '/sys/fs/bpf/foo' and a BPF object which contains two instances of a program named 'bar', and a map named 'baz':/sys/fs/bpf/foo/bar/0/sys/fs/bpf/foo/bar/1/sys/fs/bpf/foo/baz
---
v3: Mount to PATH/MAPNAME, PATH/PROGNAME/N (N = instance number)
v2: Don't automount BPF filesystem
Split program, map, object pinning into separate APIs and separate patches.
--- tools/lib/bpf/libbpf.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 55 insertions(+)
tools/lib/bpf/libbpf.c +54 -0
@@ -36,6 +36,7 @@#include <linux/magic.h> #include <linux/list.h> #include <linux/limits.h> +#include <sys/stat.h> #include <sys/vfs.h> #include <libelf.h> #include <gelf.h>
@@ -1371,6 +1372,59 @@ int bpf_map__pin(struct bpf_map *map, const char *path)return 0 ; } +int bpf_object__pin (struct bpf_object *obj,const char *path) +{ +struct bpf_program *prog; +struct bpf_map *map; +int err; + +if (!obj) +return -ENOENT ; + +if (!obj->loaded) { +pr_warning ("object not yet loaded; load it first\n" ); +return -ENOENT ; + } + + err =make_dir (path); +if (err) +return err; + +bpf_map__for_each (map, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, +bpf_map__name (map)); +if (len <0 ) +return -EINVAL ; +else if (len >PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_map__pin (map, buf); +if (err) +return err; + } + +bpf_object__for_each_program (prog, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, + prog->section_name); +if (len <0 ) +return -EINVAL ; +else if (len >PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin (prog, buf); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -65,6 +65,7 @@ struct bpf_object *bpf_object__open(const char *path);struct bpf_object *bpf_object__open_buffer (void *obj_buf,size_t obj_buf_sz,const char *name); +int bpf_object__pin (struct bpf_object *object,const char *path);void bpf_object__close (struct bpf_object *object);/* Load/unload object into/from kernel */
Signature · 1 line
2.11.0
tip-bot for Joe Stringer
merge bot[tip:perf/core] tools lib bpf: Add bpf_object__pin()
tools lib bpf: Add bpf_object__pin()
Commit-ID: d5148d8554d08f03b3e34ecc286ab1729c35c24c Gitweb: http://git.kernel.org/tip/d5148d8554d08f03b3e34ecc286ab1729c35c24c Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:19:58 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:06 -0300
tools lib bpf: Add bpf_object__pin()
Add a new API to pin a BPF object to the filesystem. The user can specify the path within a BPF filesystem to pin the object. Programs will be pinned under a subdirectory named the same as the program, with each instance appearing as a numbered file under that directory, and maps will be pinned under the path using the name of the map as the file basename.
For example, with the directory '/sys/fs/bpf/foo' and a BPF object which contains two instances of a program named 'bar', and a map named 'baz':
/sys/fs/bpf/foo/bar/0/sys/fs/bpf/foo/bar/1/sys/fs/bpf/foo/baz
--- tools/lib/bpf/libbpf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 54 insertions(+)
tools/lib/bpf/libbpf.c +53 -0
@@ -1379,6 +1379,59 @@ int bpf_map__pin(struct bpf_map *map, const char *path)return 0 ; } +int bpf_object__pin (struct bpf_object *obj,const char *path) +{ +struct bpf_program *prog; +struct bpf_map *map; +int err; + +if (!obj) +return -ENOENT ; + +if (!obj->loaded) { +pr_warning ("object not yet loaded; load it first\n" ); +return -ENOENT ; + } + + err =make_dir (path); +if (err) +return err; + +bpf_map__for_each (map, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, +bpf_map__name (map)); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_map__pin (map, buf); +if (err) +return err; + } + +bpf_object__for_each_program (prog, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, + prog->section_name); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin (prog, buf); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -65,6 +65,7 @@ struct bpf_object *bpf_object__open(const char *path);struct bpf_object *bpf_object__open_buffer (void *obj_buf,size_t obj_buf_sz,const char *name); +int bpf_object__pin (struct bpf_object *object,const char *path);void bpf_object__close (struct bpf_object *object);/* Load/unload object into/from kernel */
PATCH v3 4/6 tools perf util: Make rm_rf(path) argument const
In reply to Joe Stringerrm_rf() doesn't modify its path argument, and a future caller will pass a string constant into it to delete.
---
v3: Initial post.
--- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/util.c +1 -1
@@ -85,7 +85,7 @@ int mkdir_p(char *path, mode_t mode)return (stat (path, &st) &&mkdir (path, mode)) ?-1 :0 ; } -int rm_rf (char *path) +int rm_rf (const char *path) {DIR *dir;int ret =0 ;
tools/perf/util/util.h +1 -1
@@ -209,7 +209,7 @@ static inline int sane_case(int x, int high) }int mkdir_p (char *path,mode_t mode); -int rm_rf (char *path); +int rm_rf (const char *path);struct strlist *lsdir (const char *name,bool (*filter)(const char *,struct dirent *));bool lsdir_no_dot_filter (const char *name,struct dirent *d);int copyfile (const char *from,const char *to);
Signature · 1 line
2.11.0
tip-bot for Joe Stringer
merge bot[tip:perf/core] tools perf util: Make rm_rf(path) argument const
tools perf util: Make rm_rf(path) argument const
Commit-ID: 9a9c733d68c5cb89bd5c5ab91b9821e1a5d69272 Gitweb: http://git.kernel.org/tip/9a9c733d68c5cb89bd5c5ab91b9821e1a5d69272 Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:19:59 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:07 -0300
tools perf util: Make rm_rf(path) argument const
rm_rf() doesn't modify its path argument, and a future caller will pass a string constant into it to delete.
--- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/util.c +1 -1
@@ -85,7 +85,7 @@ int mkdir_p(char *path, mode_t mode)return (stat (path, &st) &&mkdir (path, mode)) ?-1 :0 ; } -int rm_rf (char *path) +int rm_rf (const char *path) {DIR *dir;int ret =0 ;
tools/perf/util/util.h +1 -1
@@ -209,7 +209,7 @@ static inline int sane_case(int x, int high) }int mkdir_p (char *path,mode_t mode); -int rm_rf (char *path); +int rm_rf (const char *path);struct strlist *lsdir (const char *name,bool (*filter)(const char *,struct dirent *));bool lsdir_no_dot_filter (const char *name,struct dirent *d);int copyfile (const char *from,const char *to);
PATCH v3 5/6 tools lib api fs: Add bpf_fs filesystem detector
In reply to Joe StringerAllow mounting of the BPF filesystem at /sys/fs/bpf.
---
v3: Initial post.
--- tools/lib/api/fs/fs.c | 16 ++++++++++++++++ tools/lib/api/fs/fs.h | 1 + 2 files changed, 17 insertions(+)
tools/lib/api/fs/fs.c +16 -0
@@ -38,6 +38,10 @@#define HUGETLBFS_MAGIC 0x958458f6#endif +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif +static const char *const sysfs__fs_known_mountpoints[] = {"/sys" ,0 ,
@@ -75,6 +79,11 @@ static const char * const hugetlbfs__known_mountpoints[] = { 0, }; +static const char *const bpf_fs__known_mountpoints[] = { +"/sys/fs/bpf" , +0 , +}; +struct fs {const char *name;const char *const *mounts;
@@ -89,6 +98,7 @@ enum {FS__DEBUGFS =2 ,FS__TRACEFS =3 ,FS__HUGETLBFS =4 , + FS__BPF_FS = 5, };#ifndef TRACEFS_MAGIC
@@ -121,6 +131,11 @@ static struct fs fs__entries[] = { .mounts = hugetlbfs__known_mountpoints, .magic = HUGETLBFS_MAGIC, }, + [FS__BPF_FS] = { + .name = "bpf", + .mounts = bpf_fs__known_mountpoints, + .magic = BPF_FS_MAGIC, + }, };static bool fs__read_mounts (struct fs *fs)
@@ -280,6 +295,7 @@ FS(procfs, FS__PROCFS);FS (debugfs,FS__DEBUGFS );FS (tracefs,FS__TRACEFS );FS (hugetlbfs,FS__HUGETLBFS ); +FS (bpf_fs,FS__BPF_FS );int filename__read_int (const char *filename,int *value) {
tools/lib/api/fs/fs.h +1 -0
@@ -22,6 +22,7 @@ FS(procfs) FS(debugfs) FS(tracefs) FS(hugetlbfs) +FS(bpf_fs)#undef FS
Signature · 1 line
2.11.0
tip-bot for Joe Stringer
merge bot[tip:perf/core] tools lib api fs: Add bpf_fs filesystem detector
tools lib api fs: Add bpf_fs filesystem detector
Commit-ID: 71dc4c30680fa7e7fd4b82352a845e2fb4d86b2b Gitweb: http://git.kernel.org/tip/71dc4c30680fa7e7fd4b82352a845e2fb4d86b2b Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:20:00 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:07 -0300
tools lib api fs: Add bpf_fs filesystem detector
Allow mounting of the BPF filesystem at /sys/fs/bpf.
--- tools/lib/api/fs/fs.c | 16 ++++++++++++++++ tools/lib/api/fs/fs.h | 1 + 2 files changed, 17 insertions(+)
tools/lib/api/fs/fs.c +16 -0
@@ -38,6 +38,10 @@#define HUGETLBFS_MAGIC 0x958458f6#endif +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif +static const char *const sysfs__fs_known_mountpoints[] = {"/sys" ,0 ,
@@ -75,6 +79,11 @@ static const char * const hugetlbfs__known_mountpoints[] = { 0, }; +static const char *const bpf_fs__known_mountpoints[] = { +"/sys/fs/bpf" , +0 , +}; +struct fs {const char *name;const char *const *mounts;
@@ -89,6 +98,7 @@ enum {FS__DEBUGFS =2 ,FS__TRACEFS =3 ,FS__HUGETLBFS =4 , + FS__BPF_FS = 5, };#ifndef TRACEFS_MAGIC
@@ -121,6 +131,11 @@ static struct fs fs__entries[] = { .mounts = hugetlbfs__known_mountpoints, .magic = HUGETLBFS_MAGIC, }, + [FS__BPF_FS] = { + .name = "bpf", + .mounts = bpf_fs__known_mountpoints, + .magic = BPF_FS_MAGIC, + }, };static bool fs__read_mounts (struct fs *fs)
@@ -280,6 +295,7 @@ FS(procfs, FS__PROCFS);FS (debugfs,FS__DEBUGFS );FS (tracefs,FS__TRACEFS );FS (hugetlbfs,FS__HUGETLBFS ); +FS (bpf_fs,FS__BPF_FS );int filename__read_int (const char *filename,int *value) {
tools/lib/api/fs/fs.h +1 -0
@@ -22,6 +22,7 @@ FS(procfs) FS(debugfs) FS(tracefs) FS(hugetlbfs) +FS(bpf_fs)#undef FS
PATCH v3 6/6 perf test: Add libbpf pinning test
In reply to Joe StringerAdd a test for the newly added BPF object pinning functionality.
For example:
# tools/perf/perf test 37
37: BPF filter :
37.1: Basic BPF filtering : Ok
37.2: BPF pinning : Ok
37.3: BPF prologue generation : Ok
37.4: BPF relocation checker : Ok # tools/perf/perf test 37 -v 2>&1 | grep pinned
libbpf: pinned map '/sys/fs/bpf/perf_test/flip_table'
libbpf: pinned program '/sys/fs/bpf/perf_test/func=SyS_epoll_wait/0'---
v3: Initial post.
--- tools/perf/tests/bpf.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
tools/perf/tests/bpf.c +41 -1
@@ -5,11 +5,13 @@#include <util/evlist.h> #include <linux/bpf.h> #include <linux/filter.h> +#include <api/fs/fs.h> #include <bpf/bpf.h> #include "tests.h" #include "llvm.h" #include "debug.h" #define NR_ITERS 111 +#define PERF_TEST_BPF_PATH "/sys/fs/bpf/perf_test"#ifdef HAVE_LIBBPF_SUPPORT
@@ -54,6 +56,7 @@ static struct {const char *msg_load_fail;int (*target_func)(void );int expect_result; +bool pin; } bpf_testcase_table[] = { { LLVM_TESTCASE_BASE,
@@ -63,6 +66,17 @@ static struct {"load bpf object failed" , &epoll_wait_loop, (NR_ITERS +1 ) /2 , + false, + }, + { +LLVM_TESTCASE_BASE , +"BPF pinning" , +"[bpf_pinning]" , +"fix kbuild first" , +"check your vmlinux setting?" , + &epoll_wait_loop, + (NR_ITERS +1 ) /2 , + true, }, #ifdef HAVE_BPF_PROLOGUE {
@@ -73,6 +87,7 @@ static struct {"check your vmlinux setting?" , &llseek_loop, (NR_ITERS +1 ) /4 , + false, }, #endif {
@@ -83,6 +98,7 @@ static struct { "libbpf error when dealing with relocation", NULL, 0, + false, }, };
@@ -226,10 +242,34 @@ static int __test__bpf(int idx) goto out; } -if (obj) +if (obj) { ret =do_test (obj, bpf_testcase_table[idx].target_func, bpf_testcase_table[idx].expect_result); +if (ret !=TEST_OK ) + goto out; +if (bpf_testcase_table[idx].pin) { +int err; + +if (!bpf_fs__mount ()) { +pr_debug ("BPF filesystem not mounted\n" ); + ret =TEST_FAIL ; + goto out; + } + err =mkdir (PERF_TEST_BPF_PATH ,0777 ); +if (err && errno !=EEXIST ) { +pr_debug ("Failed to make perf_test dir: %s\n" , +strerror (errno)); + ret =TEST_FAIL ; + goto out; + } +if (bpf_object__pin (obj,PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; +if (rm_rf (PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; + } + } + out:bpf__clear ();return ret;
Signature · 1 line
2.11.0
tip-bot for Joe Stringer
merge bot[tip:perf/core] perf test: Add libbpf pinning test
perf test: Add libbpf pinning test
Commit-ID: a26305363d4b3a586a2d3554c22705538aa4e926 Gitweb: http://git.kernel.org/tip/a26305363d4b3a586a2d3554c22705538aa4e926 Author: Joe Stringer <[email protected]> AuthorDate: Thu, 26 Jan 2017 13:20:01 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 31 Jan 2017 16:20:08 -0300
perf test: Add libbpf pinning test
Add a test for the newly added BPF object pinning functionality.
For example:
# tools/perf/perf test 37
37: BPF filter :
37.1: Basic BPF filtering : Ok
37.2: BPF pinning : Ok
37.3: BPF prologue generation : Ok
37.4: BPF relocation checker : Ok # tools/perf/perf test 37 -v 2>&1 | grep pinned
libbpf: pinned map '/sys/fs/bpf/perf_test/flip_table'
libbpf: pinned program '/sys/fs/bpf/perf_test/func=SyS_epoll_wait/0'--- tools/perf/tests/bpf.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
tools/perf/tests/bpf.c +41 -1
@@ -5,11 +5,13 @@#include <util/evlist.h> #include <linux/bpf.h> #include <linux/filter.h> +#include <api/fs/fs.h> #include <bpf/bpf.h> #include "tests.h" #include "llvm.h" #include "debug.h" #define NR_ITERS 111 +#define PERF_TEST_BPF_PATH "/sys/fs/bpf/perf_test"#ifdef HAVE_LIBBPF_SUPPORT
@@ -54,6 +56,7 @@ static struct {const char *msg_load_fail;int (*target_func)(void );int expect_result; +bool pin; } bpf_testcase_table[] = { { LLVM_TESTCASE_BASE,
@@ -63,6 +66,17 @@ static struct {"load bpf object failed" , &epoll_wait_loop, (NR_ITERS +1 ) /2 , + false, + }, + { +LLVM_TESTCASE_BASE , +"BPF pinning" , +"[bpf_pinning]" , +"fix kbuild first" , +"check your vmlinux setting?" , + &epoll_wait_loop, + (NR_ITERS +1 ) /2 , + true, }, #ifdef HAVE_BPF_PROLOGUE {
@@ -73,6 +87,7 @@ static struct {"check your vmlinux setting?" , &llseek_loop, (NR_ITERS +1 ) /4 , + false, }, #endif {
@@ -83,6 +98,7 @@ static struct { "libbpf error when dealing with relocation", NULL, 0, + false, }, };
@@ -226,10 +242,34 @@ static int __test__bpf(int idx) goto out; } -if (obj) +if (obj) { ret =do_test (obj, bpf_testcase_table[idx].target_func, bpf_testcase_table[idx].expect_result); +if (ret !=TEST_OK ) + goto out; +if (bpf_testcase_table[idx].pin) { +int err; + +if (!bpf_fs__mount ()) { +pr_debug ("BPF filesystem not mounted\n" ); + ret =TEST_FAIL ; + goto out; + } + err =mkdir (PERF_TEST_BPF_PATH ,0777 ); +if (err && errno !=EEXIST ) { +pr_debug ("Failed to make perf_test dir: %s\n" , +strerror (errno)); + ret =TEST_FAIL ; + goto out; + } +if (bpf_object__pin (obj,PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; +if (rm_rf (PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; + } + } + out:bpf__clear ();return ret;
Em Thu, Jan 26, 2017 at 01:19:55PM -0800, Joe Stringer escreveu:
Quoted 8 lines
This series adds pinning functionality for maps, programs, and objects. Library users may call
bpf_map__pin(map, path)orbpf_program__pin(prog, path)to pin maps and programs separately, or usebpf_object__pin(obj, path)to pin all maps and programs from the BPF object to the path. The map and program variations require a path where it will be pinned in the filesystem, and the object variation will create named directories for each program with instances within, and mount the maps by name under the path.
Quoted 5 lines
For example, with the directory '
/sys/fs/bpf/foo' and a BPF object which contains two instances of a program named 'bar', and a map named 'baz':/sys/fs/bpf/foo/bar/0/sys/fs/bpf/foo/bar/1/sys/fs/bpf/foo/baz
Thanks, applied, after some minor fixes.
- Arnaldo
Quoted 31 lines
---
v3: Split outbpf_program__pin_instance().
Change the paths from PATH/{maps,progs}/foo to the above.
Drop the patches that were applied.
Add a perf test to check that pinning works.
v2: Wang Nan provided improvements to patch 1.
Dropped patch 2 from v1.
Added acks for acked patches.
Split thebpf_obj__pin()to also provide map / program pinning APIs. Allow users to provide full filesystem path (don't autodetect/mount BPFFS).
v1: Initial post.Joe Stringer (6):
tools lib bpf: Add BPF program pinning APIs. tools lib bpf: Addbpf_map__pin()
tools lib bpf: Addbpf_object__pin()tools perf util: Makerm_rf(path)argument const tools lib api fs: Addbpf_fsfilesystem detector perf test: Add libbpf pinning testtools/lib/api/fs/fs.c | 16 +++++ tools/lib/api/fs/fs.h | 1 + tools/lib/bpf/libbpf.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 5 ++ tools/perf/tests/bpf.c | 42 ++++++++++- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- 7 files changed, 253 insertions(+), 3 deletions(-)Signature · 1 line
2.11.0