| From d9c5e9bbc47bb0ba0e00af4afc1c4b0e8f2423b7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 3 Jul 2020 16:32:06 +0200 |
| Subject: crypto: aesni - Fix build with LLVM_IAS=1 |
| |
| From: Sedat Dilek <sedat.dilek@gmail.com> |
| |
| [ Upstream commit 3347c8a079d67af21760a78cc5f2abbcf06d9571 ] |
| |
| When building with LLVM_IAS=1 means using Clang's Integrated Assembly (IAS) |
| from LLVM/Clang >= v10.0.1-rc1+ instead of GNU/as from GNU/binutils |
| I see the following breakage in Debian/testing AMD64: |
| |
| <instantiation>:15:74: error: too many positional arguments |
| PRECOMPUTE 8*3+8(%rsp), %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, |
| ^ |
| arch/x86/crypto/aesni-intel_asm.S:1598:2: note: while in macro instantiation |
| GCM_INIT %r9, 8*3 +8(%rsp), 8*3 +16(%rsp), 8*3 +24(%rsp) |
| ^ |
| <instantiation>:47:2: error: unknown use of instruction mnemonic without a size suffix |
| GHASH_4_ENCRYPT_4_PARALLEL_dec %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, %xmm8, enc |
| ^ |
| arch/x86/crypto/aesni-intel_asm.S:1599:2: note: while in macro instantiation |
| GCM_ENC_DEC dec |
| ^ |
| <instantiation>:15:74: error: too many positional arguments |
| PRECOMPUTE 8*3+8(%rsp), %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, |
| ^ |
| arch/x86/crypto/aesni-intel_asm.S:1686:2: note: while in macro instantiation |
| GCM_INIT %r9, 8*3 +8(%rsp), 8*3 +16(%rsp), 8*3 +24(%rsp) |
| ^ |
| <instantiation>:47:2: error: unknown use of instruction mnemonic without a size suffix |
| GHASH_4_ENCRYPT_4_PARALLEL_enc %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, %xmm8, enc |
| ^ |
| arch/x86/crypto/aesni-intel_asm.S:1687:2: note: while in macro instantiation |
| GCM_ENC_DEC enc |
| |
| Craig Topper suggested me in ClangBuiltLinux issue #1050: |
| |
| > I think the "too many positional arguments" is because the parser isn't able |
| > to handle the trailing commas. |
| > |
| > The "unknown use of instruction mnemonic" is because the macro was named |
| > GHASH_4_ENCRYPT_4_PARALLEL_DEC but its being instantiated with |
| > GHASH_4_ENCRYPT_4_PARALLEL_dec I guess gas ignores case on the |
| > macro instantiation, but llvm doesn't. |
| |
| First, I removed the trailing comma in the PRECOMPUTE line. |
| |
| Second, I substituted: |
| 1. GHASH_4_ENCRYPT_4_PARALLEL_DEC -> GHASH_4_ENCRYPT_4_PARALLEL_dec |
| 2. GHASH_4_ENCRYPT_4_PARALLEL_ENC -> GHASH_4_ENCRYPT_4_PARALLEL_enc |
| |
| With these changes I was able to build with LLVM_IAS=1 and boot on bare metal. |
| |
| I confirmed that this works with Linux-kernel v5.7.5 final. |
| |
| NOTE: This patch is on top of Linux v5.7 final. |
| |
| Thanks to Craig and especially Nick for double-checking and his comments. |
| |
| Suggested-by: Craig Topper <craig.topper@intel.com> |
| Suggested-by: Craig Topper <craig.topper@gmail.com> |
| Suggested-by: Nick Desaulniers <ndesaulniers@google.com> |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Cc: "ClangBuiltLinux" <clang-built-linux@googlegroups.com> |
| Link: https://github.com/ClangBuiltLinux/linux/issues/1050 |
| Link: https://bugs.llvm.org/show_bug.cgi?id=24494 |
| Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/crypto/aesni-intel_asm.S | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S |
| index cad6e1bfa7d5f..c216de2877426 100644 |
| --- a/arch/x86/crypto/aesni-intel_asm.S |
| +++ b/arch/x86/crypto/aesni-intel_asm.S |
| @@ -266,7 +266,7 @@ ALL_F: .octa 0xffffffffffffffffffffffffffffffff |
| PSHUFB_XMM %xmm2, %xmm0 |
| movdqu %xmm0, CurCount(%arg2) # ctx_data.current_counter = iv |
| |
| - PRECOMPUTE \SUBKEY, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7, |
| + PRECOMPUTE \SUBKEY, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7 |
| movdqu HashKey(%arg2), %xmm13 |
| |
| CALC_AAD_HASH %xmm13, \AAD, \AADLEN, %xmm0, %xmm1, %xmm2, %xmm3, \ |
| @@ -978,7 +978,7 @@ _initial_blocks_done\@: |
| * arg1, %arg3, %arg4 are used as pointers only, not modified |
| * %r11 is the data offset value |
| */ |
| -.macro GHASH_4_ENCRYPT_4_PARALLEL_ENC TMP1 TMP2 TMP3 TMP4 TMP5 \ |
| +.macro GHASH_4_ENCRYPT_4_PARALLEL_enc TMP1 TMP2 TMP3 TMP4 TMP5 \ |
| TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation |
| |
| movdqa \XMM1, \XMM5 |
| @@ -1186,7 +1186,7 @@ aes_loop_par_enc_done\@: |
| * arg1, %arg3, %arg4 are used as pointers only, not modified |
| * %r11 is the data offset value |
| */ |
| -.macro GHASH_4_ENCRYPT_4_PARALLEL_DEC TMP1 TMP2 TMP3 TMP4 TMP5 \ |
| +.macro GHASH_4_ENCRYPT_4_PARALLEL_dec TMP1 TMP2 TMP3 TMP4 TMP5 \ |
| TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation |
| |
| movdqa \XMM1, \XMM5 |
| -- |
| 2.25.1 |
| |