Commit cf66ba58 authored by Koki Sanagi's avatar Koki Sanagi Committed by Frederic Weisbecker
Browse files

netdev: Add tracepoints to netdev layer 



This patch adds tracepoint to dev_queue_xmit, dev_hard_start_xmit,
netif_rx and netif_receive_skb. These tracepoints help you to monitor
network driver's input/output.

          <idle>-0     [001] 112447.902030: netif_rx: dev=eth1 skbaddr=f3ef0900 len=84
          <idle>-0     [001] 112447.902039: netif_receive_skb: dev=eth1 skbaddr=f3ef0900 len=84
            sshd-6828  [000] 112447.903257: net_dev_queue: dev=eth4 skbaddr=f3fca538 len=226
            sshd-6828  [000] 112447.903260: net_dev_xmit: dev=eth4 skbaddr=f3fca538 len=226 rc=0

Signed-off-by: default avatarKoki Sanagi <sanagi.koki@jp.fujitsu.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Kaneshige Kenji <kaneshige.kenji@jp.fujitsu.com>
Cc: Izumo Taku <izumi.taku@jp.fujitsu.com>
Cc: Kosaki Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Scott Mcmillan <scott.a.mcmillan@intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
LKML-Reference: <4C72431E.3000901@jp.fujitsu.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 3e4b10d7

include/trace/events/net.h

0 → 100644
+82 −0
Original line number Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM net



#if !defined(_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_NET_H



#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/ip.h>

#include <linux/tracepoint.h>



TRACE_EVENT(net_dev_xmit,



	TP_PROTO(struct sk_buff *skb,

		 int rc),



	TP_ARGS(skb, rc),



	TP_STRUCT__entry(

		__field(	void *,		skbaddr		)

		__field(	unsigned int,	len		)

		__field(	int,		rc		)

		__string(	name,		skb->dev->name	)

	),



	TP_fast_assign(

		__entry->skbaddr = skb;

		__entry->len = skb->len;

		__entry->rc = rc;

		__assign_str(name, skb->dev->name);

	),



	TP_printk("dev=%s skbaddr=%p len=%u rc=%d",

		__get_str(name), __entry->skbaddr, __entry->len, __entry->rc)

);



DECLARE_EVENT_CLASS(net_dev_template,



	TP_PROTO(struct sk_buff *skb),



	TP_ARGS(skb),



	TP_STRUCT__entry(

		__field(	void *,		skbaddr		)

		__field(	unsigned int,	len		)

		__string(	name,		skb->dev->name	)

	),



	TP_fast_assign(

		__entry->skbaddr = skb;

		__entry->len = skb->len;

		__assign_str(name, skb->dev->name);

	),



	TP_printk("dev=%s skbaddr=%p len=%u",

		__get_str(name), __entry->skbaddr, __entry->len)

)



DEFINE_EVENT(net_dev_template, net_dev_queue,



	TP_PROTO(struct sk_buff *skb),



	TP_ARGS(skb)

);



DEFINE_EVENT(net_dev_template, netif_receive_skb,



	TP_PROTO(struct sk_buff *skb),



	TP_ARGS(skb)

);



DEFINE_EVENT(net_dev_template, netif_rx,



	TP_PROTO(struct sk_buff *skb),



	TP_ARGS(skb)

);

#endif /* _TRACE_NET_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

net/core/dev.c

+6 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#include <linux/jhash.h>

#include <linux/random.h>

#include <trace/events/napi.h>

#include <trace/events/net.h>

#include <linux/pci.h>



#include "net-sysfs.h"
@@ -1978,6 +1979,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 
		}



		rc = ops->ndo_start_xmit(skb, dev);

		trace_net_dev_xmit(skb, rc);

		if (rc == NETDEV_TX_OK)

			txq_trans_update(txq);

		return rc;
@@ -1998,6 +2000,7 @@ gso: 
			skb_dst_drop(nskb);



		rc = ops->ndo_start_xmit(nskb, dev);

		trace_net_dev_xmit(nskb, rc);

		if (unlikely(rc != NETDEV_TX_OK)) {

			if (rc & ~NETDEV_TX_MASK)

				goto out_kfree_gso_skb;
@@ -2186,6 +2189,7 @@ int dev_queue_xmit(struct sk_buff *skb) 
#ifdef CONFIG_NET_CLS_ACT

	skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_EGRESS);

#endif

	trace_net_dev_queue(skb);

	if (q->enqueue) {

		rc = __dev_xmit_skb(skb, q, dev, txq);

		goto out;
@@ -2512,6 +2516,7 @@ int netif_rx(struct sk_buff *skb) 
	if (netdev_tstamp_prequeue)

		net_timestamp_check(skb);



	trace_netif_rx(skb);

#ifdef CONFIG_RPS

	{

		struct rps_dev_flow voidflow, *rflow = &voidflow;
@@ -2828,6 +2833,7 @@ static int __netif_receive_skb(struct sk_buff *skb) 
	if (!netdev_tstamp_prequeue)

		net_timestamp_check(skb);



	trace_netif_receive_skb(skb);

	if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))

		return NET_RX_SUCCESS;

net/core/net-traces.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#define CREATE_TRACE_POINTS

#include <trace/events/skb.h>

#include <trace/events/net.h>

#include <trace/events/napi.h>



EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE