From patchwork Thu Oct 31 19:46:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 11221811 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45DE5913 for ; Thu, 31 Oct 2019 19:47:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B3E920873 for ; Thu, 31 Oct 2019 19:47:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Vx7scA32"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="o+caVVGF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B3E920873 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=9Ow7bgYtEXUS6LCRR3QX8YfkRlv48Rys1duByAryubQ=; b=Vx7scA32VEU5Z4 Y+Z0j4ETSVAcnbLfr7L1hlFiQQZXQTcAByTjo3wIQi3qUHsYP3EBut5q/D+IM2LaAnagV9tccd207 h1XtOmJqq8AIhbrHJA+lF9xs/dLCoRp+ec6lav4e5MxZRaEQmtNJ5abzkRmt3wHKiBuV/w4dO5td3 Gj8PJHque6X40ojjjhv3ljVAhCEGVRy3p5nSEX+bEElN6mvuOR3dorSDbjuYWy+XNKgrANKztJJCu F6ONck0bt5G2sbQ8o/bzzys9eDRQplojLCsXasy4g1qAgFoVn8xzyV0rbbmrAmZkdXTiIMmovG8xT yJMsEsHcOg8bqmUagw6A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iQGPV-0007oR-Jb; Thu, 31 Oct 2019 19:47:09 +0000 Received: from mail-ua1-x949.google.com ([2607:f8b0:4864:20::949]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iQGPR-0007no-U9 for linux-arm-kernel@lists.infradead.org; Thu, 31 Oct 2019 19:47:07 +0000 Received: by mail-ua1-x949.google.com with SMTP id r13so1373365uam.21 for ; Thu, 31 Oct 2019 12:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=mRTJzqi2Ekt/Yu6tImUxgj9kbqR+IWI4OvQzXYofR00=; b=o+caVVGFnJaE5mAgvlQks4Vt9WfRP5nPUg+5+Hr5H23VB74dEbBUvLWtnx5ukYsLuQ uJnHTX/0giXOn5XGbO1SWDm9RHpNQs1kXIZvDQaxkAhLJhnNkP+E1/GerwLMgguovtH5 fljcFhGwDi7EJU81lzjMjyMGYP/MwD7apkHAR327pQK+abQpiNjIgUThEiSOjbTyHbsZ 6zbj6smVIRQIuDsZC+mpkQ1bCElwZSK014y7Wjxik1ylEvZlkwDZjbHdqPKRuzEXT/IA VXyNTjLUKXtmsy5WcEspU+zgyCMY3NGcg1dZtX7etpTHuT/vE0zM6+dqJyF6AULhkhET IdVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=mRTJzqi2Ekt/Yu6tImUxgj9kbqR+IWI4OvQzXYofR00=; b=BxRnJ06hBGRVHE3GBGxTsRDWXVF5IiNCDMWq4YB34s6JC81QPY1MdTTNUlkMMSWco2 ivZmx/Ap/GAmuALGbWGBZxWfi0p/fMcX09IWDVh6ohzPyYAi1fr7Jge3TWGqZfRPqYg1 N17Ze6Mack5G/n2IBDnEF5TF7KFIpeZTPHYOh4LOUYedUXCSXPGJ0v8sbfuU2e7ERYN3 1OMdfVnJsmxZvfIHHAtFjfPr0km28uPgDh+UVYM+qtVbW5dHcE3pIb8T+vpE7Pf92LeW y2CorhcEUK6xSe/zMCY9U5XzYA8bRUMW7UsV0ZY8SsLKbD/L2dKWHuoywnSezkbyBYIW mWpQ== X-Gm-Message-State: APjAAAUPo65OSMzAdj0IqyHPf++ynL3F6uRFUxhiXMH36ElanQsS2cea 3nNnkea7l9jyqbtN272yVx9bhqk9P+Xi/QoGjiA= X-Google-Smtp-Source: APXvYqxzqMbKO2P0RiotkL+tykifzgNeUhGA6MD6WbnPJ+rbijXzJlYgYAoB8+RbcMWACIXROHcgmNmnX/OygX1b+AU= X-Received: by 2002:a67:fe86:: with SMTP id b6mr3761803vsr.162.1572551222774; Thu, 31 Oct 2019 12:47:02 -0700 (PDT) Date: Thu, 31 Oct 2019 12:46:52 -0700 Message-Id: <20191031194652.118427-1-samitolvanen@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog Subject: [RESEND PATCH] arm64: fix alternatives with LLVM's integrated assembler From: Sami Tolvanen To: Catalin Marinas , Will Deacon , Marc Zyngier X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191031_124705_998060_59369681 X-CRM114-Status: GOOD ( 11.24 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:949 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kees Cook , Nick Desaulniers , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org LLVM's integrated assembler fails with the following error when building KVM: :12:6: error: expected absolute expression .if kvm_update_va_mask == 0 ^ :21:6: error: expected absolute expression .if kvm_update_va_mask == 0 ^ :24:2: error: unrecognized instruction mnemonic NOT_AN_INSTRUCTION ^ LLVM ERROR: Error parsing inline asm These errors come from ALTERNATIVE_CB and __ALTERNATIVE_CFG, which test for the existence of the callback parameter in inline assembly using the following expression: " .if " __stringify(cb) " == 0\n" This works with GNU as, but isn't supported by LLVM. This change splits __ALTERNATIVE_CFG and ALTINSTR_ENTRY into separate macros to fix the LLVM build. Link: https://github.com/ClangBuiltLinux/linux/issues/472 Signed-off-by: Sami Tolvanen Tested-by: Nick Desaulniers Reviewed-by: Kees Cook --- arch/arm64/include/asm/alternative.h | 32 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index b9f8d787eea9..324e7d5ab37e 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -35,13 +35,16 @@ void apply_alternatives_module(void *start, size_t length); static inline void apply_alternatives_module(void *start, size_t length) { } #endif -#define ALTINSTR_ENTRY(feature,cb) \ +#define ALTINSTR_ENTRY(feature) \ " .word 661b - .\n" /* label */ \ - " .if " __stringify(cb) " == 0\n" \ " .word 663f - .\n" /* new instruction */ \ - " .else\n" \ + " .hword " __stringify(feature) "\n" /* feature bit */ \ + " .byte 662b-661b\n" /* source len */ \ + " .byte 664f-663f\n" /* replacement len */ + +#define ALTINSTR_ENTRY_CB(feature, cb) \ + " .word 661b - .\n" /* label */ \ " .word " __stringify(cb) "- .\n" /* callback */ \ - " .endif\n" \ " .hword " __stringify(feature) "\n" /* feature bit */ \ " .byte 662b-661b\n" /* source len */ \ " .byte 664f-663f\n" /* replacement len */ @@ -62,15 +65,14 @@ static inline void apply_alternatives_module(void *start, size_t length) { } * * Alternatives with callbacks do not generate replacement instructions. */ -#define __ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg_enabled, cb) \ +#define __ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg_enabled) \ ".if "__stringify(cfg_enabled)" == 1\n" \ "661:\n\t" \ oldinstr "\n" \ "662:\n" \ ".pushsection .altinstructions,\"a\"\n" \ - ALTINSTR_ENTRY(feature,cb) \ + ALTINSTR_ENTRY(feature) \ ".popsection\n" \ - " .if " __stringify(cb) " == 0\n" \ ".pushsection .altinstr_replacement, \"a\"\n" \ "663:\n\t" \ newinstr "\n" \ @@ -78,17 +80,25 @@ static inline void apply_alternatives_module(void *start, size_t length) { } ".popsection\n\t" \ ".org . - (664b-663b) + (662b-661b)\n\t" \ ".org . - (662b-661b) + (664b-663b)\n" \ - ".else\n\t" \ + ".endif\n" + +#define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb) \ + ".if "__stringify(cfg_enabled)" == 1\n" \ + "661:\n\t" \ + oldinstr "\n" \ + "662:\n" \ + ".pushsection .altinstructions,\"a\"\n" \ + ALTINSTR_ENTRY_CB(feature, cb) \ + ".popsection\n" \ "663:\n\t" \ "664:\n\t" \ - ".endif\n" \ ".endif\n" #define _ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg, ...) \ - __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg), 0) + __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg)) #define ALTERNATIVE_CB(oldinstr, cb) \ - __ALTERNATIVE_CFG(oldinstr, "NOT_AN_INSTRUCTION", ARM64_CB_PATCH, 1, cb) + __ALTERNATIVE_CFG_CB(oldinstr, ARM64_CB_PATCH, 1, cb) #else #include