Netdev List
 help / color / mirror / Atom feed
From: Jesper Dangaard Brouer <brouer@redhat.com>
To: netdev@vger.kernel.org
Cc: Daniel Borkmann <borkmann@iogearbox.net>,
	Jesper Dangaard Brouer <brouer@redhat.com>
Subject: [V3 PATCH net-next 5/5] xdp: get tracepoints xdp_exception and xdp_redirect in sync
Date: Thu, 24 Aug 2017 12:33:23 +0200	[thread overview]
Message-ID: <150357080380.26663.3229455229075039075.stgit@firesoul> (raw)
In-Reply-To: <150357074701.26663.4047992776649697788.stgit@firesoul>

Remove the net_device string name from the xdp_exception tracepoint,
like the xdp_redirect tracepoint.

Align the TP_STRUCT to have common entries between these two
tracepoint.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
---
 include/trace/events/xdp.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
index cd37706c6f55..27cf2ef35f5f 100644
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@@ -31,22 +31,22 @@ TRACE_EVENT(xdp_exception,
 	TP_ARGS(dev, xdp, act),
 
 	TP_STRUCT__entry(
-		__string(name, dev->name)
 		__array(u8, prog_tag, 8)
 		__field(u32, act)
+		__field(int, ifindex)
 	),
 
 	TP_fast_assign(
 		BUILD_BUG_ON(sizeof(__entry->prog_tag) != sizeof(xdp->tag));
 		memcpy(__entry->prog_tag, xdp->tag, sizeof(xdp->tag));
-		__assign_str(name, dev->name);
-		__entry->act = act;
+		__entry->act		= act;
+		__entry->ifindex	= dev->ifindex;
 	),
 
-	TP_printk("prog=%s device=%s action=%s",
+	TP_printk("prog=%s action=%s ifindex=%d",
 		  __print_hex_str(__entry->prog_tag, 8),
-		  __get_str(name),
-		  __print_symbolic(__entry->act, __XDP_ACT_SYM_TAB))
+		  __print_symbolic(__entry->act, __XDP_ACT_SYM_TAB),
+		  __entry->ifindex)
 );
 
 TRACE_EVENT(xdp_redirect,

  parent reply	other threads:[~2017-08-24 10:33 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-22 20:47 [PATCH net-next 0/5] xdp: more work on xdp tracepoints Jesper Dangaard Brouer
2017-08-22 20:47 ` [PATCH net-next 1/5] xdp: remove bpf_warn_invalid_xdp_redirect Jesper Dangaard Brouer
2017-08-22 21:19   ` Daniel Borkmann
2017-08-22 20:47 ` [PATCH net-next 2/5] xdp: make generic xdp redirect use tracepoint trace_xdp_redirect Jesper Dangaard Brouer
2017-08-22 21:21   ` Daniel Borkmann
2017-08-22 20:47 ` [PATCH net-next 3/5] ixgbe: use return codes from ndo_xdp_xmit that are distinguishable Jesper Dangaard Brouer
2017-08-22 21:21   ` Daniel Borkmann
2017-08-22 20:47 ` [PATCH net-next 4/5] xdp: remove net_device names from xdp_redirect tracepoint Jesper Dangaard Brouer
2017-08-22 21:23   ` Daniel Borkmann
2017-08-22 20:47 ` [PATCH net-next 5/5] xdp: get tracepoints xdp_exception and xdp_redirect in sync Jesper Dangaard Brouer
2017-08-22 21:30   ` Daniel Borkmann
2017-08-23  7:41     ` Jesper Dangaard Brouer
2017-08-23  8:54       ` Daniel Borkmann
2017-08-23 10:15         ` [V2 PATCH net-next 0/5] xdp: more work on xdp tracepoints Jesper Dangaard Brouer
2017-08-23 10:15           ` [V2 PATCH net-next 1/5] xdp: remove bpf_warn_invalid_xdp_redirect Jesper Dangaard Brouer
2017-08-23 10:15           ` [V2 PATCH net-next 2/5] xdp: make generic xdp redirect use tracepoint trace_xdp_redirect Jesper Dangaard Brouer
2017-08-23 10:15           ` [V2 PATCH net-next 3/5] ixgbe: use return codes from ndo_xdp_xmit that are distinguishable Jesper Dangaard Brouer
2017-08-23 10:15           ` [V2 PATCH net-next 4/5] xdp: remove net_device names from xdp_redirect tracepoint Jesper Dangaard Brouer
2017-08-23 10:58             ` Daniel Borkmann
2017-08-23 10:15           ` [V2 PATCH net-next 5/5] xdp: get tracepoints xdp_exception and xdp_redirect in sync Jesper Dangaard Brouer
2017-08-23 10:59             ` Daniel Borkmann
2017-08-23 11:16           ` [V2 PATCH net-next 0/5] xdp: more work on xdp tracepoints Jesper Dangaard Brouer
2017-08-24  0:07             ` David Miller
2017-08-24 10:32               ` [V3 " Jesper Dangaard Brouer
2017-08-24 10:33                 ` [V3 PATCH net-next 1/5] xdp: remove bpf_warn_invalid_xdp_redirect Jesper Dangaard Brouer
2017-08-24 10:33                 ` [V3 PATCH net-next 2/5] xdp: make generic xdp redirect use tracepoint trace_xdp_redirect Jesper Dangaard Brouer
2017-08-24 10:33                 ` [V3 PATCH net-next 3/5] ixgbe: use return codes from ndo_xdp_xmit that are distinguishable Jesper Dangaard Brouer
2017-08-24 10:33                 ` [V3 PATCH net-next 4/5] xdp: remove net_device names from xdp_redirect tracepoint Jesper Dangaard Brouer
2017-08-24 10:33                 ` Jesper Dangaard Brouer [this message]
2017-08-24 14:46                 ` [V3 PATCH net-next 0/5] xdp: more work on xdp tracepoints John Fastabend
2017-08-24 19:00                 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=150357080380.26663.3229455229075039075.stgit@firesoul \
    --to=brouer@redhat.com \
    --cc=borkmann@iogearbox.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox