[PATCH v2] bpftool: Add sock_release help info for cgroup attach command

[PATCH v2] bpftool: Add sock_release help info for cgroup attach command

[Liu Jian]

The help information is not added when the function is added.
Add the missing help information.

Fixes: db94cc0b4805 ("bpftool: Add support for BPF_CGROUP_INET_SOCK_RELEASE")
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
v1 -> v2:
    Add changelog text.

 tools/bpf/bpftool/cgroup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
index d901cc1b904a..6e53b1d393f4 100644
--- a/tools/bpf/bpftool/cgroup.c
+++ b/tools/bpf/bpftool/cgroup.c
@@ -28,7 +28,8 @@
 	"                        connect6 | getpeername4 | getpeername6 |\n"   \
 	"                        getsockname4 | getsockname6 | sendmsg4 |\n"   \
 	"                        sendmsg6 | recvmsg4 | recvmsg6 |\n"           \
-	"                        sysctl | getsockopt | setsockopt }"
+	"                        sysctl | getsockopt | setsockopt |\n"	       \
+	"                        sock_release }"
 
 static unsigned int query_flags;
 
-- 
2.17.1

Re: [PATCH v2] bpftool: Add sock_release help info for cgroup attach command

[Quentin Monnet]

2021-05-24 16:03 UTC+0800 ~ Liu Jian <liujian56@huawei.com>
> The help information is not added when the function is added.
> Add the missing help information.
> 
> Fixes: db94cc0b4805 ("bpftool: Add support for BPF_CGROUP_INET_SOCK_RELEASE")
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
> v1 -> v2:
>     Add changelog text.
> 
>  tools/bpf/bpftool/cgroup.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
> index d901cc1b904a..6e53b1d393f4 100644
> --- a/tools/bpf/bpftool/cgroup.c
> +++ b/tools/bpf/bpftool/cgroup.c
> @@ -28,7 +28,8 @@
>  	"                        connect6 | getpeername4 | getpeername6 |\n"   \
>  	"                        getsockname4 | getsockname6 | sendmsg4 |\n"   \
>  	"                        sendmsg6 | recvmsg4 | recvmsg6 |\n"           \
> -	"                        sysctl | getsockopt | setsockopt }"
> +	"                        sysctl | getsockopt | setsockopt |\n"	       \
> +	"                        sock_release }"
>  
>  static unsigned int query_flags;
>  
> 

Thanks a lot!

Note that there are a few other places in bpftool where the attach point
should be added, would you mind updating them too? That would be: the
documentation page for bpftool-cgroup, the one for bpftool-prog, the
help message in prog.c, and the bash completion. It should all be
straightforward. You can try something like "grep recvmsg4
tools/bpf/bpftool" to find the relevant locations.

Best regards,
Quentin

RE: [PATCH v2] bpftool: Add sock_release help info for cgroup attach command

[liujian (CE)]

> -----Original Message-----
> From: Quentin Monnet [mailto:quentin@isovalent.com]
> Sent: Monday, May 24, 2021 4:23 PM
> To: liujian (CE) <liujian56@huawei.com>; ast@kernel.org;
> daniel@iogearbox.net; andrii@kernel.org; kafai@fb.com;
> songliubraving@fb.com; yhs@fb.com; john.fastabend@gmail.com;
> kpsingh@kernel.org; sdf@google.com; netdev@vger.kernel.org;
> bpf@vger.kernel.org
> Subject: Re: [PATCH v2] bpftool: Add sock_release help info for cgroup
> attach command
> 
> 2021-05-24 16:03 UTC+0800 ~ Liu Jian <liujian56@huawei.com>
> > The help information is not added when the function is added.
> > Add the missing help information.
> >
> > Fixes: db94cc0b4805 ("bpftool: Add support for
> > BPF_CGROUP_INET_SOCK_RELEASE")
> > Signed-off-by: Liu Jian <liujian56@huawei.com>
> > ---
> > v1 -> v2:
> >     Add changelog text.
> >
> >  tools/bpf/bpftool/cgroup.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
> > index d901cc1b904a..6e53b1d393f4 100644
> > --- a/tools/bpf/bpftool/cgroup.c
> > +++ b/tools/bpf/bpftool/cgroup.c
> > @@ -28,7 +28,8 @@
> >  	"                        connect6 | getpeername4 | getpeername6 |\n"   \
> >  	"                        getsockname4 | getsockname6 | sendmsg4 |\n"   \
> >  	"                        sendmsg6 | recvmsg4 | recvmsg6 |\n"           \
> > -	"                        sysctl | getsockopt | setsockopt }"
> > +	"                        sysctl | getsockopt | setsockopt |\n"	       \
> > +	"                        sock_release }"
> >
> >  static unsigned int query_flags;
> >
> >
> 
> Thanks a lot!
> 
> Note that there are a few other places in bpftool where the attach point
> should be added, would you mind updating them too? That would be: the
> documentation page for bpftool-cgroup, the one for bpftool-prog, the help
> message in prog.c, and the bash completion. It should all be straightforward.
> You can try something like "grep recvmsg4 tools/bpf/bpftool" to find the
> relevant locations.

OK, I'll change it together. Thanks for your review.

> Best regards,
> Quentin