Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Neil Horman <nhorman@tuxdriver.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Neil 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: Koki Sanagi <sanagi.koki@jp.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

authored by

Neil Horman and committed by
Frederic Weisbecker
3e4b10d7 2bf2160d

+23 -2
+23 -2
include/trace/events/napi.h
··· 6 6 7 7 #include <linux/netdevice.h> 8 8 #include <linux/tracepoint.h> 9 + #include <linux/ftrace.h> 9 10 10 - DECLARE_TRACE(napi_poll, 11 + #define NO_DEV "(no_device)" 12 + 13 + TRACE_EVENT(napi_poll, 14 + 11 15 TP_PROTO(struct napi_struct *napi), 12 - TP_ARGS(napi)); 16 + 17 + TP_ARGS(napi), 18 + 19 + TP_STRUCT__entry( 20 + __field( struct napi_struct *, napi) 21 + __string( dev_name, napi->dev ? napi->dev->name : NO_DEV) 22 + ), 23 + 24 + TP_fast_assign( 25 + __entry->napi = napi; 26 + __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV); 27 + ), 28 + 29 + TP_printk("napi poll on napi struct %p for device %s", 30 + __entry->napi, __get_str(dev_name)) 31 + ); 32 + 33 + #undef NO_DEV 13 34 14 35 #endif /* _TRACE_NAPI_H_ */ 15 36