mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +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>
132 lines
2.7 KiB
C
132 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM cma
|
|
|
|
#if !defined(_TRACE_CMA_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_CMA_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(cma_release,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count),
|
|
|
|
TP_ARGS(name, pfn, page, count),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, pfn)
|
|
__field(const struct page *, page)
|
|
__field(unsigned long, count)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->pfn = pfn;
|
|
__entry->page = page;
|
|
__entry->count = count;
|
|
),
|
|
|
|
TP_printk("name=%s pfn=0x%lx page=%p count=%lu",
|
|
__get_str(name),
|
|
__entry->pfn,
|
|
__entry->page,
|
|
__entry->count)
|
|
);
|
|
|
|
TRACE_EVENT(cma_alloc_start,
|
|
|
|
TP_PROTO(const char *name, unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, count, align),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, count)
|
|
__field(unsigned int, align)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->count = count;
|
|
__entry->align = align;
|
|
),
|
|
|
|
TP_printk("name=%s count=%lu align=%u",
|
|
__get_str(name),
|
|
__entry->count,
|
|
__entry->align)
|
|
);
|
|
|
|
TRACE_EVENT(cma_alloc_finish,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count, unsigned int align, int errorno),
|
|
|
|
TP_ARGS(name, pfn, page, count, align, errorno),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, pfn)
|
|
__field(const struct page *, page)
|
|
__field(unsigned long, count)
|
|
__field(unsigned int, align)
|
|
__field(int, errorno)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->pfn = pfn;
|
|
__entry->page = page;
|
|
__entry->count = count;
|
|
__entry->align = align;
|
|
__entry->errorno = errorno;
|
|
),
|
|
|
|
TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u errorno=%d",
|
|
__get_str(name),
|
|
__entry->pfn,
|
|
__entry->page,
|
|
__entry->count,
|
|
__entry->align,
|
|
__entry->errorno)
|
|
);
|
|
|
|
TRACE_EVENT(cma_alloc_busy_retry,
|
|
|
|
TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
|
|
unsigned long count, unsigned int align),
|
|
|
|
TP_ARGS(name, pfn, page, count, align),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, name)
|
|
__field(unsigned long, pfn)
|
|
__field(const struct page *, page)
|
|
__field(unsigned long, count)
|
|
__field(unsigned int, align)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->pfn = pfn;
|
|
__entry->page = page;
|
|
__entry->count = count;
|
|
__entry->align = align;
|
|
),
|
|
|
|
TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u",
|
|
__get_str(name),
|
|
__entry->pfn,
|
|
__entry->page,
|
|
__entry->count,
|
|
__entry->align)
|
|
);
|
|
|
|
#endif /* _TRACE_CMA_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|