From patchwork Tue Jun 23 03:06:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 197601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CF55C433E0 for ; Tue, 23 Jun 2020 03:06:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58739207DD for ; Tue, 23 Jun 2020 03:06:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XqiDAsWS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731955AbgFWDGI (ORCPT ); Mon, 22 Jun 2020 23:06:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731930AbgFWDGI (ORCPT ); Mon, 22 Jun 2020 23:06:08 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDEB1C061573; Mon, 22 Jun 2020 20:06:07 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id c3so18849085wru.12; Mon, 22 Jun 2020 20:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gDFZJhziI4bx1fhA+zo/2xzJxyNJbKp5Ip/Ak0hTxhc=; b=XqiDAsWSH4MmergmVnRepCwJ0PEuawbL4vKowTIW/VoGYyHWpe07dLkBayIjWb+ky8 oQhCNL0GJUJKwDKDlPB7fz703Ny0LbgefaUPFdE52ZwwPx+LdANFNvpuI0yMFdsuKHZI Xdwq5ywzYjmYUXZiXJbpVaaGkaYd0k6b9/77OfELV4WtnHIaLdflxZy8RN92Zlld5rbl wrASZscCdn4MB1+H5nEZH4ohTojaSdKLnfxUcVnsTEhp7swpRgqkPvERiBBYvgtjQf/9 frL8Z1lBJAckmfRVam3jUlid85tSZAMs+ew4RTmW7coa54L+5qo95hNf7cI9qgPu2tct oR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gDFZJhziI4bx1fhA+zo/2xzJxyNJbKp5Ip/Ak0hTxhc=; b=JkrKpXko1OrU/nt85F6nA+/tsdM4/l6eZJ6nYXZjEK87B4LWNw1aYKrCWl53RcMo+V MGl3yVtduHFWFIFYBJgdLzSnrlBVMFVberIVR7YRVFoRqW5bA6XuEEFN0ceuBOM+4Li8 UxAZzxr7b/AJWRWaQn7qPH+cdd8OXI+dkq5i12GFuyXTt62C7uczCMpoQFtPXOpsbH43 iiv3ph3yiskEDoDxN7oR6IMTCREFx+OZ79L7GIrzX5fxKNO6gEdoLb4FM/EFUVP9MZr7 UiQu4JqKXEseekiaVciNrnwbcQ+u17ZQ5yyiaI3CmP6UVIwYg90egEod2HS/oHtGzA3G lBFw== X-Gm-Message-State: AOAM531MMuAKWGGf6xo6o+8gVYGe5M5h/ql+5q5f6YmLm1Ui+CATIyHb TuAscQ+oWDHX2EKr/osPcaY= X-Google-Smtp-Source: ABdhPJzi+Ak4Uaz0oMdndswvw8J90aq7XuDmXGHCMiENCUlGkVPbxbJ5fMVOoTv8Uk7b81TQkVZsPg== X-Received: by 2002:adf:ded2:: with SMTP id i18mr22937284wrn.109.1592881566579; Mon, 22 Jun 2020 20:06:06 -0700 (PDT) Received: from localhost.localdomain ([46.114.107.138]) by smtp.gmail.com with ESMTPSA id z9sm1666015wmi.41.2020.06.22.20.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2020 20:06:06 -0700 (PDT) From: Sedat Dilek To: Herbert Xu , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Cc: Sedat Dilek , Craig Topper , Craig Topper Subject: [PATCH 5.7 v3] x86/crypto: aesni: Fix build with LLVM_IAS=1 Date: Tue, 23 Jun 2020 05:06:00 +0200 Message-Id: <20200623030600.18848-1-sedat.dilek@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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: :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) ^ :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 ^ :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) ^ :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 Suggested-by: Craig Topper Suggested-by: Nick Desaulniers ndesaulniers@google.com Cc: "ClangBuiltLinux" Link: https://github.com/ClangBuiltLinux/linux/issues/1050 Signed-off-by: Sedat Dilek --- Changes v2->v3: - Add this Changelog Changes v1->v2: - Replace Cc by Suggested-by for Craig - Replace Cc by Suggested-by for Nick (dropped Cc as desired) - Really follow the suggestions of Craig - Drop unneeded comments for my build-environment and Links 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 cad6e1bfa7d5..c216de287742 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