Commit af05d8ef authored by Kan Liang's avatar Kan Liang Committed by Lipeng Sang
Browse files

perf/x86/intel: Add Cooper Lake stepping to isolation_ucodes[] 

stable inclusion
from stable-v5.10.154
commit 29d106d086d2f39f8635f402004d1c17a6205583
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=29d106d086d2f39f8635f402004d1c17a6205583



--------------------------------

commit 6f8faf47 upstream.

The intel_pebs_isolation quirk checks both model number and stepping.
Cooper Lake has a different stepping (11) than the other Skylake Xeon.
It cannot benefit from the optimization in commit 9b545c04
("perf/x86/kvm: Avoid unnecessary work in guest filtering").

Add the stepping of Cooper Lake into the isolation_ucodes[] table.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20221031154550.571663-1-kan.liang@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 6a9a09a5

arch/x86/events/intel/core.c

+1 −0
Original line number Diff line number Diff line
@@ -4659,6 +4659,7 @@ static const struct x86_cpu_desc isolation_ucodes[] = { 
	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 5, 0x00000000),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 6, 0x00000000),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 7, 0x00000000),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		11, 0x00000000),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L,		 3, 0x0000007c),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE,		 3, 0x0000007c),

	INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,		 9, 0x0000004e),