3 files changed, 55 insertions, 0 deletions

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 1b2277c311d2..b31081007a81 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -42,6 +42,9 @@
 #include <xen/page.h>
 #include <xen/xen-ops.h>
 #include <xen/hvc-console.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/swiotlb.h>
 /*
  * Used to do a quick range check in swiotlb_tbl_unmap_single and
  * swiotlb_tbl_sync_single_*, to see if the memory was in fact allocated by this
@@ -358,6 +361,8 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
         /*
          * Oh well, have to allocate and map a bounce buffer.
          */
+        trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
+
         map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir);
         if (map == SWIOTLB_MAP_ERROR)
                 return DMA_ERROR_CODE;
diff --git a/include/trace/events/swiotlb.h b/include/trace/events/swiotlb.h
new file mode 100644
index 000000000000..7ea4c5e7c448
--- /dev/null
+++ b/include/trace/events/swiotlb.h
@@ -0,0 +1,46 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM swiotlb
+
+#if !defined(_TRACE_SWIOTLB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SWIOTLB_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(swiotlb_bounced,
+
+        TP_PROTO(struct device *dev,
+                 dma_addr_t dev_addr,
+                 size_t size,
+                 int swiotlb_force),
+
+        TP_ARGS(dev, dev_addr, size, swiotlb_force),
+
+        TP_STRUCT__entry(
+                __string(       dev_name,       dev_name(dev)   )
+                __field(        u64,    dma_mask                )
+                __field(        dma_addr_t,     dev_addr        )
+                __field(        size_t, size                    )
+                __field(        int,    swiotlb_force           )
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name(dev));
+                __entry->dma_mask = (dev->dma_mask ? *dev->dma_mask : 0);
+                __entry->dev_addr = dev_addr;
+                __entry->size = size;
+                __entry->swiotlb_force = swiotlb_force;
+        ),
+
+        TP_printk("dev_name: %s dma_mask=%llx dev_addr=%llx "
+                "size=%zu %s",
+                __get_str(dev_name),
+                __entry->dma_mask,
+                (unsigned long long)__entry->dev_addr,
+                __entry->size,
+                __entry->swiotlb_force ? "swiotlb_force" : "" )
+);
+
+#endif /*  _TRACE_SWIOTLB_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 4e8686c7e5a4..f0d841907da6 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -38,6 +38,8 @@
 #include <linux/bootmem.h>
 #include <linux/iommu-helper.h>
 
+#include <trace/events/swiotlb.h>
+
 #define OFFSET(val,align) ((unsigned long)      \
                            ( (val) & ( (align) - 1)))
 
@@ -726,6 +728,8 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
         if (dma_capable(dev, dev_addr, size) && !swiotlb_force)
                 return dev_addr;
 
+        trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
+
         /* Oh well, have to allocate and map a bounce buffer. */
         map = map_single(dev, phys, size, dir);
         if (map == SWIOTLB_MAP_ERROR) {