Re: [PATCH bpf-next 3/7] tools: bpftool: complete and synchronise attach or map types

From: Quentin Monnet <quentin@isovalent.com>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>,
	Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next 3/7] tools: bpftool: complete and synchronise attach or map types
Date: Fri, 30 Jul 2021 22:47:34 +0100	[thread overview]
Message-ID: <7c8e25b4-1546-a411-ef21-ae6cd09477df@isovalent.com> (raw)
In-Reply-To: <CAEf4BzYp2QgaL9ORzs0sWk6KO63Q-9ixU-vOsFfLckE3-bPg6A@mail.gmail.com>

2021-07-30 11:52 UTC-0700 ~ Andrii Nakryiko <andrii.nakryiko@gmail.com>
> On Thu, Jul 29, 2021 at 9:29 AM Quentin Monnet <quentin@isovalent.com> wrote:
>>
>> Update bpftool's list of attach type names to tell it about the latest
>> attach types, or the "ringbuf" map. Also update the documentation, help
>> messages, and bash completion when relevant.
>>
>> These missing items were reported by the newly added Python script used
>> to help maintain consistency in bpftool.
>>
>> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
>> ---
>>  .../bpftool/Documentation/bpftool-prog.rst    |  2 +-
>>  tools/bpf/bpftool/bash-completion/bpftool     |  5 +-
>>  tools/bpf/bpftool/common.c                    | 76 ++++++++++---------
>>  tools/bpf/bpftool/prog.c                      |  4 +-
>>  4 files changed, 47 insertions(+), 40 deletions(-)
>>

>> diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
>> index 1828bba19020..b47797cac64f 100644
>> --- a/tools/bpf/bpftool/common.c
>> +++ b/tools/bpf/bpftool/common.c
>> @@ -31,42 +31,48 @@
>>  #endif
>>
>>  const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = {
>> -       [BPF_CGROUP_INET_INGRESS]       = "ingress",
>> -       [BPF_CGROUP_INET_EGRESS]        = "egress",
>> -       [BPF_CGROUP_INET_SOCK_CREATE]   = "sock_create",
>> -       [BPF_CGROUP_INET_SOCK_RELEASE]  = "sock_release",
>> -       [BPF_CGROUP_SOCK_OPS]           = "sock_ops",
>> -       [BPF_CGROUP_DEVICE]             = "device",
>> -       [BPF_CGROUP_INET4_BIND]         = "bind4",
>> -       [BPF_CGROUP_INET6_BIND]         = "bind6",
>> -       [BPF_CGROUP_INET4_CONNECT]      = "connect4",
>> -       [BPF_CGROUP_INET6_CONNECT]      = "connect6",
>> -       [BPF_CGROUP_INET4_POST_BIND]    = "post_bind4",
>> -       [BPF_CGROUP_INET6_POST_BIND]    = "post_bind6",
>> -       [BPF_CGROUP_INET4_GETPEERNAME]  = "getpeername4",
>> -       [BPF_CGROUP_INET6_GETPEERNAME]  = "getpeername6",
>> -       [BPF_CGROUP_INET4_GETSOCKNAME]  = "getsockname4",
>> -       [BPF_CGROUP_INET6_GETSOCKNAME]  = "getsockname6",
>> -       [BPF_CGROUP_UDP4_SENDMSG]       = "sendmsg4",
>> -       [BPF_CGROUP_UDP6_SENDMSG]       = "sendmsg6",
>> -       [BPF_CGROUP_SYSCTL]             = "sysctl",
>> -       [BPF_CGROUP_UDP4_RECVMSG]       = "recvmsg4",
>> -       [BPF_CGROUP_UDP6_RECVMSG]       = "recvmsg6",
>> -       [BPF_CGROUP_GETSOCKOPT]         = "getsockopt",
>> -       [BPF_CGROUP_SETSOCKOPT]         = "setsockopt",
>> +       [BPF_CGROUP_INET_INGRESS]               = "ingress",
>> +       [BPF_CGROUP_INET_EGRESS]                = "egress",
>> +       [BPF_CGROUP_INET_SOCK_CREATE]           = "sock_create",
>> +       [BPF_CGROUP_INET_SOCK_RELEASE]          = "sock_release",
>> +       [BPF_CGROUP_SOCK_OPS]                   = "sock_ops",
>> +       [BPF_CGROUP_DEVICE]                     = "device",
>> +       [BPF_CGROUP_INET4_BIND]                 = "bind4",
>> +       [BPF_CGROUP_INET6_BIND]                 = "bind6",
>> +       [BPF_CGROUP_INET4_CONNECT]              = "connect4",
>> +       [BPF_CGROUP_INET6_CONNECT]              = "connect6",
>> +       [BPF_CGROUP_INET4_POST_BIND]            = "post_bind4",
>> +       [BPF_CGROUP_INET6_POST_BIND]            = "post_bind6",
>> +       [BPF_CGROUP_INET4_GETPEERNAME]          = "getpeername4",
>> +       [BPF_CGROUP_INET6_GETPEERNAME]          = "getpeername6",
>> +       [BPF_CGROUP_INET4_GETSOCKNAME]          = "getsockname4",
>> +       [BPF_CGROUP_INET6_GETSOCKNAME]          = "getsockname6",
>> +       [BPF_CGROUP_UDP4_SENDMSG]               = "sendmsg4",
>> +       [BPF_CGROUP_UDP6_SENDMSG]               = "sendmsg6",
>> +       [BPF_CGROUP_SYSCTL]                     = "sysctl",
>> +       [BPF_CGROUP_UDP4_RECVMSG]               = "recvmsg4",
>> +       [BPF_CGROUP_UDP6_RECVMSG]               = "recvmsg6",
>> +       [BPF_CGROUP_GETSOCKOPT]                 = "getsockopt",
>> +       [BPF_CGROUP_SETSOCKOPT]                 = "setsockopt",
>>
>> -       [BPF_SK_SKB_STREAM_PARSER]      = "sk_skb_stream_parser",
>> -       [BPF_SK_SKB_STREAM_VERDICT]     = "sk_skb_stream_verdict",
>> -       [BPF_SK_SKB_VERDICT]            = "sk_skb_verdict",
>> -       [BPF_SK_MSG_VERDICT]            = "sk_msg_verdict",
>> -       [BPF_LIRC_MODE2]                = "lirc_mode2",
>> -       [BPF_FLOW_DISSECTOR]            = "flow_dissector",
>> -       [BPF_TRACE_RAW_TP]              = "raw_tp",
>> -       [BPF_TRACE_FENTRY]              = "fentry",
>> -       [BPF_TRACE_FEXIT]               = "fexit",
>> -       [BPF_MODIFY_RETURN]             = "mod_ret",
>> -       [BPF_LSM_MAC]                   = "lsm_mac",
>> -       [BPF_SK_LOOKUP]                 = "sk_lookup",
>> +       [BPF_SK_SKB_STREAM_PARSER]              = "sk_skb_stream_parser",
>> +       [BPF_SK_SKB_STREAM_VERDICT]             = "sk_skb_stream_verdict",
>> +       [BPF_SK_SKB_VERDICT]                    = "sk_skb_verdict",
>> +       [BPF_SK_MSG_VERDICT]                    = "sk_msg_verdict",
>> +       [BPF_LIRC_MODE2]                        = "lirc_mode2",
>> +       [BPF_FLOW_DISSECTOR]                    = "flow_dissector",
>> +       [BPF_TRACE_RAW_TP]                      = "raw_tp",
>> +       [BPF_TRACE_FENTRY]                      = "fentry",
>> +       [BPF_TRACE_FEXIT]                       = "fexit",
>> +       [BPF_MODIFY_RETURN]                     = "mod_ret",
>> +       [BPF_LSM_MAC]                           = "lsm_mac",
>> +       [BPF_SK_LOOKUP]                         = "sk_lookup",
>> +       [BPF_TRACE_ITER]                        = "trace_iter",
>> +       [BPF_XDP_DEVMAP]                        = "xdp_devmap",
>> +       [BPF_XDP_CPUMAP]                        = "xdp_cpumap",
>> +       [BPF_XDP]                               = "xdp",
>> +       [BPF_SK_REUSEPORT_SELECT]               = "sk_skb_reuseport_select",
>> +       [BPF_SK_REUSEPORT_SELECT_OR_MIGRATE]    = "sk_skb_reuseport_select_or_migrate",
>>  };
>>
> 
> you are ruining Git blaming abilities for purely aesthetic reasons,
> which are not good enough reasons, IMO. Please don't do this, this
> nice alignment is nice, but definitely not necessary. So whatever is
> longer then the "default indentation", just add another tab or two and
> be done with it.

I think I've been asked to do the opposite in the past. And I wouldn't
be ruining much in the current case, the array has been moved from
another location and nearly all types were added here in the same
commit. But OK.

> That way we can actually see what was added in this
> patch, btw.

On this one I agree :)