diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 93e87b287556..c834a6445842 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -49,8 +50,10 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, ARCH_DMA_MINALIGN, cls); dev->dma_coherent = coherent; - if (iommu) + if (iommu) { iommu_setup_dma_ops(dev, dma_base, size); + trace_android_vh_iommu_setup_dma_ops(dev, dma_base, size); + } #ifdef CONFIG_XEN if (xen_initial_domain()) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index ab184f8bdbcb..6d0212039c10 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -35,6 +35,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -150,3 +151,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_die_kernel_fault); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sea); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_mem_abort); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sp_pc_abort); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_setup_dma_ops); diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h new file mode 100644 index 000000000000..3c5829e6f6ef --- /dev/null +++ b/include/trace/hooks/iommu.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM iommu + +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_IOMMU_H + +#include + +#include +#include + +#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) + +DECLARE_HOOK(android_vh_iommu_setup_dma_ops, + TP_PROTO(struct device *dev, u64 dma_base, u64 size), + TP_ARGS(dev, dma_base, size)); + +#else + +#define trace_android_vh_iommu_setup_dma_ops(dev, dma_base, size) + +#endif + +#endif /* _TRACE_HOOK_IOMMU_H */ + +/* This part must be outside protection */ +#include