On 21/09/2023 13:09, Daan De Meyer wrote: > Add the necessary plumbing to hook up the new cgroup unix sockaddr > hooks into bpftool. > > Signed-off-by: Daan De Meyer <daan.j.demeyer@xxxxxxxxx> > --- > .../bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +++++++++++++--- > tools/bpf/bpftool/Documentation/bpftool-prog.rst | 8 +++++--- > tools/bpf/bpftool/bash-completion/bpftool | 14 +++++++------- > tools/bpf/bpftool/cgroup.c | 16 +++++++++------- > tools/bpf/bpftool/prog.c | 7 ++++--- > 5 files changed, 38 insertions(+), 23 deletions(-) > > diff --git a/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst b/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst > index bd015ec9847b..3e4f5ff24208 100644 > --- a/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst > +++ b/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst > @@ -102,21 +105,28 @@ DESCRIPTION > **post_bind6** return from bind(2) for an inet6 socket (since 4.17); > **connect4** call to connect(2) for an inet4 socket (since 4.17); > **connect6** call to connect(2) for an inet6 socket (since 4.17); > + **connectun** call to connect(2) for a unix socket (since 6.3); > **sendmsg4** call to sendto(2), sendmsg(2), sendmmsg(2) for an > unconnected udp4 socket (since 4.18); > **sendmsg6** call to sendto(2), sendmsg(2), sendmmsg(2) for an > unconnected udp6 socket (since 4.18); > + **sendmsgun** call to sendto(2), sendmsg(2), sendmmsg(2) for > + an unconnected unix socket (since 6.3); > **recvmsg4** call to recvfrom(2), recvmsg(2), recvmmsg(2) for > an unconnected udp4 socket (since 5.2); > **recvmsg6** call to recvfrom(2), recvmsg(2), recvmmsg(2) for > an unconnected udp6 socket (since 5.2); > + **recvmsgun** call to recvfrom(2), recvmsg(2), recvmmsg(2) for > + an unconnected unix socket (since 6.3); > **sysctl** sysctl access (since 5.2); > **getsockopt** call to getsockopt (since 5.3); > **setsockopt** call to setsockopt (since 5.3); > **getpeername4** call to getpeername(2) for an inet4 socket (since 5.8); > **getpeername6** call to getpeername(2) for an inet6 socket (since 5.8); > + **getpeernameun** call to getpeername(2) for a unix socket (since 6.3); > **getsockname4** call to getsockname(2) for an inet4 socket (since 5.8); > **getsockname6** call to getsockname(2) for an inet6 socket (since 5.8). > + **getsocknameun** call to getsockname(2) for a unix socket (since 6.3); Same comment as for v4 - please update the kernel version (6.3) for the new entries. Bpftool changes look good otherwise. Acked-by: Quentin Monnet <quentin@xxxxxxxxxxxxx>
