Commit 6c0893ee authored by Kim Phillips's avatar Kim Phillips Committed by Jialin Zhang
Browse files

x86/cpu, kvm: Add support for CPUID_80000021_EAX

stable inclusion
from stable-v5.10.189
commit 34f23ba8a399ecd38b45c84da257b91d278e88aa
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7RQ67
CVE: CVE-2023-20569

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



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

commit 8415a748 upstream.

Add support for CPUID leaf 80000021, EAX. The majority of the features will be
used in the kernel and thus a separate leaf is appropriate.

Include KVM's reverse_cpuid entry because features are used by VM guests, too.

  [ bp: Massage commit message. ]

Signed-off-by: default avatarKim Phillips <kim.phillips@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20230124163319.2277355-2-kim.phillips@amd.com


[bwh: Backported to 6.1: adjust context]
Signed-off-by: default avatarBen Hutchings <benh@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

 Conflicts:
	arch/x86/include/asm/cpufeature.h
	arch/x86/include/asm/cpufeatures.h
	arch/x86/include/asm/disabled-features.h
	arch/x86/include/asm/required-features.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kvm/cpuid.h

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent bd3c6fdb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment