Commit e5e1c67e authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: arm64/nhpoly1305 - eliminate unnecessary CFI wrapper 



Since the CFI implementation now supports indirect calls to assembly
functions, take advantage of that rather than use a wrapper function.

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2d203c46

arch/arm64/crypto/nh-neon-core.S

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>



	KEY		.req	x0

	MESSAGE		.req	x1
@@ -58,11 +59,11 @@ 


/*

 * void nh_neon(const u32 *key, const u8 *message, size_t message_len,

 *		u8 hash[NH_HASH_BYTES])

 *		__le64 hash[NH_NUM_PASSES])

 *

 * It's guaranteed that message_len % 16 == 0.

 */

SYM_FUNC_START(nh_neon)

SYM_TYPED_FUNC_START(nh_neon)



	ld1		{K0.4s,K1.4s}, [KEY], #32

	  movi		PASS0_SUMS.2d, #0

arch/arm64/crypto/nhpoly1305-neon-glue.c

+2 −9
Original line number Diff line number Diff line
@@ -14,14 +14,7 @@ 
#include <linux/module.h>



asmlinkage void nh_neon(const u32 *key, const u8 *message, size_t message_len,

			u8 hash[NH_HASH_BYTES]);



/* wrapper to avoid indirect call to assembly, which doesn't work with CFI */

static void _nh_neon(const u32 *key, const u8 *message, size_t message_len,

		     __le64 hash[NH_NUM_PASSES])

{

	nh_neon(key, message, message_len, (u8 *)hash);

}

			__le64 hash[NH_NUM_PASSES]);



static int nhpoly1305_neon_update(struct shash_desc *desc,

				  const u8 *src, unsigned int srclen)
@@ -33,7 +26,7 @@ static int nhpoly1305_neon_update(struct shash_desc *desc, 
		unsigned int n = min_t(unsigned int, srclen, SZ_4K);



		kernel_neon_begin();

		crypto_nhpoly1305_update_helper(desc, src, n, _nh_neon);

		crypto_nhpoly1305_update_helper(desc, src, n, nh_neon);

		kernel_neon_end();

		src += n;

		srclen -= n;