mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-09-02 08:32:55 +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>
138 lines
3.8 KiB
C
138 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/* Copyright (c) 2018-2019 Hisilicon Limited. */
|
|
|
|
/* This must be outside ifdef _HCLGEVF_TRACE_H */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM hns3
|
|
|
|
#if !defined(_HCLGEVF_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _HCLGEVF_TRACE_H_
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#define VF_GET_MBX_LEN (sizeof(struct hclge_mbx_pf_to_vf_cmd) / sizeof(u32))
|
|
#define VF_SEND_MBX_LEN (sizeof(struct hclge_mbx_vf_to_pf_cmd) / sizeof(u32))
|
|
|
|
TRACE_EVENT(hclge_vf_mbx_get,
|
|
TP_PROTO(
|
|
struct hclgevf_dev *hdev,
|
|
struct hclge_mbx_pf_to_vf_cmd *req),
|
|
TP_ARGS(hdev, req),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u8, vfid)
|
|
__field(u16, code)
|
|
__string(pciname, pci_name(hdev->pdev))
|
|
__string(devname, hdev->nic.kinfo.netdev->name)
|
|
__array(u32, mbx_data, VF_GET_MBX_LEN)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->vfid = req->dest_vfid;
|
|
__entry->code = le16_to_cpu(req->msg.code);
|
|
__assign_str(pciname);
|
|
__assign_str(devname);
|
|
memcpy(__entry->mbx_data, req,
|
|
sizeof(struct hclge_mbx_pf_to_vf_cmd));
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s vfid:%u code:%u data:%s",
|
|
__get_str(pciname), __get_str(devname), __entry->vfid,
|
|
__entry->code,
|
|
__print_array(__entry->mbx_data, VF_GET_MBX_LEN, sizeof(u32))
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(hclge_vf_mbx_send,
|
|
TP_PROTO(
|
|
struct hclgevf_dev *hdev,
|
|
struct hclge_mbx_vf_to_pf_cmd *req),
|
|
TP_ARGS(hdev, req),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u8, vfid)
|
|
__field(u8, code)
|
|
__field(u8, subcode)
|
|
__string(pciname, pci_name(hdev->pdev))
|
|
__string(devname, hdev->nic.kinfo.netdev->name)
|
|
__array(u32, mbx_data, VF_SEND_MBX_LEN)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->vfid = req->mbx_src_vfid;
|
|
__entry->code = req->msg.code;
|
|
__entry->subcode = req->msg.subcode;
|
|
__assign_str(pciname);
|
|
__assign_str(devname);
|
|
memcpy(__entry->mbx_data, req,
|
|
sizeof(struct hclge_mbx_vf_to_pf_cmd));
|
|
),
|
|
|
|
TP_printk(
|
|
"%s %s vfid:%u code:%u subcode:%u data:%s",
|
|
__get_str(pciname), __get_str(devname), __entry->vfid,
|
|
__entry->code, __entry->subcode,
|
|
__print_array(__entry->mbx_data, VF_SEND_MBX_LEN, sizeof(u32))
|
|
)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(hclge_vf_cmd_template,
|
|
TP_PROTO(struct hclge_comm_hw *hw,
|
|
struct hclge_desc *desc,
|
|
int index,
|
|
int num),
|
|
|
|
TP_ARGS(hw, desc, index, num),
|
|
|
|
TP_STRUCT__entry(__field(u16, opcode)
|
|
__field(u16, flag)
|
|
__field(u16, retval)
|
|
__field(u16, rsv)
|
|
__field(int, index)
|
|
__field(int, num)
|
|
__string(pciname, pci_name(hw->cmq.csq.pdev))
|
|
__array(u32, data, HCLGE_DESC_DATA_LEN)),
|
|
|
|
TP_fast_assign(int i;
|
|
__entry->opcode = le16_to_cpu(desc->opcode);
|
|
__entry->flag = le16_to_cpu(desc->flag);
|
|
__entry->retval = le16_to_cpu(desc->retval);
|
|
__entry->rsv = le16_to_cpu(desc->rsv);
|
|
__entry->index = index;
|
|
__entry->num = num;
|
|
__assign_str(pciname);
|
|
for (i = 0; i < HCLGE_DESC_DATA_LEN; i++)
|
|
__entry->data[i] = le32_to_cpu(desc->data[i]);),
|
|
|
|
TP_printk("%s opcode:0x%04x %d-%d flag:0x%04x retval:0x%04x rsv:0x%04x data:%s",
|
|
__get_str(pciname), __entry->opcode,
|
|
__entry->index, __entry->num,
|
|
__entry->flag, __entry->retval, __entry->rsv,
|
|
__print_array(__entry->data,
|
|
HCLGE_DESC_DATA_LEN, sizeof(u32)))
|
|
);
|
|
|
|
DEFINE_EVENT(hclge_vf_cmd_template, hclge_vf_cmd_send,
|
|
TP_PROTO(struct hclge_comm_hw *hw,
|
|
struct hclge_desc *desc,
|
|
int index,
|
|
int num),
|
|
TP_ARGS(hw, desc, index, num));
|
|
|
|
DEFINE_EVENT(hclge_vf_cmd_template, hclge_vf_cmd_get,
|
|
TP_PROTO(struct hclge_comm_hw *hw,
|
|
struct hclge_desc *desc,
|
|
int index,
|
|
int num),
|
|
TP_ARGS(hw, desc, index, num));
|
|
|
|
#endif /* _HCLGEVF_TRACE_H_ */
|
|
|
|
/* This must be outside ifdef _HCLGEVF_TRACE_H */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE hclgevf_trace
|
|
#include <trace/define_trace.h>
|