Intel SPR: Adding uncore PMU support to openEuler-22.09 · Pull Request !82 · openEuler/kernel

This patch set is to add uncore PMU support for Intel Sapphire Rapids platform.
It includes generic uncore discovery support and SPR specific uncore event support.

1. Generic uncore discovery support contains:

a) Feature patches from upstream 5.13-rc1(5 commits):
c4c55e362a52 perf/x86/intel/uncore: Generic support for the MMIO type of uncore blocks
42839ef4a20a perf/x86/intel/uncore: Generic support for the PCI type of uncore blocks
6477dc393477 perf/x86/intel/uncore: Rename uncore_notifier to uncore_pci_sub_notifier
d6c754130435 perf/x86/intel/uncore: Generic support for the MSR type of uncore blocks
edae1f06c2cd perf/x86/intel/uncore: Parse uncore discovery tables

b) To fix rb_find/rb_add implicit declaration errors, adding rbtree helper patches(v5.12-rc1, 7 commits):
798172b1374e rbtree, timerqueue: Use rb_add_cached()
5a7987253ef0 rbtree, rtmutex: Use rb_add_cached()
a905e84e6408 rbtree, uprobes: Use rbtree helpers
a3b89864554b rbtree, perf: Use new rbtree helpers
8ecca39483ed rbtree, sched/deadline: Use rb_add_cached()
bf9be9a163b4 rbtree, sched/fair: Use rb_add_cached()
2d24dd5798d0 rbtree: Add generic add and find helpers

c) To fix error(too few arguments to function ‘uncore_pci_pmu_register’), add dependent patches(5.12-rc1, 2):
9a7832ce3d92 perf/x86/intel/uncore: With > 8 nodes, get pci bus die id from NUMA info
ba9506be4e40 perf/x86/intel/uncore: Store the logical die id instead of the physical die id.

2. SPR platform specific uncore support contains:

a) Feature upstream patches from mainline v5.15-rc1(15 commits):
c76826a65f50 perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids server
0378c93a92e2 perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids server
1583971b5cb8 perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()
8053f2d752e2 perf/x86/intel/uncore: Add alias PMU name
0d771caf7284 perf/x86/intel/uncore: Add Sapphire Rapids server MDF support
2a8e51eae7c8 perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support
da5a9156cd2a perf/x86/intel/uncore: Add Sapphire Rapids server UPI support
f57191edaaeb perf/x86/intel/uncore: Add Sapphire Rapids server M2M support
85f2e30f987e perf/x86/intel/uncore: Add Sapphire Rapids server IMC support
0654dfdc7e1c perf/x86/intel/uncore: Add Sapphire Rapids server PCU support
f85ef898f884 perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support
e199eb513159 perf/x86/intel/uncore: Add Sapphire Rapids server IRP support
3ba7095beaec perf/x86/intel/uncore: Add Sapphire Rapids server IIO support
949b11381f81 perf/x86/intel/uncore: Add Sapphire Rapids server CHA support
c54c53d9921a perf/x86/intel/uncore: Add Sapphire Rapids server framework

b) Two SPR model name related changes to make above patches apply cleanly(2 commits):
(5.14-rc2) 28188cc461f6 x86/cpu: Fix core name for Sapphire Rapids
(5.13-rc1) 53375a5a218e x86/cpu: Resort and comment Intel models

c) Some SPR uncore related bugfixes(6 commits):
v5.16-rc1: 
4034fb207e30 perf/x86/intel/uncore: Fix Intel SPR M3UPI event constraints
f01d7d558e18 perf/x86/intel/uncore: Fix Intel SPR M2PCIE event constraints
67c5d44384f8 perf/x86/intel/uncore: Fix Intel SPR IIO event constraints
9d756e408e08 perf/x86/intel/uncore: Fix Intel SPR CHA event constraints
e2bb9fab08cb perf/x86/intel/uncore: Fix invalid unit check
v5.13-rc6: 
4a0e3ff30980 perf/x86/intel/uncore: Fix a kernel WARNING triggered by maxcpus=1

Intel-kernel issue:
https://gitee.com/openeuler/intel-kernel/issues/I5BECO

Test:
With this patch set, on SPR:

```
# cat /sys/devices/uncore_cha_1/alias
uncore_type_0_1
# perf stat -a -e uncore_imc_0/event=0x1/ -- sleep 1

Performance counter stats for 'system wide':

2,407,096,566      uncore_imc_0/event=0x1/

1.002850766 seconds time elapsed
# perf stat -a -e uncore_imc_free_running_0/rpq_cycles/ -- sleep 1

Performance counter stats for 'system wide':

13,879,446      uncore_imc_free_running_0/rpq_cycles/

1.002852701 seconds time elapsed
```
Without this patch set, the "uncore_cha_1" like devices are not available under /sys/devices, and the above like uncore events will be "not supported".

Known issue:
N/A

Default config change:
N/A

GVPopenEuler/kernel

搜索帮助

GVP openEuler/kernel