From patchwork Sun Oct 6 17:20:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 175300 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3313118ill; Sun, 6 Oct 2019 10:49:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxa8oPiZ2VxlbQ+A1zNCeARxVbDGpfhwjgLoFSmtSd+5Cr/FOukTGeJNF/cjEZyeNsS1BN8 X-Received: by 2002:a50:b0c5:: with SMTP id j63mr25744464edd.90.1570384170174; Sun, 06 Oct 2019 10:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570384170; cv=none; d=google.com; s=arc-20160816; b=lzzaDkK9TdXmu1uBF5nRCV/l2VwRA1FP2hEJ5uVx7mo3E3fLXyv53+/IoeHc4s2EJU 33ZOIEme4syYr6gRY/GMR9JLdPaAz+66YSWkamhEqiElnskN1i50u72a0H7B/YSUYN+p Ve9BrZH2yaTBdJuVh9ommeKka1xNunGeiYbRYllolD4trSDofR3ej5F9qEKiq+tUcNgM 8v+j5VaIT1bOcWGzLhNqfipbCnGK358OJvETHsEiDT083SfQQojZfyoT/BPRKQ7v13GH oMzKq/g0vabWpu5EiT1OOt2jjTxINGzd9BeD/Rw4Pcqe8vaTNlBR6xm7bxdGphwcRADA W1xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Wm8do8uUkgpxPUlaWaQ3vx1rSMZzH4JTTST8FZ541WU=; b=o63ingmTSQgLdugM37caDbV0UCtlHiFCJNufemW8rMunmTgMmtglj3YeFvgaUmeoLc zlK4xLBDl/yilnMPxcpnnWT3NirnYoHQZf2K9kuifreFaFzSJxW0yQ+EElyCYnX0nAoi jm4SKEuZFrXk+afQ6LjKE79mFnWIBY25jpRv/jdLHitG2QiYRRwlDLZPupXXy6foLgfM ijcQhYSrUzOfhTO6nZ/GQ1kVz/B/lTInBJf735ke77s9skvNVC5NTK8+sY1dbpFE/c1y T+poMqiHDENTf+fwG5mfPCqX6lpYyZQhL8dg1kgLTC5xwCa1h6U3EzS0+iMQoRhJV7UV g+Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D29NobGm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h26si5968266ejx.177.2019.10.06.10.49.29; Sun, 06 Oct 2019 10:49:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D29NobGm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730932AbfJFRmG (ORCPT + 27 others); Sun, 6 Oct 2019 13:42:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:41768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730902AbfJFRmD (ORCPT ); Sun, 6 Oct 2019 13:42:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B81482080F; Sun, 6 Oct 2019 17:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570383722; bh=OykuoBvG7eWAabm6JjGpW/J91pGbkUxRh6yTEZjST08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D29NobGm5re8ei1L7ORz2E9fyMRHiKCOyeEvPk7tNYgNowDiXXAr5cgbiwKIzYrVr +wylP/ZB7eftBKVFHE4A8YrFEaxZxvmHzb4Wi8RFlREPpoMzxWTo5XZ3H/PQxD5k88 QUr057NRhd/D1Lmv60OjQamMDwhquR3TtjfS3a1Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Andrew Murray , Arnd Bergmann , Will Deacon , Sasha Levin Subject: [PATCH 5.3 070/166] arm64: fix unreachable code issue with cmpxchg Date: Sun, 6 Oct 2019 19:20:36 +0200 Message-Id: <20191006171219.278323490@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191006171212.850660298@linuxfoundation.org> References: <20191006171212.850660298@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 920fdab7b3ce98c14c840261e364f490f3679a62 ] On arm64 build with clang, sometimes the __cmpxchg_mb is not inlined when CONFIG_OPTIMIZE_INLINING is set. Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is: mm/memcontrol.o: In function `__cmpxchg_mb': memcontrol.c:(.text+0x1a4c): undefined reference to `__compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `__compiletime_assert_175' Mark all of the cmpxchg() style functions as __always_inline to ensure that the compiler can see the result. Acked-by: Nick Desaulniers Reported-by: Nathan Chancellor Link: https://github.com/ClangBuiltLinux/linux/issues/648 Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Reviewed-by: Andrew Murray Tested-by: Andrew Murray Signed-off-by: Arnd Bergmann Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index 7a299a20f6dcc..7a8b8bc69e8d1 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -63,7 +63,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory") #undef __XCHG_CASE #define __XCHG_GEN(sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \ @@ -105,7 +105,7 @@ __XCHG_GEN(_mb) #define arch_xchg(...) __xchg_wrapper( _mb, __VA_ARGS__) #define __CMPXCHG_GEN(sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \ @@ -212,7 +212,7 @@ __CMPWAIT_CASE( , , 64); #undef __CMPWAIT_CASE #define __CMPWAIT_GEN(sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \