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

x86/crc-t10dif: expose CRC-T10DIF function through lib 



Move the x86 CRC-T10DIF assembly code into the lib directory and wire it
up to the library interface.  This allows it to be used without going
through the crypto API.  It remains usable via the crypto API too via
the shash algorithms that use the library interface.  Thus all the
arch-specific "shash" code becomes unnecessary and is removed.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20241202012056.209768-5-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 21dda37f

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ config X86 
	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_CPU_PASID		if IOMMU_SVA

	select ARCH_HAS_CRC32

	select ARCH_HAS_CRC_T10DIF		if X86_64

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE	if !X86_PAE

arch/x86/crypto/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -492,14 +492,4 @@ config CRYPTO_GHASH_CLMUL_NI_INTEL 
	  Architecture: x86_64 using:

	  - CLMUL-NI (carry-less multiplication new instructions)



config CRYPTO_CRCT10DIF_PCLMUL

	tristate "CRCT10DIF (PCLMULQDQ)"

	depends on X86 && 64BIT && CRC_T10DIF

	select CRYPTO_HASH

	help

	  CRC16 CRC algorithm used for the T10 (SCSI) Data Integrity Field (DIF)



	  Architecture: x86_64 using:

	  - PCLMULQDQ (carry-less multiplication)



endmenu

arch/x86/crypto/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o 
obj-$(CONFIG_CRYPTO_POLYVAL_CLMUL_NI) += polyval-clmulni.o

polyval-clmulni-y := polyval-clmulni_asm.o polyval-clmulni_glue.o



obj-$(CONFIG_CRYPTO_CRCT10DIF_PCLMUL) += crct10dif-pclmul.o

crct10dif-pclmul-y := crct10dif-pcl-asm_64.o crct10dif-pclmul_glue.o



obj-$(CONFIG_CRYPTO_POLY1305_X86_64) += poly1305-x86_64.o

poly1305-x86_64-y := poly1305-x86_64-cryptogams.o poly1305_glue.o

targets += poly1305-x86_64-cryptogams.S

arch/x86/crypto/crct10dif-pclmul_glue.c

deleted100644 → 0
+0 −143
Original line number Diff line number Diff line 
/*

 * Cryptographic API.

 *

 * T10 Data Integrity Field CRC16 Crypto Transform using PCLMULQDQ Instructions

 *

 * Copyright (C) 2013 Intel Corporation

 * Author: Tim Chen <tim.c.chen@linux.intel.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

 * Software Foundation; either version 2 of the License, or (at your option)

 * any later version.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 */



#include <linux/types.h>

#include <linux/module.h>

#include <linux/crc-t10dif.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <linux/init.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <asm/cpufeatures.h>

#include <asm/cpu_device_id.h>

#include <asm/simd.h>



asmlinkage u16 crc_t10dif_pcl(u16 init_crc, const u8 *buf, size_t len);



struct chksum_desc_ctx {

	__u16 crc;

};



static int chksum_init(struct shash_desc *desc)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	ctx->crc = 0;



	return 0;

}



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

			 unsigned int length)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	if (length >= 16 && crypto_simd_usable()) {

		kernel_fpu_begin();

		ctx->crc = crc_t10dif_pcl(ctx->crc, data, length);

		kernel_fpu_end();

	} else

		ctx->crc = crc_t10dif_generic(ctx->crc, data, length);

	return 0;

}



static int chksum_final(struct shash_desc *desc, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	*(__u16 *)out = ctx->crc;

	return 0;

}



static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out)

{

	if (len >= 16 && crypto_simd_usable()) {

		kernel_fpu_begin();

		*(__u16 *)out = crc_t10dif_pcl(crc, data, len);

		kernel_fpu_end();

	} else

		*(__u16 *)out = crc_t10dif_generic(crc, data, len);

	return 0;

}



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

			unsigned int len, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	return __chksum_finup(ctx->crc, data, len, out);

}



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

			 unsigned int length, u8 *out)

{

	return __chksum_finup(0, data, length, out);

}



static struct shash_alg alg = {

	.digestsize		=	CRC_T10DIF_DIGEST_SIZE,

	.init		=	chksum_init,

	.update		=	chksum_update,

	.final		=	chksum_final,

	.finup		=	chksum_finup,

	.digest		=	chksum_digest,

	.descsize		=	sizeof(struct chksum_desc_ctx),

	.base			=	{

		.cra_name		=	"crct10dif",

		.cra_driver_name	=	"crct10dif-pclmul",

		.cra_priority		=	200,

		.cra_blocksize		=	CRC_T10DIF_BLOCK_SIZE,

		.cra_module		=	THIS_MODULE,

	}

};



static const struct x86_cpu_id crct10dif_cpu_id[] = {

	X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, crct10dif_cpu_id);



static int __init crct10dif_intel_mod_init(void)

{

	if (!x86_match_cpu(crct10dif_cpu_id))

		return -ENODEV;



	return crypto_register_shash(&alg);

}



static void __exit crct10dif_intel_mod_fini(void)

{

	crypto_unregister_shash(&alg);

}



module_init(crct10dif_intel_mod_init);

module_exit(crct10dif_intel_mod_fini);



MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>");

MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ.");

MODULE_LICENSE("GPL");



MODULE_ALIAS_CRYPTO("crct10dif");

MODULE_ALIAS_CRYPTO("crct10dif-pclmul");

arch/x86/lib/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ obj-$(CONFIG_CRC32_ARCH) += crc32-x86.o 
crc32-x86-y := crc32-glue.o crc32-pclmul.o

crc32-x86-$(CONFIG_64BIT) += crc32c-3way.o



obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-x86.o

crc-t10dif-x86-y := crc-t10dif-glue.o crct10dif-pcl-asm_64.o



obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o

obj-y += iomem.o