| Message ID | 20220318150106.2933343-1-andrii@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table | expand |
On 3/18/22 8:01 AM, Andrii Nakryiko wrote: > BPF_TRACE_KPROBE_MULTI is a new attach type name, add it to bpftool's > table. This fixes a currently failing CI bpftool check. > > Signed-off-by: Andrii Nakryiko <andrii@kernel.org> One nit below. Acked-by: Yonghong Song <yhs@fb.com> > --- > tools/bpf/bpftool/common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c > index 606743c6db41..b091923c71cb 100644 > --- a/tools/bpf/bpftool/common.c > +++ b/tools/bpf/bpftool/common.c > @@ -56,7 +56,6 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { > [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", > @@ -76,6 +75,7 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { > [BPF_SK_REUSEPORT_SELECT] = "sk_skb_reuseport_select", > [BPF_SK_REUSEPORT_SELECT_OR_MIGRATE] = "sk_skb_reuseport_select_or_migrate", > [BPF_PERF_EVENT] = "perf_event", > + [BPF_TRACE_KPROBE_MULTI] = "trace_kprobe_bulti", trace_kprobe_multi? > }; > > void p_err(const char *fmt, ...)
On Fri, Mar 18, 2022 at 08:01:06AM -0700, Andrii Nakryiko wrote: > BPF_TRACE_KPROBE_MULTI is a new attach type name, add it to bpftool's > table. This fixes a currently failing CI bpftool check. right, I forgot about this > > Signed-off-by: Andrii Nakryiko <andrii@kernel.org> > --- > tools/bpf/bpftool/common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c > index 606743c6db41..b091923c71cb 100644 > --- a/tools/bpf/bpftool/common.c > +++ b/tools/bpf/bpftool/common.c > @@ -56,7 +56,6 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { > [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", > @@ -76,6 +75,7 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { > [BPF_SK_REUSEPORT_SELECT] = "sk_skb_reuseport_select", > [BPF_SK_REUSEPORT_SELECT_OR_MIGRATE] = "sk_skb_reuseport_select_or_migrate", > [BPF_PERF_EVENT] = "perf_event", > + [BPF_TRACE_KPROBE_MULTI] = "trace_kprobe_bulti", typo ;-) ^ jirka > }; > > void p_err(const char *fmt, ...) > -- > 2.30.2 >
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 606743c6db41..b091923c71cb 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -56,7 +56,6 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { [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", @@ -76,6 +75,7 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { [BPF_SK_REUSEPORT_SELECT] = "sk_skb_reuseport_select", [BPF_SK_REUSEPORT_SELECT_OR_MIGRATE] = "sk_skb_reuseport_select_or_migrate", [BPF_PERF_EVENT] = "perf_event", + [BPF_TRACE_KPROBE_MULTI] = "trace_kprobe_bulti", }; void p_err(const char *fmt, ...)
BPF_TRACE_KPROBE_MULTI is a new attach type name, add it to bpftool's table. This fixes a currently failing CI bpftool check. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> --- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)