[next-6.6] Intel: Backport SPR/EMR CXL and HBM perfmon support to kernel 6.6 · Pull Request !200 · OpenCloudOS/OpenCloudOS-Kernel

Some unknown uncore PMON types(like /sys/devices/uncore_type__) can be found in both SPR(Sapphire Rapids, 4th Gen Xeon) and EMR(Emerald Rapids, 5th Gen Xeon) that has built-in HBM or CXL devices available.

The unknown PMON types are HBM and CXL PMON. Except for the name, the other information regarding the HBM and CXL PMON counters can be retrieved via the discovery table. Enable them for SPR and EMR.

The first 7 patches update the generic support of the discovery table. The last patch enables the HBM and CXL PMON uncore counters for SPR and EMR.

Upstream commits from v6.11-rc1:
f8a86a9bb5f7 perf/x86/intel/uncore: Support HBM and CXL PMON counters
15a4bd51853b perf/x86/uncore: Cleanup unused unit structure
f76a8420444b perf/x86/uncore: Apply the unit control RB tree to PCI uncore units
b1d9ea2e1ca4 perf/x86/uncore: Apply the unit control RB tree to MSR uncore units
80580dae65b9 perf/x86/uncore: Apply the unit control RB tree to MMIO uncore units
585463fee642 perf/x86/uncore: Retrieve the unit ID from the unit control RB tree
c74443d92f68 perf/x86/uncore: Support per PMU cpumask
0007f3932592 perf/x86/uncore: Save the unit control address of all units

Test:
Before backport, on SPR or EMR that has HBM or CXL devices, there're "uncore_type_" devices available under "/sys/devices/".
After backport, on SPR or EMR that has HBM or CXL devices, there're "uncore_hbm_x" and/or "uncore{cxlcm,cxldp}_x" devices under "/sys/devices/", and cxl(uncore_cxlcm/cxldp) and/or hbm(cxl_hbm) perf events work fine with command like below:
```
perf stat -e uncore_cxlcm/event=0x1,umask=0x2/,uncore_cxlcm/event=0x1,umask=0x2/,uncore_cxlcm/event=0x1,umask=0x2/,uncore_cxlcm/event=0x1,umask=0x2/ -a --no-merge sleep 1
```
For cxldp, use event "uncore_cxldp/event=0x1,umask=0x1/". For hbm, use event "uncore_hbm/event=0x1,umask=0x0".

Note:
1. The backported patches have no deviations from the mainline upstream version.
2. The backported patches have been validated on Intel SPR/EMR servers.
3. The patch set only contains CXL/HBM perfmon support for SPR/EMR. Next Xeon Granite Rapids support is not included, and will be supported later with separated patch set.

类型	指派人员	状态
审查	chinaljp030 刘诗	已完成 (0/0人)
测试	chinaljp030 刘诗	已完成 (0/0人)

GVPOpenCloudOS/OpenCloudOS-Kernel

搜索帮助

GVP OpenCloudOS/OpenCloudOS-Kernel