mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-31 14:23:49 +01:00
Steven Rostedt (Google)
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/[email protected]/
Link: https://lore.kernel.org/linux-trace-kernel/[email protected]
Cc: Masami Hiramatsu <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Julia Lawall <[email protected]>
Signed-off-by: Steven Rostedt (Google) <[email protected]>
Acked-by: Jani Nikula <[email protected]>
Acked-by: Christian König <[email protected]> for the amdgpu parts.
Acked-by: Thomas Hellström <[email protected]> #for
Acked-by: Rafael J. Wysocki <[email protected]> # for thermal
Acked-by: Takashi Iwai <[email protected]>
Acked-by: Darrick J. Wong <[email protected]> # xfs
Tested-by: Guenter Roeck <[email protected]>
57 lines
1.7 KiB
C
57 lines
1.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#if !defined(_VIRTGPU_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _VIRTGPU_TRACE_H_
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM virtio_gpu
|
|
#define TRACE_INCLUDE_FILE virtgpu_trace
|
|
|
|
DECLARE_EVENT_CLASS(virtio_gpu_cmd,
|
|
TP_PROTO(struct virtqueue *vq, struct virtio_gpu_ctrl_hdr *hdr, u32 seqno),
|
|
TP_ARGS(vq, hdr, seqno),
|
|
TP_STRUCT__entry(
|
|
__field(int, dev)
|
|
__field(unsigned int, vq)
|
|
__string(name, vq->name)
|
|
__field(u32, type)
|
|
__field(u32, flags)
|
|
__field(u64, fence_id)
|
|
__field(u32, ctx_id)
|
|
__field(u32, num_free)
|
|
__field(u32, seqno)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->dev = vq->vdev->index;
|
|
__entry->vq = vq->index;
|
|
__assign_str(name);
|
|
__entry->type = le32_to_cpu(hdr->type);
|
|
__entry->flags = le32_to_cpu(hdr->flags);
|
|
__entry->fence_id = le64_to_cpu(hdr->fence_id);
|
|
__entry->ctx_id = le32_to_cpu(hdr->ctx_id);
|
|
__entry->num_free = vq->num_free;
|
|
__entry->seqno = seqno;
|
|
),
|
|
TP_printk("vdev=%d vq=%u name=%s type=0x%x flags=0x%x fence_id=%llu ctx_id=%u num_free=%u seqno=%u",
|
|
__entry->dev, __entry->vq, __get_str(name),
|
|
__entry->type, __entry->flags, __entry->fence_id,
|
|
__entry->ctx_id, __entry->num_free, __entry->seqno)
|
|
);
|
|
|
|
DEFINE_EVENT(virtio_gpu_cmd, virtio_gpu_cmd_queue,
|
|
TP_PROTO(struct virtqueue *vq, struct virtio_gpu_ctrl_hdr *hdr, u32 seqno),
|
|
TP_ARGS(vq, hdr, seqno)
|
|
);
|
|
|
|
DEFINE_EVENT(virtio_gpu_cmd, virtio_gpu_cmd_response,
|
|
TP_PROTO(struct virtqueue *vq, struct virtio_gpu_ctrl_hdr *hdr, u32 seqno),
|
|
TP_ARGS(vq, hdr, seqno)
|
|
);
|
|
|
|
#endif
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/virtio
|
|
#include <trace/define_trace.h>
|