crypto: x86/poly1305 - emit does base conversion itself
diff mbox series

Message ID 20200117104222.303112-1-Jason@zx2c4.com
State Accepted
Delegated to: Herbert Xu
Headers show
Series
  • crypto: x86/poly1305 - emit does base conversion itself
Related show

Commit Message

Jason A. Donenfeld Jan. 17, 2020, 10:42 a.m. UTC
The emit code does optional base conversion itself in assembly, so we
don't need to do that here. Also, neither one of these functions uses
simd instructions, so checking for that doesn't make sense either.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 arch/x86/crypto/poly1305_glue.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Herbert Xu Jan. 22, 2020, 10:15 a.m. UTC | #1
Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> The emit code does optional base conversion itself in assembly, so we
> don't need to do that here. Also, neither one of these functions uses
> simd instructions, so checking for that doesn't make sense either.
> 
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> arch/x86/crypto/poly1305_glue.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)

Patch applied.  Thanks.

Patch
diff mbox series

diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c
index 657363588e0c..79bb58737d52 100644
--- a/arch/x86/crypto/poly1305_glue.c
+++ b/arch/x86/crypto/poly1305_glue.c
@@ -123,13 +123,9 @@  static void poly1305_simd_blocks(void *ctx, const u8 *inp, size_t len,
 static void poly1305_simd_emit(void *ctx, u8 mac[POLY1305_DIGEST_SIZE],
 			       const u32 nonce[4])
 {
-	struct poly1305_arch_internal *state = ctx;
-
-	if (!IS_ENABLED(CONFIG_AS_AVX) || !static_branch_likely(&poly1305_use_avx) ||
-	    !state->is_base2_26 || !crypto_simd_usable()) {
-		convert_to_base2_64(ctx);
+	if (!IS_ENABLED(CONFIG_AS_AVX) || !static_branch_likely(&poly1305_use_avx))
 		poly1305_emit_x86_64(ctx, mac, nonce);
-	} else
+	else
 		poly1305_emit_avx(ctx, mac, nonce);
 }