mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
78 lines
1.9 KiB
C
78 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM napi
|
|
|
|
#if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_NAPI_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/ftrace.h>
|
|
|
|
#define NO_DEV "(no_device)"
|
|
|
|
TRACE_EVENT(napi_poll,
|
|
|
|
TP_PROTO(struct napi_struct *napi, int work, int budget),
|
|
|
|
TP_ARGS(napi, work, budget),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( struct napi_struct *, napi)
|
|
__string( dev_name, napi->dev ? napi->dev->name : NO_DEV)
|
|
__field( int, work)
|
|
__field( int, budget)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->napi = napi;
|
|
__assign_str(dev_name);
|
|
__entry->work = work;
|
|
__entry->budget = budget;
|
|
),
|
|
|
|
TP_printk("napi poll on napi struct %p for device %s work %d budget %d",
|
|
__entry->napi, __get_str(dev_name),
|
|
__entry->work, __entry->budget)
|
|
);
|
|
|
|
TRACE_EVENT(dql_stall_detected,
|
|
|
|
TP_PROTO(unsigned short thrs, unsigned int len,
|
|
unsigned long last_reap, unsigned long hist_head,
|
|
unsigned long now, unsigned long *hist),
|
|
|
|
TP_ARGS(thrs, len, last_reap, hist_head, now, hist),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( unsigned short, thrs)
|
|
__field( unsigned int, len)
|
|
__field( unsigned long, last_reap)
|
|
__field( unsigned long, hist_head)
|
|
__field( unsigned long, now)
|
|
__array( unsigned long, hist, 4)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->thrs = thrs;
|
|
__entry->len = len;
|
|
__entry->last_reap = last_reap;
|
|
__entry->hist_head = hist_head * BITS_PER_LONG;
|
|
__entry->now = now;
|
|
memcpy(__entry->hist, hist, sizeof(entry->hist));
|
|
),
|
|
|
|
TP_printk("thrs %u len %u last_reap %lu hist_head %lu now %lu hist %016lx %016lx %016lx %016lx",
|
|
__entry->thrs, __entry->len,
|
|
__entry->last_reap, __entry->hist_head, __entry->now,
|
|
__entry->hist[0], __entry->hist[1],
|
|
__entry->hist[2], __entry->hist[3])
|
|
);
|
|
|
|
#undef NO_DEV
|
|
|
|
#endif /* _TRACE_NAPI_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|