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=-22.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 E7285C433B4 for ; Thu, 6 May 2021 01:27:44 +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 6ACA06139A for ; Thu, 6 May 2021 01:27:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6ACA06139A 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+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:Cc: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=2D2Ie2NlNgMHW8KdkoYc2JgeOCviJNUBj8VSzhIu6xU=; b=VSd5eGu5LVmHS3B5iRmiW7qpik baCr32XN6CFzQH8MZU90EI6CgVeTdWNSQx+tB/pUt58y0IHdQiKLVFe121o1DBhxjXaDb/C3+feYi OmZ3evl+oMQaXsZTwzFyVcPZzl20UmtlIEOf0gxX0GN+mAG9xJYTrxh46mZWhJtahAB/kIf3oGv7O vDhsuKpeMGBDYMkzY8oqv+tTQ4Hgf3f/FantYtQzeZGZlvVWd3vgPuIBNDCg2WnMz9qDXOBvhwFSv sbrGGl565ip8jOYMUSrfa3m9/eG87FzWb1Jq2KPOjeL29udR05It3n3eQl3VVWMtlxny6g2P2QHfY 0VyHqc4w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leSlr-002omB-T1; Thu, 06 May 2021 01:25:44 +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 1leSlo-002olU-Li for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 01:25:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: Mime-Version:Message-Id:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=bZuP+FAGH6WmI1ayAzXHtNdn5xidSckeCnHh+eJccBo=; b=zKjrZQo8d45Pal2giMDgRp69hW eYhmifbDErXb0CS7Wf9aN+gSyHVaQ/pE5AI46Iwd4GuKu8Sr+50fim3Oa9arqA0AgBwynin21OXtO UWD5MeqNL4nkVxb3tkwIPGN3oR0Db4GAceoes7hKEg2uB+EkZD/uN5jeB+U8yYyjgkFonc8ELBEcd YzhRpb7sM7Vu50jrvNDCiZJHhNimvDPapweF+WQcGOpsmsQCuKd1e5giswbaGur5k+3lAYBlWVPKd kz7W3sqnpu9IJHstuw+9LWsx7J0dBJ44lWmHG8frVUPZ/H0ABsBHem32EFgp45ta9Tp19J+8H4X2C 2f8+uvog==; Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leSll-005TLP-MB for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 01:25:39 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id y18-20020a0cd9920000b02901c32e3e18f7so2984631qvj.15 for ; Wed, 05 May 2021 18:25:35 -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=bZuP+FAGH6WmI1ayAzXHtNdn5xidSckeCnHh+eJccBo=; b=HiQOtx4+gHkW3VRRuPy7Yqjjw6ldTSDofFO417RJKYHt9WvWBncqCPanYBcrZ6n02H SOe564uQyK8uaTOZ03eE7wpUPTx5EW1jfL0Sfs/cbT8t89PARXH/Yoc16HrQaN8k9Lxf abEv8B4HuEZl0OaiGbP6k013RCWXgzeEwls9jHhxIJjl52nt7C3Np0b9JSwh7mL9Xoi4 z35kbVmvPuVpZYGRVDFslHfpcefBAxTs58ROSI533s+ZFf1/E8iBzBEXRtlZMnVohSFm 2PHzowC6UqvFGuY4mBkM9dt44+ZkQUxEzQzPv1oqUwdtl3CH0zaLyh5VwOujofvpUuwQ WcIA== 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=bZuP+FAGH6WmI1ayAzXHtNdn5xidSckeCnHh+eJccBo=; b=BZQ3BdcogVrkGcmNx7HIQDNTeHWdalUVBc4gsr8pc+3aKBUPHgi/vSzZg8eQjnoBPf LP8GDVQD4yYAIj2RMnEUj1q6bxw3SUonWYalb5iVbVoJSePwGPHOLEjSFHpO2uR0UbV1 n1XDYjIuLhDqThbiTB/IQgk0JP84cwGWdI+LbCaa8Z3/ySOzTutSN9wNClBW19+TJ/gF BzB8tmyJ9yEbYSfpAxBahNtYJ8F3EC46/pDQmduUB8xzTJLz4xBoIcZ3gWfaPw3lhvv1 R/EABOoeILLcM/k2SgvSxdksOE7eqT9ZQaDyB2j7igf3LKsMbw3BqrVg3GG4tVbHnjIn EeFg== X-Gm-Message-State: AOAM5336S/9GI1pK7mSSdAR9bkiQG3wwUUBQFL55zbgfZD1x07sR3sFP Aqbi9YStpX0fnfcc7uXFaVySQhDGapZX X-Google-Smtp-Source: ABdhPJzfrzZuQ0cSH1tfNNKMzm3EQSrWHOrXtl3ZE3wJK5aAG7yWtXb71mWzAOIWtEqZlInCaCVelu1d9jBO X-Received: from jiancai.svl.corp.google.com ([2620:15c:2ce:0:1615:40c4:8c3e:9e75]) (user=jiancai job=sendgmr) by 2002:a0c:ff06:: with SMTP id w6mr1629957qvt.51.1620264334850; Wed, 05 May 2021 18:25:34 -0700 (PDT) Date: Wed, 5 May 2021 18:25:08 -0700 Message-Id: <20210506012508.3822221-1-jiancai@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH 4.19 ONLY v4] arm64: vdso: remove commas between macro name and arguments From: Jian Cai 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_182537_759963_7EAA8839 X-CRM114-Status: GOOD ( 14.68 ) 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 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 Signed-off-by: Jian Cai --- 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(-) diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S index 856fee6d3512..b6faf8b5d1fe 100644 --- 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: -- 2.31.1.607.g51e8a6a459-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel