| Message ID | 166859051534.4906.7078966677789928700.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp45184wru;
Wed, 16 Nov 2022 01:33:01 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf41xaoylc6WcfC/YHvVCPWF/rOBe4+d5i128DDJW1m5pQdd05FluKYCvzhv3OmCoqtkwC0r
X-Received: by 2002:a17:906:5959:b0:780:8c5d:f86 with SMTP id
g25-20020a170906595900b007808c5d0f86mr16749215ejr.391.1668591181548;
Wed, 16 Nov 2022 01:33:01 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1668591181; cv=none;
d=google.com; s=arc-20160816;
b=ZqMY/6D0mgXSZgEGoomoN8gDsUiaeqGkRg1vHKTunR0RMi+a+TEQs5Z5ez/q+OCmmS
3TlD3OGkAnPW0ljZtB8psztklAGdQVCL1yUGz52QzViN4gD6wy/kdU0M7mdpA+MsLDHA
emwiCb+uwzsv5GyTPeSYjT7lmy7MIcFNJGoO38t0x6Ep9ZYcIgdhjulbpiLIV7E7nUZR
xNBEZV/M4WWJU5ETt/tgUNLhPEqDKEZe9sl6v0o5S7oajnBvYULAwyyMfmJjk5zkjAoj
Ym4CtvJJuXTUPWq1qOttuBeo/8YCeVY2Q8FXBCo+ogWYsUOluA6/c0ApVHBOJDFdeqbb
PY+w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=FVY9uAbTuVF0xKex4cjna3AgPQ7XWMie7xxAYF/HBbc=;
b=AX/o6mfzPa+wNCN1/jV8OpnVs61IOAmYUGKxxkiymnq9mScfaQ9CcGZ2ZVauEjdeLD
GZFBJwOvxrgnnBKxE8WEiMDTp68sph6qcCZL/B5O2NuiBbnA6CRiWUaTYXbfLZOse8n0
QfTELidRnF17RY/JoG82av0ZY/OUcQcKYVslXnMgdDDf8bRAWvE5SqyLqV8dastNXQxM
7WOvX2G+Ba2HzGXFpDIZfS5YlCPHf8EzY25vTAA+hN7DGvndbJKl2qUCy0jrSKbBl61U
mbbuCmDjQj9PbAP1bkIlvYJ4VAy4ux+Q2Z3iATqsg5rBoYMGelcfqorxH82YDc31R2MW
Na1Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=oMAwXVdZ;
dkim=neutral (no key) header.i=@linutronix.de header.b=wZPeI8ew;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
du22-20020a17090772d600b007aeff3b0b17si9026967ejc.674.2022.11.16.01.32.37;
Wed, 16 Nov 2022 01:33:01 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=oMAwXVdZ;
dkim=neutral (no key) header.i=@linutronix.de header.b=wZPeI8ew;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S237845AbiKPJWN (ORCPT <rfc822;just.gull.subs@gmail.com>
+ 99 others); Wed, 16 Nov 2022 04:22:13 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44290 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S233549AbiKPJV7 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 16 Nov 2022 04:21:59 -0500
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EC2427142;
Wed, 16 Nov 2022 01:21:58 -0800 (PST)
Date: Wed, 16 Nov 2022 09:21:55 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1668590516;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=FVY9uAbTuVF0xKex4cjna3AgPQ7XWMie7xxAYF/HBbc=;
b=oMAwXVdZ4/q5UgEfdo00MJ2v3aowzcAkGXykYzlLDQpfYP6urBoYLeN+yrqi3L4qeHuvtO
bA+ecYMKKAVI53lH4ZEXBz7yeheA+pERzhISkn0waUfAKgdUzUDm2rkmD56DEANLZKfUNT
CXh0rVgHbruhy7n76S1LgXtwxDhdXUpSKRIi745vila1itfXHtfC04GvIomgfk3Kxf8pEn
cgbbTWuYPu/EgWquhfald+n8FnMr7ssLbFdyG4jr+Ei0V9yXH//xjPnShUEQOk2Npj/4H1
JpQFHdFHO+VwYpZTZEQffg6+V0QMpsefWStXCge+tU7nqw+RI06/CneE8lTa0Q==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1668590516;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=FVY9uAbTuVF0xKex4cjna3AgPQ7XWMie7xxAYF/HBbc=;
b=wZPeI8ew0LEdEn9vdpiKo2zx1wlLFRgV9PIUr7HxnxAk3lr4B6/LEinj7UhU8z7pH0GDTG
aHItwo6vaI9AkjCg==
From: "tip-bot2 for Guo Jin" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: locking/urgent] locking: Fix qspinlock/x86 inline asm error
Cc: Guo Jin <guoj17@chinatelecom.cn>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Nathan Chancellor <nathan@kernel.org>, x86@kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20221108060126.2505-1-guoj17@chinatelecom.cn>
References: <20221108060126.2505-1-guoj17@chinatelecom.cn>
MIME-Version: 1.0
Message-ID: <166859051534.4906.7078966677789928700.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1749644667067908558?=
X-GMAIL-MSGID: =?utf-8?q?1749644667067908558?=
|
| Series |
[tip:,locking/urgent] locking: Fix qspinlock/x86 inline asm error
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Nov. 16, 2022, 9:21 a.m. UTC
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: 23df39fc6a36183af5e6e4f47523f1ad2cdc1d30
Gitweb: https://git.kernel.org/tip/23df39fc6a36183af5e6e4f47523f1ad2cdc1d30
Author: Guo Jin <guoj17@chinatelecom.cn>
AuthorDate: Tue, 08 Nov 2022 14:01:26 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 16 Nov 2022 10:18:09 +01:00
locking: Fix qspinlock/x86 inline asm error
When compiling linux 6.1.0-rc3 configured with CONFIG_64BIT=y and
CONFIG_PARAVIRT_SPINLOCKS=y on x86_64 using LLVM 11.0, an error:
"<inline asm> error: changed section flags for .spinlock.text,
expected:: 0x6" occurred.
The reason is the .spinlock.text in kernel/locking/qspinlock.o
is used many times, but its flags are omitted in subsequent use.
LLVM 11.0 assembler didn't permit to
leave out flags in subsequent uses of the same sections.
So this patch adds the corresponding flags to avoid above error.
Fixes: 501f7f69bca1 ("locking: Add __lockfunc to slow path functions")
Signed-off-by: Guo Jin <guoj17@chinatelecom.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20221108060126.2505-1-guoj17@chinatelecom.cn
---
arch/x86/include/asm/qspinlock_paravirt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 16.11.22 10:21, tip-bot2 for Guo Jin wrote: > The following commit has been merged into the locking/urgent branch of tip: > > Commit-ID: 23df39fc6a36183af5e6e4f47523f1ad2cdc1d30 > Gitweb: https://git.kernel.org/tip/23df39fc6a36183af5e6e4f47523f1ad2cdc1d30 > Author: Guo Jin <guoj17@chinatelecom.cn> > AuthorDate: Tue, 08 Nov 2022 14:01:26 +08:00 > Committer: Peter Zijlstra <peterz@infradead.org> > CommitterDate: Wed, 16 Nov 2022 10:18:09 +01:00 > > locking: Fix qspinlock/x86 inline asm error > > When compiling linux 6.1.0-rc3 configured with CONFIG_64BIT=y and > CONFIG_PARAVIRT_SPINLOCKS=y on x86_64 using LLVM 11.0, an error: > "<inline asm> error: changed section flags for .spinlock.text, > expected:: 0x6" occurred. > > The reason is the .spinlock.text in kernel/locking/qspinlock.o > is used many times, but its flags are omitted in subsequent use. > > LLVM 11.0 assembler didn't permit to > leave out flags in subsequent uses of the same sections. > > So this patch adds the corresponding flags to avoid above error. > > Fixes: 501f7f69bca1 ("locking: Add __lockfunc to slow path functions") > Signed-off-by: Guo Jin <guoj17@chinatelecom.cn> > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> > Reviewed-by: Nathan Chancellor <nathan@kernel.org> > Link: https://lore.kernel.org/r/20221108060126.2505-1-guoj17@chinatelecom.cn Wouldn't it be better to take my more generic patch [1] instead? [1]: https://lore.kernel.org/lkml/20221109134418.6516-1-jgross@suse.com/ Juergen
On Wed, Nov 16, 2022 at 10:40:10AM +0100, Juergen Gross wrote: > On 16.11.22 10:21, tip-bot2 for Guo Jin wrote: > > The following commit has been merged into the locking/urgent branch of tip: > > > > Commit-ID: 23df39fc6a36183af5e6e4f47523f1ad2cdc1d30 > > Gitweb: https://git.kernel.org/tip/23df39fc6a36183af5e6e4f47523f1ad2cdc1d30 > > Author: Guo Jin <guoj17@chinatelecom.cn> > > AuthorDate: Tue, 08 Nov 2022 14:01:26 +08:00 > > Committer: Peter Zijlstra <peterz@infradead.org> > > CommitterDate: Wed, 16 Nov 2022 10:18:09 +01:00 > > > > locking: Fix qspinlock/x86 inline asm error > > > > When compiling linux 6.1.0-rc3 configured with CONFIG_64BIT=y and > > CONFIG_PARAVIRT_SPINLOCKS=y on x86_64 using LLVM 11.0, an error: > > "<inline asm> error: changed section flags for .spinlock.text, > > expected:: 0x6" occurred. > > > > The reason is the .spinlock.text in kernel/locking/qspinlock.o > > is used many times, but its flags are omitted in subsequent use. > > > > LLVM 11.0 assembler didn't permit to > > leave out flags in subsequent uses of the same sections. > > > > So this patch adds the corresponding flags to avoid above error. > > > > Fixes: 501f7f69bca1 ("locking: Add __lockfunc to slow path functions") > > Signed-off-by: Guo Jin <guoj17@chinatelecom.cn> > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> > > Reviewed-by: Nathan Chancellor <nathan@kernel.org> > > Link: https://lore.kernel.org/r/20221108060126.2505-1-guoj17@chinatelecom.cn > > Wouldn't it be better to take my more generic patch [1] instead? > > [1]: https://lore.kernel.org/lkml/20221109134418.6516-1-jgross@suse.com/ Durr, I missed that, lemme go stare at it.
diff --git a/arch/x86/include/asm/qspinlock_paravirt.h b/arch/x86/include/asm/qspinlock_paravirt.h index 60ece59..dbb38a6 100644 --- a/arch/x86/include/asm/qspinlock_paravirt.h +++ b/arch/x86/include/asm/qspinlock_paravirt.h @@ -37,7 +37,7 @@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath, ".spinlock.text"); * rsi = lockval (second argument) * rdx = internal variable (set to 0) */ -asm (".pushsection .spinlock.text;" +asm (".pushsection .spinlock.text, \"ax\";" ".globl " PV_UNLOCK ";" ".type " PV_UNLOCK ", @function;" ".align 4,0x90;"