From patchwork Sun Oct 6 17:20:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 175288 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3298654ill; Sun, 6 Oct 2019 10:31:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIBMgpLCFBlCvgv5pKjt50F6KrOKyI117clioRkn8694M4pS4MQtThoVEJEdG1kgtVI3az X-Received: by 2002:a50:aa86:: with SMTP id q6mr26081516edc.288.1570383078782; Sun, 06 Oct 2019 10:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570383078; cv=none; d=google.com; s=arc-20160816; b=xUOzzQsYuBDgFIHZqRwB2TCmzQdUhBO6J1zfyiltNwmWnGZ2PbUtNFqvxl3G7+qc3e eI0zIYosf+hqFrVZSww/VFMkTvCTvQwYRJH/6mdXnaMOzzXJfAIERhI2Vufi3wmVtNpw LrmJEdXKOyjOV/rgqdOSQ3yn7az9TCuZWkp59O2udTF614EC3p2T2rhi45rZooqIT/wA 31WWjvh0kIRtAT2CKsi1IVRmMxnvFp3NiWrcowqhLjCES5/oleNR1w4avV5gw6KemypI Y0FR1CTieNWvXKMGiqdVMSi1QGyTHEznFcLNQ7sfh9nRwihLWnjniyQrNP+FcUos9CuS x6Dw== 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=bZRN+Ojit5BdaqgkGYZ1FzSDUa+TqCiqhfcnOM/c2Gw=; b=fNST5r5d40hxBk/Oxc9ZWLbK1OBe87rTxAD1lZU9atjo+O/80/IY1IFUaKJ6zC8zCN tLeBPNssZyUtAtAymlSGkU97DKjYIo078GPYOCTF7QspdwSJaI69nwk399ECNCJvs2UX VUzc3Qj9GfZweILXXHeWOVBNOEMNxtFpzS/E+T+nl2r5cgRIMdVUXghIvPX3nAmIbd1+ e/f8/Ch/Gc9/T3cCaQADmLuoyNad1/pSsR3N0pGp0gJFxKo833o3EiM0u/Rppfk+YiPQ n58JGEcZvnw0XTEY2mV74kEpH5QfmdFl5NuvfUigfdyMxoXwzGkHa1iDMoOSzcQ1X2kk Cz5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=L7JY4OBz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 y13si5914027ejw.2.2019.10.06.10.31.18; Sun, 06 Oct 2019 10:31:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=L7JY4OBz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727488AbfJFRbR (ORCPT + 14 others); Sun, 6 Oct 2019 13:31:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:57444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729392AbfJFRbQ (ORCPT ); Sun, 6 Oct 2019 13:31:16 -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 2ABFA214D9; Sun, 6 Oct 2019 17:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570383075; bh=3Yxm805HcMBC0NVzEht6kknUPgIVytbLs66C3vx93cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7JY4OBz5I3IrUbCdqkNU+ZAqNRIwMduUAWGL5o5ZFgh1YvyiOt4sp96I64nCqfIQ 5OcsXef64RIe9V8AdF0cQLmT+mlWwmP3XhofVuW2yT5iE9uJm62yV+0lHG6d7i4/Q6 OmPBOEHRBV3MjgBc8gC5EkOCid1/ZYbt0iqodSZ8= 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 4.19 040/106] arm64: fix unreachable code issue with cmpxchg Date: Sun, 6 Oct 2019 19:20:46 +0200 Message-Id: <20191006171141.791897867@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191006171124.641144086@linuxfoundation.org> References: <20191006171124.641144086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 3b09382815419..d8b01c7c9cd3f 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -74,7 +74,7 @@ __XCHG_CASE( , , mb_8, 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) \ { \ @@ -116,7 +116,7 @@ __XCHG_GEN(_mb) #define 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) \ @@ -223,7 +223,7 @@ __CMPWAIT_CASE( , , 8); #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) \ { \