Commit c7510599 authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: sparc/sha1: Migrate optimized code into library 



Instead of exposing the sparc-optimized SHA-1 code via sparc-specific
crypto_shash algorithms, instead just implement the sha1_blocks()
library function.  This is much simpler, it makes the SHA-1 library
functions be sparc-optimized, and it fixes the longstanding issue where
the sparc-optimized SHA-1 code was disabled by default.  SHA-1 still
remains available through crypto_shash, but individual architectures no
longer need to handle it.

Note: to see the diff from arch/sparc/crypto/sha1_glue.c to
lib/crypto/sparc/sha1.h, view this commit with 'git show -M10'.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250712232329.818226-13-ebiggers@kernel.org


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

arch/sparc/crypto/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -26,16 +26,6 @@ config CRYPTO_MD5_SPARC64 


	  Architecture: sparc64 using crypto instructions, when available



config CRYPTO_SHA1_SPARC64

	tristate "Hash functions: SHA-1"

	depends on SPARC64

	select CRYPTO_SHA1

	select CRYPTO_HASH

	help

	  SHA-1 secure hash algorithm (FIPS 180)



	  Architecture: sparc64



config CRYPTO_AES_SPARC64

	tristate "Ciphers: AES, modes: ECB, CBC, CTR"

	depends on SPARC64

arch/sparc/crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,14 +3,12 @@ 
# Arch-specific CryptoAPI modules.

#



obj-$(CONFIG_CRYPTO_SHA1_SPARC64) += sha1-sparc64.o

obj-$(CONFIG_CRYPTO_MD5_SPARC64) += md5-sparc64.o



obj-$(CONFIG_CRYPTO_AES_SPARC64) += aes-sparc64.o

obj-$(CONFIG_CRYPTO_DES_SPARC64) += des-sparc64.o

obj-$(CONFIG_CRYPTO_CAMELLIA_SPARC64) += camellia-sparc64.o



sha1-sparc64-y := sha1_asm.o sha1_glue.o

md5-sparc64-y := md5_asm.o md5_glue.o



aes-sparc64-y := aes_asm.o aes_glue.o

arch/sparc/crypto/sha1_glue.c

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

/* Glue code for SHA1 hashing optimized for sparc64 crypto opcodes.

 *

 * This is based largely upon arch/x86/crypto/sha1_ssse3_glue.c

 *

 * Copyright (c) Alan Smithee.

 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>

 * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>

 * Copyright (c) Mathias Krause <minipli@googlemail.com>

 */



#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt



#include <asm/elf.h>

#include <asm/opcodes.h>

#include <asm/pstate.h>

#include <crypto/internal/hash.h>

#include <crypto/sha1.h>

#include <crypto/sha1_base.h>

#include <linux/kernel.h>

#include <linux/module.h>



asmlinkage void sha1_sparc64_transform(struct sha1_state *digest,

				       const u8 *data, int rounds);



static int sha1_sparc64_update(struct shash_desc *desc, const u8 *data,

			       unsigned int len)

{

	return sha1_base_do_update_blocks(desc, data, len,

					  sha1_sparc64_transform);

}



/* Add padding and return the message digest. */

static int sha1_sparc64_finup(struct shash_desc *desc, const u8 *src,

			      unsigned int len, u8 *out)

{

	sha1_base_do_finup(desc, src, len, sha1_sparc64_transform);

	return sha1_base_finish(desc, out);

}



static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	sha1_base_init,

	.update		=	sha1_sparc64_update,

	.finup		=	sha1_sparc64_finup,

	.descsize	=	SHA1_STATE_SIZE,

	.base		=	{

		.cra_name	=	"sha1",

		.cra_driver_name=	"sha1-sparc64",

		.cra_priority	=	SPARC_CR_OPCODE_PRIORITY,

		.cra_flags	=	CRYPTO_AHASH_ALG_BLOCK_ONLY,

		.cra_blocksize	=	SHA1_BLOCK_SIZE,

		.cra_module	=	THIS_MODULE,

	}

};



static bool __init sparc64_has_sha1_opcode(void)

{

	unsigned long cfr;



	if (!(sparc64_elf_hwcap & HWCAP_SPARC_CRYPTO))

		return false;



	__asm__ __volatile__("rd %%asr26, %0" : "=r" (cfr));

	if (!(cfr & CFR_SHA1))

		return false;



	return true;

}



static int __init sha1_sparc64_mod_init(void)

{

	if (sparc64_has_sha1_opcode()) {

		pr_info("Using sparc64 sha1 opcode optimized SHA-1 implementation\n");

		return crypto_register_shash(&alg);

	}

	pr_info("sparc64 sha1 opcode not available.\n");

	return -ENODEV;

}



static void __exit sha1_sparc64_mod_fini(void)

{

	crypto_unregister_shash(&alg);

}



module_init(sha1_sparc64_mod_init);

module_exit(sha1_sparc64_mod_fini);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");



MODULE_ALIAS_CRYPTO("sha1");



#include "crop_devid.c"

lib/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ config CRYPTO_LIB_SHA1_ARCH 
	default y if MIPS && CPU_CAVIUM_OCTEON

	default y if PPC

	default y if S390

	default y if SPARC64



config CRYPTO_LIB_SHA256

	tristate

lib/crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ ifeq ($(CONFIG_PPC),y) 
libsha1-y += powerpc/sha1-powerpc-asm.o

libsha1-$(CONFIG_SPE) += powerpc/sha1-spe-asm.o

endif

libsha1-$(CONFIG_SPARC) += sparc/sha1_asm.o

endif # CONFIG_CRYPTO_LIB_SHA1_ARCH



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