powerpc/crc: delete obsolete crc-vpmsum_test.c

Delete crc-vpmsum_test.c, since its functionality is now covered by the
new crc_kunit.c as well as the crypto subsystem's fuzz tests.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Vinicius Peixoto <vpeixoto@lkcamp.dev>
Link: https://lore.kernel.org/r/20241202012056.209768-12-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 15101f5c32381d94144a5ff9314e29711b817b58..465eb96c755e0f8bf9a7245fcab4ebb9b540f201 100644 (file)
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -389,7 +389,6 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_VPMSUM_TESTER=m
 CONFIG_CRYPTO_MD5_PPC=m
 CONFIG_CRYPTO_SHA1_PPC=m
 CONFIG_CRYPTO_AES_GCM_P10=m

diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig
index 45376f1a43bdb563fd4c36c8384f6578bd907b96..5b315e9756b3fd84df7037e666f049a1909d5a48 100644 (file)
--- a/arch/powerpc/crypto/Kconfig
+++ b/arch/powerpc/crypto/Kconfig
@@ -13,15 +13,6 @@ config CRYPTO_CURVE25519_PPC64
          Architecture: PowerPC64
          - Little-endian
 
-config CRYPTO_VPMSUM_TESTER
-       tristate "CRC32c and CRC32T10DIF hardware acceleration tester"
-       depends on CRYPTO_CRC32C && CRC32_ARCH
-       depends on CRYPTO_CRCT10DIF && CRC_T10DIF_ARCH
-       help
-         Stress test for CRC32c and CRCT10DIF algorithms implemented with
-         powerpc64 AltiVec extensions (POWER8 vpmsum instructions).
-         Unless you are testing these algorithms, you don't need this.
-
 config CRYPTO_MD5_PPC
        tristate "Digests: MD5"
        depends on PPC

diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile
index d2238ac7e52ced8bf8294f08e9adc01c476262ef..9b38f4a7bc1525356948e3727897088c049092c1 100644 (file)
--- a/arch/powerpc/crypto/Makefile
+++ b/arch/powerpc/crypto/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_CRYPTO_MD5_PPC) += md5-ppc.o
 obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o
 obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o
 obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o
-obj-$(CONFIG_CRYPTO_VPMSUM_TESTER) += crc-vpmsum_test.o
 obj-$(CONFIG_CRYPTO_AES_GCM_P10) += aes-gcm-p10-crypto.o
 obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o
 obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o

diff --git a/arch/powerpc/crypto/crc-vpmsum_test.c b/arch/powerpc/crypto/crc-vpmsum_test.c
deleted file mode 100644 (file)
index c61a874..0000000
--- a/arch/powerpc/crypto/crc-vpmsum_test.c
+++ /dev/null
@@ -1,133 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * CRC vpmsum tester
- * Copyright 2017 Daniel Axtens, IBM Corporation.
- */
-
-#include <linux/crc-t10dif.h>
-#include <linux/crc32.h>
-#include <crypto/internal/hash.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/random.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/cpufeature.h>
-#include <asm/switch_to.h>
-
-static unsigned long iterations = 10000;
-
-#define MAX_CRC_LENGTH 65535
-
-
-static int __init crc_test_init(void)
-{
-       u16 crc16 = 0, verify16 = 0;
-       __le32 verify32le = 0;
-       unsigned char *data;
-       u32 verify32 = 0;
-       unsigned long i;
-       __le32 crc32;
-       int ret;
-
-       struct crypto_shash *crct10dif_tfm;
-       struct crypto_shash *crc32c_tfm;
-
-       if (!cpu_has_feature(CPU_FTR_ARCH_207S))
-               return -ENODEV;
-
-       data = kmalloc(MAX_CRC_LENGTH, GFP_KERNEL);
-       if (!data)
-               return -ENOMEM;
-
-       crct10dif_tfm = crypto_alloc_shash("crct10dif", 0, 0);
-
-       if (IS_ERR(crct10dif_tfm)) {
-               pr_err("Error allocating crc-t10dif\n");
-               goto free_buf;
-       }
-
-       crc32c_tfm = crypto_alloc_shash("crc32c", 0, 0);
-
-       if (IS_ERR(crc32c_tfm)) {
-               pr_err("Error allocating crc32c\n");
-               goto free_16;
-       }
-
-       do {
-               SHASH_DESC_ON_STACK(crct10dif_shash, crct10dif_tfm);
-               SHASH_DESC_ON_STACK(crc32c_shash, crc32c_tfm);
-
-               crct10dif_shash->tfm = crct10dif_tfm;
-               ret = crypto_shash_init(crct10dif_shash);
-
-               if (ret) {
-                       pr_err("Error initing crc-t10dif\n");
-                       goto free_32;
-               }
-
-
-               crc32c_shash->tfm = crc32c_tfm;
-               ret = crypto_shash_init(crc32c_shash);
-
-               if (ret) {
-                       pr_err("Error initing crc32c\n");
-                       goto free_32;
-               }
-
-               pr_info("crc-vpmsum_test begins, %lu iterations\n", iterations);
-               for (i=0; i<iterations; i++) {
-                       size_t offset = get_random_u32_below(16);
-                       size_t len = get_random_u32_below(MAX_CRC_LENGTH);
-
-                       if (len <= offset)
-                               continue;
-                       get_random_bytes(data, len);
-                       len -= offset;
-
-                       crypto_shash_update(crct10dif_shash, data+offset, len);
-                       crypto_shash_final(crct10dif_shash, (u8 *)(&crc16));
-                       verify16 = crc_t10dif_generic(verify16, data+offset, len);
-
-
-                       if (crc16 != verify16) {
-                               pr_err("FAILURE in CRC16: got 0x%04x expected 0x%04x (len %lu)\n",
-                                      crc16, verify16, len);
-                               break;
-                       }
-
-                       crypto_shash_update(crc32c_shash, data+offset, len);
-                       crypto_shash_final(crc32c_shash, (u8 *)(&crc32));
-                       verify32 = le32_to_cpu(verify32le);
-                       verify32le = ~cpu_to_le32(__crc32c_le(~verify32, data+offset, len));
-                       if (crc32 != verify32le) {
-                               pr_err("FAILURE in CRC32: got 0x%08x expected 0x%08x (len %lu)\n",
-                                      crc32, verify32, len);
-                               break;
-                       }
-               cond_resched();
-               }
-               pr_info("crc-vpmsum_test done, completed %lu iterations\n", i);
-       } while (0);
-
-free_32:
-       crypto_free_shash(crc32c_tfm);
-
-free_16:
-       crypto_free_shash(crct10dif_tfm);
-
-free_buf:
-       kfree(data);
-
-       return 0;
-}
-
-static void __exit crc_test_exit(void) {}
-
-module_init(crc_test_init);
-module_exit(crc_test_exit);
-module_param(iterations, long, 0400);
-
-MODULE_AUTHOR("Daniel Axtens <dja@axtens.net>");
-MODULE_DESCRIPTION("Vector polynomial multiply-sum CRC tester");
-MODULE_LICENSE("GPL");