Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: crc32 - don't unnecessarily register arch algorithms

Browse Source 
Instead of registering the crc32-$arch and crc32c-$arch algorithms if
the arch-specific code was built, only register them when that code was
built *and* is not falling back to the base implementation at runtime.

This avoids confusing users like btrfs which checks the shash driver
name to determine whether it is crc32c-generic.

(It would also make sense to change btrfs to test the crc32_optimization
flags itself, so that it doesn't have to use the weird hack of parsing
the driver name.  This change still makes sense either way though.)

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20241202010844.144356-5-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2024-12-01 17:08:29 -08:00
parent b5ae12e0ee
commit 780acb2543
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/crc32_generic.c
View File

@ -157,15 +157,19 @@ static struct shash_alg algs[] = {{
.base.cra_init = crc32_cra_init,
}};
static int num_algs;
static int __init crc32_mod_init(void)
{
/* register the arch flavor only if it differs from the generic one */
return crypto_register_shashes(algs, 1 + IS_ENABLED(CONFIG_CRC32_ARCH));
num_algs = 1 + ((crc32_optimizations() & CRC32_LE_OPTIMIZATION) != 0);
return crypto_register_shashes(algs, num_algs);
}
static void __exit crc32_mod_fini(void)
{
crypto_unregister_shashes(algs, 1 + IS_ENABLED(CONFIG_CRC32_ARCH));
crypto_unregister_shashes(algs, num_algs);
}
subsys_initcall(crc32_mod_init);

8
crypto/crc32c_generic.c
View File

@ -197,15 +197,19 @@ static struct shash_alg algs[] = {{
.base.cra_init = crc32c_cra_init,
}};
static int num_algs;
static int __init crc32c_mod_init(void)
{
/* register the arch flavor only if it differs from the generic one */
return crypto_register_shashes(algs, 1 + IS_ENABLED(CONFIG_CRC32_ARCH));
num_algs = 1 + ((crc32_optimizations() & CRC32C_OPTIMIZATION) != 0);
return crypto_register_shashes(algs, num_algs);
}
static void __exit crc32c_mod_fini(void)
{
crypto_unregister_shashes(algs, 1 + IS_ENABLED(CONFIG_CRC32_ARCH));
crypto_unregister_shashes(algs, num_algs);
}
subsys_initcall(crc32c_mod_init);