kevin/linux
1
Fork 0
Code
adc218676e
linux/drivers/net/hyperv/netvsc_trace.h
Steven Rostedt (Google) 2c92ca849f tracing/treewide: Remove second parameter of __assign_str() 
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>
2024-05-22 20:14:47 -04:00

183 lines
6.2 KiB
C
Raw Blame History

/* SPDX-License-Identifier: GPL-2.0 */
#if !defined(_NETVSC_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _NETVSC_TRACE_H
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM netvsc
#define TRACE_INCLUDE_FILE netvsc_trace
TRACE_DEFINE_ENUM(RNDIS_MSG_PACKET);
TRACE_DEFINE_ENUM(RNDIS_MSG_INDICATE);
TRACE_DEFINE_ENUM(RNDIS_MSG_INIT);
TRACE_DEFINE_ENUM(RNDIS_MSG_INIT_C);
TRACE_DEFINE_ENUM(RNDIS_MSG_HALT);
TRACE_DEFINE_ENUM(RNDIS_MSG_QUERY);
TRACE_DEFINE_ENUM(RNDIS_MSG_QUERY_C);
TRACE_DEFINE_ENUM(RNDIS_MSG_SET);
TRACE_DEFINE_ENUM(RNDIS_MSG_SET_C);
TRACE_DEFINE_ENUM(RNDIS_MSG_RESET);
TRACE_DEFINE_ENUM(RNDIS_MSG_RESET_C);
TRACE_DEFINE_ENUM(RNDIS_MSG_KEEPALIVE);
TRACE_DEFINE_ENUM(RNDIS_MSG_KEEPALIVE_C);
#define show_rndis_type(type) \
__print_symbolic(type, \
{ RNDIS_MSG_PACKET, "PACKET" }, \
{ RNDIS_MSG_INDICATE, "INDICATE", }, \
{ RNDIS_MSG_INIT, "INIT", }, \
{ RNDIS_MSG_INIT_C, "INIT_C", }, \
{ RNDIS_MSG_HALT, "HALT", }, \
{ RNDIS_MSG_QUERY, "QUERY", }, \
{ RNDIS_MSG_QUERY_C, "QUERY_C", }, \
{ RNDIS_MSG_SET, "SET", }, \
{ RNDIS_MSG_SET_C, "SET_C", }, \
{ RNDIS_MSG_RESET, "RESET", }, \
{ RNDIS_MSG_RESET_C, "RESET_C", }, \
{ RNDIS_MSG_KEEPALIVE, "KEEPALIVE", }, \
{ RNDIS_MSG_KEEPALIVE_C, "KEEPALIVE_C", })
DECLARE_EVENT_CLASS(rndis_msg_class,
TP_PROTO(const struct net_device *ndev, u16 q,
const struct rndis_message *msg),
TP_ARGS(ndev, q, msg),
TP_STRUCT__entry(
__string( name, ndev->name )
__field( u16, queue )
__field( u32, req_id )
__field( u32, msg_type )
__field( u32, msg_len )
),
TP_fast_assign(
__assign_str(name);
__entry->queue = q;
__entry->req_id = msg->msg.init_req.req_id;
__entry->msg_type = msg->ndis_msg_type;
__entry->msg_len = msg->msg_len;
),
TP_printk("dev=%s q=%u req=%#x type=%s msg_len=%u",
__get_str(name), __entry->queue, __entry->req_id,
show_rndis_type(__entry->msg_type), __entry->msg_len)
);
DEFINE_EVENT(rndis_msg_class, rndis_send,
TP_PROTO(const struct net_device *ndev, u16 q,
const struct rndis_message *msg),
TP_ARGS(ndev, q, msg)
);
DEFINE_EVENT(rndis_msg_class, rndis_recv,
TP_PROTO(const struct net_device *ndev, u16 q,
const struct rndis_message *msg),
TP_ARGS(ndev, q, msg)
);
TRACE_DEFINE_ENUM(NVSP_MSG_TYPE_INIT);
TRACE_DEFINE_ENUM(NVSP_MSG_TYPE_INIT_COMPLETE);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_NDIS_VER);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RECV_BUF);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_REVOKE_RECV_BUF);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_SEND_BUF);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_REVOKE_SEND_BUF);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RNDIS_PKT);
TRACE_DEFINE_ENUM(NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE);
TRACE_DEFINE_ENUM(NVSP_MSG2_TYPE_SEND_NDIS_CONFIG);
TRACE_DEFINE_ENUM(NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION);
TRACE_DEFINE_ENUM(NVSP_MSG4_TYPE_SWITCH_DATA_PATH);
TRACE_DEFINE_ENUM(NVSP_MSG5_TYPE_SUBCHANNEL);
TRACE_DEFINE_ENUM(NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE);
#define show_nvsp_type(type) \
__print_symbolic(type, \
{ NVSP_MSG_TYPE_INIT, "INIT" }, \
{ NVSP_MSG_TYPE_INIT_COMPLETE, "INIT_COMPLETE" }, \
{ NVSP_MSG1_TYPE_SEND_NDIS_VER, "SEND_NDIS_VER" }, \
{ NVSP_MSG1_TYPE_SEND_RECV_BUF, "SEND_RECV_BUF" }, \
{ NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE, "SEND_RECV_BUF_COMPLETE" }, \
{ NVSP_MSG1_TYPE_REVOKE_RECV_BUF, "REVOKE_RECV_BUF" }, \
{ NVSP_MSG1_TYPE_SEND_SEND_BUF, "SEND_SEND_BUF" }, \
{ NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE, "SEND_SEND_BUF_COMPLETE" }, \
{ NVSP_MSG1_TYPE_REVOKE_SEND_BUF, "REVOKE_SEND_BUF" }, \
{ NVSP_MSG1_TYPE_SEND_RNDIS_PKT, "SEND_RNDIS_PKT" }, \
{ NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE, "SEND_RNDIS_PKT_COMPLETE" },\
{ NVSP_MSG2_TYPE_SEND_NDIS_CONFIG, "SEND_NDIS_CONFIG" }, \
{ NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION, "SEND_VF_ASSOCIATION" }, \
{ NVSP_MSG4_TYPE_SWITCH_DATA_PATH, "SWITCH_DATA_PATH" }, \
{ NVSP_MSG5_TYPE_SUBCHANNEL, "SUBCHANNEL" }, \
{ NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE, "SEND_INDIRECTION_TABLE" })
TRACE_EVENT(nvsp_send,
TP_PROTO(const struct net_device *ndev,
const struct nvsp_message *msg),
TP_ARGS(ndev, msg),
TP_STRUCT__entry(
__string( name, ndev->name )
__field( u32, msg_type )
),
TP_fast_assign(
__assign_str(name);
__entry->msg_type = msg->hdr.msg_type;
),
TP_printk("dev=%s type=%s",
__get_str(name),
show_nvsp_type(__entry->msg_type))
);
TRACE_EVENT(nvsp_send_pkt,
TP_PROTO(const struct net_device *ndev,
const struct vmbus_channel *chan,
const struct nvsp_1_message_send_rndis_packet *rpkt),
TP_ARGS(ndev, chan, rpkt),
TP_STRUCT__entry(
__string( name, ndev->name )
__field( u16, qid )
__field( u32, channel_type )
__field( u32, section_index )
__field( u32, section_size )
),
TP_fast_assign(
__assign_str(name);
__entry->qid = chan->offermsg.offer.sub_channel_index;
__entry->channel_type = rpkt->channel_type;
__entry->section_index = rpkt->send_buf_section_index;
__entry->section_size = rpkt->send_buf_section_size;
),
TP_printk("dev=%s qid=%u type=%s section=%u size=%d",
__get_str(name), __entry->qid,
__entry->channel_type ? "CONTROL" : "DATA",
__entry->section_index, __entry->section_size)
);
TRACE_EVENT(nvsp_recv,
TP_PROTO(const struct net_device *ndev,
const struct vmbus_channel *chan,
const struct nvsp_message *msg),
TP_ARGS(ndev, chan, msg),
TP_STRUCT__entry(
__string( name, ndev->name )
__field( u16, qid )
__field( u32, msg_type )
),
TP_fast_assign(
__assign_str(name);
__entry->qid = chan->offermsg.offer.sub_channel_index;
__entry->msg_type = msg->hdr.msg_type;
),
TP_printk("dev=%s qid=%u type=%s",
__get_str(name), __entry->qid,
show_nvsp_type(__entry->msg_type))
);
#endif /* _NETVSC_TRACE_H */
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH ../../drivers/net/hyperv
#include <trace/define_trace.h>
View Git Blame Copy Permalink