From patchwork Tue Sep 10 11:56:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 173519 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5688463ilq; Tue, 10 Sep 2019 04:57:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgk6fT4r5HZx+d+2VkMcQkeMCRkWNtyWi6HSC8UfV4AHKFnqVouTy+vMOhIDNhLI/3jzq3 X-Received: by 2002:aa7:d0d1:: with SMTP id u17mr25112101edo.99.1568116633672; Tue, 10 Sep 2019 04:57:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568116633; cv=none; d=google.com; s=arc-20160816; b=YzglmwYTVg1jlMU5nxhoO+JIhyIidOw7KAb2/5C9FEchU+WyUWR+1Rx0AuJ55gvcdL KzO2qbSTiGLeXhErhidqsfvwgg1OpaHi5ekTgI+90VnxqiiO/C5oFNAqMSVFtP7dAHwS EWpXwJToaZmT7YOZC7Jfx2v8T0yubs4kxUcB+kj5MCD5qqinHhFbRLG/JwxTXAaBoTgA UCIDrSXR/fR0gFhKLfobw1vA/WoOylGNTvFoWBolU7wtHO1ep9ipjndg+oAKBXKjq5jI 4nhM7nbfU94VA9c+qrs3vU2P+Ty5DG0jgmNIwV0OIQUUc41hjw+hvjN9igEoHsw80iBQ c8Zg== 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 :message-id:date:subject:cc:to:from; bh=TKVCHP4qC5YMV7VI1A96q8SYn1yjA9Hf41X9aRGOors=; b=Rqkj1C6SFOQOtOg3mHP8766iVSAHS8oQ6carEmgDpgKbnD6B1udhp0xwoVGZCZpR9g d+V6MvOf/aRvJG4/+BzjH03jmw5fzazEq3O6pHAFq0tL3ARHCe3vkOCP0DREKCgRKGgk MxZa9fOGnPb1f/xavuC4qldPVtvneWbh+e6UDqdCRH8pPKe0BOtJLJn7G4wtFUpgujln cVaCiXXfMqUC9hrz4GjkfQnRq+XbTQu+glUdxqANjtSZDQu1jQipiI0n7QoesuY11aEA 3PvN6jhFQGPO7zBQ1rl+OhC7olw+X+UJQhGR1ou+3GHepAjLq7ioq/59XHn7/c3vwfWh 0wdA== ARC-Authentication-Results: i=1; mx.google.com; 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 gl11si9461799ejb.306.2019.09.10.04.57.13; Tue, 10 Sep 2019 04:57:13 -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; 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 S2393172AbfIJL5K (ORCPT + 27 others); Tue, 10 Sep 2019 07:57:10 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:48971 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732932AbfIJL5I (ORCPT ); Tue, 10 Sep 2019 07:57:08 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M2xjg-1i8k9h33wC-003NW5; Tue, 10 Sep 2019 13:56:45 +0200 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Cc: Arnd Bergmann , Nick Desaulniers , Nathan Chancellor , Andrew Murray , Thomas Gleixner , "Peter Zijlstra (Intel)" , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Subject: [PATCH] [v2] arm64: fix unreachable code issue with cmpxchg Date: Tue, 10 Sep 2019 13:56:22 +0200 Message-Id: <20190910115643.391995-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:EHTSpuLoMolBSz8CcDfb/qHKuFLM8p+7X9tC8Slqv2t0NwgBE8C CEK+aT1cF8p9GCYOMXQ9HwXnX5NR3vF73638cRLoJsKIRu4XOBbcOp7sn4PNSRR5Jbt0Sry d6um31l43yl6egOIpt1DYB9KLWb+JQkE3FcXmpjvrBxGY9yI6dKjHFJ35D2Ao3CsqwFFPRU kW57LeoduR53gqRvt9G4A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:tZ2pxyEDoFE=:FjiMNmyAJhF+Kct/9J4gj6 WlnXVAVAC8Cxf0IYDscFNtsWlONzdMJXCr0JwZPzKZe6H2kyJ+9zA6HZFLjNI6X8TGtTkx1ZU YeaJHl2QR/C+yOjV5mni9COAFLkrzR9B7FOn2i+MEUH3TSPUt1pRfhhr/JI6u/vxjpCCIXE56 lNNhX2f3/fJAYKLEbZEVxiRggi9Ae3gY4942USVK6PBNwClhC4wz7fiy4rmgHW5cFUcxop+oW bhsTxXPMd3ZNAjh+m6UWJBBZlkWFR9iScOGuXMPlP9jiMWveayxKFHQzPHzdwVD0hBYv3H0Uy FAV/roihgc1V0OUDl0qwBKuk9y4inwLCLHCYShGOiiJQ/BzEHzoR8Uzn76IZ4vaBXyvsguiAQ GKMMqeoH7+xtXsCDhFTxAewinskUBlX1II/D54y5mi4S1S7Cb+s49Vy3pPwPZaCQ0FGUxBcLL bm8u22xwBXQZMAHtIBrJGBOKZEBIeoKBzNZo7YLv8DI6q+Uh2qNAWIcZF60YxOoYrkSQ2SlsX EjN3vfJjiwr+RAvsJGgW0Updu1M0NHsFManaC9mkCRbY0k36V7Bi7YkrQEzUEPjkBMVXH7l4D eaUUPAu6qsGCrrVdU9IB/Autez1PeKBWm66DURBJl+gtrTiw9RrEbLT0xkiXlBXlOs05c1YsI uxOL6R7TgViEhaboreZmuwhnng1zszG6BEXPJNLZ/bynHBAJHtf8NvDNWlzmHJC9IeTSTpQtG QLsB2fv3oQcctBcfg0wLRYs1XNLJoirOb5z3fOldnxwVHphjv344tb3G7pOKU9SH+f/JD0ZkR H1QVp8iXmykxUFgO3di1hBiinYpWgQvVDHWXAEBGF9wZY5SgfU= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- v2: skip unneeded changes, as suggested by Andrew Murray --- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.0 diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index a1398f2f9994..f9bef42c1411 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -62,7 +62,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) \ { \ @@ -148,7 +148,7 @@ __CMPXCHG_DBL(_mb) #undef __CMPXCHG_DBL #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) \ @@ -255,7 +255,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) \ { \