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>
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Marvell RVU Admin Function driver
|
|
*
|
|
* Copyright (C) 2020 Marvell.
|
|
*
|
|
*/
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM rvu
|
|
|
|
#if !defined(__RVU_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define __RVU_TRACE_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/pci.h>
|
|
|
|
#include "mbox.h"
|
|
|
|
TRACE_EVENT(otx2_msg_alloc,
|
|
TP_PROTO(const struct pci_dev *pdev, u16 id, u64 size),
|
|
TP_ARGS(pdev, id, size),
|
|
TP_STRUCT__entry(__string(dev, pci_name(pdev))
|
|
__field(u16, id)
|
|
__field(u64, size)
|
|
),
|
|
TP_fast_assign(__assign_str(dev);
|
|
__entry->id = id;
|
|
__entry->size = size;
|
|
),
|
|
TP_printk("[%s] msg:(%s) size:%lld\n", __get_str(dev),
|
|
otx2_mbox_id2name(__entry->id), __entry->size)
|
|
);
|
|
|
|
TRACE_EVENT(otx2_msg_send,
|
|
TP_PROTO(const struct pci_dev *pdev, u16 num_msgs, u64 msg_size),
|
|
TP_ARGS(pdev, num_msgs, msg_size),
|
|
TP_STRUCT__entry(__string(dev, pci_name(pdev))
|
|
__field(u16, num_msgs)
|
|
__field(u64, msg_size)
|
|
),
|
|
TP_fast_assign(__assign_str(dev);
|
|
__entry->num_msgs = num_msgs;
|
|
__entry->msg_size = msg_size;
|
|
),
|
|
TP_printk("[%s] sent %d msg(s) of size:%lld\n", __get_str(dev),
|
|
__entry->num_msgs, __entry->msg_size)
|
|
);
|
|
|
|
TRACE_EVENT(otx2_msg_check,
|
|
TP_PROTO(const struct pci_dev *pdev, u16 reqid, u16 rspid, int rc),
|
|
TP_ARGS(pdev, reqid, rspid, rc),
|
|
TP_STRUCT__entry(__string(dev, pci_name(pdev))
|
|
__field(u16, reqid)
|
|
__field(u16, rspid)
|
|
__field(int, rc)
|
|
),
|
|
TP_fast_assign(__assign_str(dev);
|
|
__entry->reqid = reqid;
|
|
__entry->rspid = rspid;
|
|
__entry->rc = rc;
|
|
),
|
|
TP_printk("[%s] req->id:0x%x rsp->id:0x%x resp_code:%d\n",
|
|
__get_str(dev), __entry->reqid,
|
|
__entry->rspid, __entry->rc)
|
|
);
|
|
|
|
TRACE_EVENT(otx2_msg_interrupt,
|
|
TP_PROTO(const struct pci_dev *pdev, const char *msg, u64 intr),
|
|
TP_ARGS(pdev, msg, intr),
|
|
TP_STRUCT__entry(__string(dev, pci_name(pdev))
|
|
__string(str, msg)
|
|
__field(u64, intr)
|
|
),
|
|
TP_fast_assign(__assign_str(dev);
|
|
__assign_str(str);
|
|
__entry->intr = intr;
|
|
),
|
|
TP_printk("[%s] mbox interrupt %s (0x%llx)\n", __get_str(dev),
|
|
__get_str(str), __entry->intr)
|
|
);
|
|
|
|
TRACE_EVENT(otx2_msg_process,
|
|
TP_PROTO(const struct pci_dev *pdev, u16 id, int err),
|
|
TP_ARGS(pdev, id, err),
|
|
TP_STRUCT__entry(__string(dev, pci_name(pdev))
|
|
__field(u16, id)
|
|
__field(int, err)
|
|
),
|
|
TP_fast_assign(__assign_str(dev);
|
|
__entry->id = id;
|
|
__entry->err = err;
|
|
),
|
|
TP_printk("[%s] msg:(%s) error:%d\n", __get_str(dev),
|
|
otx2_mbox_id2name(__entry->id), __entry->err)
|
|
);
|
|
|
|
#endif /* __RVU_TRACE_H */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE rvu_trace
|
|
|
|
#include <trace/define_trace.h>
|