Skip to contentSkip to conversation

crypto: lib/chacha - restore ability to remove modules

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

Subsystems (6)
Arm (32-bit) x86 PowerPC RISC-V +2 more subsystems
lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 crypto: lib/chacha - 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 08820553f33a ("crypto: arm/chacha - remove the redundant skcipher algorithms")
Fixes 8c28abede16c ("crypto: arm64/chacha - remove the skcipher algorithms")
Fixes f7915484c020 ("crypto: powerpc/chacha - remove the skcipher algorithms")
Fixes ceba0eda8313 ("crypto: riscv/chacha - implement library instead of skcipher")
Fixes 632ab0978f08 ("crypto: x86/chacha - remove the skcipher algorithms")
Signed-off-by Eric Biggers <[email protected]>
---
 arch/arm/crypto/chacha-glue.c           | 5 +++++
 arch/arm64/crypto/chacha-neon-glue.c    | 5 +++++
 arch/powerpc/crypto/chacha-p10-glue.c   | 5 +++++
 arch/riscv/crypto/chacha-riscv64-glue.c | 5 +++++
 arch/x86/crypto/chacha_glue.c           | 5 +++++
 5 files changed, 25 insertions(+)
arch/arm/crypto/chacha-glue.c +5 -0
index 3a5c75c95d43b..12afb40cf1ff4 100644
@@ -122,8 +122,13 @@ static int __init chacha_arm_mod_init(void)
 	}
 	return 0;
 }
 arch_initcall(chacha_arm_mod_init);
 
+static void __exit chacha_arm_mod_exit(void)
+{
+}
+module_exit(chacha_arm_mod_exit);
+
 MODULE_DESCRIPTION("ChaCha and HChaCha functions (ARM optimized)");
 MODULE_AUTHOR("Ard Biesheuvel <[email protected]>");
 MODULE_LICENSE("GPL v2");
arch/arm64/crypto/chacha-neon-glue.c +5 -0
index a0c336b284027..14a2836eff611 100644
@@ -104,8 +104,13 @@ static int __init chacha_simd_mod_init(void)
 		static_branch_enable(&have_neon);
 	return 0;
 }
 arch_initcall(chacha_simd_mod_init);
 
+static void __exit chacha_simd_mod_exit(void)
+{
+}
+module_exit(chacha_simd_mod_exit);
+
 MODULE_DESCRIPTION("ChaCha and HChaCha functions (ARM64 optimized)");
 MODULE_AUTHOR("Ard Biesheuvel <[email protected]>");
 MODULE_LICENSE("GPL v2");
arch/powerpc/crypto/chacha-p10-glue.c +5 -0
index 9982929573add..351ed409f9b21 100644
@@ -87,8 +87,13 @@ static int __init chacha_p10_init(void)
 		static_branch_enable(&have_p10);
 	return 0;
 }
 arch_initcall(chacha_p10_init);
 
+static void __exit chacha_p10_exit(void)
+{
+}
+module_exit(chacha_p10_exit);
+
 MODULE_DESCRIPTION("ChaCha stream cipher (P10 accelerated)");
 MODULE_AUTHOR("Danny Tsen <[email protected]>");
 MODULE_LICENSE("GPL v2");
arch/riscv/crypto/chacha-riscv64-glue.c +5 -0
index ccaab0dea383f..afc4e3be3cac2 100644
@@ -62,8 +62,13 @@ static int __init riscv64_chacha_mod_init(void)
 		static_branch_enable(&use_zvkb);
 	return 0;
 }
 arch_initcall(riscv64_chacha_mod_init);
 
+static void __exit riscv64_chacha_mod_exit(void)
+{
+}
+module_exit(riscv64_chacha_mod_exit);
+
 MODULE_DESCRIPTION("ChaCha stream cipher (RISC-V optimized)");
 MODULE_AUTHOR("Jerry Shih <[email protected]>");
 MODULE_LICENSE("GPL");
arch/x86/crypto/chacha_glue.c +5 -0
index fcc14c006bdeb..59bf63c000726 100644
@@ -174,8 +174,13 @@ static int __init chacha_simd_mod_init(void)
 	}
 	return 0;
 }
 arch_initcall(chacha_simd_mod_init);
 
+static void __exit chacha_simd_mod_exit(void)
+{
+}
+module_exit(chacha_simd_mod_exit);
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Martin Willi <[email protected]>");
 MODULE_DESCRIPTION("ChaCha and HChaCha functions (x86_64 optimized)");

base-commit: da4cb617bc7d827946cbb368034940b379a1de90

Signature · 1 line
2.49.0
maintainer
#1 lore raw
Quoted 11 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 08820553f33a ("crypto: arm/chacha - remove the redundant skcipher algorithms")
Fixes 8c28abede16c ("crypto: arm64/chacha - remove the skcipher algorithms")
Fixes f7915484c020 ("crypto: powerpc/chacha - remove the skcipher algorithms")
Fixes ceba0eda8313 ("crypto: riscv/chacha - implement library instead of skcipher")
Fixes 632ab0978f08 ("crypto: x86/chacha - remove the skcipher algorithms")
Signed-off-by Eric Biggers <[email protected]>
Quoted 7 lines

---

arch/arm/crypto/chacha-glue.c           | 5 +++++
arch/arm64/crypto/chacha-neon-glue.c    | 5 +++++
arch/powerpc/crypto/chacha-p10-glue.c   | 5 +++++
arch/riscv/crypto/chacha-riscv64-glue.c | 5 +++++
arch/x86/crypto/chacha_glue.c           | 5 +++++
5 files changed, 25 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