mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-28 16:56: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>
102 lines
2.3 KiB
C
102 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM hda
|
|
|
|
#if !defined(__HDAC_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define __HDAC_TRACE_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/device.h>
|
|
#include <sound/hdaudio.h>
|
|
|
|
#ifndef HDAC_MSG_MAX
|
|
#define HDAC_MSG_MAX 500
|
|
#endif
|
|
|
|
struct hdac_bus;
|
|
struct hdac_codec;
|
|
|
|
TRACE_EVENT(hda_send_cmd,
|
|
TP_PROTO(struct hdac_bus *bus, unsigned int cmd),
|
|
TP_ARGS(bus, cmd),
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name((bus)->dev))
|
|
__field(u32, cmd)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->cmd = cmd;
|
|
),
|
|
TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry->cmd >> 28, __entry->cmd)
|
|
);
|
|
|
|
TRACE_EVENT(hda_get_response,
|
|
TP_PROTO(struct hdac_bus *bus, unsigned int addr, unsigned int res),
|
|
TP_ARGS(bus, addr, res),
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name((bus)->dev))
|
|
__field(u32, addr)
|
|
__field(u32, res)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->addr = addr;
|
|
__entry->res = res;
|
|
),
|
|
TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry->addr, __entry->res)
|
|
);
|
|
|
|
TRACE_EVENT(hda_unsol_event,
|
|
TP_PROTO(struct hdac_bus *bus, u32 res, u32 res_ex),
|
|
TP_ARGS(bus, res, res_ex),
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name((bus)->dev))
|
|
__field(u32, res)
|
|
__field(u32, res_ex)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->res = res;
|
|
__entry->res_ex = res_ex;
|
|
),
|
|
TP_printk("[%s:%d] res=0x%08x, res_ex=0x%08x", __get_str(name),
|
|
__entry->res_ex & 0x0f, __entry->res, __entry->res_ex)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(hdac_stream,
|
|
TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
|
|
|
|
TP_ARGS(bus, azx_dev),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned char, stream_tag)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->stream_tag = (azx_dev)->stream_tag;
|
|
),
|
|
|
|
TP_printk("stream_tag: %d", __entry->stream_tag)
|
|
);
|
|
|
|
DEFINE_EVENT(hdac_stream, snd_hdac_stream_start,
|
|
TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
|
|
TP_ARGS(bus, azx_dev)
|
|
);
|
|
|
|
DEFINE_EVENT(hdac_stream, snd_hdac_stream_stop,
|
|
TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),
|
|
TP_ARGS(bus, azx_dev)
|
|
);
|
|
|
|
#endif /* __HDAC_TRACE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace
|
|
|
|
#include <trace/define_trace.h>
|