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

!3150 Backport 5.10.189 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I8LICQ

Conflicts:

context confilict(1):  
b05031c2bca7: um/cpu: Switch to arch_cpu_finalize_init()

Already merged(13):
9b7fe7c6fbc0: tools headers cpufeatures: Sync with the kernel sources
073a28a9b506: x86/bugs: Increase the x86 bugs vector size to two u32s
34f23ba8a399: x86/cpu, kvm: Add support for CPUID_80000021_EAX
3f9b7101bea1: x86/srso: Add a Speculative RAS Overflow mitigation
df76a59feba5: x86/srso: Add IBPB_BRTYPE support
e47af0c255ae: x86/srso: Add SRSO_NO support
4acaea47e3bc: x86/srso: Add IBPB
384d41bea948: x86/srso: Add IBPB on VMEXIT
4873939c0e1c: x86/srso: Fix return thunks in generated code
8457fb5740b1: x86/srso: Tie SBPB bit setting to microcode patch detection
f9167a2d6b94: xen/netback: Fix buffer overrun triggered by unusual packet
7db4ddcb8d8e: x86/speculation: Add Kconfig option for GDS
675046878431: Documentation/x86: Fix backwards on/off logic about YMM support

Rejected(18):
e5eb18e164d0: x86/cpu: Switch to arch_cpu_finalize_init()
18fcd72da1ed: init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()
7a2f42bce9ab: x86/fpu: Remove cpuinfo argument from init functions
2462bc3ef061: x86/fpu: Mark init functions __init
4ae1cbb730bd: x86/fpu: Move FPU initialization into arch_cpu_finalize_init()
288a2f6bc1ce: x86/speculation: Add Gather Data Sampling mitigation
363c98f9cfa8: x86/speculation: Add force option to GDS mitigation
1ff14defdfc9: mm: Move mm_cachep initialization to mm_init()
baf6d6c39e23: x86/cpu: Add VM page flush MSR availablility as a CPUID feature
437fa179f213: x86/cpufeatures: Assign dedicated feature word for CPUID_0x8000001F[EAX]
2ae9a73819a7: x86: fix backwards merge of GDS/SRSO bit
bf2fa3a9d0e6: init: Remove check_bugs() leftovers
09658b81d158: init: Invoke arch_cpu_finalize_init() earlier
eb13cce48874: KVM: Add GDS_NO support to KVM
583016037a09: x86/xen: Fix secondary processors' FPU initialization
f076d0817878: x86/mm: fix poking_init() for Xen PV guests
6ee042fd240f: x86/mm: Use mm_alloc() in poking_init()
79972c2b95ec: x86/mm: Initialize text poking earlier

Total patches: 39 - 13 - 18 = 8 
 
Link:https://gitee.com/openeuler/kernel/pulls/3150

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e7f7d85f e349540d

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ config ARCH_HAS_DMA_SET_UNCACHED 
config ARCH_HAS_DMA_CLEAR_UNCACHED

	bool



config ARCH_HAS_CPU_FINALIZE_INIT

	bool



# Select if arch init_task must go in the __init_task_data section

config ARCH_TASK_STRUCT_ON_STACK

	bool

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM 
	default y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE

arch/arm/include/asm/bugs.h

+0 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 *  arch/arm/include/asm/bugs.h

 *

 *  Copyright (C) 1995-2003 Russell King

 */

#ifndef __ASM_BUGS_H
@@ -10,10 +8,8 @@ 
extern void check_writebuffer_bugs(void);



#ifdef CONFIG_MMU

extern void check_bugs(void);

extern void check_other_bugs(void);

#else

#define check_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#endif

arch/arm/kernel/bugs.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/init.h>

#include <linux/cpu.h>

#include <asm/bugs.h>

#include <asm/proc-fns.h>
@@ -11,7 +12,7 @@ void check_other_bugs(void) 
#endif

}



void __init check_bugs(void)

void __init arch_cpu_finalize_init(void)

{

	check_writebuffer_bugs();

	check_other_bugs();

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ menu "Processor type and features" 


config IA64

	bool

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_DMA_MARK_CLEAN

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO