perf: Add Sapphire Rapids server uncore support
Subsystems (2)
v4 cover perf: Add Sapphire Rapids server uncore support
From: Kan Liang <[email protected]>
Changes since V3:
- Split the previous patch 1 and make one patch for each uncore unit.
- Split the free-running counter support patch into a IIO free-running counter support patch and a IMC free-running counter support patch.
- Post the patch "perf/x86/intel/uncore: Fix invalid unit check" in a separate thread.
- Add back the missed Documentation/ABI/ update.
Changes since V2:
- Use sysfs_emit() for the new sysfs attribute "alias" in patch 2.
- Use ATTRIBUTE_GROUPS() for uncore_alias in patch 2
Changes since V1:
- Drop the symlink between two PMU names. Add a new attribute "alias" to indicate the old numeric name.
- Add document and perf tool support for the new attribute "alias". (I once planned to use "caps/pmu_name" as the new attribute name in V1's discussion.
https://lore.kernel.org/lkml/[email protected]/
The name has a different meaning in the CPU PMU, which may causes confusion. So the "alias" is used in V2.)
- The number of the free-running counter units should be the same as the max index of the relative units plus one. Correct the number in the patch 4.
Intel Sapphire Rapids supports a discovery mechanism, that allows an uncore driver to discover the different components ("boxes") of the chip.
All the generic information of the uncore boxes should be retrieved from the discovery tables. This has been enabled with the commit edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables"). The uncore driver doesn't need to hard code the generic information for each uncore box. But we still need to enable various functionality that cannot be directly discovered. This is done in the patchset.
Without this platform-specific enabling patch set, perf uses a type ID plus a box ID, e.g., uncore_type_0_0 to name an uncore PMU. With the patch set, perf has the mapping information from a type ID to a specific uncore unit. Just like the previous platforms, the uncore PMU can be named by the real PMU name, e.g., uncore_cha_0. Add a new attribute "alias" to indicate the old numeric name. The userspace perf tool is modified in the patch-set to handle both names.
The uncore spec of Sapphire Rapids server can be found at
https://cdrdv2.intel.com/v1/dl/getContent/642245
Kan Liang (16):
perf/x86/intel/uncore: Add Sapphire Rapids server framework perf/x86/intel/uncore: Add Sapphire Rapids server CHA support perf/x86/intel/uncore: Add Sapphire Rapids server IIO support perf/x86/intel/uncore: Add Sapphire Rapids server IRP support perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support perf/x86/intel/uncore: Add Sapphire Rapids server PCU support perf/x86/intel/uncore: Add Sapphire Rapids server IMC support perf/x86/intel/uncore: Add Sapphire Rapids server M2M support perf/x86/intel/uncore: Add Sapphire Rapids server UPI support perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support perf/x86/intel/uncore: Add Sapphire Rapids server MDF support perf/x86/intel/uncore: Add alias PMU name perf/x86/intel/uncore: Factor out snr_uncore_mmio_map() perf/x86/intel/uncore: Support IIO free-running counters on Sapphire
Rapids server
perf/x86/intel/uncore: Support IMC free-running counters on Sapphire
Rapids server
perf pmu: Add PMU alias support
.../testing/sysfs-bus-event_source-devices-uncore | 13 + arch/x86/events/intel/uncore.c | 45 +- arch/x86/events/intel/uncore.h | 4 + arch/x86/events/intel/uncore_discovery.c | 42 +- arch/x86/events/intel/uncore_discovery.h | 21 + arch/x86/events/intel/uncore_snbep.c | 543 ++++++++++++++++++++- tools/perf/arch/x86/util/pmu.c | 129 ++++- tools/perf/util/parse-events.y | 4 +- tools/perf/util/pmu.c | 23 +- tools/perf/util/pmu.h | 5 + 10 files changed, 782 insertions(+), 47 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore
Signature · 1 line
2.7.4
PATCH v4 1/16 perf/x86/intel/uncore: Add Sapphire Rapids server framework
From: Kan Liang <[email protected]>
Intel Sapphire Rapids supports a discovery mechanism, that allows an uncore driver to discover the different components ("boxes") of the chip.
All the generic information of the uncore boxes should be retrieved from the discovery tables. This has been enabled with the commit edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables"). Add use_discovery to indicate the case. The uncore driver doesn't need to hard code the generic information for each uncore box.
But we still need to enable various functionality that cannot be directly discovered.
To support these functionalities, the Sapphire Rapids server framework is introduced here. Each specific uncore unit will be added into the framework in the following patches.
Add use_discovery to indicate that the discovery mechanism is required for the platform. Currently, Intel Sapphire Rapids is one of the platforms.
The box ID from the discovery table is the accurate index. Use it if applicable.
All the undiscovered platform-specific features will be hard code in the spr_uncores[]. Add uncore_type_customized_copy(), instead of the memcpy, to only overwrite these features.
The specific uncore unit hasn't been added here. From user's perspective, there is nothing changed for now.
--- arch/x86/events/intel/uncore.c | 26 ++++++++-- arch/x86/events/intel/uncore.h | 3 ++ arch/x86/events/intel/uncore_discovery.c | 2 +- arch/x86/events/intel/uncore_discovery.h | 3 ++ arch/x86/events/intel/uncore_snbep.c | 87 ++++++++++++++++++++++++++++++++ 5 files changed, 116 insertions(+), 5 deletions(-)
arch/x86/events/intel/uncore.c +22 -4
@@ -869,9 +869,13 @@ static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)sprintf (pmu->name,"uncore_%s" , type->name); else sprintf(pmu->name, "uncore"); - }else -sprintf (pmu->name,"uncore_%s_%d" , type->name, pmu->pmu_idx); - + }else { +/* +* Use the box ID from the discovery table if applicable. +*/ +sprintf (pmu->name,"uncore_%s_%d" , type->name, + type->box_ids ? type->box_ids[pmu->pmu_idx] : pmu->pmu_idx); + } }static int uncore_pmu_register (struct intel_uncore_pmu *pmu)
@@ -1667,6 +1671,7 @@ struct intel_uncore_init_fun {void (*cpu_init)(void );int (*pci_init)(void );void (*mmio_init)(void ); +bool use_discovery; };static const struct intel_uncore_init_fun nhm_uncore_init__initconst = {
@@ -1769,6 +1774,13 @@ static const struct intel_uncore_init_fun snr_uncore_init __initconst = { .mmio_init = snr_uncore_mmio_init, }; +static const struct intel_uncore_init_fun spr_uncore_init__initconst = { + .cpu_init = spr_uncore_cpu_init, + .pci_init = spr_uncore_pci_init, + .mmio_init = spr_uncore_mmio_init, + .use_discovery = true, +}; +static const struct intel_uncore_init_fun generic_uncore_init__initconst = { .cpu_init = intel_uncore_generic_uncore_cpu_init, .pci_init = intel_uncore_generic_uncore_pci_init,
@@ -1813,6 +1825,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, };
@@ -1836,8 +1849,13 @@ static int __init intel_uncore_init(void) uncore_init = (struct intel_uncore_init_fun *)&generic_uncore_init; else return -ENODEV; - }else + }else { uncore_init = (struct intel_uncore_init_fun *)id->driver_data; +if (uncore_no_discover && uncore_init->use_discovery) +return -ENODEV ; +if (uncore_init->use_discovery && !intel_uncore_has_discovery_tables ()) +return -ENODEV ; + }if (uncore_init->pci_init) { pret = uncore_init->pci_init ();
arch/x86/events/intel/uncore.h +3 -0
@@ -607,6 +607,9 @@ void snr_uncore_mmio_init(void);int icx_uncore_pci_init (void );void icx_uncore_cpu_init (void );void icx_uncore_mmio_init (void ); +int spr_uncore_pci_init (void ); +void spr_uncore_cpu_init (void ); +void spr_uncore_mmio_init (void );/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
arch/x86/events/intel/uncore_discovery.c +1 -1
@@ -568,7 +568,7 @@ static bool uncore_update_uncore_type(enum uncore_access_type type_id,return true; } -static struct intel_uncore_type ** +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id) {struct intel_uncore_discovery_type *type;
arch/x86/events/intel/uncore_discovery.h +3 -0
@@ -129,3 +129,6 @@ void intel_uncore_clear_discovery_tables(void);void intel_uncore_generic_uncore_cpu_init (void );int intel_uncore_generic_uncore_pci_init (void );void intel_uncore_generic_uncore_mmio_init (void ); + +struct intel_uncore_type ** +intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +87 -0
96 lines not on this page · raw message
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server framework
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: c54c53d9921adef2c239cb43d5a936b63c57ebf0 Gitweb: https://git.kernel.org/tip/c54c53d9921adef2c239cb43d5a936b63c57ebf0 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:25 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:36 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server framework
Intel Sapphire Rapids supports a discovery mechanism, that allows an uncore driver to discover the different components ("boxes") of the chip.
All the generic information of the uncore boxes should be retrieved from the discovery tables. This has been enabled with the commit edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables"). Add use_discovery to indicate the case. The uncore driver doesn't need to hard code the generic information for each uncore box.
But we still need to enable various functionality that cannot be directly discovered.
To support these functionalities, the Sapphire Rapids server framework is introduced here. Each specific uncore unit will be added into the framework in the following patches.
Add use_discovery to indicate that the discovery mechanism is required for the platform. Currently, Intel Sapphire Rapids is one of the platforms.
The box ID from the discovery table is the accurate index. Use it if applicable.
All the undiscovered platform-specific features will be hard code in the spr_uncores[]. Add uncore_type_customized_copy(), instead of the memcpy, to only overwrite these features.
The specific uncore unit hasn't been added here. From user's perspective, there is nothing changed for now.
--- arch/x86/events/intel/uncore.c | 26 +++++-- arch/x86/events/intel/uncore.h | 3 +- arch/x86/events/intel/uncore_discovery.c | 2 +- arch/x86/events/intel/uncore_discovery.h | 3 +- arch/x86/events/intel/uncore_snbep.c | 87 +++++++++++++++++++++++- 5 files changed, 116 insertions(+), 5 deletions(-)
arch/x86/events/intel/uncore.c +22 -4
@@ -865,9 +865,13 @@ static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)sprintf (pmu->name,"uncore_%s" , type->name); else sprintf(pmu->name, "uncore"); - }else -sprintf (pmu->name,"uncore_%s_%d" , type->name, pmu->pmu_idx); - + }else { +/* +* Use the box ID from the discovery table if applicable. +*/ +sprintf (pmu->name,"uncore_%s_%d" , type->name, + type->box_ids ? type->box_ids[pmu->pmu_idx] : pmu->pmu_idx); + } }static int uncore_pmu_register (struct intel_uncore_pmu *pmu)
@@ -1663,6 +1667,7 @@ struct intel_uncore_init_fun {void (*cpu_init)(void );int (*pci_init)(void );void (*mmio_init)(void ); +bool use_discovery; };static const struct intel_uncore_init_fun nhm_uncore_init__initconst = {
@@ -1765,6 +1770,13 @@ static const struct intel_uncore_init_fun snr_uncore_init __initconst = { .mmio_init = snr_uncore_mmio_init, }; +static const struct intel_uncore_init_fun spr_uncore_init__initconst = { + .cpu_init = spr_uncore_cpu_init, + .pci_init = spr_uncore_pci_init, + .mmio_init = spr_uncore_mmio_init, + .use_discovery = true, +}; +static const struct intel_uncore_init_fun generic_uncore_init__initconst = { .cpu_init = intel_uncore_generic_uncore_cpu_init, .pci_init = intel_uncore_generic_uncore_pci_init,
@@ -1809,6 +1821,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, };
@@ -1832,8 +1845,13 @@ static int __init intel_uncore_init(void) uncore_init = (struct intel_uncore_init_fun *)&generic_uncore_init; else return -ENODEV; - }else + }else { uncore_init = (struct intel_uncore_init_fun *)id->driver_data; +if (uncore_no_discover && uncore_init->use_discovery) +return -ENODEV ; +if (uncore_init->use_discovery && !intel_uncore_has_discovery_tables ()) +return -ENODEV ; + }if (uncore_init->pci_init) { pret = uncore_init->pci_init ();
arch/x86/events/intel/uncore.h +3 -0
@@ -608,6 +608,9 @@ void snr_uncore_mmio_init(void);int icx_uncore_pci_init (void );void icx_uncore_cpu_init (void );void icx_uncore_mmio_init (void ); +int spr_uncore_pci_init (void ); +void spr_uncore_cpu_init (void ); +void spr_uncore_mmio_init (void );/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
arch/x86/events/intel/uncore_discovery.c +1 -1
@@ -568,7 +568,7 @@ static bool uncore_update_uncore_type(enum uncore_access_type type_id,return true; } -static struct intel_uncore_type ** +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id) {struct intel_uncore_discovery_type *type;
arch/x86/events/intel/uncore_discovery.h +3 -0
@@ -129,3 +129,6 @@ void intel_uncore_clear_discovery_tables(void);void intel_uncore_generic_uncore_cpu_init (void );int intel_uncore_generic_uncore_pci_init (void );void intel_uncore_generic_uncore_mmio_init (void ); + +struct intel_uncore_type ** +intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +87 -0
96 lines not on this page · raw message
PATCH v4 2/16 perf/x86/intel/uncore: Add Sapphire Rapids server CHA support
In reply to [email protected]From: Kan Liang <[email protected]>
CHA merges the caching agent and Home Agent (HA) responsibilities of the chip into a single block. It's one of the Sapphire Rapids server uncore units.
The layout of the control registers for a CHA uncore unit is a little bit different from the generic one. The CHA uncore unit also supports a filter register for TID. So a specific format and ops are required. Expose the common MSR ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 6 +-- arch/x86/events/intel/uncore_discovery.h | 4 ++ arch/x86/events/intel/uncore_snbep.c | 90 +++++++++++++++++++++++++++++++- 3 files changed, 96 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_discovery.c +3 -3
@@ -337,17 +337,17 @@ static const struct attribute_group generic_uncore_format_group = { .attrs = generic_uncore_formats_attr, }; -static void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),GENERIC_PMON_BOX_CTL_INT ); } -static void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),GENERIC_PMON_BOX_CTL_FRZ ); } -static void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),0 ); }
arch/x86/events/intel/uncore_discovery.h +4 -0
@@ -130,5 +130,9 @@ void intel_uncore_generic_uncore_cpu_init(void);int intel_uncore_generic_uncore_pci_init (void );void intel_uncore_generic_uncore_mmio_init (void ); +void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +89 -1
111 lines not on this page · raw message
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server CHA support
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: 949b11381f81664df3997db2ae0ec9546ab6dd85 Gitweb: https://git.kernel.org/tip/949b11381f81664df3997db2ae0ec9546ab6dd85 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:26 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:37 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server CHA support
CHA merges the caching agent and Home Agent (HA) responsibilities of the chip into a single block. It's one of the Sapphire Rapids server uncore units.
The layout of the control registers for a CHA uncore unit is a little bit different from the generic one. The CHA uncore unit also supports a filter register for TID. So a specific format and ops are required. Expose the common MSR ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 6 +- arch/x86/events/intel/uncore_discovery.h | 4 +- arch/x86/events/intel/uncore_snbep.c | 90 ++++++++++++++++++++++- 3 files changed, 96 insertions(+), 4 deletions(-)
arch/x86/events/intel/uncore_discovery.c +3 -3
@@ -337,17 +337,17 @@ static const struct attribute_group generic_uncore_format_group = { .attrs = generic_uncore_formats_attr, }; -static void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),GENERIC_PMON_BOX_CTL_INT ); } -static void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),GENERIC_PMON_BOX_CTL_FRZ ); } -static void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box) {wrmsrl (uncore_msr_box_ctl (box),0 ); }
arch/x86/events/intel/uncore_discovery.h +4 -0
@@ -130,5 +130,9 @@ void intel_uncore_generic_uncore_cpu_init(void);int intel_uncore_generic_uncore_pci_init (void );void intel_uncore_generic_uncore_mmio_init (void ); +void intel_generic_uncore_msr_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +89 -1
111 lines not on this page · raw message
PATCH v4 3/16 perf/x86/intel/uncore: Add Sapphire Rapids server IIO support
In reply to [email protected]From: Kan Liang <[email protected]>
The IIO stacks are responsible for managing the traffic between the PCI Express* (PCIe*) domain and the mesh domain. The IIO PMON block is situated near the IIO stacks traffic controller capturing the traffic controller as well as the PCIe* root port information.
The layout of the control registers for a IIO uncore unit is a little bit different from the generic one.
--- arch/x86/events/intel/uncore_snbep.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +8 -1
@@ -5438,11 +5438,18 @@ static struct intel_uncore_type spr_uncore_chabox = { .format_group = &spr_uncore_chabox_format_group, }; +static struct intel_uncore_type spr_uncore_iio = { + .name ="iio" , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .event_mask_ext =SNR_IIO_PMON_RAW_EVENT_MASK_EXT , + .format_group = &snr_uncore_iio_format_group, +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, -NULL , + &spr_uncore_iio,NULL ,NULL ,NULL ,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server IIO support
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: 3ba7095beaec1bace1b5864fa92b2b7a0eaadf38 Gitweb: https://git.kernel.org/tip/3ba7095beaec1bace1b5864fa92b2b7a0eaadf38 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:27 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:37 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server IIO support
The IIO stacks are responsible for managing the traffic between the PCI Express* (PCIe*) domain and the mesh domain. The IIO PMON block is situated near the IIO stacks traffic controller capturing the traffic controller as well as the PCIe* root port information.
The layout of the control registers for a IIO uncore unit is a little bit different from the generic one.
--- arch/x86/events/intel/uncore_snbep.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +8 -1
@@ -5596,11 +5596,18 @@ static struct intel_uncore_type spr_uncore_chabox = { .format_group = &spr_uncore_chabox_format_group, }; +static struct intel_uncore_type spr_uncore_iio = { + .name ="iio" , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .event_mask_ext =SNR_IIO_PMON_RAW_EVENT_MASK_EXT , + .format_group = &snr_uncore_iio_format_group, +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, -NULL , + &spr_uncore_iio,NULL ,NULL ,NULL ,
PATCH v4 4/16 perf/x86/intel/uncore: Add Sapphire Rapids server IRP support
In reply to [email protected]From: Kan Liang <[email protected]>
The IRP is responsible for maintaining coherency for the IIO traffic targeting coherent memory.
The layout of the control registers for a IRP uncore unit is a little bit different from the generic one.
Factor out SPR_UNCORE_COMMON_FORMAT, which can be reused by the following uncore units.
--- arch/x86/events/intel/uncore_snbep.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +26 -1
@@ -5445,12 +5445,37 @@ static struct intel_uncore_type spr_uncore_iio = { .format_group = &snr_uncore_iio_format_group, }; +static struct attribute *spr_uncore_raw_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask_ext4.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, +NULL , +}; + +static const struct attribute_group spr_uncore_raw_format_group = { + .name ="format" , + .attrs = spr_uncore_raw_formats_attr, +}; + +#define SPR_UNCORE_COMMON_FORMAT () \ + .event_mask = SNBEP_PMON_RAW_EVENT_MASK, \ + .event_mask_ext = SPR_RAW_EVENT_MASK_EXT, \ + .format_group = &spr_uncore_raw_format_group + +static struct intel_uncore_type spr_uncore_irp = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="irp" , + +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, &spr_uncore_iio, -NULL , + &spr_uncore_irp,NULL ,NULL ,NULL ,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server IRP support
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: e199eb5131591c020705deceee224b437d09ece4 Gitweb: https://git.kernel.org/tip/e199eb5131591c020705deceee224b437d09ece4 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:28 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:37 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server IRP support
The IRP is responsible for maintaining coherency for the IIO traffic targeting coherent memory.
The layout of the control registers for a IRP uncore unit is a little bit different from the generic one.
Factor out SPR_UNCORE_COMMON_FORMAT, which can be reused by the following uncore units.
--- arch/x86/events/intel/uncore_snbep.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +26 -1
@@ -5603,12 +5603,37 @@ static struct intel_uncore_type spr_uncore_iio = { .format_group = &snr_uncore_iio_format_group, }; +static struct attribute *spr_uncore_raw_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask_ext4.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, +NULL , +}; + +static const struct attribute_group spr_uncore_raw_format_group = { + .name ="format" , + .attrs = spr_uncore_raw_formats_attr, +}; + +#define SPR_UNCORE_COMMON_FORMAT () \ + .event_mask = SNBEP_PMON_RAW_EVENT_MASK, \ + .event_mask_ext = SPR_RAW_EVENT_MASK_EXT, \ + .format_group = &spr_uncore_raw_format_group + +static struct intel_uncore_type spr_uncore_irp = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="irp" , + +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, &spr_uncore_iio, -NULL , + &spr_uncore_irp,NULL ,NULL ,NULL ,
PATCH v4 5/16 perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support
In reply to [email protected]From: Kan Liang <[email protected]>
M2PCIe* blocks manage the interface between the mesh and each IIO stack.
The layout of the control registers for a M2PCIe uncore unit is similar to a IRP uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5470,13 +5470,18 @@ static struct intel_uncore_type spr_uncore_irp = { }; +static struct intel_uncore_type spr_uncore_m2pcie = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="m2pcie" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, &spr_uncore_iio, &spr_uncore_irp, -NULL , + &spr_uncore_m2pcie,NULL ,NULL ,NULL ,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support
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: f85ef898f8842b2a9a8f51a64eaf45ee2a8bb1f7 Gitweb: https://git.kernel.org/tip/f85ef898f8842b2a9a8f51a64eaf45ee2a8bb1f7 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:29 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:38 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support
M2PCIe* blocks manage the interface between the mesh and each IIO stack.
The layout of the control registers for a M2PCIe uncore unit is similar to a IRP uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5628,13 +5628,18 @@ static struct intel_uncore_type spr_uncore_irp = { }; +static struct intel_uncore_type spr_uncore_m2pcie = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="m2pcie" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox, &spr_uncore_iio, &spr_uncore_irp, -NULL , + &spr_uncore_m2pcie,NULL ,NULL ,NULL ,
PATCH v4 6/16 perf/x86/intel/uncore: Add Sapphire Rapids server PCU support
In reply to [email protected]From: Kan Liang <[email protected]>
The PCU is the primary power controller for the Sapphire Rapids.
Except the name, all the information can be retrieved from the discovery tables.
--- arch/x86/events/intel/uncore_snbep.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +5 -1
@@ -5475,6 +5475,10 @@ static struct intel_uncore_type spr_uncore_m2pcie = { .name = "m2pcie", }; +static struct intel_uncore_type spr_uncore_pcu = { + .name ="pcu" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5482,7 +5486,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_iio, &spr_uncore_irp, &spr_uncore_m2pcie, -NULL , + &spr_uncore_pcu,NULL ,NULL , NULL,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server PCU support
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: 0654dfdc7e1ca30d36810ab694712da3de18440c Gitweb: https://git.kernel.org/tip/0654dfdc7e1ca30d36810ab694712da3de18440c Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:30 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:38 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server PCU support
The PCU is the primary power controller for the Sapphire Rapids.
Except the name, all the information can be retrieved from the discovery tables.
--- arch/x86/events/intel/uncore_snbep.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +5 -1
@@ -5633,6 +5633,10 @@ static struct intel_uncore_type spr_uncore_m2pcie = { .name = "m2pcie", }; +static struct intel_uncore_type spr_uncore_pcu = { + .name ="pcu" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5640,7 +5644,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_iio, &spr_uncore_irp, &spr_uncore_m2pcie, -NULL , + &spr_uncore_pcu,NULL ,NULL , NULL,
PATCH v4 7/16 perf/x86/intel/uncore: Add Sapphire Rapids server IMC support
In reply to [email protected]From: Kan Liang <[email protected]>
The Sapphire Rapids IMC provides the interface to the DRAM and communicates to the rest of the uncore through the M2M block.
The layout of the control registers for a IMC uncore unit is a little bit different from the generic one. There is a fixed counter for IMC. So a specific format and ops are required. Expose the common MMIO ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 10 ++++----- arch/x86/events/intel/uncore_discovery.h | 6 ++++++ arch/x86/events/intel/uncore_snbep.c | 35 +++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 6 deletions(-)
arch/x86/events/intel/uncore_discovery.c +5 -5
@@ -454,7 +454,7 @@ static unsigned int generic_uncore_mmio_box_ctl(struct intel_uncore_box *box)return type->box_ctls[box->dieid] + type->mmio_offsets[box->pmu->pmu_idx]; } -static void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box) {unsigned int box_ctl =generic_uncore_mmio_box_ctl (box);struct intel_uncore_type *type = box->pmu->type;
@@ -478,7 +478,7 @@ static void intel_generic_uncore_mmio_init_box(struct intel_uncore_box *box)writel (GENERIC_PMON_BOX_CTL_INT , box->io_addr); } -static void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box) {if (!box->io_addr)return ;
@@ -486,7 +486,7 @@ static void intel_generic_uncore_mmio_disable_box(struct intel_uncore_box *box)writel (GENERIC_PMON_BOX_CTL_FRZ , box->io_addr); } -static void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box) {if (!box->io_addr)return ;
@@ -505,8 +505,8 @@ static void intel_generic_uncore_mmio_enable_event(struct intel_uncore_box *box,writel (hwc->config, box->io_addr + hwc->config_base); } -static void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, -struct perf_event *event) +void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, +struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;
arch/x86/events/intel/uncore_discovery.h +6 -0
@@ -134,5 +134,11 @@ void intel_generic_uncore_msr_init_box(struct intel_uncore_box *box);void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box);void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, +struct perf_event *event); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +34 -1
@@ -5479,6 +5479,39 @@ static struct intel_uncore_type spr_uncore_pcu = { .name = "pcu", }; +static void spr_uncore_mmio_enable_event (struct intel_uncore_box *box, +struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; + +if (!box->io_addr) +return ; + +if (uncore_pmc_fixed (hwc->idx)) +writel (SNBEP_PMON_CTL_EN , box->io_addr + hwc->config_base); +else +writel (hwc->config, box->io_addr + hwc->config_base); +} + +static struct intel_uncore_ops spr_uncore_mmio_ops = { + .init_box = intel_generic_uncore_mmio_init_box, + .exit_box = uncore_mmio_exit_box, + .disable_box = intel_generic_uncore_mmio_disable_box, + .enable_box = intel_generic_uncore_mmio_enable_box, + .disable_event = intel_generic_uncore_mmio_disable_event, + .enable_event = spr_uncore_mmio_enable_event, + .read_counter = uncore_mmio_read_counter, +}; + +static struct intel_uncore_type spr_uncore_imc = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="imc" , + .fixed_ctr_bits =48 , + .fixed_ctr =SNR_IMC_MMIO_PMON_FIXED_CTR , + .fixed_ctl =SNR_IMC_MMIO_PMON_FIXED_CTL , + .ops = &spr_uncore_mmio_ops, +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5488,7 +5521,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_m2pcie, &spr_uncore_pcu,NULL , -NULL , + &spr_uncore_imc,NULL ,NULL , NULL,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server IMC support
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: 85f2e30f987ecc73fbb5e24eda0f36ba7f337c5c Gitweb: https://git.kernel.org/tip/85f2e30f987ecc73fbb5e24eda0f36ba7f337c5c Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:31 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:39 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server IMC support
The Sapphire Rapids IMC provides the interface to the DRAM and communicates to the rest of the uncore through the M2M block.
The layout of the control registers for a IMC uncore unit is a little bit different from the generic one. There is a fixed counter for IMC. So a specific format and ops are required. Expose the common MMIO ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 10 +++---- arch/x86/events/intel/uncore_discovery.h | 6 ++++- arch/x86/events/intel/uncore_snbep.c | 35 ++++++++++++++++++++++- 3 files changed, 45 insertions(+), 6 deletions(-)
arch/x86/events/intel/uncore_discovery.c +5 -5
@@ -454,7 +454,7 @@ static unsigned int generic_uncore_mmio_box_ctl(struct intel_uncore_box *box)return type->box_ctls[box->dieid] + type->mmio_offsets[box->pmu->pmu_idx]; } -static void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box) {unsigned int box_ctl =generic_uncore_mmio_box_ctl (box);struct intel_uncore_type *type = box->pmu->type;
@@ -478,7 +478,7 @@ static void intel_generic_uncore_mmio_init_box(struct intel_uncore_box *box)writel (GENERIC_PMON_BOX_CTL_INT , box->io_addr); } -static void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box) {if (!box->io_addr)return ;
@@ -486,7 +486,7 @@ static void intel_generic_uncore_mmio_disable_box(struct intel_uncore_box *box)writel (GENERIC_PMON_BOX_CTL_FRZ , box->io_addr); } -static void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box) {if (!box->io_addr)return ;
@@ -505,8 +505,8 @@ static void intel_generic_uncore_mmio_enable_event(struct intel_uncore_box *box,writel (hwc->config, box->io_addr + hwc->config_base); } -static void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, -struct perf_event *event) +void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, +struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;
arch/x86/events/intel/uncore_discovery.h +6 -0
@@ -134,5 +134,11 @@ void intel_generic_uncore_msr_init_box(struct intel_uncore_box *box);void intel_generic_uncore_msr_disable_box (struct intel_uncore_box *box);void intel_generic_uncore_msr_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box, +struct perf_event *event); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +34 -1
@@ -5637,6 +5637,39 @@ static struct intel_uncore_type spr_uncore_pcu = { .name = "pcu", }; +static void spr_uncore_mmio_enable_event (struct intel_uncore_box *box, +struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; + +if (!box->io_addr) +return ; + +if (uncore_pmc_fixed (hwc->idx)) +writel (SNBEP_PMON_CTL_EN , box->io_addr + hwc->config_base); +else +writel (hwc->config, box->io_addr + hwc->config_base); +} + +static struct intel_uncore_ops spr_uncore_mmio_ops = { + .init_box = intel_generic_uncore_mmio_init_box, + .exit_box = uncore_mmio_exit_box, + .disable_box = intel_generic_uncore_mmio_disable_box, + .enable_box = intel_generic_uncore_mmio_enable_box, + .disable_event = intel_generic_uncore_mmio_disable_event, + .enable_event = spr_uncore_mmio_enable_event, + .read_counter = uncore_mmio_read_counter, +}; + +static struct intel_uncore_type spr_uncore_imc = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="imc" , + .fixed_ctr_bits =48 , + .fixed_ctr =SNR_IMC_MMIO_PMON_FIXED_CTR , + .fixed_ctl =SNR_IMC_MMIO_PMON_FIXED_CTL , + .ops = &spr_uncore_mmio_ops, +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5646,7 +5679,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_m2pcie, &spr_uncore_pcu,NULL , -NULL , + &spr_uncore_imc,NULL ,NULL , NULL,
PATCH v4 8/16 perf/x86/intel/uncore: Add Sapphire Rapids server M2M support
In reply to [email protected]From: Kan Liang <[email protected]>
The M2M blocks manage the interface between the mesh (operating on both the mesh and the SMI3 protocol) and the memory controllers.
The layout of the control registers for a M2M uncore unit is a little
bit different from the generic one. So a specific format and ops are
required. Expose the common PCI ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 14 +++++++------- arch/x86/events/intel/uncore_discovery.h | 8 ++++++++ arch/x86/events/intel/uncore_snbep.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 8 deletions(-)
arch/x86/events/intel/uncore_discovery.c +7 -7
@@ -377,7 +377,7 @@ static struct intel_uncore_ops generic_uncore_msr_ops = { .read_counter = uncore_msr_read_counter, }; -static void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -386,7 +386,7 @@ static void intel_generic_uncore_pci_init_box(struct intel_uncore_box *box)pci_write_config_dword (pdev, box_ctl,GENERIC_PMON_BOX_CTL_INT ); } -static void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -394,7 +394,7 @@ static void intel_generic_uncore_pci_disable_box(struct intel_uncore_box *box)pci_write_config_dword (pdev, box_ctl,GENERIC_PMON_BOX_CTL_FRZ ); } -static void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -411,8 +411,8 @@ static void intel_generic_uncore_pci_enable_event(struct intel_uncore_box *box,pci_write_config_dword (pdev, hwc->config_base, hwc->config); } -static void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, -struct perf_event *event) +void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, +struct perf_event *event) {struct pci_dev *pdev = box->pci_dev;struct hw_perf_event *hwc = &event->hw;
@@ -420,8 +420,8 @@ static void intel_generic_uncore_pci_disable_event(struct intel_uncore_box *box,pci_write_config_dword (pdev, hwc->config_base,0 ); } -static u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, -struct perf_event *event) +u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, +struct perf_event *event) {struct pci_dev *pdev = box->pci_dev;struct hw_perf_event *hwc = &event->hw;
arch/x86/events/intel/uncore_discovery.h +8 -0
@@ -140,5 +140,13 @@ void intel_generic_uncore_mmio_enable_box(struct intel_uncore_box *box);void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box,struct perf_event *event); +void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, +struct perf_event *event); +u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, +struct perf_event *event); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +29 -1
@@ -5512,6 +5512,34 @@ static struct intel_uncore_type spr_uncore_imc = { .ops = &spr_uncore_mmio_ops, }; +static void spr_uncore_pci_enable_event (struct intel_uncore_box *box, +struct perf_event *event) +{ +struct pci_dev *pdev = box->pci_dev; +struct hw_perf_event *hwc = &event->hw; + +pci_write_config_dword (pdev, hwc->config_base +4 , (u32)(hwc->config >>32 )); +pci_write_config_dword (pdev, hwc->config_base, (u32 )hwc->config); +} + +static struct intel_uncore_ops spr_uncore_pci_ops = { + .init_box = intel_generic_uncore_pci_init_box, + .disable_box = intel_generic_uncore_pci_disable_box, + .enable_box = intel_generic_uncore_pci_enable_box, + .disable_event = intel_generic_uncore_pci_disable_event, + .enable_event = spr_uncore_pci_enable_event, + .read_counter = intel_generic_uncore_pci_read_counter, +}; + +#define SPR_UNCORE_PCI_COMMON_FORMAT () \ + SPR_UNCORE_COMMON_FORMAT(), \ + .ops = &spr_uncore_pci_ops + +static struct intel_uncore_type spr_uncore_m2m = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="m2m" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5522,7 +5550,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_pcu,NULL , &spr_uncore_imc, -NULL , + &spr_uncore_m2m,NULL ,NULL , NULL,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server M2M support
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: f57191edaaeb01279a88ace1be5b7230bdd8c0ab Gitweb: https://git.kernel.org/tip/f57191edaaeb01279a88ace1be5b7230bdd8c0ab Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:32 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:39 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server M2M support
The M2M blocks manage the interface between the mesh (operating on both the mesh and the SMI3 protocol) and the memory controllers.
The layout of the control registers for a M2M uncore unit is a little
bit different from the generic one. So a specific format and ops are
required. Expose the common PCI ops which can be reused.
--- arch/x86/events/intel/uncore_discovery.c | 14 +++++------ arch/x86/events/intel/uncore_discovery.h | 8 ++++++- arch/x86/events/intel/uncore_snbep.c | 30 ++++++++++++++++++++++- 3 files changed, 44 insertions(+), 8 deletions(-)
arch/x86/events/intel/uncore_discovery.c +7 -7
@@ -377,7 +377,7 @@ static struct intel_uncore_ops generic_uncore_msr_ops = { .read_counter = uncore_msr_read_counter, }; -static void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -386,7 +386,7 @@ static void intel_generic_uncore_pci_init_box(struct intel_uncore_box *box)pci_write_config_dword (pdev, box_ctl,GENERIC_PMON_BOX_CTL_INT ); } -static void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -394,7 +394,7 @@ static void intel_generic_uncore_pci_disable_box(struct intel_uncore_box *box)pci_write_config_dword (pdev, box_ctl,GENERIC_PMON_BOX_CTL_FRZ ); } -static void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box) +void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box) {struct pci_dev *pdev = box->pci_dev;int box_ctl =uncore_pci_box_ctl (box);
@@ -411,8 +411,8 @@ static void intel_generic_uncore_pci_enable_event(struct intel_uncore_box *box,pci_write_config_dword (pdev, hwc->config_base, hwc->config); } -static void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, -struct perf_event *event) +void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, +struct perf_event *event) {struct pci_dev *pdev = box->pci_dev;struct hw_perf_event *hwc = &event->hw;
@@ -420,8 +420,8 @@ static void intel_generic_uncore_pci_disable_event(struct intel_uncore_box *box,pci_write_config_dword (pdev, hwc->config_base,0 ); } -static u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, -struct perf_event *event) +u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, +struct perf_event *event) {struct pci_dev *pdev = box->pci_dev;struct hw_perf_event *hwc = &event->hw;
arch/x86/events/intel/uncore_discovery.h +8 -0
@@ -140,5 +140,13 @@ void intel_generic_uncore_mmio_enable_box(struct intel_uncore_box *box);void intel_generic_uncore_mmio_disable_event (struct intel_uncore_box *box,struct perf_event *event); +void intel_generic_uncore_pci_init_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_disable_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_enable_box (struct intel_uncore_box *box); +void intel_generic_uncore_pci_disable_event (struct intel_uncore_box *box, +struct perf_event *event); +u64 intel_generic_uncore_pci_read_counter (struct intel_uncore_box *box, +struct perf_event *event); +struct intel_uncore_type **intel_uncore_generic_init_uncores (enum uncore_access_type type_id);
arch/x86/events/intel/uncore_snbep.c +29 -1
@@ -5670,6 +5670,34 @@ static struct intel_uncore_type spr_uncore_imc = { .ops = &spr_uncore_mmio_ops, }; +static void spr_uncore_pci_enable_event (struct intel_uncore_box *box, +struct perf_event *event) +{ +struct pci_dev *pdev = box->pci_dev; +struct hw_perf_event *hwc = &event->hw; + +pci_write_config_dword (pdev, hwc->config_base +4 , (u32)(hwc->config >>32 )); +pci_write_config_dword (pdev, hwc->config_base, (u32 )hwc->config); +} + +static struct intel_uncore_ops spr_uncore_pci_ops = { + .init_box = intel_generic_uncore_pci_init_box, + .disable_box = intel_generic_uncore_pci_disable_box, + .enable_box = intel_generic_uncore_pci_enable_box, + .disable_event = intel_generic_uncore_pci_disable_event, + .enable_event = spr_uncore_pci_enable_event, + .read_counter = intel_generic_uncore_pci_read_counter, +}; + +#define SPR_UNCORE_PCI_COMMON_FORMAT () \ + SPR_UNCORE_COMMON_FORMAT(), \ + .ops = &spr_uncore_pci_ops + +static struct intel_uncore_type spr_uncore_m2m = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="m2m" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5680,7 +5708,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_pcu,NULL , &spr_uncore_imc, -NULL , + &spr_uncore_m2m,NULL ,NULL , NULL,
PATCH v4 9/16 perf/x86/intel/uncore: Add Sapphire Rapids server UPI support
In reply to [email protected]From: Kan Liang <[email protected]>
Sapphire Rapids uses a coherent interconnect for scaling to multiple sockets known as Intel UPI. Intel UPI technology provides a cache coherent socket to socket external communication interface between processors.
The layout of the control registers for a UPI uncore unit is similar to a M2M uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5540,6 +5540,11 @@ static struct intel_uncore_type spr_uncore_m2m = { .name = "m2m", }; +static struct intel_uncore_type spr_uncore_upi = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="upi" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5551,7 +5556,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = {NULL , &spr_uncore_imc, &spr_uncore_m2m, -NULL , + &spr_uncore_upi,NULL ,NULL , NULL,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server UPI support
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: da5a9156cd2a3be2b00f8defb529ee3e35e5769b Gitweb: https://git.kernel.org/tip/da5a9156cd2a3be2b00f8defb529ee3e35e5769b Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:33 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:39 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server UPI support
Sapphire Rapids uses a coherent interconnect for scaling to multiple sockets known as Intel UPI. Intel UPI technology provides a cache coherent socket to socket external communication interface between processors.
The layout of the control registers for a UPI uncore unit is similar to a M2M uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5698,6 +5698,11 @@ static struct intel_uncore_type spr_uncore_m2m = { .name = "m2m", }; +static struct intel_uncore_type spr_uncore_upi = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="upi" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5709,7 +5714,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = {NULL , &spr_uncore_imc, &spr_uncore_m2m, -NULL , + &spr_uncore_upi,NULL ,NULL , NULL,
PATCH v4 10/16 perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support
In reply to [email protected]From: Kan Liang <[email protected]>
M3 Intel UPI is the interface between the mesh and the Intel UPI link layer. It is responsible for translating between the mesh protocol packets and the flits that are used for transmitting data across the Intel UPI interface.
The layout of the control registers for a M3UPI uncore unit is similar to a UPI uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5545,6 +5545,11 @@ static struct intel_uncore_type spr_uncore_upi = { .name = "upi", }; +static struct intel_uncore_type spr_uncore_m3upi = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="m3upi" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5557,7 +5562,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_imc, &spr_uncore_m2m, &spr_uncore_upi, -NULL , + &spr_uncore_m3upi,NULL , NULL, };
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support
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: 2a8e51eae7c83c29795622cfc794cf83436cc05d Gitweb: https://git.kernel.org/tip/2a8e51eae7c83c29795622cfc794cf83436cc05d Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:34 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:40 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support
M3 Intel UPI is the interface between the mesh and the Intel UPI link layer. It is responsible for translating between the mesh protocol packets and the flits that are used for transmitting data across the Intel UPI interface.
The layout of the control registers for a M3UPI uncore unit is similar to a UPI uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5703,6 +5703,11 @@ static struct intel_uncore_type spr_uncore_upi = { .name = "upi", }; +static struct intel_uncore_type spr_uncore_m3upi = { +SPR_UNCORE_PCI_COMMON_FORMAT (), + .name ="m3upi" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5715,7 +5720,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_imc, &spr_uncore_m2m, &spr_uncore_upi, -NULL , + &spr_uncore_m3upi,NULL , NULL, };
PATCH v4 11/16 perf/x86/intel/uncore: Add Sapphire Rapids server MDF support
In reply to [email protected]From: Kan Liang <[email protected]>
The MDF subsystem is a new IP built to support the new Intel Xeon architecture that bridges multiple dies with a embedded bridge system.
The layout of the control registers for a MDF uncore unit is similar to a IRP uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5550,6 +5550,11 @@ static struct intel_uncore_type spr_uncore_m3upi = { .name = "m3upi", }; +static struct intel_uncore_type spr_uncore_mdf = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="mdf" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5564,7 +5569,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_upi, &spr_uncore_m3upi,NULL , - NULL, + &spr_uncore_mdf, }; static void uncore_type_customized_copy(struct intel_uncore_type *to_type,
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add Sapphire Rapids server MDF support
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: 0d771caf728436d9ebc2cd1d50bed71685bfe7d8 Gitweb: https://git.kernel.org/tip/0d771caf728436d9ebc2cd1d50bed71685bfe7d8 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:35 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:40 +02:00
perf/x86/intel/uncore: Add Sapphire Rapids server MDF support
The MDF subsystem is a new IP built to support the new Intel Xeon architecture that bridges multiple dies with a embedded bridge system.
The layout of the control registers for a MDF uncore unit is similar to a IRP uncore unit.
--- arch/x86/events/intel/uncore_snbep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +6 -1
@@ -5708,6 +5708,11 @@ static struct intel_uncore_type spr_uncore_m3upi = { .name = "m3upi", }; +static struct intel_uncore_type spr_uncore_mdf = { +SPR_UNCORE_COMMON_FORMAT (), + .name ="mdf" , +}; +#define UNCORE_SPR_NUM_UNCORE_TYPES 12static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = {
@@ -5722,7 +5727,7 @@ static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_upi, &spr_uncore_m3upi,NULL , - NULL, + &spr_uncore_mdf, }; static void uncore_type_customized_copy(struct intel_uncore_type *to_type,
PATCH v4 12/16 perf/x86/intel/uncore: Add alias PMU name
In reply to [email protected]From: Kan Liang <[email protected]>
A perf PMU may have two PMU names. For example, Intel Sapphire Rapids server supports the discovery mechanism. Without the platform-specific support, an uncore PMU is named by a type ID plus a box ID, e.g., uncore_type_0_0, because the real name of the uncore PMU cannot be retrieved from the discovery table. With the platform-specific support later, perf has the mapping information from a type ID to a specific uncore unit. Just like the previous platforms, the uncore PMU is named by the real PMU name, e.g., uncore_cha_0. The user scripts which work well with the old numeric name may not work anymore.
Add a new attribute "alias" to indicate the old numeric name. The following userspace perf tool patch will handle both names. The user scripts should work properly with the updated perf tool.
--- .../testing/sysfs-bus-event_source-devices-uncore | 13 ++++++++++ arch/x86/events/intel/uncore.c | 19 ++++++++++----- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 28 +++++++++++++++++++++- 4 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore
Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore new file +13 -0
@@ -0,0 +1,13 @@ +What: /sys/bus/event_source/devices/uncore_*/alias +Date: June 2021 +KernelVersion: 5.15 +Contact: Linux kernel mailing list <[email protected]> +Description: Read-only. An attribute to describe the alias name of + the uncore PMU if an alias exists on some platforms. + The 'perf(1)' tool should treat both names the same. + They both can be used to access the uncore PMU. + + Example: + + $ cat /sys/devices/uncore_cha_2/alias + uncore_type_0_2
arch/x86/events/intel/uncore.c +13 -6
@@ -846,6 +846,18 @@ static const struct attribute_group uncore_pmu_attr_group = { .attrs = uncore_pmu_attrs, }; +void uncore_get_alias_name (char *pmu_name,struct intel_uncore_pmu *pmu) +{ +struct intel_uncore_type *type = pmu->type; + +if (type->num_boxes ==1 ) +sprintf (pmu_name,"uncore_type_%u" , type->type_id); +else { +sprintf (pmu_name,"uncore_type_%u_%d" , + type->type_id, type->box_ids[pmu->pmu_idx]); + } +} +static void uncore_get_pmu_name (struct intel_uncore_pmu *pmu) {struct intel_uncore_type *type = pmu->type;
@@ -855,12 +867,7 @@ static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)* Use uncore_type_&typeid_&boxid as name. */ if (!type->name) { -if (type->num_boxes ==1 ) -sprintf (pmu->name,"uncore_type_%u" , type->type_id); -else { -sprintf (pmu->name,"uncore_type_%u_%d" , - type->type_id, type->box_ids[pmu->pmu_idx]); - } +uncore_get_alias_name (pmu->name, pmu);return ; }
arch/x86/events/intel/uncore.h +1 -0
@@ -560,6 +560,7 @@ struct event_constraint * uncore_get_constraint(struct intel_uncore_box *box, struct perf_event *event);void uncore_put_constraint (struct intel_uncore_box *box,struct perf_event *event);u64 uncore_shared_reg_config (struct intel_uncore_box *box,int idx); +void uncore_get_alias_name (char *pmu_name,struct intel_uncore_pmu *pmu);extern struct intel_uncore_type *empty_uncore[];extern struct intel_uncore_type **uncore_msr_uncores;
arch/x86/events/intel/uncore_snbep.c +27 -1
@@ -5429,6 +5429,26 @@ static const struct attribute_group spr_uncore_chabox_format_group = { .attrs = spr_uncore_cha_formats_attr, }; +static ssize_t alias_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct intel_uncore_pmu *pmu =dev_to_uncore_pmu (dev); +char pmu_name[UNCORE_PMU_NAME_LEN ]; + +uncore_get_alias_name (pmu_name, pmu); +return sysfs_emit (buf,"%s\n" , pmu_name); +} + +static DEVICE_ATTR_RO (alias); + +static struct attribute *uncore_alias_attrs[] = { + &dev_attr_alias.attr, +NULL +}; + +ATTRIBUTE_GROUPS (uncore_alias); +static struct intel_uncore_type spr_uncore_chabox = { .name ="cha" , .event_mask =SPR_CHA_PMON_EVENT_MASK ,
@@ -5436,6 +5456,7 @@ static struct intel_uncore_type spr_uncore_chabox = { .num_shared_regs = 1, .ops = &spr_uncore_chabox_ops, .format_group = &spr_uncore_chabox_format_group, + .attr_update = uncore_alias_groups, };static struct intel_uncore_type spr_uncore_iio = {
@@ -5443,6 +5464,7 @@ static struct intel_uncore_type spr_uncore_iio = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .event_mask_ext = SNR_IIO_PMON_RAW_EVENT_MASK_EXT, .format_group = &snr_uncore_iio_format_group, + .attr_update = uncore_alias_groups, };static struct attribute *spr_uncore_raw_formats_attr[] = {
@@ -5462,7 +5484,8 @@ static const struct attribute_group spr_uncore_raw_format_group = {#define SPR_UNCORE_COMMON_FORMAT () \ .event_mask = SNBEP_PMON_RAW_EVENT_MASK, \ .event_mask_ext = SPR_RAW_EVENT_MASK_EXT, \ - .format_group = &spr_uncore_raw_format_group + .format_group = &spr_uncore_raw_format_group, \ + .attr_update = uncore_alias_groupsstatic struct intel_uncore_type spr_uncore_irp = {SPR_UNCORE_COMMON_FORMAT (),
@@ -5477,6 +5500,7 @@ static struct intel_uncore_type spr_uncore_m2pcie = {static struct intel_uncore_type spr_uncore_pcu = { .name ="pcu" , + .attr_update = uncore_alias_groups, }; static void spr_uncore_mmio_enable_event(struct intel_uncore_box *box,
@@ -5602,6 +5626,8 @@ static void uncore_type_customized_copy(struct intel_uncore_type *to_type, to_type->event_descs = from_type->event_descs;if (from_type->format_group) to_type->format_group = from_type->format_group; +if (from_type->attr_update) + to_type->attr_update = from_type->attr_update; } static struct intel_uncore_type **
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Add alias PMU name
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: 8053f2d752e2936f494ede62766a6c9e9fb674f2 Gitweb: https://git.kernel.org/tip/8053f2d752e2936f494ede62766a6c9e9fb674f2 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:36 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:40 +02:00
perf/x86/intel/uncore: Add alias PMU name
A perf PMU may have two PMU names. For example, Intel Sapphire Rapids server supports the discovery mechanism. Without the platform-specific support, an uncore PMU is named by a type ID plus a box ID, e.g., uncore_type_0_0, because the real name of the uncore PMU cannot be retrieved from the discovery table. With the platform-specific support later, perf has the mapping information from a type ID to a specific uncore unit. Just like the previous platforms, the uncore PMU is named by the real PMU name, e.g., uncore_cha_0. The user scripts which work well with the old numeric name may not work anymore.
Add a new attribute "alias" to indicate the old numeric name. The following userspace perf tool patch will handle both names. The user scripts should work properly with the updated perf tool.
--- Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore | 13 +++++++++++++ arch/x86/events/intel/uncore.c | 19 +++++++++++++------ arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snbep.c | 28 +++++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore
Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore new file +13 -0
@@ -0,0 +1,13 @@ +What: /sys/bus/event_source/devices/uncore_*/alias +Date: June 2021 +KernelVersion: 5.15 +Contact: Linux kernel mailing list <[email protected]> +Description: Read-only. An attribute to describe the alias name of + the uncore PMU if an alias exists on some platforms. + The 'perf(1)' tool should treat both names the same. + They both can be used to access the uncore PMU. + + Example: + + $ cat /sys/devices/uncore_cha_2/alias + uncore_type_0_2
arch/x86/events/intel/uncore.c +13 -6
@@ -842,6 +842,18 @@ static const struct attribute_group uncore_pmu_attr_group = { .attrs = uncore_pmu_attrs, }; +void uncore_get_alias_name (char *pmu_name,struct intel_uncore_pmu *pmu) +{ +struct intel_uncore_type *type = pmu->type; + +if (type->num_boxes ==1 ) +sprintf (pmu_name,"uncore_type_%u" , type->type_id); +else { +sprintf (pmu_name,"uncore_type_%u_%d" , + type->type_id, type->box_ids[pmu->pmu_idx]); + } +} +static void uncore_get_pmu_name (struct intel_uncore_pmu *pmu) {struct intel_uncore_type *type = pmu->type;
@@ -851,12 +863,7 @@ static void uncore_get_pmu_name(struct intel_uncore_pmu *pmu)* Use uncore_type_&typeid_&boxid as name. */ if (!type->name) { -if (type->num_boxes ==1 ) -sprintf (pmu->name,"uncore_type_%u" , type->type_id); -else { -sprintf (pmu->name,"uncore_type_%u_%d" , - type->type_id, type->box_ids[pmu->pmu_idx]); - } +uncore_get_alias_name (pmu->name, pmu);return ; }
arch/x86/events/intel/uncore.h +1 -0
@@ -561,6 +561,7 @@ struct event_constraint * uncore_get_constraint(struct intel_uncore_box *box, struct perf_event *event);void uncore_put_constraint (struct intel_uncore_box *box,struct perf_event *event);u64 uncore_shared_reg_config (struct intel_uncore_box *box,int idx); +void uncore_get_alias_name (char *pmu_name,struct intel_uncore_pmu *pmu);extern struct intel_uncore_type *empty_uncore[];extern struct intel_uncore_type **uncore_msr_uncores;
arch/x86/events/intel/uncore_snbep.c +27 -1
@@ -5587,6 +5587,26 @@ static const struct attribute_group spr_uncore_chabox_format_group = { .attrs = spr_uncore_cha_formats_attr, }; +static ssize_t alias_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct intel_uncore_pmu *pmu =dev_to_uncore_pmu (dev); +char pmu_name[UNCORE_PMU_NAME_LEN ]; + +uncore_get_alias_name (pmu_name, pmu); +return sysfs_emit (buf,"%s\n" , pmu_name); +} + +static DEVICE_ATTR_RO (alias); + +static struct attribute *uncore_alias_attrs[] = { + &dev_attr_alias.attr, +NULL +}; + +ATTRIBUTE_GROUPS (uncore_alias); +static struct intel_uncore_type spr_uncore_chabox = { .name ="cha" , .event_mask =SPR_CHA_PMON_EVENT_MASK ,
@@ -5594,6 +5614,7 @@ static struct intel_uncore_type spr_uncore_chabox = { .num_shared_regs = 1, .ops = &spr_uncore_chabox_ops, .format_group = &spr_uncore_chabox_format_group, + .attr_update = uncore_alias_groups, };static struct intel_uncore_type spr_uncore_iio = {
@@ -5601,6 +5622,7 @@ static struct intel_uncore_type spr_uncore_iio = { .event_mask = SNBEP_PMON_RAW_EVENT_MASK, .event_mask_ext = SNR_IIO_PMON_RAW_EVENT_MASK_EXT, .format_group = &snr_uncore_iio_format_group, + .attr_update = uncore_alias_groups, };static struct attribute *spr_uncore_raw_formats_attr[] = {
@@ -5620,7 +5642,8 @@ static const struct attribute_group spr_uncore_raw_format_group = {#define SPR_UNCORE_COMMON_FORMAT () \ .event_mask = SNBEP_PMON_RAW_EVENT_MASK, \ .event_mask_ext = SPR_RAW_EVENT_MASK_EXT, \ - .format_group = &spr_uncore_raw_format_group + .format_group = &spr_uncore_raw_format_group, \ + .attr_update = uncore_alias_groupsstatic struct intel_uncore_type spr_uncore_irp = {SPR_UNCORE_COMMON_FORMAT (),
@@ -5635,6 +5658,7 @@ static struct intel_uncore_type spr_uncore_m2pcie = {static struct intel_uncore_type spr_uncore_pcu = { .name ="pcu" , + .attr_update = uncore_alias_groups, }; static void spr_uncore_mmio_enable_event(struct intel_uncore_box *box,
@@ -5760,6 +5784,8 @@ static void uncore_type_customized_copy(struct intel_uncore_type *to_type, to_type->event_descs = from_type->event_descs;if (from_type->format_group) to_type->format_group = from_type->format_group; +if (from_type->attr_update) + to_type->attr_update = from_type->attr_update; } static struct intel_uncore_type **
PATCH v4 13/16 perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()
In reply to [email protected]From: Kan Liang <[email protected]>
The IMC free-running counters on Sapphire Rapids server are also accessed by MMIO, which is similar to the previous platforms, SNR and ICX. The only difference is the device ID of the device which contains BAR address.
Factor out snr_uncore_mmio_map() which ioremap the MMIO space. It can be reused in the following patch for SPR.
Use the snr_uncore_mmio_map() in the icx_uncore_imc_freerunning_init_box(). There is no box_ctl for the free-running counters.
--- arch/x86/events/intel/uncore_snbep.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
arch/x86/events/intel/uncore_snbep.c +25 -11
@@ -4684,13 +4684,15 @@ int snr_uncore_pci_init(void)return 0 ; } -static struct pci_dev *snr_uncore_get_mc_dev (int id) +#define SNR_MC_DEVICE_ID 0x3451 + +static struct pci_dev *snr_uncore_get_mc_dev (unsigned int device,int id) {struct pci_dev *mc_dev =NULL ;int pkg;while (1 ) { - mc_dev =pci_get_device (PCI_VENDOR_ID_INTEL ,0x3451 , mc_dev); + mc_dev =pci_get_device (PCI_VENDOR_ID_INTEL , device, mc_dev);if (!mc_dev)break ; pkg =uncore_pcibus_to_dieid (mc_dev->bus);
@@ -4700,16 +4702,17 @@ static struct pci_dev *snr_uncore_get_mc_dev(int id)return mc_dev; } -static void __snr_uncore_mmio_init_box (struct intel_uncore_box *box, -unsigned int box_ctl,int mem_offset) +static int snr_uncore_mmio_map (struct intel_uncore_box *box, +unsigned int box_ctl,int mem_offset, +unsigned int device) { -struct pci_dev *pdev =snr_uncore_get_mc_dev (box->dieid); +struct pci_dev *pdev =snr_uncore_get_mc_dev (device, box->dieid);struct intel_uncore_type *type = box->pmu->type;resource_size_t addr;u32 pci_dword;if (!pdev) -return ; +return -ENODEV ;pci_read_config_dword (pdev,SNR_IMC_MMIO_BASE_OFFSET , &pci_dword); addr = (pci_dword &SNR_IMC_MMIO_BASE_MASK ) <<23 ;
@@ -4722,16 +4725,25 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, box->io_addr =ioremap (addr, type->mmio_map_size);if (!box->io_addr) {pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); -return ; +return -EINVAL ; } -writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); +return 0 ; +} + +static void __snr_uncore_mmio_init_box (struct intel_uncore_box *box, +unsigned int box_ctl,int mem_offset, +unsigned int device) +{ +if (!snr_uncore_mmio_map (box, box_ctl, mem_offset, device)) +writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); }static void snr_uncore_mmio_init_box (struct intel_uncore_box *box) {__snr_uncore_mmio_init_box (box,uncore_mmio_box_ctl (box), -SNR_IMC_MMIO_MEM0_OFFSET ); +SNR_IMC_MMIO_MEM0_OFFSET , +SNR_MC_DEVICE_ID ); }static void snr_uncore_mmio_disable_box (struct intel_uncore_box *box)
@@ -5255,7 +5267,8 @@ static void icx_uncore_imc_init_box(struct intel_uncore_box *box)int mem_offset = (box->pmu->pmu_idx /ICX_NUMBER_IMC_CHN ) *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; -__snr_uncore_mmio_init_box (box, box_ctl, mem_offset); +__snr_uncore_mmio_init_box (box, box_ctl, mem_offset, +SNR_MC_DEVICE_ID ); }static struct intel_uncore_ops icx_uncore_mmio_ops = {
@@ -5325,7 +5338,8 @@ static void icx_uncore_imc_freerunning_init_box(struct intel_uncore_box *box)int mem_offset = box->pmu->pmu_idx *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; -__snr_uncore_mmio_init_box (box,uncore_mmio_box_ctl (box), mem_offset); +snr_uncore_mmio_map (box,uncore_mmio_box_ctl (box), + mem_offset,SNR_MC_DEVICE_ID ); }static struct intel_uncore_ops icx_uncore_imc_freerunning_ops = {
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()
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: 1583971b5cb8c786df88be580cdd96a974ad591b Gitweb: https://git.kernel.org/tip/1583971b5cb8c786df88be580cdd96a974ad591b Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:37 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:41 +02:00
perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()
The IMC free-running counters on Sapphire Rapids server are also accessed by MMIO, which is similar to the previous platforms, SNR and ICX. The only difference is the device ID of the device which contains BAR address.
Factor out snr_uncore_mmio_map() which ioremap the MMIO space. It can be reused in the following patch for SPR.
Use the snr_uncore_mmio_map() in the icx_uncore_imc_freerunning_init_box(). There is no box_ctl for the free-running counters.
--- arch/x86/events/intel/uncore_snbep.c | 36 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-)
arch/x86/events/intel/uncore_snbep.c +25 -11
@@ -4792,13 +4792,15 @@ int snr_uncore_pci_init(void)return 0 ; } -static struct pci_dev *snr_uncore_get_mc_dev (int id) +#define SNR_MC_DEVICE_ID 0x3451 + +static struct pci_dev *snr_uncore_get_mc_dev (unsigned int device,int id) {struct pci_dev *mc_dev =NULL ;int pkg;while (1 ) { - mc_dev =pci_get_device (PCI_VENDOR_ID_INTEL ,0x3451 , mc_dev); + mc_dev =pci_get_device (PCI_VENDOR_ID_INTEL , device, mc_dev);if (!mc_dev)break ; pkg =uncore_pcibus_to_dieid (mc_dev->bus);
@@ -4808,16 +4810,17 @@ static struct pci_dev *snr_uncore_get_mc_dev(int id)return mc_dev; } -static void __snr_uncore_mmio_init_box (struct intel_uncore_box *box, -unsigned int box_ctl,int mem_offset) +static int snr_uncore_mmio_map (struct intel_uncore_box *box, +unsigned int box_ctl,int mem_offset, +unsigned int device) { -struct pci_dev *pdev =snr_uncore_get_mc_dev (box->dieid); +struct pci_dev *pdev =snr_uncore_get_mc_dev (device, box->dieid);struct intel_uncore_type *type = box->pmu->type;resource_size_t addr;u32 pci_dword;if (!pdev) -return ; +return -ENODEV ;pci_read_config_dword (pdev,SNR_IMC_MMIO_BASE_OFFSET , &pci_dword); addr = (pci_dword &SNR_IMC_MMIO_BASE_MASK ) <<23 ;
@@ -4830,16 +4833,25 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, box->io_addr =ioremap (addr, type->mmio_map_size);if (!box->io_addr) {pr_warn ("perf uncore: Failed to ioremap for %s.\n" , type->name); -return ; +return -EINVAL ; } -writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); +return 0 ; +} + +static void __snr_uncore_mmio_init_box (struct intel_uncore_box *box, +unsigned int box_ctl,int mem_offset, +unsigned int device) +{ +if (!snr_uncore_mmio_map (box, box_ctl, mem_offset, device)) +writel (IVBEP_PMON_BOX_CTL_INT , box->io_addr); }static void snr_uncore_mmio_init_box (struct intel_uncore_box *box) {__snr_uncore_mmio_init_box (box,uncore_mmio_box_ctl (box), -SNR_IMC_MMIO_MEM0_OFFSET ); +SNR_IMC_MMIO_MEM0_OFFSET , +SNR_MC_DEVICE_ID ); }static void snr_uncore_mmio_disable_box (struct intel_uncore_box *box)
@@ -5413,7 +5425,8 @@ static void icx_uncore_imc_init_box(struct intel_uncore_box *box)int mem_offset = (box->pmu->pmu_idx /ICX_NUMBER_IMC_CHN ) *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; -__snr_uncore_mmio_init_box (box, box_ctl, mem_offset); +__snr_uncore_mmio_init_box (box, box_ctl, mem_offset, +SNR_MC_DEVICE_ID ); }static struct intel_uncore_ops icx_uncore_mmio_ops = {
@@ -5483,7 +5496,8 @@ static void icx_uncore_imc_freerunning_init_box(struct intel_uncore_box *box)int mem_offset = box->pmu->pmu_idx *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; -__snr_uncore_mmio_init_box (box,uncore_mmio_box_ctl (box), mem_offset); +snr_uncore_mmio_map (box,uncore_mmio_box_ctl (box), + mem_offset,SNR_MC_DEVICE_ID ); }static struct intel_uncore_ops icx_uncore_imc_freerunning_ops = {
PATCH v4 14/16 perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids server
In reply to [email protected]From: Kan Liang <[email protected]>
Several free-running counters for IIO uncore blocks are supported on Sapphire Rapids server.
They are not enumerated in the discovery tables. Extend generic_init_uncores() to support extra uncore types. The uncore types for the free-running counters is inserted right after the uncore types retrieved from the discovery table.
The number of the free-running counter boxes is calculated from the max number of the corresponding standard boxes.
--- arch/x86/events/intel/uncore_discovery.c | 10 +-- arch/x86/events/intel/uncore_discovery.h | 2 +- arch/x86/events/intel/uncore_snbep.c | 135 +++++++++++++++++++++++++++++-- 3 files changed, 136 insertions(+), 11 deletions(-)
arch/x86/events/intel/uncore_discovery.c +5 -5
@@ -569,7 +569,7 @@ static bool uncore_update_uncore_type(enum uncore_access_type type_id, }struct intel_uncore_type ** -intel_uncore_generic_init_uncores (enum uncore_access_type type_id) +intel_uncore_generic_init_uncores (enum uncore_access_type type_id,int num_extra) {struct intel_uncore_discovery_type *type;struct intel_uncore_type **uncores;
@@ -577,7 +577,7 @@ intel_uncore_generic_init_uncores(enum uncore_access_type type_id)struct rb_node *node;int i =0 ; - uncores =kcalloc (num_discovered_types[type_id] +1 , + uncores =kcalloc (num_discovered_types[type_id] + num_extra +1 ,sizeof (struct intel_uncore_type *),GFP_KERNEL );if (!uncores)return empty_uncore;
@@ -606,17 +606,17 @@ intel_uncore_generic_init_uncores(enum uncore_access_type type_id)void intel_uncore_generic_uncore_cpu_init (void ) { - uncore_msr_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MSR ); + uncore_msr_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MSR ,0 ); }int intel_uncore_generic_uncore_pci_init (void ) { - uncore_pci_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_PCI ); + uncore_pci_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_PCI ,0 );return 0 ; }void intel_uncore_generic_uncore_mmio_init (void ) { - uncore_mmio_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MMIO ); + uncore_mmio_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MMIO ,0 ); }
arch/x86/events/intel/uncore_discovery.h +1 -1
@@ -149,4 +149,4 @@ u64 intel_generic_uncore_pci_read_counter(struct intel_uncore_box *box, struct perf_event *event);struct intel_uncore_type ** -intel_uncore_generic_init_uncores (enum uncore_access_type type_id); +intel_uncore_generic_init_uncores (enum uncore_access_type type_id,int num_extra);
arch/x86/events/intel/uncore_snbep.c +130 -5
176 lines not on this page · raw message
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids server
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: 0378c93a92e226d99f4672e66fe4c08ee7b19e2d Gitweb: https://git.kernel.org/tip/0378c93a92e226d99f4672e66fe4c08ee7b19e2d Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:38 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:41 +02:00
perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids server
Several free-running counters for IIO uncore blocks are supported on Sapphire Rapids server.
They are not enumerated in the discovery tables. Extend generic_init_uncores() to support extra uncore types. The uncore types for the free-running counters is inserted right after the uncore types retrieved from the discovery table.
The number of the free-running counter boxes is calculated from the max number of the corresponding standard boxes.
--- arch/x86/events/intel/uncore_discovery.c | 10 +- arch/x86/events/intel/uncore_discovery.h | 2 +- arch/x86/events/intel/uncore_snbep.c | 135 +++++++++++++++++++++- 3 files changed, 136 insertions(+), 11 deletions(-)
arch/x86/events/intel/uncore_discovery.c +5 -5
@@ -569,7 +569,7 @@ static bool uncore_update_uncore_type(enum uncore_access_type type_id, }struct intel_uncore_type ** -intel_uncore_generic_init_uncores (enum uncore_access_type type_id) +intel_uncore_generic_init_uncores (enum uncore_access_type type_id,int num_extra) {struct intel_uncore_discovery_type *type;struct intel_uncore_type **uncores;
@@ -577,7 +577,7 @@ intel_uncore_generic_init_uncores(enum uncore_access_type type_id)struct rb_node *node;int i =0 ; - uncores =kcalloc (num_discovered_types[type_id] +1 , + uncores =kcalloc (num_discovered_types[type_id] + num_extra +1 ,sizeof (struct intel_uncore_type *),GFP_KERNEL );if (!uncores)return empty_uncore;
@@ -606,17 +606,17 @@ intel_uncore_generic_init_uncores(enum uncore_access_type type_id)void intel_uncore_generic_uncore_cpu_init (void ) { - uncore_msr_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MSR ); + uncore_msr_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MSR ,0 ); }int intel_uncore_generic_uncore_pci_init (void ) { - uncore_pci_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_PCI ); + uncore_pci_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_PCI ,0 );return 0 ; }void intel_uncore_generic_uncore_mmio_init (void ) { - uncore_mmio_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MMIO ); + uncore_mmio_uncores =intel_uncore_generic_init_uncores (UNCORE_ACCESS_MMIO ,0 ); }
arch/x86/events/intel/uncore_discovery.h +1 -1
@@ -149,4 +149,4 @@ u64 intel_generic_uncore_pci_read_counter(struct intel_uncore_box *box, struct perf_event *event);struct intel_uncore_type ** -intel_uncore_generic_init_uncores (enum uncore_access_type type_id); +intel_uncore_generic_init_uncores (enum uncore_access_type type_id,int num_extra);
arch/x86/events/intel/uncore_snbep.c +130 -5
176 lines not on this page · raw message
PATCH v4 15/16 perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids server
In reply to [email protected]From: Kan Liang <[email protected]>
Several free-running counters for IMC uncore blocks are supported on Sapphire Rapids server.
They are not enumerated in the discovery tables. The number of the free-running counter boxes is calculated from the number of corresponding standard boxes.
The snbep_pci2phy_map_init() is invoked to setup the mapping from a PCI BUS to a Die ID, which is used to locate the corresponding MC device of a IMC uncore unit in the spr_uncore_imc_freerunning_init_box().
--- arch/x86/events/intel/uncore_snbep.c | 66 +++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +65 -1
@@ -5595,6 +5595,7 @@ static struct intel_uncore_type spr_uncore_mdf = {#define UNCORE_SPR_NUM_UNCORE_TYPES 12#define UNCORE_SPR_IIO 1 +#define UNCORE_SPR_IMC 6static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox,
@@ -5691,12 +5692,65 @@ static struct intel_uncore_type spr_uncore_iio_free_running = { .format_group = &skx_uncore_iio_freerunning_format_group, }; +enum perf_uncore_spr_imc_freerunning_type_id { +SPR_IMC_DCLK , +SPR_IMC_PQ_CYCLES , + +SPR_IMC_FREERUNNING_TYPE_MAX , +}; + +static struct freerunning_counters spr_imc_freerunning[] = { + [SPR_IMC_DCLK ] = {0x22b0 ,0x0 ,0 ,1 ,48 }, + [SPR_IMC_PQ_CYCLES ] = {0x2318 ,0x8 ,0 ,2 ,48 }, +}; + +static struct uncore_event_desc spr_uncore_imc_freerunning_events[] = { +INTEL_UNCORE_EVENT_DESC (dclk,"event=0xff,umask=0x10" ), + +INTEL_UNCORE_EVENT_DESC (rpq_cycles,"event=0xff,umask=0x20" ), +INTEL_UNCORE_EVENT_DESC (wpq_cycles,"event=0xff,umask=0x21" ), + {/* end: all zeroes */ }, +}; + +#define SPR_MC_DEVICE_ID 0x3251 + +static void spr_uncore_imc_freerunning_init_box (struct intel_uncore_box *box) +{ +int mem_offset = box->pmu->pmu_idx *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; + +snr_uncore_mmio_map (box,uncore_mmio_box_ctl (box), + mem_offset,SPR_MC_DEVICE_ID ); +} + +static struct intel_uncore_ops spr_uncore_imc_freerunning_ops = { + .init_box = spr_uncore_imc_freerunning_init_box, + .exit_box = uncore_mmio_exit_box, + .read_counter = uncore_mmio_read_counter, + .hw_config = uncore_freerunning_hw_config, +}; + +static struct intel_uncore_type spr_uncore_imc_free_running = { + .name ="imc_free_running" , + .num_counters =3 , + .mmio_map_size =SNR_IMC_MMIO_SIZE , + .num_freerunning_types =SPR_IMC_FREERUNNING_TYPE_MAX , + .freerunning = spr_imc_freerunning, + .ops = &spr_uncore_imc_freerunning_ops, + .event_descs = spr_uncore_imc_freerunning_events, + .format_group = &skx_uncore_iio_freerunning_format_group, +}; +#define UNCORE_SPR_MSR_EXTRA_UNCORES 1 +#define UNCORE_SPR_MMIO_EXTRA_UNCORES 1static struct intel_uncore_type *spr_msr_uncores[UNCORE_SPR_MSR_EXTRA_UNCORES ] = { &spr_uncore_iio_free_running, }; +static struct intel_uncore_type *spr_mmio_uncores[UNCORE_SPR_MMIO_EXTRA_UNCORES ] = { + &spr_uncore_imc_free_running, +}; +static void uncore_type_customized_copy (struct intel_uncore_type *to_type,struct intel_uncore_type *from_type) {
@@ -5799,7 +5853,17 @@ int spr_uncore_pci_init(void)void spr_uncore_mmio_init (void ) { - uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO ,0 ,NULL ); +int ret =snbep_pci2phy_map_init (0x3250 ,SKX_CPUNODEID ,SKX_GIDNIDMAP , true); + +if (ret) + uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO ,0 ,NULL ); +else { + uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO , +UNCORE_SPR_MMIO_EXTRA_UNCORES , + spr_mmio_uncores); + + spr_uncore_imc_free_running.num_boxes =uncore_type_max_boxes (uncore_mmio_uncores,UNCORE_SPR_IMC ) /2 ; + } }/* end of SPR uncore support */
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids server
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: c76826a65f50038f050424365dbf3f97203f8710 Gitweb: https://git.kernel.org/tip/c76826a65f50038f050424365dbf3f97203f8710 Author: Kan Liang <[email protected]> AuthorDate: Wed, 30 Jun 2021 14:08:39 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:42 +02:00
perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids server
Several free-running counters for IMC uncore blocks are supported on Sapphire Rapids server.
They are not enumerated in the discovery tables. The number of the free-running counter boxes is calculated from the number of corresponding standard boxes.
The snbep_pci2phy_map_init() is invoked to setup the mapping from a PCI BUS to a Die ID, which is used to locate the corresponding MC device of a IMC uncore unit in the spr_uncore_imc_freerunning_init_box().
--- arch/x86/events/intel/uncore_snbep.c | 66 ++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore_snbep.c +65 -1
@@ -5753,6 +5753,7 @@ static struct intel_uncore_type spr_uncore_mdf = {#define UNCORE_SPR_NUM_UNCORE_TYPES 12#define UNCORE_SPR_IIO 1 +#define UNCORE_SPR_IMC 6static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES ] = { &spr_uncore_chabox,
@@ -5849,12 +5850,65 @@ static struct intel_uncore_type spr_uncore_iio_free_running = { .format_group = &skx_uncore_iio_freerunning_format_group, }; +enum perf_uncore_spr_imc_freerunning_type_id { +SPR_IMC_DCLK , +SPR_IMC_PQ_CYCLES , + +SPR_IMC_FREERUNNING_TYPE_MAX , +}; + +static struct freerunning_counters spr_imc_freerunning[] = { + [SPR_IMC_DCLK ] = {0x22b0 ,0x0 ,0 ,1 ,48 }, + [SPR_IMC_PQ_CYCLES ] = {0x2318 ,0x8 ,0 ,2 ,48 }, +}; + +static struct uncore_event_desc spr_uncore_imc_freerunning_events[] = { +INTEL_UNCORE_EVENT_DESC (dclk,"event=0xff,umask=0x10" ), + +INTEL_UNCORE_EVENT_DESC (rpq_cycles,"event=0xff,umask=0x20" ), +INTEL_UNCORE_EVENT_DESC (wpq_cycles,"event=0xff,umask=0x21" ), + {/* end: all zeroes */ }, +}; + +#define SPR_MC_DEVICE_ID 0x3251 + +static void spr_uncore_imc_freerunning_init_box (struct intel_uncore_box *box) +{ +int mem_offset = box->pmu->pmu_idx *ICX_IMC_MEM_STRIDE +SNR_IMC_MMIO_MEM0_OFFSET ; + +snr_uncore_mmio_map (box,uncore_mmio_box_ctl (box), + mem_offset,SPR_MC_DEVICE_ID ); +} + +static struct intel_uncore_ops spr_uncore_imc_freerunning_ops = { + .init_box = spr_uncore_imc_freerunning_init_box, + .exit_box = uncore_mmio_exit_box, + .read_counter = uncore_mmio_read_counter, + .hw_config = uncore_freerunning_hw_config, +}; + +static struct intel_uncore_type spr_uncore_imc_free_running = { + .name ="imc_free_running" , + .num_counters =3 , + .mmio_map_size =SNR_IMC_MMIO_SIZE , + .num_freerunning_types =SPR_IMC_FREERUNNING_TYPE_MAX , + .freerunning = spr_imc_freerunning, + .ops = &spr_uncore_imc_freerunning_ops, + .event_descs = spr_uncore_imc_freerunning_events, + .format_group = &skx_uncore_iio_freerunning_format_group, +}; +#define UNCORE_SPR_MSR_EXTRA_UNCORES 1 +#define UNCORE_SPR_MMIO_EXTRA_UNCORES 1static struct intel_uncore_type *spr_msr_uncores[UNCORE_SPR_MSR_EXTRA_UNCORES ] = { &spr_uncore_iio_free_running, }; +static struct intel_uncore_type *spr_mmio_uncores[UNCORE_SPR_MMIO_EXTRA_UNCORES ] = { + &spr_uncore_imc_free_running, +}; +static void uncore_type_customized_copy (struct intel_uncore_type *to_type,struct intel_uncore_type *from_type) {
@@ -5957,7 +6011,17 @@ int spr_uncore_pci_init(void)void spr_uncore_mmio_init (void ) { - uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO ,0 ,NULL ); +int ret =snbep_pci2phy_map_init (0x3250 ,SKX_CPUNODEID ,SKX_GIDNIDMAP , true); + +if (ret) + uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO ,0 ,NULL ); +else { + uncore_mmio_uncores =uncore_get_uncores (UNCORE_ACCESS_MMIO , +UNCORE_SPR_MMIO_EXTRA_UNCORES , + spr_mmio_uncores); + + spr_uncore_imc_free_running.num_boxes =uncore_type_max_boxes (uncore_mmio_uncores,UNCORE_SPR_IMC ) /2 ; + } }/* end of SPR uncore support */
PATCH v4 16/16 perf pmu: Add PMU alias support
In reply to [email protected]From: Kan Liang <[email protected]>
A perf uncore PMU may have two PMU names, a real name and an alias. The alias is exported at /sys/bus/event_source/devices/uncore_*/alias. The perf tool should support the alias as well.
Add alias_name in the struct perf_pmu to store the alias. For the PMU which doesn't have an alias. It's NULL.
Introduce two X86 specific functions to retrieve the real name and the alias separately.
Only go through the sysfs to retrieve the mapping between the real name and the alias once. The result is cached in a list, uncore_pmu_list.
Nothing changed for the other ARCHs.
With the patch, the perf tool can monitor the PMU with either the real name or the alias.
Use the real name,
$perf stat -e uncore_cha_2/event=1/ -x,
4044879584,,uncore_cha_2/event=1/,2528059205,100.00,,
Use the alias,
$perf stat -e uncore_type_0_2/event=1/ -x,
3659675336,,uncore_type_0_2/event=1/,2287306455,100.00,,
--- tools/perf/arch/x86/util/pmu.c | 129 ++++++++++++++++++++++++++++++++++++++++- tools/perf/util/parse-events.y | 4 +- tools/perf/util/pmu.c | 23 +++++++- tools/perf/util/pmu.h | 5 ++ 4 files changed, 156 insertions(+), 5 deletions(-)
tools/perf/arch/x86/util/pmu.c +128 -1
@@ -1,12 +1,28 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> - +#include <stdio.h> +#include <sys/types.h> +#include <dirent.h> +#include <fcntl.h> #include <linux/stddef.h> #include <linux/perf_event.h> +#include <linux/zalloc.h> +#include <api/fs/fs.h> #include "../../../util/intel-pt.h" #include "../../../util/intel-bts.h" #include "../../../util/pmu.h" +#include "../../../util/fncache.h" + +#define TEMPLATE_UNCORE_ALIAS "%s/bus/event_source/devices/%s/alias" + +struct perf_uncore_pmu_name { +char *name; +char *alias; +struct list_head list; +}; + +static LIST_HEAD (uncore_pmu_list);struct perf_event_attr *perf_pmu__get_default_config (struct perf_pmu *pmu__maybe_unused ) {
@@ -18,3 +34,114 @@ struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu __mayb#endif return NULL ; } + +static void setup_uncore_pmu_list (void ) +{ +char path[PATH_MAX ]; +DIR *dir; +struct dirent *dent; +const char *sysfs =sysfs__mountpoint (); +struct perf_uncore_pmu_name *pmu; +char buf[MAX_PMU_NAME_LEN ]; +FILE *file; +int size; + +if (!sysfs) +return ; + +snprintf (path,PATH_MAX , +"%s" EVENT_SOURCE_DEVICE_PATH , sysfs); + + dir =opendir (path); +if (!dir) +return ; + +while ((dent =readdir (dir))) { +if (!strcmp (dent->d_name,"." ) || + !strcmp (dent->d_name,".." ) || +strncmp (dent->d_name,"uncore_" ,7 )) +continue ; + +snprintf (path,PATH_MAX , +TEMPLATE_UNCORE_ALIAS , sysfs, dent->d_name); + +if (!file_available (path)) +continue ; + + file =fopen (path,"r" ); +if (!file) +continue ; + +memset (buf,0 ,sizeof (buf)); +if (!fread (buf,1 ,sizeof (buf), file)) +continue ; + + pmu =zalloc (sizeof (*pmu)); +if (!pmu) +continue ; + + size =strlen (buf) -1 ; + pmu->alias =zalloc (size); +if (!pmu->alias) { +free (pmu); +continue ; + } +strncpy (pmu->alias, buf, size); + pmu->name =strdup (dent->d_name); +list_add_tail (&pmu->list, &uncore_pmu_list); + +fclose (file); + } + +closedir (dir); + +} + +static char *__pmu_find_real_name (const char *name) +{ +struct perf_uncore_pmu_name *pmu; + +/* +* The template of the uncore alias is uncore_type_* +* Only find the real name for the uncore alias. +*/ +if (strncmp (name,"uncore_type_" ,12 )) +return strdup (name); + +list_for_each_entry (pmu, &uncore_pmu_list, list) { +if (!strcmp (name, pmu->alias)) +return strdup (pmu->name); + } + +return strdup (name); +} + +char *pmu_find_real_name (const char *name) +{ +static bool cached_list; + +if (strncmp (name,"uncore_" ,7 )) +return strdup (name); + +if (cached_list) +return __pmu_find_real_name (name); + +setup_uncore_pmu_list (); + cached_list = true; + +return __pmu_find_real_name (name); +} + +char *pmu_find_alias_name (const char *name) +{ +struct perf_uncore_pmu_name *pmu; + +if (strncmp (name,"uncore_" ,7 )) +return NULL ; + +list_for_each_entry (pmu, &uncore_pmu_list, list) { +if (!strcmp (name, pmu->name)) +return strdup (pmu->alias); + } +return NULL ; +}
tools/perf/util/parse-events.y +3 -1
@@ -316,7 +316,9 @@ event_pmu_name opt_pmu_config if (!strncmp(name, "uncore_", 7) && strncmp($1, "uncore_", 7)) name += 7; - if (!fnmatch(pattern, name, 0)) { + + if (!fnmatch(pattern, name, 0) || + (pmu->alias_name && !fnmatch(pattern, pmu->alias_name, 0))) { if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false))
tools/perf/util/pmu.c +20 -3
@@ -921,13 +921,28 @@ static int pmu_max_precise(const char *name)return max_precise; } -static struct perf_pmu *pmu_lookup (const char *name) +char *__weak +pmu_find_real_name (const char *name) +{ +return strdup (name); +} + +char *__weak +pmu_find_alias_name (const char *name__maybe_unused ) +{ +return NULL ; +} + +static struct perf_pmu *pmu_lookup (const char *lookup_name) {struct perf_pmu *pmu; +char *name;LIST_HEAD (format);LIST_HEAD (aliases);__u32 type; + name =pmu_find_real_name (lookup_name); +/* * The pmu data we store & need consists of the pmu * type value and format definitions. Load both right
@@ -950,7 +965,8 @@ static struct perf_pmu *pmu_lookup(const char *name)return NULL ; pmu->cpus =pmu_cpumask (name); - pmu->name =strdup (name); + pmu->name = name; + pmu->alias_name =pmu_find_alias_name (name); pmu->type = type; pmu->is_uncore =pmu_is_uncore (name);if (pmu->is_uncore)
@@ -980,7 +996,8 @@ static struct perf_pmu *pmu_find(const char *name)struct perf_pmu *pmu;list_for_each_entry (pmu, &pmus, list) -if (!strcmp (pmu->name, name)) +if (!strcmp (pmu->name, name) || + (pmu->alias_name && !strcmp (pmu->alias_name, name)))return pmu;return NULL ;
tools/perf/util/pmu.h +5 -0
@@ -21,6 +21,7 @@ enum {#define PERF_PMU_FORMAT_BITS 64#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus" +#define MAX_PMU_NAME_LEN 128struct perf_event_attr ;
@@ -32,6 +33,7 @@ struct perf_pmu_caps {struct perf_pmu {char *name; +char *alias_name;/* PMU alias name */ char *id;__u32 type;bool selectable;
@@ -134,4 +136,7 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,bool perf_pmu__has_hybrid (void ); +char *pmu_find_real_name (const char *name); +char *pmu_find_alias_name (const char *name); +#endif /* __PMU_H */
Signature · 1 line
2.7.4