Skip to content

perf: Add Sapphire Rapids server uncore support

[email protected] lkml 4 versions – Applied

Status from this message: The following commit has been merged into the perf/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest16 patches 0 repliesApplied
  2. v36 patches 9 repliesSuperseded
  3. v26 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v17 patches25 repliesSuperseded

Changes in v4 from the cover letter

- 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.

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/16perf/x86/intel/uncore: Add Sapphire Rapids server frameworkarch/x86/events/intel/uncore.c arch/x86/events/intel/uncore.h arch/x86/events/intel/uncore_discovery.c +2 more+116 -50 replies
2/16perf/x86/intel/uncore: Add Sapphire Rapids server CHA supportarch/x86/events/intel/uncore_discovery.c arch/x86/events/intel/uncore_discovery.h arch/x86/events/intel/uncore_snbep.c+96 -40 replies
3/16perf/x86/intel/uncore: Add Sapphire Rapids server IIO supportarch/x86/events/intel/uncore_snbep.c+8 -10 replies
4/16perf/x86/intel/uncore: Add Sapphire Rapids server IRP supportarch/x86/events/intel/uncore_snbep.c+26 -10 replies
5/16perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe supportarch/x86/events/intel/uncore_snbep.c+6 -10 replies
6/16perf/x86/intel/uncore: Add Sapphire Rapids server PCU supportarch/x86/events/intel/uncore_snbep.c+5 -10 replies
7/16perf/x86/intel/uncore: Add Sapphire Rapids server IMC supportarch/x86/events/intel/uncore_discovery.c arch/x86/events/intel/uncore_discovery.h arch/x86/events/intel/uncore_snbep.c+45 -60 replies
8/16perf/x86/intel/uncore: Add Sapphire Rapids server M2M supportarch/x86/events/intel/uncore_discovery.c arch/x86/events/intel/uncore_discovery.h arch/x86/events/intel/uncore_snbep.c+44 -80 replies
9/16perf/x86/intel/uncore: Add Sapphire Rapids server UPI supportarch/x86/events/intel/uncore_snbep.c+6 -10 replies
10/16perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI supportarch/x86/events/intel/uncore_snbep.c+6 -10 replies
11/16perf/x86/intel/uncore: Add Sapphire Rapids server MDF supportarch/x86/events/intel/uncore_snbep.c+6 -10 replies
12/16perf/x86/intel/uncore: Add alias PMU nameDocumentation/ABI/testing/sysfs-bus-event_source-devices-uncore arch/x86/events/intel/uncore.c arch/x86/events/intel/uncore.h +1 more+54 -70 replies
13/16perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()arch/x86/events/intel/uncore_snbep.c+25 -110 replies
14/16perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids serverarch/x86/events/intel/uncore_discovery.c arch/x86/events/intel/uncore_discovery.h arch/x86/events/intel/uncore_snbep.c+136 -110 replies
15/16perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids serverarch/x86/events/intel/uncore_snbep.c+65 -10 replies
16/16perf pmu: Add PMU alias supporttools/perf/arch/x86/util/pmu.c tools/perf/util/parse-events.y tools/perf/util/pmu.c +1 more+156 -50 replies

Reviews trailers per patch

All 16 patches have a Reviewed-by or Acked-by.

PatchAndi Kleen
1/16R-b
2/16R-b
3/16R-b
4/16R-b
5/16R-b
6/16R-b
7/16R-b
8/16R-b
9/16R-b
10/16R-b
11/16R-b
12/16R-b
13/16R-b
14/16R-b
15/16R-b
16/16R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH V4 00/16] 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