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>
163 lines
3.0 KiB
C
163 lines
3.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* iommu trace points
|
|
*
|
|
* Copyright (C) 2013 Shuah Khan <shuah.kh@samsung.com>
|
|
*
|
|
*/
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM iommu
|
|
|
|
#if !defined(_TRACE_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_IOMMU_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
struct device;
|
|
|
|
DECLARE_EVENT_CLASS(iommu_group_event,
|
|
|
|
TP_PROTO(int group_id, struct device *dev),
|
|
|
|
TP_ARGS(group_id, dev),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(int, gid)
|
|
__string(device, dev_name(dev))
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->gid = group_id;
|
|
__assign_str(device);
|
|
),
|
|
|
|
TP_printk("IOMMU: groupID=%d device=%s",
|
|
__entry->gid, __get_str(device)
|
|
)
|
|
);
|
|
|
|
DEFINE_EVENT(iommu_group_event, add_device_to_group,
|
|
|
|
TP_PROTO(int group_id, struct device *dev),
|
|
|
|
TP_ARGS(group_id, dev)
|
|
|
|
);
|
|
|
|
DEFINE_EVENT(iommu_group_event, remove_device_from_group,
|
|
|
|
TP_PROTO(int group_id, struct device *dev),
|
|
|
|
TP_ARGS(group_id, dev)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(iommu_device_event,
|
|
|
|
TP_PROTO(struct device *dev),
|
|
|
|
TP_ARGS(dev),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(dev))
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
),
|
|
|
|
TP_printk("IOMMU: device=%s", __get_str(device)
|
|
)
|
|
);
|
|
|
|
DEFINE_EVENT(iommu_device_event, attach_device_to_domain,
|
|
|
|
TP_PROTO(struct device *dev),
|
|
|
|
TP_ARGS(dev)
|
|
);
|
|
|
|
TRACE_EVENT(map,
|
|
|
|
TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
|
|
|
|
TP_ARGS(iova, paddr, size),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u64, iova)
|
|
__field(u64, paddr)
|
|
__field(size_t, size)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->iova = iova;
|
|
__entry->paddr = paddr;
|
|
__entry->size = size;
|
|
),
|
|
|
|
TP_printk("IOMMU: iova=0x%016llx - 0x%016llx paddr=0x%016llx size=%zu",
|
|
__entry->iova, __entry->iova + __entry->size, __entry->paddr,
|
|
__entry->size
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(unmap,
|
|
|
|
TP_PROTO(unsigned long iova, size_t size, size_t unmapped_size),
|
|
|
|
TP_ARGS(iova, size, unmapped_size),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u64, iova)
|
|
__field(size_t, size)
|
|
__field(size_t, unmapped_size)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->iova = iova;
|
|
__entry->size = size;
|
|
__entry->unmapped_size = unmapped_size;
|
|
),
|
|
|
|
TP_printk("IOMMU: iova=0x%016llx - 0x%016llx size=%zu unmapped_size=%zu",
|
|
__entry->iova, __entry->iova + __entry->size,
|
|
__entry->size, __entry->unmapped_size
|
|
)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(iommu_error,
|
|
|
|
TP_PROTO(struct device *dev, unsigned long iova, int flags),
|
|
|
|
TP_ARGS(dev, iova, flags),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(dev))
|
|
__string(driver, dev_driver_string(dev))
|
|
__field(u64, iova)
|
|
__field(int, flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device);
|
|
__assign_str(driver);
|
|
__entry->iova = iova;
|
|
__entry->flags = flags;
|
|
),
|
|
|
|
TP_printk("IOMMU:%s %s iova=0x%016llx flags=0x%04x",
|
|
__get_str(driver), __get_str(device),
|
|
__entry->iova, __entry->flags
|
|
)
|
|
);
|
|
|
|
DEFINE_EVENT(iommu_error, io_page_fault,
|
|
|
|
TP_PROTO(struct device *dev, unsigned long iova, int flags),
|
|
|
|
TP_ARGS(dev, iova, flags)
|
|
);
|
|
#endif /* _TRACE_IOMMU_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|