bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table
@ 2022-03-18 15:01 Andrii Nakryiko
  2022-03-18 15:44 ` Yonghong Song
  2022-03-18 20:28 ` Jiri Olsa
  0 siblings, 2 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2022-03-18 15:01 UTC (permalink / raw)
  To: bpf, ast, daniel; +Cc: andrii, kernel-team

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(-)

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, ...)
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table
  2022-03-18 15:01 [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table Andrii Nakryiko
@ 2022-03-18 15:44 ` Yonghong Song
  2022-03-18 20:28 ` Jiri Olsa
  1 sibling, 0 replies; 3+ messages in thread
From: Yonghong Song @ 2022-03-18 15:44 UTC (permalink / raw)
  To: Andrii Nakryiko, bpf, ast, daniel; +Cc: kernel-team



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, ...)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table
  2022-03-18 15:01 [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table Andrii Nakryiko
  2022-03-18 15:44 ` Yonghong Song
@ 2022-03-18 20:28 ` Jiri Olsa
  1 sibling, 0 replies; 3+ messages in thread
From: Jiri Olsa @ 2022-03-18 20:28 UTC (permalink / raw)
  To: Andrii Nakryiko; +Cc: bpf, ast, daniel, kernel-team

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
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-03-18 20:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-18 15:01 [PATCH bpf-next] bpftool: add BPF_TRACE_KPROBE_MULTI to attach type names table Andrii Nakryiko
2022-03-18 15:44 ` Yonghong Song
2022-03-18 20:28 ` Jiri Olsa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).