crypto/aes: enable asm block ciphers for ppc64

This does not enable GCM or CBC variants for ppc64, they
require more work to support bi-endian.

Updates #18499

Change-Id: Ic2bbe81c60107abc0a4803d8b9a833213286b1d0
Reviewed-on: https://go-review.googlesource.com/c/go/+/404395
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Paul Murphy <murp@ibm.com>
Reviewed-by: Lynn Boger <laboger@linux.vnet.ibm.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Filippo Valsorda <valsorda@google.com>

diff --git a/src/crypto/aes/asm_ppc64le.s b/src/crypto/aes/asm_ppc64x.s
similarity index 97%
rename from src/crypto/aes/asm_ppc64le.s
rename to src/crypto/aes/asm_ppc64x.s
index 1a2e575bccf34365558e5c4dba6eace466f1c3c3..3513f09a93fc5666570aa01e5fa644363abbd6db 100644 (file)
--- a/src/crypto/aes/asm_ppc64le.s
+++ b/src/crypto/aes/asm_ppc64x.s
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ppc64 || ppc64le
+
 // Based on CRYPTOGAMS code with the following comment:
 // # ====================================================================
 // # Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -68,6 +70,7 @@ DATA ·rcon+0x48(SB)/8, $0x0000000000000000
 GLOBL ·rcon(SB), RODATA, $80
 
 // Emulate unaligned BE vector load/stores on LE targets
+#ifdef GOARCH_ppc64le
 #define P8_LXVB16X(RA,RB,VT) \
        LXVD2X  (RA+RB), VT \
        VPERM   VT, VT, ESPERM, VT
@@ -87,6 +90,22 @@ GLOBL ·rcon(SB), RODATA, $80
 #define LXSDX_BE(RA,RB,VT) \
        LXSDX   (RA+RB), VT \
        VPERM   VT, VT, ESPERM, VT
+#else
+#define P8_LXVB16X(RA,RB,VT) \
+       LXVD2X  (RA+RB), VT
+
+#define P8_STXVB16X(VS,RA,RB) \
+       STXVD2X VS, (RA+RB)
+
+#define P8_STXV(VS,RA,RB) \
+       STXVD2X VS, (RA+RB)
+
+#define P8_LXV(RA,RB,VT) \
+       LXVD2X  (RA+RB), VT
+
+#define LXSDX_BE(RA,RB,VT) \
+       LXSDX   (RA+RB), VT
+#endif
 
 // func setEncryptKeyAsm(nr int, key *byte, enc *uint32, dec *uint32)
 TEXT ·expandKeyAsm(SB), NOSPLIT|NOFRAME, $0
@@ -96,9 +115,13 @@ TEXT ·expandKeyAsm(SB), NOSPLIT|NOFRAME, $0
        MOVD    enc+16(FP), OUTENC
        MOVD    dec+24(FP), OUTDEC
 
+#ifdef GOARCH_ppc64le
        MOVD    $·rcon(SB), PTR // PTR point to rcon addr
        LVX     (PTR), ESPERM
        ADD     $0x10, PTR
+#else
+       MOVD    $·rcon+0x10(SB), PTR // PTR point to rcon addr (skipping permute vector)
+#endif
 
        // Get key from memory and write aligned into VR
        P8_LXVB16X(INP, R0, IN0)
@@ -300,8 +323,10 @@ TEXT ·encryptBlockAsm(SB), NOSPLIT|NOFRAME, $0
        MOVD    xk+8(FP), R5   // Key pointer
        MOVD    dst+16(FP), R3 // Dest pointer
        MOVD    src+24(FP), R4 // Src pointer
+#ifdef GOARCH_ppc64le
        MOVD    $·rcon(SB), R7
        LVX     (R7), ESPERM   // Permute value for P8_ macros.
+#endif
 
        // Set CR{1,2,3}EQ to hold the key size information.
        CMPU    R6, $10, CR1
@@ -393,8 +418,10 @@ TEXT ·decryptBlockAsm(SB), NOSPLIT|NOFRAME, $0
        MOVD    xk+8(FP), R5   // Key pointer
        MOVD    dst+16(FP), R3 // Dest pointer
        MOVD    src+24(FP), R4 // Src pointer
+#ifdef GOARCH_ppc64le
        MOVD    $·rcon(SB), R7
        LVX     (R7), ESPERM   // Permute value for P8_ macros.
+#endif
 
        // Set CR{1,2,3}EQ to hold the key size information.
        CMPU    R6, $10, CR1

diff --git a/src/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
index 9c14a2b21f02c380d6551bf4927963efa6e924ae..b7e59d7edb6bd4c4425ddaf8fb1ad9362330bd9a 100644 (file)
--- a/src/crypto/aes/cipher_asm.go
+++ b/src/crypto/aes/cipher_asm.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build amd64 || arm64 || ppc64le
+//go:build amd64 || arm64 || ppc64 || ppc64le
 
 package aes
 
@@ -38,7 +38,7 @@ type aesCipherGCM struct {
        aesCipherAsm
 }
 
-var supportsAES = cpu.X86.HasAES || cpu.ARM64.HasAES || goarch.IsPpc64le == 1
+var supportsAES = cpu.X86.HasAES || cpu.ARM64.HasAES || goarch.IsPpc64 == 1 || goarch.IsPpc64le == 1
 var supportsGFMUL = cpu.X86.HasPCLMULQDQ || cpu.ARM64.HasPMULL
 
 func newCipher(key []byte) (cipher.Block, error) {

diff --git a/src/crypto/aes/cipher_generic.go b/src/crypto/aes/cipher_generic.go
index bff21ae54b59c01c2c06b65e624b6f5ab43c6f04..8a8a3fff384400c4c17191cd7527fba6da503ac1 100644 (file)
--- a/src/crypto/aes/cipher_generic.go
+++ b/src/crypto/aes/cipher_generic.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !amd64 && !s390x && !ppc64le && !arm64
+//go:build !amd64 && !s390x && !ppc64 && !ppc64le && !arm64
 
 package aes