Skip to contentSkip to conversation

bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table

PATCH In review Andrii Nakryiko 3 participants 3 messages Mar 18, 2022

Subsystems (2)
lore
Share & tools
lore

Andrii Nakryiko

author maintainer
#0 lore raw

PATCH 1/1 bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table

BPF_TRACE_KPROBE_MULTI is a new attach type name, add it to bpftool's table. This fixes a currently failing CI bpftool check.

---
 tools/bpf/bpftool/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/common.c +1 -1
index 606743c6db41..b091923c71cb 100644
@@ -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, ...)
Signature · 1 line
2.30.2
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Andrii Nakryiko

BPF_TRACE_KPROBE_MULTI is a new attach type name, add it to bpftool's table. This fixes a currently failing CI bpftool check.

One nit below.

Quoted 17 lines
---
  tools/bpf/bpftool/common.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/common.c +0 -1
index 606743c6db41..b091923c71cb 100644
@@ -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",

tools/bpf/bpftool/common.c const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { · line 78

Quoted 4 lines
tools/bpf/bpftool/common.c +1 -0
@@ -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?

Quoted 3 lines
tools/bpf/bpftool/common.c +0 -0
  };
 
  void p_err(const char *fmt, ...)
#2 lore raw
In reply to Andrii Nakryiko
Quoted 2 lines · Andrii Nakryiko

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

Quoted 19 lines
---
 tools/bpf/bpftool/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/common.c +0 -1
index 606743c6db41..b091923c71cb 100644
@@ -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",

tools/bpf/bpftool/common.c const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { · line 78

Quoted 4 lines
tools/bpf/bpftool/common.c +1 -0
@@ -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

Quoted 6 lines
tools/bpf/bpftool/common.c +0 -0
 };
 
 void p_err(const char *fmt, ...)
Signature · 1 line
2.30.2