From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastiano Miano Subject: [bpf-next PATCH 2/3] bpf: add id to prog tracepoint Date: Wed, 18 Apr 2018 17:30:53 +0200 Message-ID: <152406545357.3465.11912320259045335712.stgit@localhost.localdomain> References: <152406544226.3465.948692097697975172.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: mingo@redhat.com, rostedt@goodmis.org, brouer@redhat.com, fulvio.risso@polito.it To: netdev@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net Return-path: Received: from fm1nodo1.polito.it ([130.192.180.16]:51526 "EHLO antispam.polito.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870AbeDRP61 (ORCPT ); Wed, 18 Apr 2018 11:58:27 -0400 In-Reply-To: <152406544226.3465.948692097697975172.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-ID: This patch adds the prog id to the bpf tracepoints that can be used when monitoring or inspecting prog related functions. Signed-off-by: Sebastiano Miano Suggested-by: Jesper Dangaard Brouer --- include/trace/events/bpf.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/include/trace/events/bpf.h b/include/trace/events/bpf.h index d7c9726..4ec19c5 100644 --- a/include/trace/events/bpf.h +++ b/include/trace/events/bpf.h @@ -65,16 +65,19 @@ DECLARE_EVENT_CLASS(bpf_prog_event, TP_STRUCT__entry( __array(u8, prog_tag, 8) __field(u32, type) + __field(u32, id) ), TP_fast_assign( BUILD_BUG_ON(sizeof(__entry->prog_tag) != sizeof(prg->tag)); memcpy(__entry->prog_tag, prg->tag, sizeof(prg->tag)); __entry->type = prg->type; + __entry->id = prg->aux->id; ), - TP_printk("prog=%s type=%s", + TP_printk("prog=%s id=%u type=%s", __print_hex_str(__entry->prog_tag, 8), + __entry->id, __print_symbolic(__entry->type, __PROG_TYPE_SYM_TAB)) ); @@ -102,6 +105,7 @@ TRACE_EVENT(bpf_prog_load, __array(u8, prog_tag, 8) __field(u32, type) __field(int, ufd) + __field(u32, id) ), TP_fast_assign( @@ -109,10 +113,12 @@ TRACE_EVENT(bpf_prog_load, memcpy(__entry->prog_tag, prg->tag, sizeof(prg->tag)); __entry->type = prg->type; __entry->ufd = ufd; + __entry->id = prg->aux->id; ), - TP_printk("prog=%s type=%s ufd=%d", + TP_printk("prog=%s id=%u type=%s ufd=%d", __print_hex_str(__entry->prog_tag, 8), + __entry->id, __print_symbolic(__entry->type, __PROG_TYPE_SYM_TAB), __entry->ufd) ); @@ -161,6 +167,7 @@ DECLARE_EVENT_CLASS(bpf_obj_prog, __array(u8, prog_tag, 8) __field(int, ufd) __string(path, pname->name) + __field(u32, id) ), TP_fast_assign( @@ -168,10 +175,12 @@ DECLARE_EVENT_CLASS(bpf_obj_prog, memcpy(__entry->prog_tag, prg->tag, sizeof(prg->tag)); __assign_str(path, pname->name); __entry->ufd = ufd; + __entry->id = prg->aux->id; ), - TP_printk("prog=%s path=%s ufd=%d", + TP_printk("prog=%s id=%u path=%s ufd=%d", __print_hex_str(__entry->prog_tag, 8), + __entry->id, __get_str(path), __entry->ufd) );