[PATCH bpf-next 1/3] bpftool: Add missing prog types and attach types

[Andrey Ignatov]

Add missing prog types to `bpftool prog` and missing attach types to
`bpftool cgroup`.

Signed-off-by: Andrey Ignatov <r...@fb.com>
---
 tools/bpf/bpftool/cgroup.c | 19 ++++++++++++++++---
 tools/bpf/bpftool/prog.c   |  3 +++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
index cae32a6..8689916 100644
--- a/tools/bpf/bpftool/cgroup.c
+++ b/tools/bpf/bpftool/cgroup.c
@@ -16,15 +16,28 @@
 #define HELP_SPEC_ATTACH_FLAGS                                         \
        "ATTACH_FLAGS := { multi | override }"
 
-#define HELP_SPEC_ATTACH_TYPES                                         \
-       "ATTACH_TYPE := { ingress | egress | sock_create | sock_ops | device }"
+#define HELP_SPEC_ATTACH_TYPES                                                \
+       "       ATTACH_TYPE := { ingress | egress | sock_create |\n"           \
+       "                        sock_ops | stream_parser |\n"                 \
+       "                        stream_verdict | device | msg_verdict |\n"    \
+       "                        bind4 | bind6 | connect4 | connect6 |\n"      \
+       "                        post_bind4 | post_bind6 }"
 
 static const char * const attach_type_strings[] = {
        [BPF_CGROUP_INET_INGRESS] = "ingress",
        [BPF_CGROUP_INET_EGRESS] = "egress",
        [BPF_CGROUP_INET_SOCK_CREATE] = "sock_create",
        [BPF_CGROUP_SOCK_OPS] = "sock_ops",
+       [BPF_SK_SKB_STREAM_PARSER] = "stream_parser",
+       [BPF_SK_SKB_STREAM_VERDICT] = "stream_verdict",
        [BPF_CGROUP_DEVICE] = "device",
+       [BPF_SK_MSG_VERDICT] = "msg_verdict",
+       [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",
        [__MAX_BPF_ATTACH_TYPE] = NULL,
 };
 
@@ -282,7 +295,7 @@ static int do_help(int argc, char **argv)
                "       %s %s detach CGROUP ATTACH_TYPE PROG\n"
                "       %s %s help\n"
                "\n"
-               "       " HELP_SPEC_ATTACH_TYPES "\n"
+               HELP_SPEC_ATTACH_TYPES "\n"
                "       " HELP_SPEC_ATTACH_FLAGS "\n"
                "       " HELP_SPEC_PROGRAM "\n"
                "       " HELP_SPEC_OPTIONS "\n"
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index f7a8108..548adb9 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -68,6 +68,9 @@ static const char * const prog_type_name[] = {
        [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",
 };
 
 static void print_boot_time(__u64 nsecs, char *buf, unsigned int size)
-- 
2.9.5