Skip to contentSkip to conversation

crypto: lib/poly1305 - restore ability to remove modules

PATCH In review Eric Biggers 2 participants 2 messages Apr 18, 2025 – Apr 19, 2025

Subsystems (5)
Arm (32-bit) x86 PowerPC Crypto API +1 more subsystems
lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 crypto: lib/poly1305 - restore ability to remove modules

From: Eric Biggers <[email protected]>

Though the module_exit functions are now no-ops, they should still be defined, since otherwise the modules become unremovable.

Fixes 1f81c58279c7 ("crypto: arm/poly1305 - remove redundant shash algorithm")
Fixes f4b1a73aec5c ("crypto: arm64/poly1305 - remove redundant shash algorithm")
Fixes 378a337ab40f ("crypto: powerpc/poly1305 - implement library instead of shash")
Fixes 21969da642a2 ("crypto: x86/poly1305 - remove redundant shash algorithm")
Signed-off-by Eric Biggers <[email protected]>
---
 arch/arm/crypto/poly1305-glue.c         | 5 +++++
 arch/arm64/crypto/poly1305-glue.c       | 5 +++++
 arch/powerpc/crypto/poly1305-p10-glue.c | 5 +++++
 arch/x86/crypto/poly1305_glue.c         | 5 +++++
 4 files changed, 20 insertions(+)
arch/arm/crypto/poly1305-glue.c +5 -0
index 6d6998b3ec7e3..42d0ebde1ae15 100644
@@ -114,7 +114,12 @@ static int __init arm_poly1305_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
 arch_initcall(arm_poly1305_mod_init);
 
+static void __exit arm_poly1305_mod_exit(void)
+{
+}
+module_exit(arm_poly1305_mod_exit);
+
 MODULE_DESCRIPTION("Accelerated Poly1305 transform for ARM");
 MODULE_LICENSE("GPL v2");
arch/arm64/crypto/poly1305-glue.c +5 -0
index cb152ceac14a1..906970dd53732 100644
@@ -105,7 +105,12 @@ static int __init neon_poly1305_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
 arch_initcall(neon_poly1305_mod_init);
 
+static void __exit neon_poly1305_mod_exit(void)
+{
+}
+module_exit(neon_poly1305_mod_exit);
+
 MODULE_DESCRIPTION("Poly1305 authenticator (ARM64 optimized)");
 MODULE_LICENSE("GPL v2");
arch/powerpc/crypto/poly1305-p10-glue.c +5 -0
index 40d296d52c23e..00617f4c58e69 100644
@@ -125,8 +125,13 @@ static int __init poly1305_p10_init(void)
 		static_branch_enable(&have_p10);
 	return 0;
 }
 arch_initcall(poly1305_p10_init);
 
+static void __exit poly1305_p10_exit(void)
+{
+}
+module_exit(poly1305_p10_exit);
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Danny Tsen <[email protected]>");
 MODULE_DESCRIPTION("Optimized Poly1305 for P10");
arch/x86/crypto/poly1305_glue.c +5 -0
index a0fc543a0d688..cff35ca5822a8 100644
@@ -206,8 +206,13 @@ static int __init poly1305_simd_mod_init(void)
 		static_branch_enable(&poly1305_use_avx512);
 	return 0;
 }
 arch_initcall(poly1305_simd_mod_init);
 
+static void __exit poly1305_simd_mod_exit(void)
+{
+}
+module_exit(poly1305_simd_mod_exit);
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>");
 MODULE_DESCRIPTION("Poly1305 authenticator");

base-commit: da4cb617bc7d827946cbb368034940b379a1de90

Signature · 1 line
2.49.0
maintainer
#1 lore raw
Quoted 10 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Though the module_exit functions are now no-ops, they should still be defined, since otherwise the modules become unremovable.

Fixes 1f81c58279c7 ("crypto: arm/poly1305 - remove redundant shash algorithm")
Fixes f4b1a73aec5c ("crypto: arm64/poly1305 - remove redundant shash algorithm")
Fixes 378a337ab40f ("crypto: powerpc/poly1305 - implement library instead of shash")
Fixes 21969da642a2 ("crypto: x86/poly1305 - remove redundant shash algorithm")
Signed-off-by Eric Biggers <[email protected]>
Quoted 6 lines

---

arch/arm/crypto/poly1305-glue.c         | 5 +++++
arch/arm64/crypto/poly1305-glue.c       | 5 +++++
arch/powerpc/crypto/poly1305-p10-glue.c | 5 +++++
arch/x86/crypto/poly1305_glue.c         | 5 +++++
4 files changed, 20 insertions(+)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt