mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-04 04:02: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>
93 lines
2.4 KiB
C
93 lines
2.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Trace support header file for device mode
|
|
*
|
|
* Copyright (C) 2020 NXP
|
|
*
|
|
* Author: Peter Chen <peter.chen@nxp.com>
|
|
*/
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM chipidea
|
|
|
|
#if !defined(__LINUX_CHIPIDEA_TRACE) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define __LINUX_CHIPIDEA_TRACE
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/usb/chipidea.h>
|
|
#include "ci.h"
|
|
#include "udc.h"
|
|
|
|
#define CHIPIDEA_MSG_MAX 500
|
|
|
|
void ci_log(struct ci_hdrc *ci, const char *fmt, ...);
|
|
|
|
TRACE_EVENT(ci_log,
|
|
TP_PROTO(struct ci_hdrc *ci, struct va_format *vaf),
|
|
TP_ARGS(ci, vaf),
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name(ci->dev))
|
|
__vstring(msg, vaf->fmt, vaf->va)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__assign_vstr(msg, vaf->fmt, vaf->va);
|
|
),
|
|
TP_printk("%s: %s", __get_str(name), __get_str(msg))
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(ci_log_trb,
|
|
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
|
TP_ARGS(hwep, hwreq, td),
|
|
TP_STRUCT__entry(
|
|
__string(name, hwep->name)
|
|
__field(struct td_node *, td)
|
|
__field(struct usb_request *, req)
|
|
__field(dma_addr_t, dma)
|
|
__field(s32, td_remaining_size)
|
|
__field(u32, next)
|
|
__field(u32, token)
|
|
__field(u32, type)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->req = &hwreq->req;
|
|
__entry->td = td;
|
|
__entry->dma = td->dma;
|
|
__entry->td_remaining_size = td->td_remaining_size;
|
|
__entry->next = le32_to_cpu(td->ptr->next);
|
|
__entry->token = le32_to_cpu(td->ptr->token);
|
|
__entry->type = usb_endpoint_type(hwep->ep.desc);
|
|
),
|
|
TP_printk("%s: req: %p, td: %p, td_dma_address: %pad, remaining_size: %d, "
|
|
"next: %x, total bytes: %d, status: %lx",
|
|
__get_str(name), __entry->req, __entry->td, &__entry->dma,
|
|
__entry->td_remaining_size, __entry->next,
|
|
(int)((__entry->token & TD_TOTAL_BYTES) >> __ffs(TD_TOTAL_BYTES)),
|
|
__entry->token & TD_STATUS
|
|
)
|
|
);
|
|
|
|
DEFINE_EVENT(ci_log_trb, ci_prepare_td,
|
|
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
|
TP_ARGS(hwep, hwreq, td)
|
|
);
|
|
|
|
DEFINE_EVENT(ci_log_trb, ci_complete_td,
|
|
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
|
TP_ARGS(hwep, hwreq, td)
|
|
);
|
|
|
|
#endif /* __LINUX_CHIPIDEA_TRACE */
|
|
|
|
/* this part must be outside header guard */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace
|
|
|
|
#include <trace/define_trace.h>
|