perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR and ICX
Subsystems (2)
cover perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR and ICX
From: Alexander Antonov <[email protected]>
Currently I/O stacks to IIO PMON mapping is available on Skylake servers only and it is exposed through attributes /sys/devices/uncore_iio_<pmu_idx>/dieX, where dieX is a file which holds "Segment:Root Bus" for PCIe root port which can be monitored by that IIO PMON block.
The example for 2-S Skylake server:
# tail /sys/devices/uncore_iio_*/die* ==> /sys/devices/uncore_iio_0/die0 <== 0000:00 ==> /sys/devices/uncore_iio_0/die1 <== 0000:80 ==> /sys/devices/uncore_iio_1/die0 <== 0000:17 ==> /sys/devices/uncore_iio_1/die1 <== 0000:85 ==> /sys/devices/uncore_iio_2/die0 <== 0000:3a ==> /sys/devices/uncore_iio_2/die1 <== 0000:ae ==> /sys/devices/uncore_iio_3/die0 <== 0000:5d ==> /sys/devices/uncore_iio_3/die1 <== 0000:d7
Mapping algorithm for Skylake server is based on topology information from CPU_BUS_NO MSR but this approach is not applicable for Snowridge and Icelake server.
In case of these platforms mapping can be enabled by reading SAD_CONTROL_CFG CSR from Mesh2IIO device with 0x09a2 DID. This CSR contains stack IDs in its own notation and these IDs are statically mapped on IDs in PMON notation.
This patchset enables I/O stacks to IIO PMON mapping for Snowridge and Icelake server.
Alexander Antonov (3):
perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX
arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 173 ++++++++++++++++++++++++++- 2 files changed, 168 insertions(+), 6 deletions(-)
base-commit: cface0326a6c2ae5c8f47bd466f07624b3e348a7
Signature · 1 line
2.21.3
PATCH 1/3 perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure
From: Alexander Antonov <[email protected]>
Currently I/O stacks to IIO PMON mapping is available on Skylake servers only and need to make code more general to easily enable further platforms. So, introduce get_topology() callback in struct intel_uncore_type which allows to move common code to separate function and make mapping procedure more general.
--- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-)
arch/x86/events/intel/uncore.h +1 -0
@@ -92,6 +92,7 @@ struct intel_uncore_type {/* * Optional callbacks for managing mapping of Uncore units to PMONs */ +int (*get_topology)(struct intel_uncore_type *type);int (*set_mapping)(struct intel_uncore_type *type);void (*cleanup_mapping)(struct intel_uncore_type *type); };
arch/x86/events/intel/uncore_snbep.c +20 -6
@@ -3689,12 +3689,19 @@ static inline u8 skx_iio_stack(struct intel_uncore_pmu *pmu, int die) }static umode_t -skx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +pmu_iio_mapping_visible (struct kobject *kobj,struct attribute *attr, +int die,int zero_bus_pmu) {struct intel_uncore_pmu *pmu =dev_to_uncore_pmu (kobj_to_dev (kobj)); -/* Root bus 0x00 is valid only for die 0 AND pmu_idx = 0. */ -return (!skx_iio_stack (pmu, die) && pmu->pmu_idx) ?0 : attr->mode; +return (!skx_iio_stack (pmu, die) && pmu->pmu_idx != zero_bus_pmu) ?0 : attr->mode; +} + +static umode_t +skx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 0. */ +return pmu_iio_mapping_visible (kobj, attr, die,0 ); } static ssize_t skx_iio_mapping_show(struct device *dev,
@@ -3779,7 +3786,8 @@ static const struct attribute_group *skx_iio_attr_update[] = { NULL, }; -static int skx_iio_set_mapping (struct intel_uncore_type *type) +static int +pmu_iio_set_mapping (struct intel_uncore_type *type,struct attribute_group *ag) {char buf[64 ];int ret;
@@ -3787,7 +3795,7 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)struct attribute **attrs =NULL ;struct dev_ext_attribute *eas =NULL ; - ret =skx_iio_get_topology (type); + ret = type->get_topology (type);if (ret <0 ) goto clear_attr_update;
@@ -3814,7 +3822,7 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) eas[die].var = (void *)die; attrs[die] = &eas[die].attr.attr; } - skx_iio_mapping_group.attrs = attrs; + ag->attrs = attrs;return 0 ; err:
@@ -3828,6 +3836,11 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)return ret; } +static int skx_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &skx_iio_mapping_group); +} +static void skx_iio_cleanup_mapping (struct intel_uncore_type *type) {struct attribute **attr = skx_iio_mapping_group.attrs;
@@ -3858,6 +3871,7 @@ static struct intel_uncore_type skx_uncore_iio = { .ops = &skx_uncore_iio_ops, .format_group = &skx_uncore_iio_format_group, .attr_update = skx_iio_attr_update, + .get_topology = skx_iio_get_topology, .set_mapping = skx_iio_set_mapping, .cleanup_mapping = skx_iio_cleanup_mapping, };
Signature · 1 line
2.21.3
[tip: perf/core] perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: f471fac77b41a2573c7b677ef790bf18a0e64195 Gitweb: https://git.kernel.org/tip/f471fac77b41a2573c7b677ef790bf18a0e64195 Author: Alexander Antonov <[email protected]> AuthorDate: Mon, 26 Apr 2021 16:16:12 +03:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 18 May 2021 12:53:56 +02:00
perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure
Currently I/O stacks to IIO PMON mapping is available on Skylake servers only and need to make code more general to easily enable further platforms. So, introduce get_topology() callback in struct intel_uncore_type which allows to move common code to separate function and make mapping procedure more general.
--- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-)
arch/x86/events/intel/uncore.h +1 -0
@@ -92,6 +92,7 @@ struct intel_uncore_type {/* * Optional callbacks for managing mapping of Uncore units to PMONs */ +int (*get_topology)(struct intel_uncore_type *type);int (*set_mapping)(struct intel_uncore_type *type);void (*cleanup_mapping)(struct intel_uncore_type *type); };
arch/x86/events/intel/uncore_snbep.c +20 -6
@@ -3680,12 +3680,19 @@ static inline u8 skx_iio_stack(struct intel_uncore_pmu *pmu, int die) }static umode_t -skx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +pmu_iio_mapping_visible (struct kobject *kobj,struct attribute *attr, +int die,int zero_bus_pmu) {struct intel_uncore_pmu *pmu =dev_to_uncore_pmu (kobj_to_dev (kobj)); -/* Root bus 0x00 is valid only for die 0 AND pmu_idx = 0. */ -return (!skx_iio_stack (pmu, die) && pmu->pmu_idx) ?0 : attr->mode; +return (!skx_iio_stack (pmu, die) && pmu->pmu_idx != zero_bus_pmu) ?0 : attr->mode; +} + +static umode_t +skx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 0. */ +return pmu_iio_mapping_visible (kobj, attr, die,0 ); } static ssize_t skx_iio_mapping_show(struct device *dev,
@@ -3770,7 +3777,8 @@ static const struct attribute_group *skx_iio_attr_update[] = { NULL, }; -static int skx_iio_set_mapping (struct intel_uncore_type *type) +static int +pmu_iio_set_mapping (struct intel_uncore_type *type,struct attribute_group *ag) {char buf[64 ];int ret;
@@ -3778,7 +3786,7 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)struct attribute **attrs =NULL ;struct dev_ext_attribute *eas =NULL ; - ret =skx_iio_get_topology (type); + ret = type->get_topology (type);if (ret <0 ) goto clear_attr_update;
@@ -3805,7 +3813,7 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) eas[die].var = (void *)die; attrs[die] = &eas[die].attr.attr; } - skx_iio_mapping_group.attrs = attrs; + ag->attrs = attrs;return 0 ; err:
@@ -3819,6 +3827,11 @@ clear_attr_update:return ret; } +static int skx_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &skx_iio_mapping_group); +} +static void skx_iio_cleanup_mapping (struct intel_uncore_type *type) {struct attribute **attr = skx_iio_mapping_group.attrs;
@@ -3849,6 +3862,7 @@ static struct intel_uncore_type skx_uncore_iio = { .ops = &skx_uncore_iio_ops, .format_group = &skx_uncore_iio_format_group, .attr_update = skx_iio_attr_update, + .get_topology = skx_iio_get_topology, .set_mapping = skx_iio_set_mapping, .cleanup_mapping = skx_iio_cleanup_mapping, };
PATCH 2/3 perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR
In reply to [email protected]From: Alexander Antonov <[email protected]>
I/O stacks to PMON mapping on Skylake server relies on topology information from CPU_BUS_NO MSR but this approach is not applicable for SNR and ICX. Mapping on these platforms can be gotten by reading SAD_CONTROL_CFG CSR from Mesh2IIO device with 0x09a2 DID.SAD_CONTROL_CFG CSR contains stack IDs in its own notation which are statically mapped on IDs in PMON notation.
The map for Snowridge:
Stack Name | CBDMA/DMI | PCIe Gen 3 | DLB | NIS | QAT SAD_CONTROL_CFG ID | 0 | 1 | 2 | 3 | 4 PMON ID | 1 | 4 | 3 | 2 | 0
This patch enables I/O stacks to IIO PMON mapping on Snowridge. Mapping is exposed through attributes /sys/devices/uncore_iio_<pmu_idx>/dieX, where dieX is file which holds "Segment:Root Bus" for PCIe root port which can be monitored by that IIO PMON block. Example for Snowridge:
==> /sys/devices/uncore_iio_0/die0 <==
0000:f3
==> /sys/devices/uncore_iio_1/die0 <==
0000:00
==> /sys/devices/uncore_iio_2/die0 <==
0000:eb
==> /sys/devices/uncore_iio_3/die0 <==
0000:e3
==> /sys/devices/uncore_iio_4/die0 <==
0000:14
Mapping for Icelake server will be enabled in the follow-up patch.
--- arch/x86/events/intel/uncore_snbep.c | 96 ++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)
arch/x86/events/intel/uncore_snbep.c +96 -0
@@ -348,6 +348,13 @@#define SKX_M2M_PCI_PMON_CTR0 0x200#define SKX_M2M_PCI_PMON_BOX_CTL 0x258 +/* Memory Map registers device ID */ +#define SNR_ICX_MESH2IIO_MMAP_DID 0x9a2 +#define SNR_ICX_SAD_CONTROL_CFG 0x3f4 + +/* Getting I/O stack id in SAD_COTROL_CFG notation */ +#define SAD_CONTROL_STACK_ID (data) (((data) >> 4) & 0x7) +/* SNR Ubox */ #define SNR_U_MSR_PMON_CTR0 0x1f98#define SNR_U_MSR_PMON_CTL0 0x1f91
@@ -4414,6 +4421,91 @@ static const struct attribute_group snr_uncore_iio_format_group = { .attrs = snr_uncore_iio_formats_attr, }; +static umode_t +snr_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 1. */ +return pmu_iio_mapping_visible (kobj, attr, die,1 ); +} + +static struct attribute_group snr_iio_mapping_group = { + .is_visible = snr_iio_mapping_visible, +}; + +static const struct attribute_group *snr_iio_attr_update[] = { + &snr_iio_mapping_group, +NULL , +}; + +static int sad_cfg_iio_topology (struct intel_uncore_type *type,u8 *sad_pmon_mapping) +{ +u32 sad_cfg; +int die, stack_id, ret = -EPERM ; +struct pci_dev *dev =NULL ; + + type->topology =kcalloc (uncore_max_dies (),sizeof (*type->topology), +GFP_KERNEL ); +if (!type->topology) +return -ENOMEM ; + +while ((dev =pci_get_device (PCI_VENDOR_ID_INTEL ,SNR_ICX_MESH2IIO_MMAP_DID , dev))) { + ret =pci_read_config_dword (dev,SNR_ICX_SAD_CONTROL_CFG , &sad_cfg); +if (ret) { + ret =pcibios_err_to_errno (ret); +break ; + } + + die =uncore_pcibus_to_dieid (dev->bus); + stack_id =SAD_CONTROL_STACK_ID (sad_cfg); +if (die <0 || stack_id >= type->num_boxes) { + ret = -EPERM ; +break ; + } + +/* Convert stack id from SAD_CONTROL to PMON notation. */ + stack_id = sad_pmon_mapping[stack_id]; + + ((u8 *)&(type->topology[die].configuration))[stack_id] = dev->bus->number; + type->topology[die].segment =pci_domain_nr (dev->bus); + } + +if (ret) { +kfree (type->topology); + type->topology =NULL ; + } + +return ret; +} + +/* +* SNR has a static mapping of stack IDs from SAD_CONTROL_CFG notation to PMON +*/ +enum { +SNR_QAT_PMON_ID , +SNR_CBDMA_DMI_PMON_ID , +SNR_NIS_PMON_ID , +SNR_DLB_PMON_ID , +SNR_PCIE_GEN3_PMON_ID +}; + +static u8 snr_sad_pmon_mapping[] = { +SNR_CBDMA_DMI_PMON_ID , +SNR_PCIE_GEN3_PMON_ID , +SNR_DLB_PMON_ID , +SNR_NIS_PMON_ID , +SNR_QAT_PMON_ID +}; + +static int snr_iio_get_topology (struct intel_uncore_type *type) +{ +return sad_cfg_iio_topology (type, snr_sad_pmon_mapping); +} + +static int snr_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &snr_iio_mapping_group); +} +static struct intel_uncore_type snr_uncore_iio = { .name ="iio" , .num_counters =4 ,
@@ -4427,6 +4519,10 @@ static struct intel_uncore_type snr_uncore_iio = { .msr_offset = SNR_IIO_MSR_OFFSET, .ops = &ivbep_uncore_msr_ops, .format_group = &snr_uncore_iio_format_group, + .attr_update = snr_iio_attr_update, + .get_topology = snr_iio_get_topology, + .set_mapping = snr_iio_set_mapping, + .cleanup_mapping = skx_iio_cleanup_mapping, };static struct intel_uncore_type snr_uncore_irp = {
Signature · 1 line
2.21.3
[tip: perf/core] perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c1777be3646b48f6638d8339ad270a27659adaa4 Gitweb: https://git.kernel.org/tip/c1777be3646b48f6638d8339ad270a27659adaa4 Author: Alexander Antonov <[email protected]> AuthorDate: Mon, 26 Apr 2021 16:16:13 +03:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 18 May 2021 12:53:57 +02:00
perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR
I/O stacks to PMON mapping on Skylake server relies on topology information from CPU_BUS_NO MSR but this approach is not applicable for SNR and ICX. Mapping on these platforms can be gotten by reading SAD_CONTROL_CFG CSR from Mesh2IIO device with 0x09a2 DID.SAD_CONTROL_CFG CSR contains stack IDs in its own notation which are statically mapped on IDs in PMON notation.
The map for Snowridge:
Stack Name | CBDMA/DMI | PCIe Gen 3 | DLB | NIS | QAT SAD_CONTROL_CFG ID | 0 | 1 | 2 | 3 | 4 PMON ID | 1 | 4 | 3 | 2 | 0
This patch enables I/O stacks to IIO PMON mapping on Snowridge. Mapping is exposed through attributes /sys/devices/uncore_iio_<pmu_idx>/dieX, where dieX is file which holds "Segment:Root Bus" for PCIe root port which can be monitored by that IIO PMON block. Example for Snowridge:
==> /sys/devices/uncore_iio_0/die0 <==
0000:f3
==> /sys/devices/uncore_iio_1/die0 <==
0000:00
==> /sys/devices/uncore_iio_2/die0 <==
0000:eb
==> /sys/devices/uncore_iio_3/die0 <==
0000:e3
==> /sys/devices/uncore_iio_4/die0 <==
0000:14
Mapping for Icelake server will be enabled in the follow-up patch.
--- arch/x86/events/intel/uncore_snbep.c | 96 +++++++++++++++++++++++++++- 1 file changed, 96 insertions(+)
arch/x86/events/intel/uncore_snbep.c +96 -0
@@ -348,6 +348,13 @@#define SKX_M2M_PCI_PMON_CTR0 0x200#define SKX_M2M_PCI_PMON_BOX_CTL 0x258 +/* Memory Map registers device ID */ +#define SNR_ICX_MESH2IIO_MMAP_DID 0x9a2 +#define SNR_ICX_SAD_CONTROL_CFG 0x3f4 + +/* Getting I/O stack id in SAD_COTROL_CFG notation */ +#define SAD_CONTROL_STACK_ID (data) (((data) >> 4) & 0x7) +/* SNR Ubox */ #define SNR_U_MSR_PMON_CTR0 0x1f98#define SNR_U_MSR_PMON_CTL0 0x1f91
@@ -4405,6 +4412,91 @@ static const struct attribute_group snr_uncore_iio_format_group = { .attrs = snr_uncore_iio_formats_attr, }; +static umode_t +snr_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 1. */ +return pmu_iio_mapping_visible (kobj, attr, die,1 ); +} + +static struct attribute_group snr_iio_mapping_group = { + .is_visible = snr_iio_mapping_visible, +}; + +static const struct attribute_group *snr_iio_attr_update[] = { + &snr_iio_mapping_group, +NULL , +}; + +static int sad_cfg_iio_topology (struct intel_uncore_type *type,u8 *sad_pmon_mapping) +{ +u32 sad_cfg; +int die, stack_id, ret = -EPERM ; +struct pci_dev *dev =NULL ; + + type->topology =kcalloc (uncore_max_dies (),sizeof (*type->topology), +GFP_KERNEL ); +if (!type->topology) +return -ENOMEM ; + +while ((dev =pci_get_device (PCI_VENDOR_ID_INTEL ,SNR_ICX_MESH2IIO_MMAP_DID , dev))) { + ret =pci_read_config_dword (dev,SNR_ICX_SAD_CONTROL_CFG , &sad_cfg); +if (ret) { + ret =pcibios_err_to_errno (ret); +break ; + } + + die =uncore_pcibus_to_dieid (dev->bus); + stack_id =SAD_CONTROL_STACK_ID (sad_cfg); +if (die <0 || stack_id >= type->num_boxes) { + ret = -EPERM ; +break ; + } + +/* Convert stack id from SAD_CONTROL to PMON notation. */ + stack_id = sad_pmon_mapping[stack_id]; + + ((u8 *)&(type->topology[die].configuration))[stack_id] = dev->bus->number; + type->topology[die].segment =pci_domain_nr (dev->bus); + } + +if (ret) { +kfree (type->topology); + type->topology =NULL ; + } + +return ret; +} + +/* +* SNR has a static mapping of stack IDs from SAD_CONTROL_CFG notation to PMON +*/ +enum { +SNR_QAT_PMON_ID , +SNR_CBDMA_DMI_PMON_ID , +SNR_NIS_PMON_ID , +SNR_DLB_PMON_ID , +SNR_PCIE_GEN3_PMON_ID +}; + +static u8 snr_sad_pmon_mapping[] = { +SNR_CBDMA_DMI_PMON_ID , +SNR_PCIE_GEN3_PMON_ID , +SNR_DLB_PMON_ID , +SNR_NIS_PMON_ID , +SNR_QAT_PMON_ID +}; + +static int snr_iio_get_topology (struct intel_uncore_type *type) +{ +return sad_cfg_iio_topology (type, snr_sad_pmon_mapping); +} + +static int snr_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &snr_iio_mapping_group); +} +static struct intel_uncore_type snr_uncore_iio = { .name ="iio" , .num_counters =4 ,
@@ -4418,6 +4510,10 @@ static struct intel_uncore_type snr_uncore_iio = { .msr_offset = SNR_IIO_MSR_OFFSET, .ops = &ivbep_uncore_msr_ops, .format_group = &snr_uncore_iio_format_group, + .attr_update = snr_iio_attr_update, + .get_topology = snr_iio_get_topology, + .set_mapping = snr_iio_set_mapping, + .cleanup_mapping = skx_iio_cleanup_mapping, };static struct intel_uncore_type snr_uncore_irp = {
PATCH 3/3 perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX
In reply to [email protected]From: Alexander Antonov <[email protected]>
This patch enables I/O stacks to IIO PMON mapping on Icelake server.
Mapping of IDs in SAD_CONTROL_CFG notation to IDs in PMON notation for Icelake server:
Stack Name | CBDMA/DMI | PCIe_1 | PCIe_2 | PCIe_3 | PCIe_4 | PCIe_5 SAD_CONTROL_CFG ID | 0 | 1 | 2 | 3 | 4 | 5 PMON ID | 5 | 0 | 1 | 2 | 3 | 4
I/O stacks to IIO PMON mapping is exposed through attributes /sys/devices/uncore_iio_<pmu_idx>/dieX, where dieX is file which holds "Segment:Root Bus" for PCIe root port which can be monitored by that IIO PMON block. Example for 2-S Icelake server:
==> /sys/devices/uncore_iio_0/die0 <==
0000:16
==> /sys/devices/uncore_iio_0/die1 <==
0000:97
==> /sys/devices/uncore_iio_1/die0 <==
0000:30
==> /sys/devices/uncore_iio_1/die1 <==
0000:b0
==> /sys/devices/uncore_iio_3/die0 <==
0000:4a
==> /sys/devices/uncore_iio_3/die1 <==
0000:c9
==> /sys/devices/uncore_iio_4/die0 <==
0000:64
==> /sys/devices/uncore_iio_4/die1 <==
0000:e2
==> /sys/devices/uncore_iio_5/die0 <==
0000:00
==> /sys/devices/uncore_iio_5/die1 <==
0000:80
--- arch/x86/events/intel/uncore_snbep.c | 51 ++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
arch/x86/events/intel/uncore_snbep.c +51 -0
@@ -5050,6 +5050,53 @@ static struct event_constraint icx_uncore_iio_constraints[] = {EVENT_CONSTRAINT_END }; +static umode_t +icx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 5. */ +return pmu_iio_mapping_visible (kobj, attr, die,5 ); +} + +static struct attribute_group icx_iio_mapping_group = { + .is_visible = icx_iio_mapping_visible, +}; + +static const struct attribute_group *icx_iio_attr_update[] = { + &icx_iio_mapping_group, +NULL , +}; + +/* +* ICX has a static mapping of stack IDs from SAD_CONTROL_CFG notation to PMON +*/ +enum { +ICX_PCIE1_PMON_ID , +ICX_PCIE2_PMON_ID , +ICX_PCIE3_PMON_ID , +ICX_PCIE4_PMON_ID , +ICX_PCIE5_PMON_ID , +ICX_CBDMA_DMI_PMON_ID +}; + +static u8 icx_sad_pmon_mapping[] = { +ICX_CBDMA_DMI_PMON_ID , +ICX_PCIE1_PMON_ID , +ICX_PCIE2_PMON_ID , +ICX_PCIE3_PMON_ID , +ICX_PCIE4_PMON_ID , +ICX_PCIE5_PMON_ID , +}; + +static int icx_iio_get_topology (struct intel_uncore_type *type) +{ +return sad_cfg_iio_topology (type, icx_sad_pmon_mapping); +} + +static int icx_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &icx_iio_mapping_group); +} +static struct intel_uncore_type icx_uncore_iio = { .name ="iio" , .num_counters =4 ,
@@ -5064,6 +5111,10 @@ static struct intel_uncore_type icx_uncore_iio = { .constraints = icx_uncore_iio_constraints, .ops = &skx_uncore_iio_ops, .format_group = &snr_uncore_iio_format_group, + .attr_update = icx_iio_attr_update, + .get_topology = icx_iio_get_topology, + .set_mapping = icx_iio_set_mapping, + .cleanup_mapping = skx_iio_cleanup_mapping, };static struct intel_uncore_type icx_uncore_irp = {
Signature · 1 line
2.21.3
[tip: perf/core] perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 10337e95e04c9bcd15d9bf5b26f194c92c13da56 Gitweb: https://git.kernel.org/tip/10337e95e04c9bcd15d9bf5b26f194c92c13da56 Author: Alexander Antonov <[email protected]> AuthorDate: Mon, 26 Apr 2021 16:16:14 +03:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 18 May 2021 12:53:57 +02:00
perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX
This patch enables I/O stacks to IIO PMON mapping on Icelake server.
Mapping of IDs in SAD_CONTROL_CFG notation to IDs in PMON notation for Icelake server:
Stack Name | CBDMA/DMI | PCIe_1 | PCIe_2 | PCIe_3 | PCIe_4 | PCIe_5 SAD_CONTROL_CFG ID | 0 | 1 | 2 | 3 | 4 | 5 PMON ID | 5 | 0 | 1 | 2 | 3 | 4
I/O stacks to IIO PMON mapping is exposed through attributes /sys/devices/uncore_iio_<pmu_idx>/dieX, where dieX is file which holds "Segment:Root Bus" for PCIe root port which can be monitored by that IIO PMON block. Example for 2-S Icelake server:
==> /sys/devices/uncore_iio_0/die0 <==
0000:16
==> /sys/devices/uncore_iio_0/die1 <==
0000:97
==> /sys/devices/uncore_iio_1/die0 <==
0000:30
==> /sys/devices/uncore_iio_1/die1 <==
0000:b0
==> /sys/devices/uncore_iio_3/die0 <==
0000:4a
==> /sys/devices/uncore_iio_3/die1 <==
0000:c9
==> /sys/devices/uncore_iio_4/die0 <==
0000:64
==> /sys/devices/uncore_iio_4/die1 <==
0000:e2
==> /sys/devices/uncore_iio_5/die0 <==
0000:00
==> /sys/devices/uncore_iio_5/die1 <==
0000:80
--- arch/x86/events/intel/uncore_snbep.c | 51 +++++++++++++++++++++++++++- 1 file changed, 51 insertions(+)
arch/x86/events/intel/uncore_snbep.c +51 -0
@@ -5041,6 +5041,53 @@ static struct event_constraint icx_uncore_iio_constraints[] = {EVENT_CONSTRAINT_END }; +static umode_t +icx_iio_mapping_visible (struct kobject *kobj,struct attribute *attr,int die) +{ +/* Root bus 0x00 is valid only for pmu_idx = 5. */ +return pmu_iio_mapping_visible (kobj, attr, die,5 ); +} + +static struct attribute_group icx_iio_mapping_group = { + .is_visible = icx_iio_mapping_visible, +}; + +static const struct attribute_group *icx_iio_attr_update[] = { + &icx_iio_mapping_group, +NULL , +}; + +/* +* ICX has a static mapping of stack IDs from SAD_CONTROL_CFG notation to PMON +*/ +enum { +ICX_PCIE1_PMON_ID , +ICX_PCIE2_PMON_ID , +ICX_PCIE3_PMON_ID , +ICX_PCIE4_PMON_ID , +ICX_PCIE5_PMON_ID , +ICX_CBDMA_DMI_PMON_ID +}; + +static u8 icx_sad_pmon_mapping[] = { +ICX_CBDMA_DMI_PMON_ID , +ICX_PCIE1_PMON_ID , +ICX_PCIE2_PMON_ID , +ICX_PCIE3_PMON_ID , +ICX_PCIE4_PMON_ID , +ICX_PCIE5_PMON_ID , +}; + +static int icx_iio_get_topology (struct intel_uncore_type *type) +{ +return sad_cfg_iio_topology (type, icx_sad_pmon_mapping); +} + +static int icx_iio_set_mapping (struct intel_uncore_type *type) +{ +return pmu_iio_set_mapping (type, &icx_iio_mapping_group); +} +static struct intel_uncore_type icx_uncore_iio = { .name ="iio" , .num_counters =4 ,
@@ -5055,6 +5102,10 @@ static struct intel_uncore_type icx_uncore_iio = { .constraints = icx_uncore_iio_constraints, .ops = &skx_uncore_iio_ops, .format_group = &snr_uncore_iio_format_group, + .attr_update = icx_iio_attr_update, + .get_topology = icx_iio_get_topology, + .set_mapping = icx_iio_set_mapping, + .cleanup_mapping = skx_iio_cleanup_mapping, };static struct intel_uncore_type icx_uncore_irp = {
Peter Zijlstra
maintainerQuoted 8 lines · On Mon, Apr 26, 2021 at 04:16:11PM +0300, [email protected]…
Alexander Antonov (3):
perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on SNR perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICXarch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 173 ++++++++++++++++++++++++++- 2 files changed, 168 insertions(+), 6 deletions(-)
Thanks!