Commit 984d03ad authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vt-d: trace: Extend map_sg trace event 



Current map_sg stores trace message in a coarse manner. This
extends it so that more detailed messages could be traced.

The map_sg trace message looks like:

map_sg: dev=0000:00:17.0 [1/9] dev_addr=0xf8f90000 phys_addr=0x158051000 size=4096
map_sg: dev=0000:00:17.0 [2/9] dev_addr=0xf8f91000 phys_addr=0x15a858000 size=4096
map_sg: dev=0000:00:17.0 [3/9] dev_addr=0xf8f92000 phys_addr=0x15aa13000 size=4096
map_sg: dev=0000:00:17.0 [4/9] dev_addr=0xf8f93000 phys_addr=0x1570f1000 size=8192
map_sg: dev=0000:00:17.0 [5/9] dev_addr=0xf8f95000 phys_addr=0x15c6d0000 size=4096
map_sg: dev=0000:00:17.0 [6/9] dev_addr=0xf8f96000 phys_addr=0x157194000 size=4096
map_sg: dev=0000:00:17.0 [7/9] dev_addr=0xf8f97000 phys_addr=0x169552000 size=4096
map_sg: dev=0000:00:17.0 [8/9] dev_addr=0xf8f98000 phys_addr=0x169dde000 size=4096
map_sg: dev=0000:00:17.0 [9/9] dev_addr=0xf8f99000 phys_addr=0x148351000 size=4096

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 034d4731

drivers/iommu/intel-iommu.c

+5 −2
Original line number Diff line number Diff line
@@ -3776,8 +3776,8 @@ static int intel_map_sg(struct device *dev, struct scatterlist *sglist, int nele 
		return 0;

	}



	trace_map_sg(dev, iova_pfn << PAGE_SHIFT,

		     sg_phys(sglist), size << VTD_PAGE_SHIFT);

	for_each_sg(sglist, sg, nelems, i)

		trace_map_sg(dev, i + 1, nelems, sg);



	return nelems;

}
@@ -3989,6 +3989,9 @@ bounce_map_sg(struct device *dev, struct scatterlist *sglist, int nelems, 
		sg_dma_len(sg) = sg->length;

	}



	for_each_sg(sglist, sg, nelems, i)

		trace_bounce_map_sg(dev, i + 1, nelems, sg);



	return nelems;



out_unmap:

include/trace/events/intel_iommu.h

+42 −6
Original line number Diff line number Diff line
@@ -49,12 +49,6 @@ DEFINE_EVENT(dma_map, map_single, 
	TP_ARGS(dev, dev_addr, phys_addr, size)

);



DEFINE_EVENT(dma_map, map_sg,

	TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,

		 size_t size),

	TP_ARGS(dev, dev_addr, phys_addr, size)

);



DEFINE_EVENT(dma_map, bounce_map_single,

	TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,

		 size_t size),
@@ -99,6 +93,48 @@ DEFINE_EVENT(dma_unmap, bounce_unmap_single, 
	TP_ARGS(dev, dev_addr, size)

);



DECLARE_EVENT_CLASS(dma_map_sg,

	TP_PROTO(struct device *dev, int index, int total,

		 struct scatterlist *sg),



	TP_ARGS(dev, index, total, sg),



	TP_STRUCT__entry(

		__string(dev_name, dev_name(dev))

		__field(dma_addr_t, dev_addr)

		__field(phys_addr_t, phys_addr)

		__field(size_t,	size)

		__field(int, index)

		__field(int, total)

	),



	TP_fast_assign(

		__assign_str(dev_name, dev_name(dev));

		__entry->dev_addr = sg->dma_address;

		__entry->phys_addr = sg_phys(sg);

		__entry->size = sg->dma_length;

		__entry->index = index;

		__entry->total = total;

	),



	TP_printk("dev=%s [%d/%d] dev_addr=0x%llx phys_addr=0x%llx size=%zu",

		  __get_str(dev_name), __entry->index, __entry->total,

		  (unsigned long long)__entry->dev_addr,

		  (unsigned long long)__entry->phys_addr,

		  __entry->size)

);



DEFINE_EVENT(dma_map_sg, map_sg,

	TP_PROTO(struct device *dev, int index, int total,

		 struct scatterlist *sg),

	TP_ARGS(dev, index, total, sg)

);



DEFINE_EVENT(dma_map_sg, bounce_map_sg,

	TP_PROTO(struct device *dev, int index, int total,

		 struct scatterlist *sg),

	TP_ARGS(dev, index, total, sg)

);

#endif /* _TRACE_INTEL_IOMMU_H */



/* This part must be outside protection */

CRA Git | Maintained and supported by SUSTech CRA and CCSE