mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +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>
126 lines
2.9 KiB
C
126 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM smc
|
|
|
|
#if !defined(_TRACE_SMC_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_SMC_H
|
|
|
|
#include <linux/ipv6.h>
|
|
#include <linux/tcp.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <net/ipv6.h>
|
|
#include "smc.h"
|
|
#include "smc_core.h"
|
|
|
|
TRACE_EVENT(smc_switch_to_fallback,
|
|
|
|
TP_PROTO(const struct smc_sock *smc, int fallback_rsn),
|
|
|
|
TP_ARGS(smc, fallback_rsn),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(const void *, sk)
|
|
__field(const void *, clcsk)
|
|
__field(u64, net_cookie)
|
|
__field(int, fallback_rsn)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
const struct sock *sk = &smc->sk;
|
|
const struct sock *clcsk = smc->clcsock->sk;
|
|
|
|
__entry->sk = sk;
|
|
__entry->clcsk = clcsk;
|
|
__entry->net_cookie = sock_net(sk)->net_cookie;
|
|
__entry->fallback_rsn = fallback_rsn;
|
|
),
|
|
|
|
TP_printk("sk=%p clcsk=%p net=%llu fallback_rsn=%d",
|
|
__entry->sk, __entry->clcsk,
|
|
__entry->net_cookie, __entry->fallback_rsn)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(smc_msg_event,
|
|
|
|
TP_PROTO(const struct smc_sock *smc, size_t len),
|
|
|
|
TP_ARGS(smc, len),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(const void *, smc)
|
|
__field(u64, net_cookie)
|
|
__field(size_t, len)
|
|
__string(name, smc->conn.lnk->ibname)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
const struct sock *sk = &smc->sk;
|
|
|
|
__entry->smc = smc;
|
|
__entry->net_cookie = sock_net(sk)->net_cookie;
|
|
__entry->len = len;
|
|
__assign_str(name);
|
|
),
|
|
|
|
TP_printk("smc=%p net=%llu len=%zu dev=%s",
|
|
__entry->smc, __entry->net_cookie,
|
|
__entry->len, __get_str(name))
|
|
);
|
|
|
|
DEFINE_EVENT(smc_msg_event, smc_tx_sendmsg,
|
|
|
|
TP_PROTO(const struct smc_sock *smc, size_t len),
|
|
|
|
TP_ARGS(smc, len)
|
|
);
|
|
|
|
DEFINE_EVENT(smc_msg_event, smc_rx_recvmsg,
|
|
|
|
TP_PROTO(const struct smc_sock *smc, size_t len),
|
|
|
|
TP_ARGS(smc, len)
|
|
);
|
|
|
|
TRACE_EVENT(smcr_link_down,
|
|
|
|
TP_PROTO(const struct smc_link *lnk, void *location),
|
|
|
|
TP_ARGS(lnk, location),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(const void *, lnk)
|
|
__field(const void *, lgr)
|
|
__field(u64, net_cookie)
|
|
__field(int, state)
|
|
__string(name, lnk->ibname)
|
|
__field(void *, location)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
const struct smc_link_group *lgr = lnk->lgr;
|
|
|
|
__entry->lnk = lnk;
|
|
__entry->lgr = lgr;
|
|
__entry->net_cookie = lgr->net->net_cookie;
|
|
__entry->state = lnk->state;
|
|
__assign_str(name);
|
|
__entry->location = location;
|
|
),
|
|
|
|
TP_printk("lnk=%p lgr=%p net=%llu state=%d dev=%s location=%pS",
|
|
__entry->lnk, __entry->lgr, __entry->net_cookie,
|
|
__entry->state, __get_str(name),
|
|
__entry->location)
|
|
);
|
|
|
|
#endif /* _TRACE_SMC_H */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE smc_tracepoint
|
|
|
|
#include <trace/define_trace.h>
|