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

!3221 Backport x86 patches from upstream 5.10.189 

Merge Pull Request from: @allen-shi 
 
This PR is to backport x86 related patches from upstream 5.10.189.

Already merged(26):
f9167a2d6b94: xen/netback: Fix buffer overrun triggered by unusual packet
8457fb5740b1: x86/srso: Tie SBPB bit setting to microcode patch detection
4873939c0e1c: x86/srso: Fix return thunks in generated code
384d41bea948: x86/srso: Add IBPB on VMEXIT
4acaea47e3bc: x86/srso: Add IBPB
e47af0c255ae: x86/srso: Add SRSO_NO support
df76a59feba5: x86/srso: Add IBPB_BRTYPE support
3f9b7101bea1: x86/srso: Add a Speculative RAS Overflow mitigation
34f23ba8a399: x86/cpu, kvm: Add support for CPUID_80000021_EAX
073a28a9b506: x86/bugs: Increase the x86 bugs vector size to two u32s
9b7fe7c6fbc0: tools headers cpufeatures: Sync with the kernel sources
437fa179f213: x86/cpufeatures: Assign dedicated feature word for CPUID_0x8000001F[EAX]
baf6d6c39e23: x86/cpu: Add VM page flush MSR availablility as a CPUID feature
675046878431: Documentation/x86: Fix backwards on/off logic about YMM support
eb13cce48874: KVM: Add GDS_NO support to KVM
7db4ddcb8d8e: x86/speculation: Add Kconfig option for GDS
363c98f9cfa8: x86/speculation: Add force option to GDS mitigation
288a2f6bc1ce: x86/speculation: Add Gather Data Sampling mitigation
b05031c2bca7: um/cpu: Switch to arch_cpu_finalize_init()
2edb3b39ca79: sparc/cpu: Switch to arch_cpu_finalize_init()
3c45134b38b4: sh/cpu: Switch to arch_cpu_finalize_init()
75bb54c951e9: mips/cpu: Switch to arch_cpu_finalize_init()
1cd3fc18eb16: m68k/cpu: Switch to arch_cpu_finalize_init()
12d93c6c98d5: ia64/cpu: Switch to arch_cpu_finalize_init()
c0fff20d4efa: ARM: cpu: Switch to arch_cpu_finalize_init()
6e606e681873: init: Provide arch_cpu_finalize_init()

Rejected(1):
2ae9a73819a7: x86: fix backwards merge of GDS/SRSO bit
 _As this commit is conflict with the following two backported commits:_ 
358ebdef: x86/speculation: Add Gather Data Sampling mitigation
8105f71b: x86/srso: Add a Speculative RAS Overflow mitigation

Fixes(1):
4bc6a4fca1f0: x86/fpu: Set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4

KABI fix(1):
06345b79: kabi: Fix kabi breakage caused by c1e70ec4

Total patches: 39 - 26 - 1 + 2 = 14

 **Intel-Kernel Issue** 
[#I8LVBS](https://gitee.com/openeuler/intel-kernel/issues/I8LVBS)

 **Test** 
Built and run the kernel successfully.
Vulnerabilities info shows correctly with lscpu.

 **Known Issue** 
N/A
 
 
Link:https://gitee.com/openeuler/kernel/pulls/3221

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c2273fd8 06345b79

arch/alpha/include/asm/bugs.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 *  include/asm-alpha/bugs.h

 *

 *  Copyright (C) 1994  Linus Torvalds

 */



/*

 * This is included by init/main.c to check for architecture-dependent bugs.

 *

 * Needs:

 *	void check_bugs(void);

 */



/*

 * I don't know of any alpha bugs yet.. Nice chip

 */



static void check_bugs(void)

{

}

arch/parisc/include/asm/bugs.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  include/asm-parisc/bugs.h

 *

 *  Copyright (C) 1999	Mike Shaver

 */



/*

 * This is included by init/main.c to check for architecture-dependent bugs.

 *

 * Needs:

 *	void check_bugs(void);

 */



#include <asm/processor.h>



static inline void check_bugs(void)

{

//	identify_cpu(&boot_cpu_data);

}

arch/powerpc/include/asm/bugs.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _ASM_POWERPC_BUGS_H

#define _ASM_POWERPC_BUGS_H



/*

 */



/*

 * This file is included by 'init/main.c' to check for

 * architecture-dependent bugs.

 */



static inline void check_bugs(void) { }



#endif	/* _ASM_POWERPC_BUGS_H */

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config X86 
	select ARCH_32BIT_OFF_T			if X86_32

	select ARCH_CLOCKSOURCE_INIT

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE	if !X86_PAE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

arch/x86/include/asm/bugs.h

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


#include <asm/processor.h>



extern void check_bugs(void);



#if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_32)

int ppro_with_ram_bug(void);

#else