Skip to contentSkip to conversation

iommu: Add iommu_error class event to iommu trace

PATCH Applied Shuah Khan 2 participants 4 messages Sep 24, 2013 – Sep 25, 2013

Subsystems (2)
lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

v4 cover iommu: Add iommu_error class event to iommu trace

This patch set adds iommu_error class event to iommu trace. iommu_error class event can be enabled to trigger when an iommu error occurs. This trace event is intended to be called to report the error information. Trace information includes driver name, device name, iova, and flags.

iommu_error:io_page_fault

This patch set depends on the previous patch set that added iommu tracing feature. Reference:

http://www.kernelhub.org/?msg=313155&p=2
http://www.kernelhub.org/?msg=313156&p=2

Shuah Khan (2):
iommu: Add iommu_error class event to iommu trace
iommu: Change iommu driver to call io_page_fault trace event

 drivers/iommu/iommu-traces.c |  3 +++
 include/linux/iommu.h        |  2 ++
 include/trace/events/iommu.h | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH v4 1/2 iommu: Add iommu_error class event to iommu trace

iommu_error class event can be enabled to trigger when an iommu error occurs. This trace event is intended to be called to report the error information. Trace information includes driver name, device name, iova, and flags.

iommu_error:io_page_fault

---
 drivers/iommu/iommu-traces.c |  3 +++
 include/trace/events/iommu.h | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
drivers/iommu/iommu-traces.c +3 -0
index a2af60f..71ac5fa 100644
@@ -22,3 +22,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(detach_device_from_domain);
 /* iommu_map_unmap */
 EXPORT_TRACEPOINT_SYMBOL_GPL(map);
 EXPORT_TRACEPOINT_SYMBOL_GPL(unmap);
+
+/* iommu_error */
+EXPORT_TRACEPOINT_SYMBOL_GPL(io_page_fault);
include/trace/events/iommu.h +33 -0
index 86bcc5a..a8f5c32 100644
@@ -123,6 +123,39 @@ DEFINE_EVENT_PRINT(iommu_map_unmap, unmap,
 			__entry->iova, __entry->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, dev_name(dev));
+		__assign_str(driver, dev_driver_string(dev));
+		__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 */
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH v4 2/2 iommu: Change iommu driver to call io_page_fault trace event

In reply to Shuah Khan

Change iommu driver call io_page_fault trace event. This iommu_error class event can be enabled to trigger when an iommu error occurs. Trace information includes driver name, device name, iova, and flags.

Testing:
Added trace calls to iommu_prepare_identity_map() for testing some of the conditions that are hard to trigger. Here is the trace from the testing:

       swapper/0-1     [003] ....     2.003774: io_page_fault: IOMMU:pci 0000:00:02.0 iova=0x00000000cb800000 flags=0x0002
       swapper/0-1     [003] ....     2.004098: io_page_fault: IOMMU:pci 0000:00:1d.0 iova=0x00000000cadc6000 flags=0x0002
       swapper/0-1     [003] ....     2.004115: io_page_fault: IOMMU:pci 0000:00:1a.0 iova=0x00000000cadc6000 flags=0x0002
       swapper/0-1     [003] ....     2.004129: io_page_fault: IOMMU:pci 0000:00:1f.0 iova=0x0000000000000000 flags=0x0002
---
 include/linux/iommu.h | 2 ++
 1 file changed, 2 insertions(+)
include/linux/iommu.h +2 -0
index 7ea319e..a444c79 100644
@@ -22,6 +22,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/types.h>
+#include <trace/events/iommu.h>
 
 #define IOMMU_READ	(1)
 #define IOMMU_WRITE	(2)
@@ -227,6 +228,7 @@ static inline int report_iommu_fault(struct iommu_domain *domain,
 		ret = domain->handler(domain, dev, iova, flags,
 						domain->handler_token);
 
+	trace_io_page_fault(dev, iova, flags);
 	return ret;
 }
 
Signature · 1 line
1.8.1.2
maintainer Applied
#3 lore raw
In reply to Shuah Khan
Quoted 3 lines · Shuah Khan

Shuah Khan (2):
iommu: Add iommu_error class event to iommu trace
iommu: Change iommu driver to call io_page_fault trace event

Applied to the tracing branch, thanks Shuah.