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>
179 lines
4.7 KiB
C
179 lines
4.7 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause-Clear */
|
|
/*
|
|
* Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.
|
|
* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
#if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include "core.h"
|
|
|
|
#define _TRACE_H_
|
|
|
|
/* create empty functions when tracing is disabled */
|
|
#if !defined(CONFIG_ATH12K_TRACING)
|
|
#undef TRACE_EVENT
|
|
#define TRACE_EVENT(name, proto, ...) \
|
|
static inline void trace_ ## name(proto) {}
|
|
#endif /* !CONFIG_ATH12K_TRACING || __CHECKER__ */
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM ath12k
|
|
|
|
TRACE_EVENT(ath12k_htt_pktlog,
|
|
TP_PROTO(struct ath12k *ar, const void *buf, u16 buf_len,
|
|
u32 pktlog_checksum),
|
|
|
|
TP_ARGS(ar, buf, buf_len, pktlog_checksum),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(ar->ab->dev))
|
|
__string(driver, dev_driver_string(ar->ab->dev))
|
|
__field(u16, buf_len)
|
|
__field(u32, pktlog_checksum)
|
|
__dynamic_array(u8, pktlog, buf_len)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
__assign_str(driver);
|
|
__entry->buf_len = buf_len;
|
|
__entry->pktlog_checksum = pktlog_checksum;
|
|
memcpy(__get_dynamic_array(pktlog), buf, buf_len);
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s size %u pktlog_checksum %d",
|
|
__get_str(driver),
|
|
__get_str(device),
|
|
__entry->buf_len,
|
|
__entry->pktlog_checksum
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(ath12k_htt_ppdu_stats,
|
|
TP_PROTO(struct ath12k *ar, const void *data, size_t len),
|
|
|
|
TP_ARGS(ar, data, len),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(ar->ab->dev))
|
|
__string(driver, dev_driver_string(ar->ab->dev))
|
|
__field(u16, len)
|
|
__field(u32, info)
|
|
__field(u32, sync_tstmp_lo_us)
|
|
__field(u32, sync_tstmp_hi_us)
|
|
__field(u32, mlo_offset_lo)
|
|
__field(u32, mlo_offset_hi)
|
|
__field(u32, mlo_offset_clks)
|
|
__field(u32, mlo_comp_clks)
|
|
__field(u32, mlo_comp_timer)
|
|
__dynamic_array(u8, ppdu, len)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
__assign_str(driver);
|
|
__entry->len = len;
|
|
__entry->info = ar->pdev->timestamp.info;
|
|
__entry->sync_tstmp_lo_us = ar->pdev->timestamp.sync_timestamp_hi_us;
|
|
__entry->sync_tstmp_hi_us = ar->pdev->timestamp.sync_timestamp_lo_us;
|
|
__entry->mlo_offset_lo = ar->pdev->timestamp.mlo_offset_lo;
|
|
__entry->mlo_offset_hi = ar->pdev->timestamp.mlo_offset_hi;
|
|
__entry->mlo_offset_clks = ar->pdev->timestamp.mlo_offset_clks;
|
|
__entry->mlo_comp_clks = ar->pdev->timestamp.mlo_comp_clks;
|
|
__entry->mlo_comp_timer = ar->pdev->timestamp.mlo_comp_timer;
|
|
memcpy(__get_dynamic_array(ppdu), data, len);
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s ppdu len %d",
|
|
__get_str(driver),
|
|
__get_str(device),
|
|
__entry->len
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(ath12k_htt_rxdesc,
|
|
TP_PROTO(struct ath12k *ar, const void *data, size_t type, size_t len),
|
|
|
|
TP_ARGS(ar, data, type, len),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(ar->ab->dev))
|
|
__string(driver, dev_driver_string(ar->ab->dev))
|
|
__field(u16, len)
|
|
__field(u16, type)
|
|
__field(u32, info)
|
|
__field(u32, sync_tstmp_lo_us)
|
|
__field(u32, sync_tstmp_hi_us)
|
|
__field(u32, mlo_offset_lo)
|
|
__field(u32, mlo_offset_hi)
|
|
__field(u32, mlo_offset_clks)
|
|
__field(u32, mlo_comp_clks)
|
|
__field(u32, mlo_comp_timer)
|
|
__dynamic_array(u8, rxdesc, len)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
__assign_str(driver);
|
|
__entry->len = len;
|
|
__entry->type = type;
|
|
__entry->info = ar->pdev->timestamp.info;
|
|
__entry->sync_tstmp_lo_us = ar->pdev->timestamp.sync_timestamp_hi_us;
|
|
__entry->sync_tstmp_hi_us = ar->pdev->timestamp.sync_timestamp_lo_us;
|
|
__entry->mlo_offset_lo = ar->pdev->timestamp.mlo_offset_lo;
|
|
__entry->mlo_offset_hi = ar->pdev->timestamp.mlo_offset_hi;
|
|
__entry->mlo_offset_clks = ar->pdev->timestamp.mlo_offset_clks;
|
|
__entry->mlo_comp_clks = ar->pdev->timestamp.mlo_comp_clks;
|
|
__entry->mlo_comp_timer = ar->pdev->timestamp.mlo_comp_timer;
|
|
memcpy(__get_dynamic_array(rxdesc), data, len);
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s rxdesc len %d",
|
|
__get_str(driver),
|
|
__get_str(device),
|
|
__entry->len
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(ath12k_wmi_diag,
|
|
TP_PROTO(struct ath12k_base *ab, const void *data, size_t len),
|
|
|
|
TP_ARGS(ab, data, len),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(ab->dev))
|
|
__string(driver, dev_driver_string(ab->dev))
|
|
__field(u16, len)
|
|
__dynamic_array(u8, data, len)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
__assign_str(driver);
|
|
__entry->len = len;
|
|
memcpy(__get_dynamic_array(data), data, len);
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s tlv diag len %d",
|
|
__get_str(driver),
|
|
__get_str(device),
|
|
__entry->len
|
|
)
|
|
);
|
|
|
|
#endif /* _TRACE_H_ || TRACE_HEADER_MULTI_READ*/
|
|
|
|
/* we don't want to use include/trace/events */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|