[bpf-next,v2,2/2] tools, bpftool: Define attach_type_name array only once

Define attach_type_name in common.c instead of main.h so it is only
defined once. This leads to a slight decrease in the binary size of
bpftool.

Before:

   text	   data	    bss	    dec	    hex	filename
 399024	  11168	1573160	1983352	 1e4378	bpftool

After:

   text	   data	    bss	    dec	    hex	filename
 398256	  10880	1573160	1982296	 1e3f58	bpftool

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
v2: move attach_type_name to common.c instead of cgroup.c as suggested
    by Andrii

 tools/bpf/bpftool/common.c | 36 ++++++++++++++++++++++++++++++++++++
 tools/bpf/bpftool/main.h   | 36 +-----------------------------------
 2 files changed, 37 insertions(+), 35 deletions(-)

2020-06-23 12:42 UTC+0200 ~ Tobias Klauser <tklauser@distanz.ch>
> Define attach_type_name in common.c instead of main.h so it is only
> defined once. This leads to a slight decrease in the binary size of
> bpftool.
> 
> Before:
> 
>    text	   data	    bss	    dec	    hex	filename
>  399024	  11168	1573160	1983352	 1e4378	bpftool
> 
> After:
> 
>    text	   data	    bss	    dec	    hex	filename
>  398256	  10880	1573160	1982296	 1e3f58	bpftool
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Reviewed-by: Quentin Monnet <quentin@isovalent.com>

On 6/23/20 12:42 PM, Tobias Klauser wrote:
> Define attach_type_name in common.c instead of main.h so it is only
> defined once. This leads to a slight decrease in the binary size of
> bpftool.
> 
> Before:
> 
>     text	   data	    bss	    dec	    hex	filename
>   399024	  11168	1573160	1983352	 1e4378	bpftool
> 
> After:
> 
>     text	   data	    bss	    dec	    hex	filename
>   398256	  10880	1573160	1982296	 1e3f58	bpftool
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
> v2: move attach_type_name to common.c instead of cgroup.c as suggested
>      by Andrii
> 
>   tools/bpf/bpftool/common.c | 36 ++++++++++++++++++++++++++++++++++++
>   tools/bpf/bpftool/main.h   | 36 +-----------------------------------
>   2 files changed, 37 insertions(+), 35 deletions(-)
> 
> diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
> index 6c864c3683fc..3c767dd114c7 100644
> --- a/tools/bpf/bpftool/common.c
> +++ b/tools/bpf/bpftool/common.c
> @@ -29,6 +29,42 @@
>   #define BPF_FS_MAGIC		0xcafe4a11
>   #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_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_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",

Just a small nit given we touch these here, could you properly align the strings
such that it looks similarly to prog_type_name[] one? That plus the typo fix that
Quentin mentioned, and it's good to go.

Thanks,
Daniel