Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e4b10d7 authored by Neil Horman's avatar Neil Horman Committed by Frederic Weisbecker
Browse files

napi: Convert trace_napi_poll to TRACE_EVENT 

This patch converts trace_napi_poll from DECLARE_EVENT to TRACE_EVENT
to improve the usability of napi_poll tracepoint.

          <idle>-0     [001] 241302.750777: napi_poll: napi poll on napi struct f6acc480 for device eth3
          <idle>-0     [000] 241302.852389: napi_poll: napi poll on napi struct f5d0d70c for device eth1

The original patch is below:
http://marc.info/?l=linux-kernel&m=126021713809450&w=2

[ sanagi.koki@jp.fujitsu.com: And add a fix by Steven Rostedt:
http://marc.info/?l=linux-kernel&m=126150506519173&w=2

 ]

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.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: <4C7242D7.4050009@jp.fujitsu.com>
Signed-off-by: default avatarKoki Sanagi <sanagi.koki@jp.fujitsu.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 2bf2160d

include/trace/events/napi.h

+23 −2
Original line number Diff line number Diff line
@@ -6,10 +6,31 @@ 


#include <linux/netdevice.h>

#include <linux/tracepoint.h>

#include <linux/ftrace.h>



#define NO_DEV "(no_device)"



TRACE_EVENT(napi_poll,



DECLARE_TRACE(napi_poll,

	TP_PROTO(struct napi_struct *napi),

	TP_ARGS(napi));



	TP_ARGS(napi),



	TP_STRUCT__entry(

		__field(	struct napi_struct *,	napi)

		__string(	dev_name, napi->dev ? napi->dev->name : NO_DEV)

	),



	TP_fast_assign(

		__entry->napi = napi;

		__assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV);

	),



	TP_printk("napi poll on napi struct %p for device %s",

		__entry->napi, __get_str(dev_name))

);



#undef NO_DEV



#endif /* _TRACE_NAPI_H_ */