Commit 29e39a11 authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: arm/nh: Migrate optimized code into library 

Migrate the arm32 NEON implementation of NH into lib/crypto/.  This
makes the nh() function be optimized on arm32 kernels.

Note: this temporarily makes the adiantum template not utilize the arm32
optimized NH code.  This is resolved in a later commit that converts the
adiantum template to use nh() instead of "nhpoly1305".

Link: https://lore.kernel.org/r/20251211011846.8179-4-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 7246fe6c

arch/arm/crypto/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -23,16 +23,6 @@ config CRYPTO_GHASH_ARM_CE 
	  that is part of the ARMv8 Crypto Extensions, or a slower variant that

	  uses the vmull.p8 instruction that is part of the basic NEON ISA.



config CRYPTO_NHPOLY1305_NEON

	tristate "Hash functions: NHPoly1305 (NEON)"

	depends on KERNEL_MODE_NEON

	select CRYPTO_NHPOLY1305

	help

	  NHPoly1305 hash function (Adiantum)



	  Architecture: arm using:

	  - NEON (Advanced SIMD) extensions



config CRYPTO_AES_ARM

	tristate "Ciphers: AES"

	select CRYPTO_ALGAPI

arch/arm/crypto/Makefile

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


obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o

obj-$(CONFIG_CRYPTO_AES_ARM_BS) += aes-arm-bs.o

obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o



obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o

obj-$(CONFIG_CRYPTO_GHASH_ARM_CE) += ghash-arm-ce.o
@@ -14,4 +13,3 @@ aes-arm-y := aes-cipher-core.o aes-cipher-glue.o 
aes-arm-bs-y	:= aes-neonbs-core.o aes-neonbs-glue.o

aes-arm-ce-y	:= aes-ce-core.o aes-ce-glue.o

ghash-arm-ce-y	:= ghash-ce-core.o ghash-ce-glue.o
 
nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o

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

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * NHPoly1305 - ε-almost-∆-universal hash function for Adiantum

 * (NEON accelerated version)

 *

 * Copyright 2018 Google LLC

 */



#include <asm/neon.h>

#include <asm/simd.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <crypto/nhpoly1305.h>

#include <linux/module.h>



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

			__le64 hash[NH_NUM_PASSES]);



static int nhpoly1305_neon_update(struct shash_desc *desc,

				  const u8 *src, unsigned int srclen)

{

	if (srclen < 64 || !crypto_simd_usable())

		return crypto_nhpoly1305_update(desc, src, srclen);



	do {

		unsigned int n = min_t(unsigned int, srclen, SZ_4K);



		kernel_neon_begin();

		crypto_nhpoly1305_update_helper(desc, src, n, nh_neon);

		kernel_neon_end();

		src += n;

		srclen -= n;

	} while (srclen);

	return 0;

}



static int nhpoly1305_neon_digest(struct shash_desc *desc,

				  const u8 *src, unsigned int srclen, u8 *out)

{

	return crypto_nhpoly1305_init(desc) ?:

	       nhpoly1305_neon_update(desc, src, srclen) ?:

	       crypto_nhpoly1305_final(desc, out);

}



static struct shash_alg nhpoly1305_alg = {

	.base.cra_name		= "nhpoly1305",

	.base.cra_driver_name	= "nhpoly1305-neon",

	.base.cra_priority	= 200,

	.base.cra_ctxsize	= sizeof(struct nhpoly1305_key),

	.base.cra_module	= THIS_MODULE,

	.digestsize		= POLY1305_DIGEST_SIZE,

	.init			= crypto_nhpoly1305_init,

	.update			= nhpoly1305_neon_update,

	.final			= crypto_nhpoly1305_final,

	.digest			= nhpoly1305_neon_digest,

	.setkey			= crypto_nhpoly1305_setkey,

	.descsize		= sizeof(struct nhpoly1305_state),

};



static int __init nhpoly1305_mod_init(void)

{

	if (!(elf_hwcap & HWCAP_NEON))

		return -ENODEV;



	return crypto_register_shash(&nhpoly1305_alg);

}



static void __exit nhpoly1305_mod_exit(void)

{

	crypto_unregister_shash(&nhpoly1305_alg);

}



module_init(nhpoly1305_mod_init);

module_exit(nhpoly1305_mod_exit);



MODULE_DESCRIPTION("NHPoly1305 ε-almost-∆-universal hash function (NEON-accelerated)");

MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Eric Biggers <ebiggers@google.com>");

MODULE_ALIAS_CRYPTO("nhpoly1305");

MODULE_ALIAS_CRYPTO("nhpoly1305-neon");

lib/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ config CRYPTO_LIB_NH 
config CRYPTO_LIB_NH_ARCH

	bool

	depends on CRYPTO_LIB_NH && !UML

	default y if ARM && KERNEL_MODE_NEON



config CRYPTO_LIB_POLY1305

	tristate

lib/crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ obj-$(CONFIG_CRYPTO_LIB_NH) += libnh.o 
libnh-y := nh.o

ifeq ($(CONFIG_CRYPTO_LIB_NH_ARCH),y)

CFLAGS_nh.o += -I$(src)/$(SRCARCH)

libnh-$(CONFIG_ARM) += arm/nh-neon-core.o

endif



################################################################################