iommu/vt-d: Enable IOMMU perfmon support

Register and enable an IOMMU perfmon for each active IOMMU device.

The failure of IOMMU perfmon registration doesn't impact other
functionalities of an IOMMU device.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20230128200428.1459118-8-kan.liang@linux.intel.com
Signed-off-by: Lu Baolu <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 43db6ebe8b571268653e3356a6ce8ad85f452c50..6acfe879589cb75f625c8b9715838b193ba44e4b 100644 (file)
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -1144,6 +1144,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
                err = iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);
                if (err)
                        goto err_sysfs;
+
+               iommu_pmu_register(iommu);
        }
 
        drhd->iommu = iommu;
@@ -1166,6 +1168,7 @@ error:
 static void free_iommu(struct intel_iommu *iommu)
 {
        if (intel_iommu_enabled && !iommu->drhd->ignored) {
+               iommu_pmu_unregister(iommu);
                iommu_device_unregister(&iommu->iommu);
                iommu_device_sysfs_remove(&iommu->iommu);
        }

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index e314c30d371a703fbce1b0228a2fed92ab8aa12b..691b306fada5e16c59251e36bf1f45a77a1ea850 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -29,6 +29,7 @@
 #include "../iommu-sva.h"
 #include "pasid.h"
 #include "cap_audit.h"
+#include "perfmon.h"
 
 #define ROOT_SIZE              VTD_PAGE_SIZE
 #define CONTEXT_SIZE           VTD_PAGE_SIZE
@@ -4012,6 +4013,8 @@ int __init intel_iommu_init(void)
                                       intel_iommu_groups,
                                       "%s", iommu->name);
                iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);
+
+               iommu_pmu_register(iommu);
        }
        up_read(&dmar_global_lock);