Commit 51647156 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libcrypto-fixes-for-linus' of... 

Merge tag 'libcrypto-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

Pull crypto library fixes from Eric Biggers:

 - Fix a performance issue with the scoped_ksimd() macro (new in 6.19)
   where it unnecessarily initialized the entire fpsimd state.

 - Add a missing gitignore entry for a generated file added in 6.18.

* tag 'libcrypto-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: riscv: Add poly1305-core.S to .gitignore
  arm64/simd: Avoid pointless clearing of FP/SIMD buffer
parents 5caa3808 5a0b1882

arch/arm64/include/asm/simd.h

+8 −1
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ DEFINE_LOCK_GUARD_1(ksimd, 
		    kernel_neon_begin(_T->lock),

		    kernel_neon_end(_T->lock))



#define scoped_ksimd()	scoped_guard(ksimd, &(struct user_fpsimd_state){})

#define __scoped_ksimd(_label)					\

	for (struct user_fpsimd_state __uninitialized __st;	\

	     true; ({ goto _label; }))				\

		if (0) {					\

_label:			break;					\

		} else scoped_guard(ksimd, &__st)



#define scoped_ksimd()	__scoped_ksimd(__UNIQUE_ID(label))



#endif

lib/crypto/riscv/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

poly1305-core.S