| Message ID | 20181005171306.218137-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: x86/aes-ni - fix build error following fpu template removal | expand |
On 5 October 2018 at 19:13, Eric Biggers <ebiggers@kernel.org> wrote: > From: Eric Biggers <ebiggers@google.com> > > aesni-intel_glue.c still calls crypto_fpu_init() and crypto_fpu_exit() > to register/unregister the "fpu" template. But these functions don't > exist anymore, causing a build error. Remove the calls to them. > > Fixes: 944585a64f5e ("crypto: x86/aes-ni - remove special handling of AES in PCBC mode") > Signed-off-by: Eric Biggers <ebiggers@google.com> Thanks for spotting that. I had actually noticed myself, but wasn't really expecting this RFC patch to be picked up without discussion. > --- > arch/x86/crypto/aesni-intel_glue.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c > index 89bae64eef4f9..661f7daf43da9 100644 > --- a/arch/x86/crypto/aesni-intel_glue.c > +++ b/arch/x86/crypto/aesni-intel_glue.c > @@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out, > asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out, > const u8 *in, unsigned int len, u8 *iv); > > -int crypto_fpu_init(void); > -void crypto_fpu_exit(void); > - > #define AVX_GEN2_OPTSIZE 640 > #define AVX_GEN4_OPTSIZE 4096 > > @@ -1449,13 +1446,9 @@ static int __init aesni_init(void) > #endif > #endif > > - err = crypto_fpu_init(); > - if (err) > - return err; > - > err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); > if (err) > - goto fpu_exit; > + return err; > > err = crypto_register_skciphers(aesni_skciphers, > ARRAY_SIZE(aesni_skciphers)); > @@ -1489,8 +1482,6 @@ static int __init aesni_init(void) > ARRAY_SIZE(aesni_skciphers)); > unregister_algs: > crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); > -fpu_exit: > - crypto_fpu_exit(); > return err; > } > > @@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void) > crypto_unregister_skciphers(aesni_skciphers, > ARRAY_SIZE(aesni_skciphers)); > crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); > - > - crypto_fpu_exit(); > } > > late_initcall(aesni_init); > -- > 2.19.0.605.g01d371f741-goog >
On Fri, Oct 05, 2018 at 07:16:13PM +0200, Ard Biesheuvel wrote: > On 5 October 2018 at 19:13, Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > > > aesni-intel_glue.c still calls crypto_fpu_init() and crypto_fpu_exit() > > to register/unregister the "fpu" template. But these functions don't > > exist anymore, causing a build error. Remove the calls to them. > > > > Fixes: 944585a64f5e ("crypto: x86/aes-ni - remove special handling of AES in PCBC mode") > > Signed-off-by: Eric Biggers <ebiggers@google.com> > > Thanks for spotting that. > > I had actually noticed myself, but wasn't really expecting this RFC > patch to be picked up without discussion. > The patch seems reasonable to me -- we shouldn't maintain a special FPU template just for AES-PCBC when possibly no one is even using that algorithm. - Eric
On Fri, Oct 05, 2018 at 10:13:06AM -0700, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > aesni-intel_glue.c still calls crypto_fpu_init() and crypto_fpu_exit() > to register/unregister the "fpu" template. But these functions don't > exist anymore, causing a build error. Remove the calls to them. > > Fixes: 944585a64f5e ("crypto: x86/aes-ni - remove special handling of AES in PCBC mode") > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > arch/x86/crypto/aesni-intel_glue.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) Patch applied. Thanks.
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 89bae64eef4f9..661f7daf43da9 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -102,9 +102,6 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out, asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in, unsigned int len, u8 *iv); -int crypto_fpu_init(void); -void crypto_fpu_exit(void); - #define AVX_GEN2_OPTSIZE 640 #define AVX_GEN4_OPTSIZE 4096 @@ -1449,13 +1446,9 @@ static int __init aesni_init(void) #endif #endif - err = crypto_fpu_init(); - if (err) - return err; - err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); if (err) - goto fpu_exit; + return err; err = crypto_register_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers)); @@ -1489,8 +1482,6 @@ static int __init aesni_init(void) ARRAY_SIZE(aesni_skciphers)); unregister_algs: crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); -fpu_exit: - crypto_fpu_exit(); return err; } @@ -1501,8 +1492,6 @@ static void __exit aesni_exit(void) crypto_unregister_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers)); crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs)); - - crypto_fpu_exit(); } late_initcall(aesni_init);