From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 5ED7EC433B4 for ; Mon, 10 May 2021 08:30:25 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BC93861455 for ; Mon, 10 May 2021 08:30:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC93861455 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=h6iudIQxWZDJuE2hRgeRCGSlD6wOFJYB1OC386Ot8Zc=; b=jPfj2Q384YmFe2lE3zkWfXCwt eL5SePkP0GykFrwTgoU9CrhLujLj7me6PrarkMqdM4n5p2xlXrVQxYFp50EBc37QePhGidSvrHOMe cqFBNFztVnHaNimz/ToFiXxkelJNIO2SEglfhNUrzrnpEz9Fp49kwSkIJ3cuUVJDfvdx9dRWKzz/8 RFQHu//jUdnmrcTNjffV/zUPu/Pm2lcF89HIcFSgRHwksG7iLlfVnkFpn9D4ZCIYxg/HqsZWQrYr5 e8P01CwWzNlsM92I0hqdV1DPCaYOTuOQA8qGl2QMCZNTIw6lcKOsRVbOng1EtTaxsrVfFooQW1ijt +caWCkgoA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg1H8-00Dclm-UV; Mon, 10 May 2021 08:28:27 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lg1H3-00DclL-LK for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 08:28:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To:Subject: Sender:Reply-To:Content-ID:Content-Description:References; bh=l0jwb4u/CjIOxBHgW4nLHVtLF19en9O03ETTzcoet+g=; b=TUORRgtFPz3YgaOrsa3BWcw0TK hZqvj7xCM/YbbzBhAH524lL12UccfNcN9aZ9j+pbyWf2XVOXg8J96Bdrc9Dfw3Ej35TWGlEz1DgfE VnqVkvdXKNsEbAq0MSwMUVylRZ7yh4QAwBJSuu/XySFVCRwomDvnWXsIpWSJ5UeZtM3YYh8j6H+Xl l+pzkIP9G51PBK1IKYJSEkR5lS5iq2P5cySYakad/0Q4XBbc+LDIUlSR7tU/TWZIbeuQlfMIethF1 Cb/eJOmkBCco8RxqC1DR0WYWJyUeKyPq9BhvvFaIkKVL/d5ihUUFulsEt44GAwjnPvtIuHrZf2JdQ k6Kpmuiw==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lg1Gz-008Pcz-Gs for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 08:28:19 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id CBD0661364; Mon, 10 May 2021 08:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620635294; bh=HAylSQmcDIBL+xmdvGWhifIFXGCfAkVvgGK16rHXguQ=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=FLJx4EiRkIOwB07GcYsfTl0UyuPKr9rppI8pSshFS10NMRlxcrfxc6Vb2y0y3PVVG SPgGI1GLkL2ZnLagQJOp+QZqdfcdd8u3ZlX2eQmZwy8AQ6Ax/iJ1ddLY5t5JfqwF+4 72UC7fyhsdfMyWEeHB7rlmWi48OFIQcOVAR9K7Ic= Subject: Patch "arm64: vdso: remove commas between macro name and arguments" has been added to the 4.19-stable tree To: catalin.marinas@arm.com, clang-built-linux@googlegroups.com, gregkh@linuxfoundation.org, jiancai@google.com, linux-arm-kernel@lists.infradead.org, llozano@google.com, manojgupta@google.com, nathan@kernel.org, ndesaulniers@google.com, sashal@kernel.org, will.deacon@arm.com, will@kernel.org Cc: From: Date: Mon, 10 May 2021 10:28:08 +0200 In-Reply-To: <20210506012508.3822221-1-jiancai@google.com> Message-ID: <16206352882063@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_012817_646027_DA98059C X-CRM114-Status: GOOD ( 15.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled arm64: vdso: remove commas between macro name and arguments to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm64-vdso-remove-commas-between-macro-name-and-arguments.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From jiancai@google.com Mon May 10 10:02:08 2021 From: Jian Cai Date: Wed, 5 May 2021 18:25:08 -0700 Subject: arm64: vdso: remove commas between macro name and arguments To: gregkh@linuxfoundation.org, sashal@kernel.org, will@kernel.org, catalin.marinas@arm.com, nathan@kernel.org Cc: stable@vger.kernel.org, ndesaulniers@google.com, manojgupta@google.com, llozano@google.com, clang-built-linux@googlegroups.com, Jian Cai , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Message-ID: <20210506012508.3822221-1-jiancai@google.com> From: Jian Cai LLVM's integrated assembler appears to assume an argument with default value is passed whenever it sees a comma right after the macro name. It will be fine if the number of following arguments is one less than the number of parameters specified in the macro definition. Otherwise, it fails. For example, the following code works: $ cat foo.s .macro foo arg1=2, arg2=4 ldr r0, [r1, #\arg1] ldr r0, [r1, #\arg2] .endm foo, arg2=8 $ llvm-mc -triple=armv7a -filetype=obj foo.s -o ias.o arm-linux-gnueabihf-objdump -dr ias.o ias.o: file format elf32-littlearm Disassembly of section .text: 00000000 <.text>: 0: e5910001 ldr r0, [r1, #2] 4: e5910003 ldr r0, [r1, #8] While the the following code would fail: $ cat foo.s .macro foo arg1=2, arg2=4 ldr r0, [r1, #\arg1] ldr r0, [r1, #\arg2] .endm foo, arg1=2, arg2=8 $ llvm-mc -triple=armv7a -filetype=obj foo.s -o ias.o foo.s:6:14: error: too many positional arguments foo, arg1=2, arg2=8 This causes build failures as follows: arch/arm64/kernel/vdso/gettimeofday.S:230:24: error: too many positional arguments clock_gettime_return, shift=1 ^ arch/arm64/kernel/vdso/gettimeofday.S:253:24: error: too many positional arguments clock_gettime_return, shift=1 ^ arch/arm64/kernel/vdso/gettimeofday.S:274:24: error: too many positional arguments clock_gettime_return, shift=1 This error is not in mainline because commit 28b1a824a4f4 ("arm64: vdso: Substitute gettimeofday() with C implementation") rewrote this assembler file in C as part of a 25 patch series that is unsuitable for stable. Just remove the comma in the clock_gettime_return invocations in 4.19 so that GNU as and LLVM's integrated assembler work the same. Link: https://github.com/ClangBuiltLinux/linux/issues/1349 Suggested-by: Nathan Chancellor Reviewed-by: Nathan Chancellor Signed-off-by: Jian Cai Signed-off-by: Greg Kroah-Hartman --- Changes v1 -> v2: Keep the comma in the macro definition to be consistent with other definitions. Changes v2 -> v3: Edit tags. Changes v3 -> v4: Update the commit message based on Nathan's comments. arch/arm64/kernel/vdso/gettimeofday.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/arm64/kernel/vdso/gettimeofday.S +++ b/arch/arm64/kernel/vdso/gettimeofday.S @@ -227,7 +227,7 @@ realtime: seqcnt_check fail=realtime get_ts_realtime res_sec=x10, res_nsec=x11, \ clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN monotonic: @@ -250,7 +250,7 @@ monotonic: clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9 add_ts sec=x10, nsec=x11, ts_sec=x3, ts_nsec=x4, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN monotonic_raw: @@ -271,7 +271,7 @@ monotonic_raw: clock_nsec=x15, nsec_to_sec=x9 add_ts sec=x10, nsec=x11, ts_sec=x13, ts_nsec=x14, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN realtime_coarse: Patches currently in stable-queue which might be from jiancai@google.com are queue-4.19/arm64-vdso-remove-commas-between-macro-name-and-arguments.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel