All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] crypto: arm/blake2s - fix for big endian
@ 2021-03-10  7:27 ` Eric Biggers
  0 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2021-03-10  7:27 UTC (permalink / raw)
  To: linux-crypto; +Cc: linux-arm-kernel

From: Eric Biggers <ebiggers@google.com>

The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
in big endian kernel builds because it doesn't swap the endianness of
the message words when loading them.  Fix this.

Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm/crypto/blake2s-core.S b/arch/arm/crypto/blake2s-core.S
index bed897e9a181a..86345751bbf3a 100644
--- a/arch/arm/crypto/blake2s-core.S
+++ b/arch/arm/crypto/blake2s-core.S
@@ -8,6 +8,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 	// Registers used to hold message words temporarily.  There aren't
 	// enough ARM registers to hold the whole message block, so we have to
@@ -38,6 +39,23 @@
 #endif
 .endm
 
+.macro _le32_bswap	a, tmp
+#ifdef __ARMEB__
+	rev_l		\a, \tmp
+#endif
+.endm
+
+.macro _le32_bswap_8x	a, b, c, d, e, f, g, h,  tmp
+	_le32_bswap	\a, \tmp
+	_le32_bswap	\b, \tmp
+	_le32_bswap	\c, \tmp
+	_le32_bswap	\d, \tmp
+	_le32_bswap	\e, \tmp
+	_le32_bswap	\f, \tmp
+	_le32_bswap	\g, \tmp
+	_le32_bswap	\h, \tmp
+.endm
+
 // Execute a quarter-round of BLAKE2s by mixing two columns or two diagonals.
 // (a0, b0, c0, d0) and (a1, b1, c1, d1) give the registers containing the two
 // columns/diagonals.  s0-s1 are the word offsets to the message words the first
@@ -180,8 +198,10 @@ ENTRY(blake2s_compress_arch)
 	tst		r1, #3
 	bne		.Lcopy_block_misaligned
 	ldmia		r1!, {r2-r9}
+	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14
 	stmia		r12!, {r2-r9}
 	ldmia		r1!, {r2-r9}
+	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14
 	stmia		r12, {r2-r9}
 .Lcopy_block_done:
 	str		r1, [sp, #68]		// Update message pointer
@@ -268,6 +288,7 @@ ENTRY(blake2s_compress_arch)
 1:
 #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
 	ldr		r3, [r1], #4
+	_le32_bswap	r3, r4
 #else
 	ldrb		r3, [r1, #0]
 	ldrb		r4, [r1, #1]
-- 
2.30.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] crypto: arm/blake2s - fix for big endian
@ 2021-03-10  7:27 ` Eric Biggers
  0 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2021-03-10  7:27 UTC (permalink / raw)
  To: linux-crypto; +Cc: linux-arm-kernel

From: Eric Biggers <ebiggers@google.com>

The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
in big endian kernel builds because it doesn't swap the endianness of
the message words when loading them.  Fix this.

Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm/crypto/blake2s-core.S b/arch/arm/crypto/blake2s-core.S
index bed897e9a181a..86345751bbf3a 100644
--- a/arch/arm/crypto/blake2s-core.S
+++ b/arch/arm/crypto/blake2s-core.S
@@ -8,6 +8,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 	// Registers used to hold message words temporarily.  There aren't
 	// enough ARM registers to hold the whole message block, so we have to
@@ -38,6 +39,23 @@
 #endif
 .endm
 
+.macro _le32_bswap	a, tmp
+#ifdef __ARMEB__
+	rev_l		\a, \tmp
+#endif
+.endm
+
+.macro _le32_bswap_8x	a, b, c, d, e, f, g, h,  tmp
+	_le32_bswap	\a, \tmp
+	_le32_bswap	\b, \tmp
+	_le32_bswap	\c, \tmp
+	_le32_bswap	\d, \tmp
+	_le32_bswap	\e, \tmp
+	_le32_bswap	\f, \tmp
+	_le32_bswap	\g, \tmp
+	_le32_bswap	\h, \tmp
+.endm
+
 // Execute a quarter-round of BLAKE2s by mixing two columns or two diagonals.
 // (a0, b0, c0, d0) and (a1, b1, c1, d1) give the registers containing the two
 // columns/diagonals.  s0-s1 are the word offsets to the message words the first
@@ -180,8 +198,10 @@ ENTRY(blake2s_compress_arch)
 	tst		r1, #3
 	bne		.Lcopy_block_misaligned
 	ldmia		r1!, {r2-r9}
+	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14
 	stmia		r12!, {r2-r9}
 	ldmia		r1!, {r2-r9}
+	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14
 	stmia		r12, {r2-r9}
 .Lcopy_block_done:
 	str		r1, [sp, #68]		// Update message pointer
@@ -268,6 +288,7 @@ ENTRY(blake2s_compress_arch)
 1:
 #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
 	ldr		r3, [r1], #4
+	_le32_bswap	r3, r4
 #else
 	ldrb		r3, [r1, #0]
 	ldrb		r4, [r1, #1]
-- 
2.30.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] crypto: arm/blake2s - fix for big endian
  2021-03-10  7:27 ` Eric Biggers
@ 2021-03-10  8:55   ` Ard Biesheuvel
  -1 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2021-03-10  8:55 UTC (permalink / raw)
  To: Eric Biggers; +Cc: Linux Crypto Mailing List, Linux ARM

On Wed, 10 Mar 2021 at 08:29, Eric Biggers <ebiggers@kernel.org> wrote:
>
> From: Eric Biggers <ebiggers@google.com>
>
> The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
> in big endian kernel builds because it doesn't swap the endianness of
> the message words when loading them.  Fix this.
>
> Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/crypto/blake2s-core.S b/arch/arm/crypto/blake2s-core.S
> index bed897e9a181a..86345751bbf3a 100644
> --- a/arch/arm/crypto/blake2s-core.S
> +++ b/arch/arm/crypto/blake2s-core.S
> @@ -8,6 +8,7 @@
>   */
>
>  #include <linux/linkage.h>
> +#include <asm/assembler.h>
>
>         // Registers used to hold message words temporarily.  There aren't
>         // enough ARM registers to hold the whole message block, so we have to
> @@ -38,6 +39,23 @@
>  #endif
>  .endm
>
> +.macro _le32_bswap     a, tmp
> +#ifdef __ARMEB__
> +       rev_l           \a, \tmp
> +#endif
> +.endm
> +
> +.macro _le32_bswap_8x  a, b, c, d, e, f, g, h,  tmp
> +       _le32_bswap     \a, \tmp
> +       _le32_bswap     \b, \tmp
> +       _le32_bswap     \c, \tmp
> +       _le32_bswap     \d, \tmp
> +       _le32_bswap     \e, \tmp
> +       _le32_bswap     \f, \tmp
> +       _le32_bswap     \g, \tmp
> +       _le32_bswap     \h, \tmp
> +.endm
> +
>  // Execute a quarter-round of BLAKE2s by mixing two columns or two diagonals.
>  // (a0, b0, c0, d0) and (a1, b1, c1, d1) give the registers containing the two
>  // columns/diagonals.  s0-s1 are the word offsets to the message words the first
> @@ -180,8 +198,10 @@ ENTRY(blake2s_compress_arch)
>         tst             r1, #3
>         bne             .Lcopy_block_misaligned
>         ldmia           r1!, {r2-r9}
> +       _le32_bswap_8x  r2, r3, r4, r5, r6, r7, r8, r9,  r14
>         stmia           r12!, {r2-r9}
>         ldmia           r1!, {r2-r9}
> +       _le32_bswap_8x  r2, r3, r4, r5, r6, r7, r8, r9,  r14
>         stmia           r12, {r2-r9}
>  .Lcopy_block_done:
>         str             r1, [sp, #68]           // Update message pointer
> @@ -268,6 +288,7 @@ ENTRY(blake2s_compress_arch)
>  1:
>  #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
>         ldr             r3, [r1], #4
> +       _le32_bswap     r3, r4
>  #else
>         ldrb            r3, [r1, #0]
>         ldrb            r4, [r1, #1]
> --
> 2.30.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] crypto: arm/blake2s - fix for big endian
@ 2021-03-10  8:55   ` Ard Biesheuvel
  0 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2021-03-10  8:55 UTC (permalink / raw)
  To: Eric Biggers; +Cc: Linux Crypto Mailing List, Linux ARM

On Wed, 10 Mar 2021 at 08:29, Eric Biggers <ebiggers@kernel.org> wrote:
>
> From: Eric Biggers <ebiggers@google.com>
>
> The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
> in big endian kernel builds because it doesn't swap the endianness of
> the message words when loading them.  Fix this.
>
> Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/crypto/blake2s-core.S b/arch/arm/crypto/blake2s-core.S
> index bed897e9a181a..86345751bbf3a 100644
> --- a/arch/arm/crypto/blake2s-core.S
> +++ b/arch/arm/crypto/blake2s-core.S
> @@ -8,6 +8,7 @@
>   */
>
>  #include <linux/linkage.h>
> +#include <asm/assembler.h>
>
>         // Registers used to hold message words temporarily.  There aren't
>         // enough ARM registers to hold the whole message block, so we have to
> @@ -38,6 +39,23 @@
>  #endif
>  .endm
>
> +.macro _le32_bswap     a, tmp
> +#ifdef __ARMEB__
> +       rev_l           \a, \tmp
> +#endif
> +.endm
> +
> +.macro _le32_bswap_8x  a, b, c, d, e, f, g, h,  tmp
> +       _le32_bswap     \a, \tmp
> +       _le32_bswap     \b, \tmp
> +       _le32_bswap     \c, \tmp
> +       _le32_bswap     \d, \tmp
> +       _le32_bswap     \e, \tmp
> +       _le32_bswap     \f, \tmp
> +       _le32_bswap     \g, \tmp
> +       _le32_bswap     \h, \tmp
> +.endm
> +
>  // Execute a quarter-round of BLAKE2s by mixing two columns or two diagonals.
>  // (a0, b0, c0, d0) and (a1, b1, c1, d1) give the registers containing the two
>  // columns/diagonals.  s0-s1 are the word offsets to the message words the first
> @@ -180,8 +198,10 @@ ENTRY(blake2s_compress_arch)
>         tst             r1, #3
>         bne             .Lcopy_block_misaligned
>         ldmia           r1!, {r2-r9}
> +       _le32_bswap_8x  r2, r3, r4, r5, r6, r7, r8, r9,  r14
>         stmia           r12!, {r2-r9}
>         ldmia           r1!, {r2-r9}
> +       _le32_bswap_8x  r2, r3, r4, r5, r6, r7, r8, r9,  r14
>         stmia           r12, {r2-r9}
>  .Lcopy_block_done:
>         str             r1, [sp, #68]           // Update message pointer
> @@ -268,6 +288,7 @@ ENTRY(blake2s_compress_arch)
>  1:
>  #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
>         ldr             r3, [r1], #4
> +       _le32_bswap     r3, r4
>  #else
>         ldrb            r3, [r1, #0]
>         ldrb            r4, [r1, #1]
> --
> 2.30.1
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] crypto: arm/blake2s - fix for big endian
  2021-03-10  7:27 ` Eric Biggers
@ 2021-03-19 11:03   ` Herbert Xu
  -1 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2021-03-19 11:03 UTC (permalink / raw)
  To: Eric Biggers; +Cc: linux-crypto, linux-arm-kernel

Eric Biggers <ebiggers@kernel.org> wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
> in big endian kernel builds because it doesn't swap the endianness of
> the message words when loading them.  Fix this.
> 
> Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] crypto: arm/blake2s - fix for big endian
@ 2021-03-19 11:03   ` Herbert Xu
  0 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2021-03-19 11:03 UTC (permalink / raw)
  To: Eric Biggers; +Cc: linux-crypto, linux-arm-kernel

Eric Biggers <ebiggers@kernel.org> wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The new ARM BLAKE2s code doesn't work correctly (fails the self-tests)
> in big endian kernel builds because it doesn't swap the endianness of
> the message words when loading them.  Fix this.
> 
> Fixes: 5172d322d34c ("crypto: arm/blake2s - add ARM scalar optimized BLAKE2s")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> arch/arm/crypto/blake2s-core.S | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-19 11:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-10  7:27 [PATCH] crypto: arm/blake2s - fix for big endian Eric Biggers
2021-03-10  7:27 ` Eric Biggers
2021-03-10  8:55 ` Ard Biesheuvel
2021-03-10  8:55   ` Ard Biesheuvel
2021-03-19 11:03 ` Herbert Xu
2021-03-19 11:03   ` Herbert Xu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.