Message ID | 20190219141332.23103-1-alban@kinvolk.io |
---|---|
State | Accepted |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf-next,v2] bpf: bpftool, fix documentation for attach types | expand |
2019-02-19 15:13 UTC+0100 ~ Alban Crequy <alban.crequy@gmail.com> > From: Alban Crequy <alban@kinvolk.io> > > 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 > b7d3826c2ed6 ("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: Alban Crequy <alban@kinvolk.io> > > --- > > Changes v1 to v2: > - fix man pages & bash completion (from Quentin's review) Thanks a lot! Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
On 02/19/2019 03:13 PM, Alban Crequy wrote: > From: Alban Crequy <alban@kinvolk.io> > > 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 > b7d3826c2ed6 ("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: Alban Crequy <alban@kinvolk.io> Applied, thanks Alban!
diff --git a/tools/bpf/bpftool/Documentation/bpftool-prog.rst b/tools/bpf/bpftool/Documentation/bpftool-prog.rst index 7e59495cb028..12bc1e2d4b46 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-prog.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-prog.rst @@ -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** | } diff --git a/tools/bpf/bpftool/bash-completion/bpftool b/tools/bpf/bpftool/bash-completion/bpftool index 763dd12482aa..b803827d01e8 100644 --- a/tools/bpf/bpftool/bash-completion/bpftool +++ b/tools/bpf/bpftool/bash-completion/bpftool @@ -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) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 33ed0806ccc0..db978c8d76a8 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -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" "",