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

Commit 2fd206d4 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-bpftool-misc-fixes' 



Jakub Kicinski says:

====================
This series addresses small issues that snuck through the review
of cgroup code.  "list" and "show" are now made aliases to satisfy
all users.  Small fix to errors printed is needed, errors can't
contain new line characters, otherwise JSON will break.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 5620e1a8 b4fac96d

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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,

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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.

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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.

tools/bpf/bpftool/Documentation/bpftool.rst

+3 −3
Original line number Original line Diff line number Diff line
@@ -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

===========

===========

tools/bpf/bpftool/bash-completion/bpftool

+4 −4
Original line number Original line Diff line number Diff line
@@ -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

            ;;

            ;;