tools: bpftool: add owner_prog_type and owner_jited to bpftool output

For prog array maps, the type of the owner program, and the JIT-ed state
of that program, are available from the file descriptor information
under /proc. Add them to "bpftool map show" output. Example output:

    # bpftool map show
    158225: prog_array  name jmp_table  flags 0x0
        key 4B  value 4B  max_entries 8  memlock 4096B
        owner_prog_type flow_dissector  owner jited
    # bpftool --json --pretty map show
    [{
            "id": 1337,
            "type": "prog_array",
            "name": "jmp_table",
            "flags": 0,
            "bytes_key": 4,
            "bytes_value": 4,
            "max_entries": 8,
            "bytes_memlock": 4096,
            "owner_prog_type": "flow_dissector",
            "owner_jited": true
        }
    ]

As we move the table used for associating names to program types,
complete it with the missing types (lwt_seg6local and sk_reuseport).
Also add missing types to the help message for "bpftool prog"
(sk_reuseport and flow_dissector).

Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 26 insertions, 0 deletions

diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index 7431669fae0a..2761981669c8 100644
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -78,6 +78,32 @@
 #define HELP_SPEC_MAP                                                   \
         "MAP := { id MAP_ID | pinned FILE }"
 
+static const char * const prog_type_name[] = {
+        [BPF_PROG_TYPE_UNSPEC]                  = "unspec",
+        [BPF_PROG_TYPE_SOCKET_FILTER]           = "socket_filter",
+        [BPF_PROG_TYPE_KPROBE]                  = "kprobe",
+        [BPF_PROG_TYPE_SCHED_CLS]               = "sched_cls",
+        [BPF_PROG_TYPE_SCHED_ACT]               = "sched_act",
+        [BPF_PROG_TYPE_TRACEPOINT]              = "tracepoint",
+        [BPF_PROG_TYPE_XDP]                     = "xdp",
+        [BPF_PROG_TYPE_PERF_EVENT]              = "perf_event",
+        [BPF_PROG_TYPE_CGROUP_SKB]              = "cgroup_skb",
+        [BPF_PROG_TYPE_CGROUP_SOCK]             = "cgroup_sock",
+        [BPF_PROG_TYPE_LWT_IN]                  = "lwt_in",
+        [BPF_PROG_TYPE_LWT_OUT]                 = "lwt_out",
+        [BPF_PROG_TYPE_LWT_XMIT]                = "lwt_xmit",
+        [BPF_PROG_TYPE_SOCK_OPS]                = "sock_ops",
+        [BPF_PROG_TYPE_SK_SKB]                  = "sk_skb",
+        [BPF_PROG_TYPE_CGROUP_DEVICE]           = "cgroup_device",
+        [BPF_PROG_TYPE_SK_MSG]                  = "sk_msg",
+        [BPF_PROG_TYPE_RAW_TRACEPOINT]          = "raw_tracepoint",
+        [BPF_PROG_TYPE_CGROUP_SOCK_ADDR]        = "cgroup_sock_addr",
+        [BPF_PROG_TYPE_LWT_SEG6LOCAL]           = "lwt_seg6local",
+        [BPF_PROG_TYPE_LIRC_MODE2]              = "lirc_mode2",
+        [BPF_PROG_TYPE_SK_REUSEPORT]            = "sk_reuseport",
+        [BPF_PROG_TYPE_FLOW_DISSECTOR]          = "flow_dissector",
+};
+
 enum bpf_obj_type {
         BPF_OBJ_UNKNOWN,
         BPF_OBJ_PROG,