| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 26 Nov 2012 16:00:25 -0600
From: Steven Kinney <steven.kinney@....com>
To: Joerg Roedel <bhelgaas@...gle.com>
CC: Hiroshi DOYU <hdoyu@...dia.com>,
Stephen Warren <swarren@...dotorg.org>,
Jiri Kosina <jkosina@...e.cz>,
Kukjin Kim <kgene.kim@...sung.com>,
<linux-kernel@...r.kernel.org>, <iommu@...ts.linux-foundation.org>,
Steven Kinney <steven.kinney@....com>
Subject: [PATCH 1/1] iommuv2/amd: Enable Performance Counters On Family 15h Models 10h-1Fh
From: "Steven L. Kinney" <steven.kinney@....com>
Add Kernel configuration selection for AMD IOMMUv2 performance counters.
Add a check that will determine the configuration of the AMD IOMMUv2
performance counter(s) and extend the IOMMUv2 MMIO Region to account for the
additional PC register bank.
Add maximum IOMMUv2 bank/counter members to the amd_iommu structure that will
hold the relevant data concerning the available PC bank and counter resources.
Add code to iommu_init_pci that will check for IOMMUv2 PC HW support and
populate the max banks and counters into the amd_iommu structure.
Add exported functionality that will allow external drivers to obtain IOMMUv2
PC bank/counter resource information and manage the IOMMUv2 PC measurment
configuration. Bank and counter assignment is managed outside of this driver;
for example, within a perf IOMMUv2 PMU realization.
Signed-off-by: Steven L. Kinney <steven.kinney@....com>
---
drivers/iommu/Kconfig | 10 +++++
drivers/iommu/amd_iommu_init.c | 86 +++++++++++++++++++++++++++++++++++++++
drivers/iommu/amd_iommu_types.h | 13 +++++-
3 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e39f9db..d732e31 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -73,6 +73,16 @@ config AMD_IOMMU_V2
hardware. Select this option if you want to use devices that support
the PCI PRI and PASID interface.
+# AMD IOMMUv2 Performance Counter support
+config AMD_IOMMU_V2_PC
+ bool "AMD IOMMUv2 Performance Counters (EXPERIMENTAL)"
+ depends on AMD_IOMMU_V2
+ ---help---
+ This option enables support for AMD IOMMUv2 Performance Counters.
+ Select this option if you want to enable IOMMUv2 Performance
+ Counters support.
+ If unsure, say N.
+
# Intel IOMMU support
config DMAR_TABLE
bool
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 81837b0..d3243af 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1145,6 +1145,20 @@ static int iommu_init_pci(struct amd_iommu *iommu)
if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE))
amd_iommu_np_cache = true;
+#ifdef CONFIG_AMD_IOMMU_V2_PC
+ if (iommu_feature(iommu, FEATURE_PC)) {
+ u32 val;
+ dev_printk(KERN_DEBUG, &iommu->dev->dev,
+ "AMD-Vi: IOMMUv2 perf counters supported\n");
+ val = readl(iommu->mmio_base + MMIO_CNTR_CONF_OFFSET);
+ iommu->max_banks = (u8) ((val >> 12) & 0x3f);
+ iommu->max_counters = (u8) ((val >> 7) & 0xf);
+ dev_printk(KERN_DEBUG, &iommu->dev->dev,
+ "AMD-Vi: %d counter banks, %d counters each\n",
+ iommu->max_banks, iommu->max_counters);
+ }
+#endif
+
if (is_rd890_iommu(iommu->dev)) {
int i, j;
@@ -2076,3 +2090,75 @@ bool amd_iommu_v2_supported(void)
return amd_iommu_v2_present;
}
EXPORT_SYMBOL(amd_iommu_v2_supported);
+
+#ifdef CONFIG_AMD_IOMMU_V2_PC
+/****************************************************************************
+ *
+ * IOMMUv2 EFR Performance Counter support functionality. This code allows
+ * access to the IOMMUv2 PC functionality.
+ *
+ ****************************************************************************/
+
+u8 amd_iommu_v2_get_max_pc_banks(u16 devid)
+{
+ struct amd_iommu *iommu;
+
+ /* locate the iommu governing the devid */
+ iommu = amd_iommu_rlookup_table[devid];
+
+ if (iommu)
+ return iommu->max_banks;
+
+ return -ENODEV;
+}
+EXPORT_SYMBOL(amd_iommu_v2_get_max_pc_banks);
+
+u8 amd_iommu_v2_get_max_pc_counters(u16 devid)
+{
+ struct amd_iommu *iommu;
+
+ /* locate the iommu governing the devid */
+ iommu = amd_iommu_rlookup_table[devid];
+
+ if (iommu)
+ return iommu->max_counters;
+
+ return -ENODEV;
+}
+EXPORT_SYMBOL(amd_iommu_v2_get_max_pc_counters);
+
+int amd_iommu_v2_get_set_pc_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn,
+ long long *value, is_write)
+{
+ struct amd_iommu *iommu;
+ u32 offset;
+ u32 max_offset_lim;
+
+ /* locate the iommu associated with the device ID */
+ iommu = amd_iommu_rlookup_table[devid];
+ if (iommu == NULL)
+ return -ENODEV;
+
+ /* check for valid iommu pc register indexing */
+ if (fxn < 0 || fxn > 0x28 || (fxn & 7))
+ return -ENODEV;
+
+ offset = (u32)(((0x40|bank) << 12) | (cntr << 8) | fxn);
+
+ /* limit the offset to the hw defined mmio region aperture */
+ max_offset_lim = (u32)(((0x40|iommu->max_banks) << 12) |
+ (iommu->max_counters << 8) | 0x28);
+ if ((offset < IOMMU_V2_PC_REG_OFFSET) ||
+ (offset > max_offset_lim))
+ return -EINVAL;
+
+ if (is_write)
+ *value = readl(iommu->mmio_base + offset);
+ else
+ writel((u32)*value, iommu->mmio_base + offset);
+
+ return 0;
+}
+EXPORT_SYMBOL(amd_iommu_v2_get_set_pc_reg_val);
+#endif
+
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index c9aa3d0..6dc1f68 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -38,7 +38,12 @@
#define RLOOKUP_TABLE_ENTRY_SIZE (sizeof(void *))
/* Length of the MMIO region for the AMD IOMMU */
+#ifdef CONFIG_AMD_IOMMU_V2_PC
+#define MMIO_REGION_LENGTH 0x80000
+#define IOMMU_V2_PC_REG_OFFSET 0x40000
+#else
#define MMIO_REGION_LENGTH 0x4000
+#endif
/* Capability offsets used by the driver */
#define MMIO_CAP_HDR_OFFSET 0x00
@@ -77,7 +82,7 @@
#define MMIO_STATUS_OFFSET 0x2020
#define MMIO_PPR_HEAD_OFFSET 0x2030
#define MMIO_PPR_TAIL_OFFSET 0x2038
-
+#define MMIO_CNTR_CONF_OFFSET 0x4000
/* Extended Feature Bits */
#define FEATURE_PREFETCH (1ULL<<0)
@@ -584,6 +589,12 @@ struct amd_iommu {
/* The l2 indirect registers */
u32 stored_l2[0x83];
+
+#ifdef CONFIG_AMD_IOMMU_V2_PC
+ /* The maximum PC banks and counters/bank (PCSup=1) */
+ u8 max_banks;
+ u8 max_counters;
+#endif
};
struct devid_map {
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists