From: Alban Crequy <alban.crequy@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
alban@kinvolk.io, iago@kinvolk.io
Subject: [PATCH bpf-next v1 5/7] tools: bpftool: support loading map by fd from parent process
Date: Wed, 20 Mar 2019 18:33:30 +0100 [thread overview]
Message-ID: <20190320173332.18105-5-alban@kinvolk.io> (raw)
In-Reply-To: <20190320173332.18105-1-alban@kinvolk.io>
From: Alban Crequy <alban@kinvolk.io>
Using a file descriptor passed by the parent process enables
applications to fork a bpftool command to inspect a map they know by
file descriptor even when they don't support bpffs or map ids.
Documentation and bash completion updated as well.
Signed-off-by: Alban Crequy <alban@kinvolk.io>
---
tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 ++++++++
tools/bpf/bpftool/bash-completion/bpftool | 10 +++++-----
tools/bpf/bpftool/map.c | 13 +++++++++++++
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst b/tools/bpf/bpftool/Documentation/bpftool-map.rst
index dfd8352fa453..658fe2fb8ecf 100644
--- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
+++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst
@@ -265,6 +265,14 @@ would be lost as soon as bpftool exits).
anon_inode:bpf-map
+**# bpftool map exec pinned /sys/fs/bpf/foo fd 99 cmd -- bpftool map show fd 99**
+
+::
+
+ 10: hash name some_map flags 0x0
+ key 4B value 8B max_entries 2048 memlock 167936B
+
+
SEE ALSO
========
**bpf**\ (2),
diff --git a/tools/bpf/bpftool/bash-completion/bpftool b/tools/bpf/bpftool/bash-completion/bpftool
index 63cd53c4d3a7..9ec1833bda1e 100644
--- a/tools/bpf/bpftool/bash-completion/bpftool
+++ b/tools/bpf/bpftool/bash-completion/bpftool
@@ -253,7 +253,7 @@ _bpftool()
esac
local PROG_TYPE='id pinned tag'
- local MAP_TYPE='id pinned'
+ local MAP_TYPE='id pinned fd'
case $command in
show|list)
[[ $prev != "$command" ]] && return 0
@@ -343,7 +343,7 @@ _bpftool()
obj=${words[3]}
if [[ ${words[-4]} == "map" ]]; then
- COMPREPLY=( $( compgen -W "id pinned" -- "$cur" ) )
+ COMPREPLY=( $( compgen -W "id pinned fd" -- "$cur" ) )
return 0
fi
if [[ ${words[-3]} == "map" ]]; then
@@ -406,7 +406,7 @@ _bpftool()
esac
;;
map)
- local MAP_TYPE='id pinned'
+ local MAP_TYPE='id pinned fd'
case $command in
show|list|dump|peek|pop|dequeue)
case $prev in
@@ -462,7 +462,7 @@ _bpftool()
return 0
;;
innermap)
- COMPREPLY+=( $( compgen -W "id pinned" -- "$cur" ) )
+ COMPREPLY+=( $( compgen -W "id pinned fd" -- "$cur" ) )
return 0
;;
id)
@@ -525,7 +525,7 @@ _bpftool()
# map, depending on the type of the map to update.
case "$(_bpftool_map_guess_map_type)" in
array_of_maps|hash_of_maps)
- local MAP_TYPE='id pinned'
+ local MAP_TYPE='id pinned fd'
COMPREPLY+=( $( compgen -W "$MAP_TYPE" \
-- "$cur" ) )
return 0
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index 768497364cee..9befcabc299d 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -125,6 +125,19 @@ int map_parse_fd(int *argc, char ***argv)
NEXT_ARGP();
return open_obj_pinned_any(path, BPF_OBJ_MAP);
+ } else if (is_prefix(**argv, "fd")) {
+ char *endptr;
+
+ NEXT_ARGP();
+
+ fd = strtoul(**argv, &endptr, 0);
+ if (*endptr) {
+ p_err("can't parse %s as fd", **argv);
+ return -1;
+ }
+ NEXT_ARGP();
+
+ return dup(fd);
}
p_err("expected 'id' or 'pinned', got: '%s'?", **argv);
--
2.20.1
next prev parent reply other threads:[~2019-03-20 17:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 17:33 [PATCH bpf-next v1 1/7] tools: bpftool: fix infinite loop Alban Crequy
2019-03-20 17:33 ` [PATCH bpf-next v1 2/7] tools: bpftool: fix error message on invalid argument count Alban Crequy
2019-03-20 21:02 ` Jakub Kicinski
2019-03-20 17:33 ` [PATCH bpf-next v1 3/7] tools: bpftool: create map of maps Alban Crequy
2019-03-20 19:00 ` Quentin Monnet
2019-03-20 17:33 ` [PATCH bpf-next v1 4/7] tools: bpftool: implement map exec command Alban Crequy
2019-03-20 19:01 ` Quentin Monnet
2019-03-20 21:23 ` Jakub Kicinski
2019-03-21 9:57 ` Alban Crequy
2019-03-21 20:16 ` Jakub Kicinski
2019-03-20 17:33 ` Alban Crequy [this message]
2019-03-20 19:05 ` [PATCH bpf-next v1 5/7] tools: bpftool: support loading map by fd from parent process Quentin Monnet
2019-03-20 17:33 ` [PATCH bpf-next v1 6/7] tools: bpftool: fix bpffs mount when pinning subdirectories Alban Crequy
2019-03-20 19:01 ` Quentin Monnet
2019-03-20 17:33 ` [PATCH bpf-next v1 7/7] tools: bpftool: add error message on map pinning failure Alban Crequy
2019-03-20 19:01 ` Quentin Monnet
2019-03-20 20:54 ` [PATCH bpf-next v1 1/7] tools: bpftool: fix infinite loop Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190320173332.18105-5-alban@kinvolk.io \
--to=alban.crequy@gmail.com \
--cc=alban@kinvolk.io \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=iago@kinvolk.io \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).