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

arch/x86/include/asm/cpufeature.h

+5 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ enum cpuid_leafs 
	CPUID_7_ECX,

	CPUID_8000_0007_EBX,

	CPUID_7_EDX,

	CPUID_8000_0021_EAX,

};



#ifdef CONFIG_X86_FEATURE_NAMES
@@ -89,8 +90,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) ||	\

	   REQUIRED_MASK_CHECK					  ||	\

	   BUILD_BUG_ON_ZERO(NCAPINTS != 19))

	   BUILD_BUG_ON_ZERO(NCAPINTS != 20))



#define DISABLED_MASK_BIT_SET(feature_bit)				\

	 ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK,  0, feature_bit) ||	\
@@ -112,8 +114,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) ||	\

	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) ||	\

	   DISABLED_MASK_CHECK					  ||	\

	   BUILD_BUG_ON_ZERO(NCAPINTS != 19))

	   BUILD_BUG_ON_ZERO(NCAPINTS != 20))



#define cpu_has(c, bit)							\

	(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :	\

arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
/*

 * Defines x86 CPU feature bits

 */

#define NCAPINTS			19     /* N 32-bit words worth of info */

#define NCAPINTS			20	   /* N 32-bit words worth of info */

#define NBUGINTS			2	   /* N 32-bit bug flags */



/*

arch/x86/include/asm/disabled-features.h

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
			 DISABLE_ENQCMD)

#define DISABLED_MASK17	0

#define DISABLED_MASK18	0

#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

#define DISABLED_MASK19	0

#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 20)



#endif /* _ASM_X86_DISABLED_FEATURES_H */

arch/x86/include/asm/required-features.h

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#define REQUIRED_MASK16	0

#define REQUIRED_MASK17	0

#define REQUIRED_MASK18	0

#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

#define REQUIRED_MASK19	0

#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 20)



#endif /* _ASM_X86_REQUIRED_FEATURES_H */

arch/x86/kernel/cpu/common.c

+3 −0
Original line number Diff line number Diff line
@@ -963,6 +963,9 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
	if (c->extended_cpuid_level >= 0x8000000a)

		c->x86_capability[CPUID_8000_000A_EDX] = cpuid_edx(0x8000000a);



	if (c->extended_cpuid_level >= 0x80000021)

		c->x86_capability[CPUID_8000_0021_EAX] = cpuid_eax(0x80000021);



	init_scattered_cpuid_features(c);

	init_speculation_control(c);