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>
197 lines
5.3 KiB
C
197 lines
5.3 KiB
C
/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
|
|
/* Copyright 2014-2015 Freescale Semiconductor Inc.
|
|
*/
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM dpaa2_eth
|
|
|
|
#if !defined(_DPAA2_ETH_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _DPAA2_ETH_TRACE_H
|
|
|
|
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#define TR_FMT "[%s] fd: addr=0x%llx, len=%u, off=%u"
|
|
/* trace_printk format for raw buffer event class */
|
|
#define TR_BUF_FMT "[%s] vaddr=%p size=%zu dma_addr=%pad map_size=%zu bpid=%d"
|
|
|
|
/* This is used to declare a class of events.
|
|
* individual events of this type will be defined below.
|
|
*/
|
|
|
|
/* Store details about a frame descriptor */
|
|
DECLARE_EVENT_CLASS(dpaa2_eth_fd,
|
|
/* Trace function prototype */
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
/* Repeat argument list here */
|
|
TP_ARGS(netdev, fd),
|
|
|
|
/* A structure containing the relevant information we want
|
|
* to record. Declare name and type for each normal element,
|
|
* name, type and size for arrays. Use __string for variable
|
|
* length strings.
|
|
*/
|
|
TP_STRUCT__entry(
|
|
__field(u64, fd_addr)
|
|
__field(u32, fd_len)
|
|
__field(u16, fd_offset)
|
|
__string(name, netdev->name)
|
|
),
|
|
|
|
/* The function that assigns values to the above declared
|
|
* fields
|
|
*/
|
|
TP_fast_assign(
|
|
__entry->fd_addr = dpaa2_fd_get_addr(fd);
|
|
__entry->fd_len = dpaa2_fd_get_len(fd);
|
|
__entry->fd_offset = dpaa2_fd_get_offset(fd);
|
|
__assign_str(name);
|
|
),
|
|
|
|
/* This is what gets printed when the trace event is
|
|
* triggered.
|
|
*/
|
|
TP_printk(TR_FMT,
|
|
__get_str(name),
|
|
__entry->fd_addr,
|
|
__entry->fd_len,
|
|
__entry->fd_offset)
|
|
);
|
|
|
|
/* Now declare events of the above type. Format is:
|
|
* DEFINE_EVENT(class, name, proto, args), with proto and args same as for class
|
|
*/
|
|
|
|
/* Tx (egress) fd */
|
|
DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_fd,
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
TP_ARGS(netdev, fd)
|
|
);
|
|
|
|
/* Tx (egress) XSK fd */
|
|
DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_xsk_fd,
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
TP_ARGS(netdev, fd)
|
|
);
|
|
|
|
/* Rx fd */
|
|
DEFINE_EVENT(dpaa2_eth_fd, dpaa2_rx_fd,
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
TP_ARGS(netdev, fd)
|
|
);
|
|
|
|
/* Rx XSK fd */
|
|
DEFINE_EVENT(dpaa2_eth_fd, dpaa2_rx_xsk_fd,
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
TP_ARGS(netdev, fd)
|
|
);
|
|
|
|
/* Tx confirmation fd */
|
|
DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_conf_fd,
|
|
TP_PROTO(struct net_device *netdev,
|
|
const struct dpaa2_fd *fd),
|
|
|
|
TP_ARGS(netdev, fd)
|
|
);
|
|
|
|
/* Log data about raw buffers. Useful for tracing DPBP content. */
|
|
DECLARE_EVENT_CLASS(dpaa2_eth_buf,
|
|
/* Trace function prototype */
|
|
TP_PROTO(struct net_device *netdev,
|
|
/* virtual address and size */
|
|
void *vaddr,
|
|
size_t size,
|
|
/* dma map address and size */
|
|
dma_addr_t dma_addr,
|
|
size_t map_size,
|
|
/* buffer pool id, if relevant */
|
|
u16 bpid),
|
|
|
|
/* Repeat argument list here */
|
|
TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid),
|
|
|
|
/* A structure containing the relevant information we want
|
|
* to record. Declare name and type for each normal element,
|
|
* name, type and size for arrays. Use __string for variable
|
|
* length strings.
|
|
*/
|
|
TP_STRUCT__entry(
|
|
__field(void *, vaddr)
|
|
__field(size_t, size)
|
|
__field(dma_addr_t, dma_addr)
|
|
__field(size_t, map_size)
|
|
__field(u16, bpid)
|
|
__string(name, netdev->name)
|
|
),
|
|
|
|
/* The function that assigns values to the above declared
|
|
* fields
|
|
*/
|
|
TP_fast_assign(
|
|
__entry->vaddr = vaddr;
|
|
__entry->size = size;
|
|
__entry->dma_addr = dma_addr;
|
|
__entry->map_size = map_size;
|
|
__entry->bpid = bpid;
|
|
__assign_str(name);
|
|
),
|
|
|
|
/* This is what gets printed when the trace event is
|
|
* triggered.
|
|
*/
|
|
TP_printk(TR_BUF_FMT,
|
|
__get_str(name),
|
|
__entry->vaddr,
|
|
__entry->size,
|
|
&__entry->dma_addr,
|
|
__entry->map_size,
|
|
__entry->bpid)
|
|
);
|
|
|
|
/* Main memory buff seeding */
|
|
DEFINE_EVENT(dpaa2_eth_buf, dpaa2_eth_buf_seed,
|
|
TP_PROTO(struct net_device *netdev,
|
|
void *vaddr,
|
|
size_t size,
|
|
dma_addr_t dma_addr,
|
|
size_t map_size,
|
|
u16 bpid),
|
|
|
|
TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid)
|
|
);
|
|
|
|
/* UMEM buff seeding on AF_XDP fast path */
|
|
DEFINE_EVENT(dpaa2_eth_buf, dpaa2_xsk_buf_seed,
|
|
TP_PROTO(struct net_device *netdev,
|
|
void *vaddr,
|
|
size_t size,
|
|
dma_addr_t dma_addr,
|
|
size_t map_size,
|
|
u16 bpid),
|
|
|
|
TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid)
|
|
);
|
|
|
|
/* If only one event of a certain type needs to be declared, use TRACE_EVENT().
|
|
* The syntax is the same as for DECLARE_EVENT_CLASS().
|
|
*/
|
|
|
|
#endif /* _DPAA2_ETH_TRACE_H */
|
|
|
|
/* This must be outside ifdef _DPAA2_ETH_TRACE_H */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE dpaa2-eth-trace
|
|
#include <trace/define_trace.h>
|