Commit d8a7c0cf authored by Kan Liang's avatar Kan Liang Committed by Joerg Roedel
Browse files

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: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20230128200428.1459118-8-kan.liang@linux.intel.com


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

drivers/iommu/intel/dmar.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1144,6 +1144,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 
		err = iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);

		err = iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);

		if (err)

		if (err)

			goto err_sysfs;

			goto err_sysfs;



		iommu_pmu_register(iommu);

	}

	}





	drhd->iommu = iommu;

	drhd->iommu = iommu;
@@ -1166,6 +1168,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 
static void free_iommu(struct intel_iommu *iommu)

static void free_iommu(struct intel_iommu *iommu)

{

{

	if (intel_iommu_enabled && !iommu->drhd->ignored) {

	if (intel_iommu_enabled && !iommu->drhd->ignored) {

		iommu_pmu_unregister(iommu);

		iommu_device_unregister(&iommu->iommu);

		iommu_device_unregister(&iommu->iommu);

		iommu_device_sysfs_remove(&iommu->iommu);

		iommu_device_sysfs_remove(&iommu->iommu);

	}

	}

drivers/iommu/intel/iommu.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "../iommu-sva.h"

#include "../iommu-sva.h"

#include "pasid.h"

#include "pasid.h"

#include "cap_audit.h"

#include "cap_audit.h"

#include "perfmon.h"





#define ROOT_SIZE		VTD_PAGE_SIZE

#define ROOT_SIZE		VTD_PAGE_SIZE

#define CONTEXT_SIZE		VTD_PAGE_SIZE

#define CONTEXT_SIZE		VTD_PAGE_SIZE
@@ -4012,6 +4013,8 @@ int __init intel_iommu_init(void) 
				       intel_iommu_groups,

				       intel_iommu_groups,

				       "%s", iommu->name);

				       "%s", iommu->name);

		iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);

		iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);



		iommu_pmu_register(iommu);

	}

	}

	up_read(&dmar_global_lock);

	up_read(&dmar_global_lock);