iommu: Change trace unmap api to report unmapped size

Currently map and unmap are implemented as events under a
common trace class declaration. The common class forces
trace_unmap() to require a bogus physical address argument
that it doesn't use. Changing unmap to report unmapped size
will provide useful information for debugging. Remove common
map_unmap trace class and change map and unmap into separate
events as opposed to events under the same class to allow for
differences in the reporting information. In addition, map and
unmap are changed to handle size value as size_t instead of int
to match the passed size value and avoid overflow.

Change-Id: Ic231e28c2784fbfe41a6749175cc390920165e81
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Suggested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
[pdaly@codeaurora.org Keep map_unmap class]

2 files changed, 43 insertions, 15 deletions

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3b447302ddbf..0e7aeb49dfa9 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1201,7 +1201,7 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
 		unmapped += unmapped_page;
 	}
 
-	trace_unmap(orig_iova, 0, size);
+	trace_unmap(orig_iova, size, unmapped);
 	trace_unmap_end(orig_iova, 0, size);
 	return unmapped;
 }
diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h
index 4f44a9c4a697..7b8ba9ffa5a3 100644
--- a/include/trace/events/iommu.h
+++ b/include/trace/events/iommu.h
@@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
 	TP_STRUCT__entry(
 		__field(u64, iova)
 		__field(u64, paddr)
-		__field(int, size)
+		__field(size_t, size)
 	),
 
 	TP_fast_assign(
@@ -101,41 +101,69 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
 		__entry->size = size;
 	),
 
-	TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%x",
+	TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%zx",
 			__entry->iova, __entry->paddr, __entry->size
 	)
 );
 
-DEFINE_EVENT(iommu_map_unmap, map,
+TRACE_EVENT(map,
 
 	TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
 
-	TP_ARGS(iova, paddr, 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 paddr=0x%016llx size=%zu",
+			__entry->iova, __entry->paddr, __entry->size
+	)
 );
 
-DEFINE_EVENT(iommu_map_unmap, map_start,
+TRACE_EVENT(unmap,
 
-	TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+	TP_PROTO(unsigned long iova, size_t size, size_t unmapped_size),
 
-	TP_ARGS(iova, paddr, 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 size=%zu unmapped_size=%zu",
+			__entry->iova, __entry->size, __entry->unmapped_size
+	)
 );
 
-DEFINE_EVENT(iommu_map_unmap, map_end,
+DEFINE_EVENT(iommu_map_unmap, map_start,
 
 	TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
 
 	TP_ARGS(iova, paddr, size)
 );
 
-DEFINE_EVENT_PRINT(iommu_map_unmap, unmap,
+DEFINE_EVENT(iommu_map_unmap, map_end,
 
 	TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
 
-	TP_ARGS(iova, paddr, size),
-
-	TP_printk("IOMMU: iova=0x%016llx size=0x%x",
-			__entry->iova, __entry->size
-	)
+	TP_ARGS(iova, paddr, size)
 );
 
 DEFINE_EVENT_PRINT(iommu_map_unmap, unmap_start,