Unverified Commit af481f24 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1315 Intel: Backport mainline UPI uncore discovery warning fixes for SPR MCC to OLK-5.10

Merge Pull Request from: @yunyingsun 
 
Title:
Backport mainline UPI uncore discovery warning fixes for SPR MCC to OLK-5.10

Content:
The discovery table of UPI on SPR MCC is broken. The broken discovery table triggers a kernel warning message on SPR MCC: “WARNING: CPU: xx PID: xx at arch/x86/events/intel/uncore_discovery.c:184  intel_uncore_has_discovery_tables+  ……”, which is overkilled. 

The backported patch series is to mitigate the issue by providing a hardcode pre-defined table, and it also refines the error handling code.

Commits from mainline kernel v6.3-rc1:
5d515ee4 perf/x86/uncore: Don't WARN_ON_ONCE() for a broken discovery table
65248a9a perf/x86/uncore: Add a quirk for UPI on SPR
bd9514a4 perf/x86/uncore: Ignore broken units in discovery table
3af548f2 perf/x86/uncore: Fix potential NULL pointer in uncore_get_alias_name
dbf061b2 perf/x86/uncore: Factor out uncore_device_to_die()

It has been verified on our SPR MCC(spreec01) that with the backported patches, the uncore related kernel warning and the call trace are not seen anymore.

Kernel issue:
https://gitee.com/openeuler/kernel/issues/I7H29Y

Test:
1. Before backport, with OLK-5.10 kernel on SPR MCC, below warning and call trace are seen in dmesg(with "dmesg | grep uncore"):
"“WARNING: CPU: xx PID: xx at arch/x86/events/intel/uncore_discovery.c:184  intel_uncore_has_discovery_tables+".

After backport, above warning and call trace are gone. Instead new uncore information prints are seen:
"[    6.801611] intel_uncore: Duplicate uncore type 3 box ID 7 is detected, Drop the duplicate uncore unit.
[    6.801638] intel_uncore: Duplicate uncore type 1 box ID 7 is detected, Drop the duplicate uncore unit.
[    6.801663] intel_uncore: Duplicate uncore type 2 box ID 7 is detected, Drop the duplicate uncore unit."

2. Before backport, there's no uncore_m3upi_x devices under /sys/devices/.
After backport, there're uncore_m3upi_1/2 available under /sys/devices/.

Known issue:
N/A

Default config change:
N/A 
 
Link:https://gitee.com/openeuler/kernel/pulls/1315

 

Reviewed-by: default avatarJun Tian <jun.j.tian@intel.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c5633a85 cab52da6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment