redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

tools: bpftool: alias show and list commands

Browse source 
iproute2 seems to accept show and list as aliases.
Let's do the same thing, and by allowing both bring
cgroup syntax back in line with maps and progs.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jakub Kicinski 2018-01-02 14:48:36 -08:00 committed by Daniel Borkmann
parent 65b875bcc8
commit 6ebe6dbd68
8 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/bpf/bpftool/Documentation/bpftool-cgroup.rst
View file

@ -15,12 +15,12 @@ SYNOPSIS
*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } } *OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }
*COMMANDS* := *COMMANDS* :=
{ **list** | **attach** | **detach** | **help** } { **show** | **list** | **attach** | **detach** | **help** }
MAP COMMANDS MAP COMMANDS
============= =============
| **bpftool** **cgroup list** *CGROUP* | **bpftool** **cgroup { show | list }** *CGROUP*
| **bpftool** **cgroup attach** *CGROUP* *ATTACH_TYPE* *PROG* [*ATTACH_FLAGS*] | **bpftool** **cgroup attach** *CGROUP* *ATTACH_TYPE* *PROG* [*ATTACH_FLAGS*]
| **bpftool** **cgroup detach** *CGROUP* *ATTACH_TYPE* *PROG* | **bpftool** **cgroup detach** *CGROUP* *ATTACH_TYPE* *PROG*
| **bpftool** **cgroup help** | **bpftool** **cgroup help**
@ -31,7 +31,7 @@ MAP COMMANDS
DESCRIPTION DESCRIPTION
=========== ===========
**bpftool cgroup list** *CGROUP* **bpftool cgroup { show | list }** *CGROUP*
List all programs attached to the cgroup *CGROUP*. List all programs attached to the cgroup *CGROUP*.
Output will start with program ID followed by attach type, Output will start with program ID followed by attach type,

6
tools/bpf/bpftool/Documentation/bpftool-map.rst
View file

@ -15,13 +15,13 @@ SYNOPSIS
*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } } *OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }
*COMMANDS* := *COMMANDS* :=
{ **show** | **dump** | **update** | **lookup** | **getnext** | **delete** { **show** | **list** | **dump** | **update** | **lookup** | **getnext** | **delete**
| **pin** | **help** } | **pin** | **help** }
MAP COMMANDS MAP COMMANDS
============= =============
| **bpftool** **map show** [*MAP*] | **bpftool** **map { show | list }** [*MAP*]
| **bpftool** **map dump** *MAP* | **bpftool** **map dump** *MAP*
| **bpftool** **map update** *MAP* **key** *BYTES* **value** *VALUE* [*UPDATE_FLAGS*] | **bpftool** **map update** *MAP* **key** *BYTES* **value** *VALUE* [*UPDATE_FLAGS*]
| **bpftool** **map lookup** *MAP* **key** *BYTES* | **bpftool** **map lookup** *MAP* **key** *BYTES*
@ -36,7 +36,7 @@ MAP COMMANDS
DESCRIPTION DESCRIPTION
=========== ===========
**bpftool map show** [*MAP*] **bpftool map { show | list }** [*MAP*]
Show information about loaded maps. If *MAP* is specified Show information about loaded maps. If *MAP* is specified
show information only about given map, otherwise list all show information only about given map, otherwise list all
maps currently loaded on the system. maps currently loaded on the system.

6
tools/bpf/bpftool/Documentation/bpftool-prog.rst
View file

@ -15,12 +15,12 @@ SYNOPSIS
*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } } *OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }
*COMMANDS* := *COMMANDS* :=
{ **show** | **dump xlated** | **dump jited** | **pin** | **load** | **help** } { **show** | **list** | **dump xlated** | **dump jited** | **pin** | **load** | **help** }
MAP COMMANDS MAP COMMANDS
============= =============
| **bpftool** **prog show** [*PROG*] | **bpftool** **prog { show | list }** [*PROG*]
| **bpftool** **prog dump xlated** *PROG* [{**file** *FILE* | **opcodes**}] | **bpftool** **prog dump xlated** *PROG* [{**file** *FILE* | **opcodes**}]
| **bpftool** **prog dump jited** *PROG* [{**file** *FILE* | **opcodes**}] | **bpftool** **prog dump jited** *PROG* [{**file** *FILE* | **opcodes**}]
| **bpftool** **prog pin** *PROG* *FILE* | **bpftool** **prog pin** *PROG* *FILE*
@ -31,7 +31,7 @@ MAP COMMANDS
DESCRIPTION DESCRIPTION
=========== ===========
**bpftool prog show** [*PROG*] **bpftool prog { show | list }** [*PROG*]
Show information about loaded programs. If *PROG* is Show information about loaded programs. If *PROG* is
specified show information only about given program, otherwise specified show information only about given program, otherwise
list all programs currently loaded on the system. list all programs currently loaded on the system.

6
tools/bpf/bpftool/Documentation/bpftool.rst
View file

@ -22,13 +22,13 @@ SYNOPSIS
| { **-j** | **--json** } [{ **-p** | **--pretty** }] } | { **-j** | **--json** } [{ **-p** | **--pretty** }] }
*MAP-COMMANDS* := *MAP-COMMANDS* :=
{ **show** | **dump** | **update** | **lookup** | **getnext** | **delete** { **show** | **list** | **dump** | **update** | **lookup** | **getnext** | **delete**
| **pin** | **help** } | **pin** | **help** }
*PROG-COMMANDS* := { **show** | **dump jited** | **dump xlated** | **pin** *PROG-COMMANDS* := { **show** | **list** | **dump jited** | **dump xlated** | **pin**
| **load** | **help** } | **load** | **help** }
*CGROUP-COMMANDS* := { **list** | **attach** | **detach** | **help** } *CGROUP-COMMANDS* := { **show** | **list** | **attach** | **detach** | **help** }
DESCRIPTION DESCRIPTION
=========== ===========

8
tools/bpf/bpftool/bash-completion/bpftool
View file

@ -197,7 +197,7 @@ _bpftool()
local PROG_TYPE='id pinned tag' local PROG_TYPE='id pinned tag'
case $command in case $command in
show) show|list)
[[ $prev != "$command" ]] && return 0 [[ $prev != "$command" ]] && return 0
COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) ) COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) )
return 0 return 0
@ -232,7 +232,7 @@ _bpftool()
;; ;;
*) *)
[[ $prev == $object ]] && \ [[ $prev == $object ]] && \
COMPREPLY=( $( compgen -W 'dump help pin show' -- \ COMPREPLY=( $( compgen -W 'dump help pin show list' -- \
"$cur" ) ) "$cur" ) )
;; ;;
esac esac
@ -240,7 +240,7 @@ _bpftool()
map) map)
local MAP_TYPE='id pinned' local MAP_TYPE='id pinned'
case $command in case $command in
show|dump) show|list|dump)
case $prev in case $prev in
$command) $command)
COMPREPLY=( $( compgen -W "$MAP_TYPE" -- "$cur" ) ) COMPREPLY=( $( compgen -W "$MAP_TYPE" -- "$cur" ) )
@ -343,7 +343,7 @@ _bpftool()
*) *)
[[ $prev == $object ]] && \ [[ $prev == $object ]] && \
COMPREPLY=( $( compgen -W 'delete dump getnext help \ COMPREPLY=( $( compgen -W 'delete dump getnext help \
lookup pin show update' -- "$cur" ) ) lookup pin show list update' -- "$cur" ) )
;; ;;
esac esac
;; ;;

3
tools/bpf/bpftool/cgroup.c
View file

@ -277,7 +277,7 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s list CGROUP\n" "Usage: %s %s { show | list } CGROUP\n"
" %s %s attach CGROUP ATTACH_TYPE PROG [ATTACH_FLAGS]\n" " %s %s attach CGROUP ATTACH_TYPE PROG [ATTACH_FLAGS]\n"
" %s %s detach CGROUP ATTACH_TYPE PROG\n" " %s %s detach CGROUP ATTACH_TYPE PROG\n"
" %s %s help\n" " %s %s help\n"
@ -294,6 +294,7 @@ static int do_help(int argc, char **argv)
} }
static const struct cmd cmds[] = { static const struct cmd cmds[] = {
{ "show", do_show },
{ "list", do_show }, { "list", do_show },
{ "attach", do_attach }, { "attach", do_attach },
{ "detach", do_detach }, { "detach", do_detach },

3
tools/bpf/bpftool/map.c
View file

@ -861,7 +861,7 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s show [MAP]\n" "Usage: %s %s { show | list } [MAP]\n"
" %s %s dump MAP\n" " %s %s dump MAP\n"
" %s %s update MAP key BYTES value VALUE [UPDATE_FLAGS]\n" " %s %s update MAP key BYTES value VALUE [UPDATE_FLAGS]\n"
" %s %s lookup MAP key BYTES\n" " %s %s lookup MAP key BYTES\n"
@ -885,6 +885,7 @@ static int do_help(int argc, char **argv)
static const struct cmd cmds[] = { static const struct cmd cmds[] = {
{ "show", do_show }, { "show", do_show },
{ "list", do_show },
{ "help", do_help }, { "help", do_help },
{ "dump", do_dump }, { "dump", do_dump },
{ "update", do_update }, { "update", do_update },

3
tools/bpf/bpftool/prog.c
View file

@ -836,7 +836,7 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s show [PROG]\n" "Usage: %s %s { show | list } [PROG]\n"
" %s %s dump xlated PROG [{ file FILE | opcodes }]\n" " %s %s dump xlated PROG [{ file FILE | opcodes }]\n"
" %s %s dump jited PROG [{ file FILE | opcodes }]\n" " %s %s dump jited PROG [{ file FILE | opcodes }]\n"
" %s %s pin PROG FILE\n" " %s %s pin PROG FILE\n"
@ -854,6 +854,7 @@ static int do_help(int argc, char **argv)
static const struct cmd cmds[] = { static const struct cmd cmds[] = {
{ "show", do_show }, { "show", do_show },
{ "list", do_show },
{ "help", do_help }, { "help", do_help },
{ "dump", do_dump }, { "dump", do_dump },
{ "pin", do_pin }, { "pin", do_pin },