From: Ard Biesheuvel <ardb@kernel.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Ondrej Mosnacek <omosnacek@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, Eric Biggers <ebiggers@google.com>,
Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] crypto: aegis128 - fix link error without SIMD
Date: Fri, 4 Dec 2020 09:22:37 +0100 [thread overview]
Message-ID: <CAMj1kXEFbTWSRg5fvD=YiJRCSuvpyF2zThaTvQVwFiSFGYvXZQ@mail.gmail.com> (raw)
In-Reply-To: <20201203222557.952393-1-arnd@kernel.org>
On Thu, 3 Dec 2020 at 23:26, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> When the SIMD portion of the driver is disabled, the compiler cannot
> figure out in advance if it will be called:
>
> ERROR: modpost: "crypto_aegis128_update_simd" [crypto/aegis128.ko] undefined!
>
> Add a conditional to let the compiler use dead code elimination
> as before.
>
> Fixes: ac50aec41a9f ("crypto: aegis128 - expose SIMD code path as separate driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
I already sent the exact same fix a couple of days ago, and Herbert
just merged it today.
> ---
> crypto/aegis128-core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/crypto/aegis128-core.c b/crypto/aegis128-core.c
> index 2b05f79475d3..89dc1c559689 100644
> --- a/crypto/aegis128-core.c
> +++ b/crypto/aegis128-core.c
> @@ -89,7 +89,7 @@ static void crypto_aegis128_update_a(struct aegis_state *state,
> const union aegis_block *msg,
> bool do_simd)
> {
> - if (do_simd) {
> + if (IS_ENABLED(CONFIG_CRYPTO_AEGIS128_SIMD) && do_simd) {
> crypto_aegis128_update_simd(state, msg);
> return;
> }
> @@ -101,7 +101,7 @@ static void crypto_aegis128_update_a(struct aegis_state *state,
> static void crypto_aegis128_update_u(struct aegis_state *state, const void *msg,
> bool do_simd)
> {
> - if (do_simd) {
> + if (IS_ENABLED(CONFIG_CRYPTO_AEGIS128_SIMD) && do_simd) {
> crypto_aegis128_update_simd(state, msg);
> return;
> }
> --
> 2.27.0
>
prev parent reply other threads:[~2020-12-04 8:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 22:25 [PATCH] crypto: aegis128 - fix link error without SIMD Arnd Bergmann
2020-12-04 8:22 ` Ard Biesheuvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMj1kXEFbTWSRg5fvD=YiJRCSuvpyF2zThaTvQVwFiSFGYvXZQ@mail.gmail.com' \
--to=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=davem@davemloft.net \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=omosnacek@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).