Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ebe6dbd authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

tools: bpftool: alias show and list commands 



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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 65b875bc

tools/bpf/bpftool/Documentation/bpftool-cgroup.rst

+3 −3
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ SYNOPSIS 
	*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }



	*COMMANDS* :=

	{ **list** | **attach** | **detach** | **help** }

	{ **show** | **list** | **attach** | **detach** | **help** }



MAP COMMANDS

=============



|	**bpftool** **cgroup list** *CGROUP*

|	**bpftool** **cgroup { show | list }** *CGROUP*

|	**bpftool** **cgroup attach** *CGROUP* *ATTACH_TYPE* *PROG* [*ATTACH_FLAGS*]

|	**bpftool** **cgroup detach** *CGROUP* *ATTACH_TYPE* *PROG*

|	**bpftool** **cgroup help**
@@ -31,7 +31,7 @@ MAP COMMANDS 


DESCRIPTION

===========

	**bpftool cgroup list** *CGROUP*

	**bpftool cgroup { show | list }** *CGROUP*

		  List all programs attached to the cgroup *CGROUP*.



		  Output will start with program ID followed by attach type,

tools/bpf/bpftool/Documentation/bpftool-map.rst

+3 −3
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ SYNOPSIS 
	*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }



	*COMMANDS* :=

	{ **show** | **dump** | **update** | **lookup** | **getnext** | **delete**

	{ **show** | **list** | **dump** | **update** | **lookup** | **getnext** | **delete**

	| **pin** | **help** }



MAP COMMANDS

=============



|	**bpftool** **map show**   [*MAP*]

|	**bpftool** **map { show | list }**   [*MAP*]

|	**bpftool** **map dump**    *MAP*

|	**bpftool** **map update**  *MAP*  **key** *BYTES*   **value** *VALUE* [*UPDATE_FLAGS*]

|	**bpftool** **map lookup**  *MAP*  **key** *BYTES*
@@ -36,7 +36,7 @@ MAP COMMANDS 


DESCRIPTION

===========

	**bpftool map show**   [*MAP*]

	**bpftool map { show | list }**   [*MAP*]

		  Show information about loaded maps.  If *MAP* is specified

		  show information only about given map, otherwise list all

		  maps currently loaded on the system.

tools/bpf/bpftool/Documentation/bpftool-prog.rst

+3 −3
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ SYNOPSIS 
	*OPTIONS* := { { **-j** | **--json** } [{ **-p** | **--pretty** }] | { **-f** | **--bpffs** } }



	*COMMANDS* :=

	{ **show** | **dump xlated** | **dump jited** | **pin** | **load** | **help** }

	{ **show** | **list** | **dump xlated** | **dump jited** | **pin** | **load** | **help** }



MAP COMMANDS

=============



|	**bpftool** **prog show** [*PROG*]

|	**bpftool** **prog { show | list }** [*PROG*]

|	**bpftool** **prog dump xlated** *PROG* [{**file** *FILE* | **opcodes**}]

|	**bpftool** **prog dump jited**  *PROG* [{**file** *FILE* | **opcodes**}]

|	**bpftool** **prog pin** *PROG* *FILE*
@@ -31,7 +31,7 @@ MAP COMMANDS 


DESCRIPTION

===========

	**bpftool prog show** [*PROG*]

	**bpftool prog { show | list }** [*PROG*]

		  Show information about loaded programs.  If *PROG* is

		  specified show information only about given program, otherwise

		  list all programs currently loaded on the system.

tools/bpf/bpftool/Documentation/bpftool.rst

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ SYNOPSIS 
	| { **-j** | **--json** } [{ **-p** | **--pretty** }] }



	*MAP-COMMANDS* :=

	{ **show** | **dump** | **update** | **lookup** | **getnext** | **delete**

	{ **show** | **list** | **dump** | **update** | **lookup** | **getnext** | **delete**

	| **pin** | **help** }



	*PROG-COMMANDS* := { **show** | **dump jited** | **dump xlated** | **pin**

	*PROG-COMMANDS* := { **show** | **list** | **dump jited** | **dump xlated** | **pin**

	| **load** | **help** }



	*CGROUP-COMMANDS* := { **list** | **attach** | **detach** | **help** }

	*CGROUP-COMMANDS* := { **show** | **list** | **attach** | **detach** | **help** }



DESCRIPTION

===========

tools/bpf/bpftool/bash-completion/bpftool

+4 −4
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ _bpftool() 


            local PROG_TYPE='id pinned tag'

            case $command in

                show)

                show|list)

                    [[ $prev != "$command" ]] && return 0

                    COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) )

                    return 0
@@ -232,7 +232,7 @@ _bpftool() 
                    ;;

                *)

                    [[ $prev == $object ]] && \

                        COMPREPLY=( $( compgen -W 'dump help pin show' -- \

                        COMPREPLY=( $( compgen -W 'dump help pin show list' -- \

                            "$cur" ) )

                    ;;

            esac
@@ -240,7 +240,7 @@ _bpftool() 
        map)

            local MAP_TYPE='id pinned'

            case $command in

                show|dump)

                show|list|dump)

                    case $prev in

                        $command)

                            COMPREPLY=( $( compgen -W "$MAP_TYPE" -- "$cur" ) )
@@ -343,7 +343,7 @@ _bpftool() 
                *)

                    [[ $prev == $object ]] && \

                        COMPREPLY=( $( compgen -W 'delete dump getnext help \

                            lookup pin show update' -- "$cur" ) )

                            lookup pin show list update' -- "$cur" ) )

                    ;;

            esac

            ;;