Commit a5d9265e authored by Alban Crequy's avatar Alban Crequy Committed by Daniel Borkmann
Browse files

bpf: bpftool, fix documentation for attach types 



bpftool has support for attach types "stream_verdict" and
"stream_parser" but the documentation was referring to them as
"skb_verdict" and "skb_parse". The inconsistency comes from commit
b7d3826c ("bpf: bpftool, add support for attaching programs to
maps").

This patch changes the documentation to match the implementation:
- "bpftool prog help"
- man pages
- bash completion

Signed-off-by: default avatarAlban Crequy <alban@kinvolk.io>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent c9b747db

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ PROG COMMANDS 
|		**cgroup/connect4** | **cgroup/connect6** | **cgroup/sendmsg4** | **cgroup/sendmsg6**

|	}

|       *ATTACH_TYPE* := {

|		**msg_verdict** | **skb_verdict** | **skb_parse** | **flow_dissector**

|		**msg_verdict** | **stream_verdict** | **stream_parser** | **flow_dissector**

|	}

tools/bpf/bpftool/bash-completion/bpftool

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ _bpftool() 
                            return 0

                            ;;

                        5)

                            COMPREPLY=( $( compgen -W 'msg_verdict skb_verdict \

                                skb_parse flow_dissector' -- "$cur" ) )

                            COMPREPLY=( $( compgen -W 'msg_verdict stream_verdict \

                                stream_parser flow_dissector' -- "$cur" ) )

                            return 0

                            ;;

                        6)

tools/bpf/bpftool/prog.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ static int do_help(int argc, char **argv) 
		"                 cgroup/bind4 | cgroup/bind6 | cgroup/post_bind4 |\n"

		"                 cgroup/post_bind6 | cgroup/connect4 | cgroup/connect6 |\n"

		"                 cgroup/sendmsg4 | cgroup/sendmsg6 }\n"

		"       ATTACH_TYPE := { msg_verdict | skb_verdict | skb_parse |\n"

		"       ATTACH_TYPE := { msg_verdict | stream_verdict | stream_parser |\n"

		"                        flow_dissector }\n"

		"       " HELP_SPEC_OPTIONS "\n"

		"",

CRA Git | Maintained and supported by SUSTech CRA and CCSE