Unverified Commit 5e8b8205 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6161 Backport 5.10.203 LTS patches from upstream 

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

Conflicts:
Already merged(3):
f78d0f301395  ravb: Fix races between ravb_tx_timeout_work() and net related ops
ac65f8979b0e  RDMA/irdma: Prevent zero-length STAG registration
772fe1da9a8d  ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet

Rejected(5):
86a7f67d7605  nvmet: remove unnecessary ctrl parameter
2be451e7a2f1  nvmet: nul-terminate the NQNs passed in the connect command
aa6568033cfb  ext4: using nofail preallocation in ext4_es_remove_extent()
10341e77e49f  ext4: fix slab-use-after-free in ext4_es_insert_extent()
ec75d1d0cd2c  ext4: make sure allocate pending entry not fail

Kabi broken(2):
2df04d76c97d  driver core: Move the "removable" attribute from USB to core
8d4237a149e3  drm/amdgpu: don't use ATRM for external devices

Total patches: 125 - 3 - 5 - 2 = 115 
 
Link:https://gitee.com/openeuler/kernel/pulls/6161

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f356a9b6 807676b4

arch/arm/xen/enlighten.c

+2 −1
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ static int __init xen_guest_init(void) 
	 * for secondary CPUs as they are brought up.

	 * For uniformity we use VCPUOP_register_vcpu_info even on cpu0.

	 */

	xen_vcpu_info = alloc_percpu(struct vcpu_info);

	xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),

				       1 << fls(sizeof(struct vcpu_info) - 1));

	if (xen_vcpu_info == NULL)

		return -ENOMEM;

arch/mips/kvm/mmu.c

+1 −2
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, 
	gfn_t gfn = gpa >> PAGE_SHIFT;

	int srcu_idx, err;

	kvm_pfn_t pfn;

	pte_t *ptep, entry, old_pte;

	pte_t *ptep, entry;

	bool writeable;

	unsigned long prot_bits;

	unsigned long mmu_seq;
@@ -664,7 +664,6 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, 
	entry = pfn_pte(pfn, __pgprot(prot_bits));



	/* Write the PTE */

	old_pte = *ptep;

	set_pte(ptep, entry);



	err = 0;

arch/parisc/include/uapi/asm/errno.h

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 


/* We now return you to your regularly scheduled HPUX. */



#define ENOSYM		215	/* symbol does not exist in executable */

#define	ENOTSOCK	216	/* Socket operation on non-socket */

#define	EDESTADDRREQ	217	/* Destination address required */

#define	EMSGSIZE	218	/* Message too long */
@@ -101,7 +100,6 @@ 
#define	ETIMEDOUT	238	/* Connection timed out */

#define	ECONNREFUSED	239	/* Connection refused */

#define	EREFUSED	ECONNREFUSED	/* for HP's NFS apparently */

#define	EREMOTERELEASE	240	/* Remote peer released connection */

#define	EHOSTDOWN	241	/* Host is down */

#define	EHOSTUNREACH	242	/* No route to host */

arch/powerpc/kernel/fpu.S

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ 
#include <asm/feature-fixups.h>



#ifdef CONFIG_VSX

#define __REST_1FPVSR(n,c,base)						\

BEGIN_FTR_SECTION							\

	b	2f;							\

END_FTR_SECTION_IFSET(CPU_FTR_VSX);					\

	REST_FPR(n,base);						\

	b	3f;							\

2:	REST_VSR(n,c,base);						\

3:



#define __REST_32FPVSRS(n,c,base)					\

BEGIN_FTR_SECTION							\

	b	2f;							\
@@ -41,9 +50,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); \ 
2:	SAVE_32VSRS(n,c,base);						\

3:

#else

#define __REST_1FPVSR(n,b,base)		REST_FPR(n, base)

#define __REST_32FPVSRS(n,b,base)	REST_32FPRS(n, base)

#define __SAVE_32FPVSRS(n,b,base)	SAVE_32FPRS(n, base)

#endif

#define REST_1FPVSR(n,c,base)   __REST_1FPVSR(n,__REG_##c,__REG_##base)

#define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)

#define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
@@ -67,6 +78,7 @@ _GLOBAL(store_fp_state) 
	SAVE_32FPVSRS(0, R4, R3)

	mffs	fr0

	stfd	fr0,FPSTATE_FPSCR(r3)

	REST_1FPVSR(0, R4, R3)

	blr

EXPORT_SYMBOL(store_fp_state)
@@ -132,4 +144,5 @@ _GLOBAL(save_fpu) 
2:	SAVE_32FPVSRS(0, R4, R6)

	mffs	fr0

	stfd	fr0,FPSTATE_FPSCR(r6)

	REST_1FPVSR(0, R4, R6)

	blr

arch/powerpc/kernel/vector.S

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ _GLOBAL(store_vr_state) 
	mfvscr	v0

	li	r4, VRSTATE_VSCR

	stvx	v0, r4, r3

	lvx	v0, 0, r3

	blr

EXPORT_SYMBOL(store_vr_state)
@@ -104,6 +105,7 @@ _GLOBAL(save_altivec) 
	mfvscr	v0

	li	r4,VRSTATE_VSCR

	stvx	v0,r4,r7

	lvx	v0,0,r7

	blr



#ifdef CONFIG_VSX