Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60709c09 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: merge stable fix into main nfsd branch

parents 7323f0d2 0839ffb8

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -10195,7 +10195,6 @@ F: drivers/media/tuners/qt1010* 
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER

M:	QCA ath9k Development <ath9k-devel@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath9k

S:	Supported

F:	drivers/net/wireless/ath/ath9k/
@@ -13066,7 +13065,7 @@ F: drivers/input/serio/userio.c 
F:	include/uapi/linux/userio.h



VIRTIO CONSOLE DRIVER

M:	Amit Shah <amit.shah@redhat.com>

M:	Amit Shah <amit@kernel.org>

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/char/virtio_console.c

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -797,7 +797,7 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) 
KBUILD_ARFLAGS := $(call ar-option,D)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif

arch/arm64/crypto/aes-modes.S

+42 −46
Original line number Diff line number Diff line
@@ -193,15 +193,16 @@ AES_ENTRY(aes_cbc_encrypt) 
	cbz		w6, .Lcbcencloop



	ld1		{v0.16b}, [x5]			/* get iv */

	enc_prepare	w3, x2, x5

	enc_prepare	w3, x2, x6



.Lcbcencloop:

	ld1		{v1.16b}, [x1], #16		/* get next pt block */

	eor		v0.16b, v0.16b, v1.16b		/* ..and xor with iv */

	encrypt_block	v0, w3, x2, x5, w6

	encrypt_block	v0, w3, x2, x6, w7

	st1		{v0.16b}, [x0], #16

	subs		w4, w4, #1

	bne		.Lcbcencloop

	st1		{v0.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_encrypt)
@@ -211,7 +212,7 @@ AES_ENTRY(aes_cbc_decrypt) 
	cbz		w6, .LcbcdecloopNx



	ld1		{v7.16b}, [x5]			/* get iv */

	dec_prepare	w3, x2, x5

	dec_prepare	w3, x2, x6



.LcbcdecloopNx:

#if INTERLEAVE >= 2
@@ -248,7 +249,7 @@ AES_ENTRY(aes_cbc_decrypt) 
.Lcbcdecloop:

	ld1		{v1.16b}, [x1], #16		/* get next ct block */

	mov		v0.16b, v1.16b			/* ...and copy to v0 */

	decrypt_block	v0, w3, x2, x5, w6

	decrypt_block	v0, w3, x2, x6, w7

	eor		v0.16b, v0.16b, v7.16b		/* xor with iv => pt */

	mov		v7.16b, v1.16b			/* ct is next iv */

	st1		{v0.16b}, [x0], #16
@@ -256,6 +257,7 @@ AES_ENTRY(aes_cbc_decrypt) 
	bne		.Lcbcdecloop

.Lcbcdecout:

	FRAME_POP

	st1		{v7.16b}, [x5]			/* return iv */

	ret

AES_ENDPROC(aes_cbc_decrypt)
@@ -267,24 +269,15 @@ AES_ENDPROC(aes_cbc_decrypt) 


AES_ENTRY(aes_ctr_encrypt)

	FRAME_PUSH

	cbnz		w6, .Lctrfirst		/* 1st time around? */

	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x5, x5

#if INTERLEAVE >= 2

	cmn		w5, w4			/* 32 bit overflow? */

	bcs		.Lctrinc

	add		x5, x5, #1		/* increment BE ctr */

	b		.LctrincNx

#else

	b		.Lctrinc

#endif

.Lctrfirst:

	cbz		w6, .Lctrnotfirst	/* 1st time around? */

	enc_prepare	w3, x2, x6

	ld1		{v4.16b}, [x5]

	umov		x5, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x5, x5



.Lctrnotfirst:

	umov		x8, v4.d[1]		/* keep swabbed ctr in reg */

	rev		x8, x8

#if INTERLEAVE >= 2

	cmn		w5, w4			/* 32 bit overflow? */

	cmn		w8, w4			/* 32 bit overflow? */

	bcs		.Lctrloop

.LctrloopNx:

	subs		w4, w4, #INTERLEAVE
@@ -292,11 +285,11 @@ AES_ENTRY(aes_ctr_encrypt) 
#if INTERLEAVE == 2

	mov		v0.8b, v4.8b

	mov		v1.8b, v4.8b

	rev		x7, x5

	add		x5, x5, #1

	rev		x7, x8

	add		x8, x8, #1

	ins		v0.d[1], x7

	rev		x7, x5

	add		x5, x5, #1

	rev		x7, x8

	add		x8, x8, #1

	ins		v1.d[1], x7

	ld1		{v2.16b-v3.16b}, [x1], #32	/* get 2 input blocks */

	do_encrypt_block2x
@@ -305,7 +298,7 @@ AES_ENTRY(aes_ctr_encrypt) 
	st1		{v0.16b-v1.16b}, [x0], #32

#else

	ldr		q8, =0x30000000200000001	/* addends 1,2,3[,0] */

	dup		v7.4s, w5

	dup		v7.4s, w8

	mov		v0.16b, v4.16b

	add		v7.4s, v7.4s, v8.4s

	mov		v1.16b, v4.16b
@@ -323,18 +316,12 @@ AES_ENTRY(aes_ctr_encrypt) 
	eor		v2.16b, v7.16b, v2.16b

	eor		v3.16b, v5.16b, v3.16b

	st1		{v0.16b-v3.16b}, [x0], #64

	add		x5, x5, #INTERLEAVE

	add		x8, x8, #INTERLEAVE

#endif

	cbz		w4, .LctroutNx

.LctrincNx:

	rev		x7, x5

	rev		x7, x8

	ins		v4.d[1], x7

	cbz		w4, .Lctrout

	b		.LctrloopNx

.LctroutNx:

	sub		x5, x5, #1

	rev		x7, x5

	ins		v4.d[1], x7

	b		.Lctrout

.Lctr1x:

	adds		w4, w4, #INTERLEAVE

	beq		.Lctrout
@@ -342,30 +329,39 @@ AES_ENTRY(aes_ctr_encrypt) 
.Lctrloop:

	mov		v0.16b, v4.16b

	encrypt_block	v0, w3, x2, x6, w7



	adds		x8, x8, #1		/* increment BE ctr */

	rev		x7, x8

	ins		v4.d[1], x7

	bcs		.Lctrcarry		/* overflow? */



.Lctrcarrydone:

	subs		w4, w4, #1

	bmi		.Lctrhalfblock		/* blocks < 0 means 1/2 block */

	ld1		{v3.16b}, [x1], #16

	eor		v3.16b, v0.16b, v3.16b

	st1		{v3.16b}, [x0], #16

	beq		.Lctrout

.Lctrinc:

	adds		x5, x5, #1		/* increment BE ctr */

	rev		x7, x5

	ins		v4.d[1], x7

	bcc		.Lctrloop		/* no overflow? */

	umov		x7, v4.d[0]		/* load upper word of ctr  */

	rev		x7, x7			/* ... to handle the carry */

	add		x7, x7, #1

	rev		x7, x7

	ins		v4.d[0], x7

	b		.Lctrloop

	bne		.Lctrloop



.Lctrout:

	st1		{v4.16b}, [x5]		/* return next CTR value */

	FRAME_POP

	ret



.Lctrhalfblock:

	ld1		{v3.8b}, [x1]

	eor		v3.8b, v0.8b, v3.8b

	st1		{v3.8b}, [x0]

.Lctrout:

	FRAME_POP

	ret



.Lctrcarry:

	umov		x7, v4.d[0]		/* load upper word of ctr  */

	rev		x7, x7			/* ... to handle the carry */

	add		x7, x7, #1

	rev		x7, x7

	ins		v4.d[0], x7

	b		.Lctrcarrydone

AES_ENDPROC(aes_ctr_encrypt)

	.ltorg

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ config PPC 
	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_KERNEL_GZIP

	select HAVE_CC_STACKPROTECTOR



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN
@@ -484,6 +483,7 @@ config RELOCATABLE 
	bool "Build a relocatable kernel"

	depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))

	select NONSTATIC_KERNEL

	select MODULE_REL_CRCS if MODVERSIONS

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at. For ppc32, there is no any

arch/powerpc/include/asm/cpu_has_feature.h

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ static __always_inline bool cpu_has_feature(unsigned long feature) 
{

	int i;



#ifndef __clang__ /* clang can't cope with this */

	BUILD_BUG_ON(!__builtin_constant_p(feature));

#endif



#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG

	if (!static_key_initialized) {