iommu/vt-d: Move trace/events/intel_iommu.h under iommu

This header file is private to the Intel IOMMU driver. Move it to the
driver folder.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Link: https://lore.kernel.org/r/20220514014322.2927339-2-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index 9699ca101c6245289be61be06abcff64e3997006..f91b45be1d929fa1f9a9fccf33dd7c52f7ca9f6e 100644 (file)
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -30,10 +30,10 @@
 #include <linux/numa.h>
 #include <linux/limits.h>
 #include <asm/irq_remapping.h>
-#include <trace/events/intel_iommu.h>
 
 #include "../irq_remapping.h"
 #include "perf.h"
+#include "trace.h"
 
 typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *);
 struct dmar_res_callback {

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 7ee37d996e157234147fe12e6d870ef3ef23025b..70b40d007a525b1555ce0412ebffc35048d4cebf 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -21,11 +21,11 @@
 #include <linux/ioasid.h>
 #include <asm/page.h>
 #include <asm/fpu/api.h>
-#include <trace/events/intel_iommu.h>
 
 #include "pasid.h"
 #include "perf.h"
 #include "../iommu-sva-lib.h"
+#include "trace.h"
 
 static irqreturn_t prq_event_thread(int irq, void *d);
 static void intel_svm_drain_prq(struct device *dev, u32 pasid);

diff --git a/drivers/iommu/intel/trace.c b/drivers/iommu/intel/trace.c
index bfb6a6e37a88b426b638f7ec82d0dacd4d4bdf9e..117e626e3ea9884e574ea0b6fb33cecc30155b0b 100644 (file)
--- a/drivers/iommu/intel/trace.c
+++ b/drivers/iommu/intel/trace.c
@@ -11,4 +11,4 @@
 #include <linux/types.h>
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/intel_iommu.h>
+#include "trace.h"

diff --git a/drivers/iommu/intel/trace.h b/drivers/iommu/intel/trace.h
new file mode 100644 (file)
index 0000000..25cb7f8
--- /dev/null
+++ b/drivers/iommu/intel/trace.h
@@ -0,0 +1,98 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Intel IOMMU trace support
+ *
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM intel_iommu
+
+#if !defined(_TRACE_INTEL_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_INTEL_IOMMU_H
+
+#include <linux/tracepoint.h>
+#include <linux/intel-iommu.h>
+
+#define MSG_MAX                256
+
+TRACE_EVENT(qi_submit,
+       TP_PROTO(struct intel_iommu *iommu, u64 qw0, u64 qw1, u64 qw2, u64 qw3),
+
+       TP_ARGS(iommu, qw0, qw1, qw2, qw3),
+
+       TP_STRUCT__entry(
+               __field(u64, qw0)
+               __field(u64, qw1)
+               __field(u64, qw2)
+               __field(u64, qw3)
+               __string(iommu, iommu->name)
+       ),
+
+       TP_fast_assign(
+               __assign_str(iommu, iommu->name);
+               __entry->qw0 = qw0;
+               __entry->qw1 = qw1;
+               __entry->qw2 = qw2;
+               __entry->qw3 = qw3;
+       ),
+
+       TP_printk("%s %s: 0x%llx 0x%llx 0x%llx 0x%llx",
+                 __print_symbolic(__entry->qw0 & 0xf,
+                                  { QI_CC_TYPE,        "cc_inv" },
+                                  { QI_IOTLB_TYPE,     "iotlb_inv" },
+                                  { QI_DIOTLB_TYPE,    "dev_tlb_inv" },
+                                  { QI_IEC_TYPE,       "iec_inv" },
+                                  { QI_IWD_TYPE,       "inv_wait" },
+                                  { QI_EIOTLB_TYPE,    "p_iotlb_inv" },
+                                  { QI_PC_TYPE,        "pc_inv" },
+                                  { QI_DEIOTLB_TYPE,   "p_dev_tlb_inv" },
+                                  { QI_PGRP_RESP_TYPE, "page_grp_resp" }),
+               __get_str(iommu),
+               __entry->qw0, __entry->qw1, __entry->qw2, __entry->qw3
+       )
+);
+
+TRACE_EVENT(prq_report,
+       TP_PROTO(struct intel_iommu *iommu, struct device *dev,
+                u64 dw0, u64 dw1, u64 dw2, u64 dw3,
+                unsigned long seq),
+
+       TP_ARGS(iommu, dev, dw0, dw1, dw2, dw3, seq),
+
+       TP_STRUCT__entry(
+               __field(u64, dw0)
+               __field(u64, dw1)
+               __field(u64, dw2)
+               __field(u64, dw3)
+               __field(unsigned long, seq)
+               __string(iommu, iommu->name)
+               __string(dev, dev_name(dev))
+               __dynamic_array(char, buff, MSG_MAX)
+       ),
+
+       TP_fast_assign(
+               __entry->dw0 = dw0;
+               __entry->dw1 = dw1;
+               __entry->dw2 = dw2;
+               __entry->dw3 = dw3;
+               __entry->seq = seq;
+               __assign_str(iommu, iommu->name);
+               __assign_str(dev, dev_name(dev));
+       ),
+
+       TP_printk("%s/%s seq# %ld: %s",
+               __get_str(iommu), __get_str(dev), __entry->seq,
+               decode_prq_descriptor(__get_str(buff), MSG_MAX, __entry->dw0,
+                                     __entry->dw1, __entry->dw2, __entry->dw3)
+       )
+);
+#endif /* _TRACE_INTEL_IOMMU_H */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH ../../drivers/iommu/intel/
+#define TRACE_INCLUDE_FILE trace
+#include <trace/define_trace.h>

diff --git a/include/trace/events/intel_iommu.h b/include/trace/events/intel_iommu.h
deleted file mode 100644 (file)
index e5c1ca6..0000000
--- a/include/trace/events/intel_iommu.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Intel IOMMU trace support
- *
- * Copyright (C) 2019 Intel Corporation
- *
- * Author: Lu Baolu <baolu.lu@linux.intel.com>
- */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM intel_iommu
-
-#if !defined(_TRACE_INTEL_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_INTEL_IOMMU_H
-
-#include <linux/tracepoint.h>
-#include <linux/intel-iommu.h>
-
-#define MSG_MAX                256
-
-TRACE_EVENT(qi_submit,
-       TP_PROTO(struct intel_iommu *iommu, u64 qw0, u64 qw1, u64 qw2, u64 qw3),
-
-       TP_ARGS(iommu, qw0, qw1, qw2, qw3),
-
-       TP_STRUCT__entry(
-               __field(u64, qw0)
-               __field(u64, qw1)
-               __field(u64, qw2)
-               __field(u64, qw3)
-               __string(iommu, iommu->name)
-       ),
-
-       TP_fast_assign(
-               __assign_str(iommu, iommu->name);
-               __entry->qw0 = qw0;
-               __entry->qw1 = qw1;
-               __entry->qw2 = qw2;
-               __entry->qw3 = qw3;
-       ),
-
-       TP_printk("%s %s: 0x%llx 0x%llx 0x%llx 0x%llx",
-                 __print_symbolic(__entry->qw0 & 0xf,
-                                  { QI_CC_TYPE,        "cc_inv" },
-                                  { QI_IOTLB_TYPE,     "iotlb_inv" },
-                                  { QI_DIOTLB_TYPE,    "dev_tlb_inv" },
-                                  { QI_IEC_TYPE,       "iec_inv" },
-                                  { QI_IWD_TYPE,       "inv_wait" },
-                                  { QI_EIOTLB_TYPE,    "p_iotlb_inv" },
-                                  { QI_PC_TYPE,        "pc_inv" },
-                                  { QI_DEIOTLB_TYPE,   "p_dev_tlb_inv" },
-                                  { QI_PGRP_RESP_TYPE, "page_grp_resp" }),
-               __get_str(iommu),
-               __entry->qw0, __entry->qw1, __entry->qw2, __entry->qw3
-       )
-);
-
-TRACE_EVENT(prq_report,
-       TP_PROTO(struct intel_iommu *iommu, struct device *dev,
-                u64 dw0, u64 dw1, u64 dw2, u64 dw3,
-                unsigned long seq),
-
-       TP_ARGS(iommu, dev, dw0, dw1, dw2, dw3, seq),
-
-       TP_STRUCT__entry(
-               __field(u64, dw0)
-               __field(u64, dw1)
-               __field(u64, dw2)
-               __field(u64, dw3)
-               __field(unsigned long, seq)
-               __string(iommu, iommu->name)
-               __string(dev, dev_name(dev))
-               __dynamic_array(char, buff, MSG_MAX)
-       ),
-
-       TP_fast_assign(
-               __entry->dw0 = dw0;
-               __entry->dw1 = dw1;
-               __entry->dw2 = dw2;
-               __entry->dw3 = dw3;
-               __entry->seq = seq;
-               __assign_str(iommu, iommu->name);
-               __assign_str(dev, dev_name(dev));
-       ),
-
-       TP_printk("%s/%s seq# %ld: %s",
-               __get_str(iommu), __get_str(dev), __entry->seq,
-               decode_prq_descriptor(__get_str(buff), MSG_MAX, __entry->dw0,
-                                     __entry->dw1, __entry->dw2, __entry->dw3)
-       )
-);
-#endif /* _TRACE_INTEL_IOMMU_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>