| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20190315183211.GB24482@kernel.org>
Date: Fri, 15 Mar 2019 15:41:41 -0300
From: Arnaldo Carvalho de Melo <acme@...hat.com>
To: Quentin Monnet <quentin.monnet@...ronome.com>,
Daniel Borkmann <daniel@...earbox.net>
Cc: Alexei Starovoitov <ast@...nel.org>,
Jakub Kicinski <jakub.kicinski@...ronome.com>,
Jiri Olsa <jolsa@...nel.org>, Martin KaFai Lau <kafai@...com>,
Namhyung Kim <namhyung@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Song Liu <songliubraving@...com>,
Stanislav Fomichev <sdf@...gle.com>,
Yonghong Song <yhs@...com>, bpf@...r.kernel.org,
netdev@...r.kernel.org
Subject: [PATCH 1/1] bpftool: Allow referring to maps by its name
While developing 'perf trace' and looking at BPF maps it puts in place I
noticed that one needs to first use 'bpftool map' to lookup a map id to
then use 'bpftool map dump map id <map-id-looked-up>'.
This is needed because everytime we restart 'perf trace' the map IDs
gets changed so we need to do the ID lookup again.
To speed up this sequence, allow specifying just the map name, look up
its ID and then use the existing routines as if the user had provided
the map id.
This:
# bpftool map
13: lpm_trie flags 0x1
key 8B value 8B max_entries 1 memlock 4096B
14: lpm_trie flags 0x1
key 20B value 8B max_entries 1 memlock 4096B
15: lpm_trie flags 0x1
key 8B value 8B max_entries 1 memlock 4096B
16: lpm_trie flags 0x1
key 20B value 8B max_entries 1 memlock 4096B
17: lpm_trie flags 0x1
key 8B value 8B max_entries 1 memlock 4096B
18: lpm_trie flags 0x1
key 20B value 8B max_entries 1 memlock 4096B
21: lpm_trie flags 0x1
key 8B value 8B max_entries 1 memlock 4096B
22: lpm_trie flags 0x1
key 20B value 8B max_entries 1 memlock 4096B
28: perf_event_array name __augmented_sys flags 0x0
key 4B value 4B max_entries 8 memlock 4096B
29: array name syscalls flags 0x0
key 4B value 1B max_entries 512 memlock 8192B
30: hash name pids_filtered flags 0x0
key 4B value 1B max_entries 64 memlock 8192B
#
# bpftool map dump id 30
[{
"key": 26554,
"value": true
},{
"key": 2592,
"value": true
}
]
#
Now is equivalent to:
# bpftool map dump pids_filtered
[{
"key": 26554,
"value": true
},{
"key": 2592,
"value": true
}
]
#
Cc: Alexei Starovoitov <ast@...nel.org>
Cc: Daniel Borkmann <daniel@...earbox.net>
Cc: Jakub Kicinski <jakub.kicinski@...ronome.com>
cc: Jiri Olsa <jolsa@...nel.org>
Cc: Martin KaFai Lau <kafai@...com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Quentin Monnet <quentin.monnet@...ronome.com>
Cc: Song Liu <songliubraving@...com>
Cc: Stanislav Fomichev <sdf@...gle.com>
Cc: Yonghong Song <yhs@...com>
Link: https://lkml.kernel.org/n/tip-rrnxuhvety3j3rf0r9zlbfro@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/bpf/bpftool/map.c | 56 +++++++++++++++++++++++++++++++++++++----
1 file changed, 51 insertions(+), 5 deletions(-)
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index e0c650d91784..94789992b934 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -89,12 +89,55 @@ static void *alloc_value(struct bpf_map_info *info)
return malloc(info->value_size);
}
+static int bpf_map_get_id_by_name(const char *name, __u32 *idp)
+{
+ struct bpf_map_info info = {};
+ __u32 len = sizeof(info);
+ __u32 id = 0;
+ int err;
+ int fd;
+
+ while (true) {
+ err = bpf_map_get_next_id(id, &id);
+ if (err) {
+ if (errno == ENOENT)
+ break;
+ p_err("can't get next map: %s%s", strerror(errno),
+ errno == EINVAL ? " -- kernel too old?" : "");
+ break;
+ }
+
+ fd = bpf_map_get_fd_by_id(id);
+ if (fd < 0) {
+ if (errno == ENOENT)
+ continue;
+ p_err("can't get map by id (%u): %s",
+ id, strerror(errno));
+ break;
+ }
+
+ err = bpf_obj_get_info_by_fd(fd, &info, &len);
+ if (err) {
+ p_err("can't get map info: %s", strerror(errno));
+ close(fd);
+ break;
+ }
+
+ if (strcmp(info.name, name) == 0) {
+ *idp = id;
+ return 0;
+ }
+ }
+
+ return errno == ENOENT ? 0 : -1;
+}
+
int map_parse_fd(int *argc, char ***argv)
{
+ unsigned int id = 0;
int fd;
if (is_prefix(**argv, "id")) {
- unsigned int id;
char *endptr;
NEXT_ARGP();
@@ -104,8 +147,8 @@ int map_parse_fd(int *argc, char ***argv)
p_err("can't parse %s as ID", **argv);
return -1;
}
+get_fd_by_id:
NEXT_ARGP();
-
fd = bpf_map_get_fd_by_id(id);
if (fd < 0)
p_err("get map by id (%u): %s", id, strerror(errno));
@@ -119,9 +162,12 @@ int map_parse_fd(int *argc, char ***argv)
NEXT_ARGP();
return open_obj_pinned_any(path, BPF_OBJ_MAP);
+ } else {
+ if (bpf_map_get_id_by_name(**argv, &id) == 0)
+ goto get_fd_by_id;
}
- p_err("expected 'id' or 'pinned', got: '%s'?", **argv);
+ p_err("expected 'id' or 'pinned' or an existing map name, got: '%s'?", **argv);
return -1;
}
@@ -625,7 +671,7 @@ static int do_show(int argc, char **argv)
if (show_pinned)
build_pinned_obj_table(&map_table, BPF_OBJ_MAP);
- if (argc == 2) {
+ if (argc == 2 || argc == 1) {
fd = map_parse_fd_and_info(&argc, &argv, &info, &len);
if (fd < 0)
return -1;
@@ -741,7 +787,7 @@ static int do_dump(int argc, char **argv)
int err;
int fd;
- if (argc != 2)
+ if (argc != 2 && argc != 1)
usage();
fd = map_parse_fd_and_info(&argc, &argv, &info, &len);
--
2.20.1
----- End forwarded message -----
--
- Arnaldo
Powered by blists - more mailing lists