From patchwork Tue Jun 6 08:26:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 103641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3240102vqr; Tue, 6 Jun 2023 01:41:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4hpqaK+kLFTStdPYjaYXp5ZIA8cb1xc9YglKb2SRpa1fPIf4lu8l7BSqeYvxCNHd1bv9ji X-Received: by 2002:a05:6808:7c3:b0:39b:6f01:babb with SMTP id f3-20020a05680807c300b0039b6f01babbmr1542125oij.58.1686040871066; Tue, 06 Jun 2023 01:41:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686040871; cv=none; d=google.com; s=arc-20160816; b=1BvT/UXmv0w3kM2bJsCpOH1FzlxMpzMUg16x11GFaU5uV5d3bVZX39m15L1k/gQHOC XlAZfIel+bG9PDUYZwYisGJZ/YVOqon+RlrsiAyyZpN02mF8I68ng4rJkepAl/vV4XDc 8kMW78tEdKPXbUxOYHr7goQtVBxsA+WrAnrJhCKhLNd16LvUU8xx2y/KDQE4HScj+yb4 uO6SpeJg88749kcHLEgbwpgi/w5/msylUGowbsBN9uBfg5BdpT/+59rir7iC3mRnGXks RAB7u35vC522OcDRY8m1OpApegIIAEtQTfW2nmDMkbpL1jSDGkMKmLG5Bi3IiVMb4t9h zg9g== 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=BVDJKw0h36cHDibWeATrGhuXpgCUKyzQWlzjEydLh2s=; b=QcT+vQnovEF6UnkYTbvr4EJ35Y2ya7yxLehXH1OtDtRlHBn1tjKwuSCUs6wy/Mnr7E TFVXSiYzIMG6nlD7l8pRr6uZSIXb6lMHPMSy/Z2AJCNJ1XpTyjfMFgA9ORugVRl+6w8F ZwgB2q8Z5AS8YI83E3yJ0F4bnLWulnbLvNS4MA5Y9AGrZBA9m7xpPvD1qgpDuc6dSaG2 RRDa+GQm6bwsx4K6pp3Ui5QDvq1P3u0ibZkEROIgcig59hITkk77pM5ZtXOu2Gm2efZx Fb+aTq/H1kdEH4AqlLgC/P2O1+EAnC9nwAlv0kRE+mNvDdngR2JswgXaW1r9MdfTs1UB lW7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xOvyIjNd; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 x27-20020aa7941b000000b0064d3fb487cbsi1449317pfo.72.2023.06.06.01.40.59; Tue, 06 Jun 2023 01:41:11 -0700 (PDT) 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=xOvyIjNd; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S236507AbjFFI12 (ORCPT + 99 others); Tue, 6 Jun 2023 04:27:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236711AbjFFI0g (ORCPT ); Tue, 6 Jun 2023 04:26:36 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40E7FE5E; Tue, 6 Jun 2023 01:26:26 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686039982; 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=BVDJKw0h36cHDibWeATrGhuXpgCUKyzQWlzjEydLh2s=; b=xOvyIjNdgxmYGbaeDC1QnCF97EjCdDcr1JVxOrf1dLtJgd/GvdRg3N8JqGidJYuJNg9zD+ Ef3WKwGFAASHlXFjJeN7kstc/3a4JA29Nd3IE8eOXF+x3CxOoMN8Og68MPJyxYsfEKwym5 dRt9iKsVHt6EVY0LlCDfar8fk8RYRccqw9AR3+Q9XzOpFhwztalyE0dhXYD3HHiB0oJTvO jLoWeRCRp3FmWUAhTGVfRYAw7cMBkci99TDmqxyjexWvRREtYjP4s5uZv3N5FeVe8VHRNZ +L6i4/hf9YPG0SeQo/BfuR8nXwSnKmzZRR9hoQN4ZdsrbToIge084CuppE7r/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686039982; 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=BVDJKw0h36cHDibWeATrGhuXpgCUKyzQWlzjEydLh2s=; b=zBu558pBIV01czc0LkZFFLve6c3CxRZB4cr5SxW7ix4/nmxXunEz5E9ZOBHNPpjX1Fflmf dtcjP3oA+XAWcsAQ== From: "tip-bot2 for Mark Rutland" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/atomic: x86: add preprocessor symbols Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-13-mark.rutland@arm.com> References: <20230605070124.3741859-13-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998182.404.4072857844390908185.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767845776379177375?= X-GMAIL-MSGID: =?utf-8?q?1767941992372033961?= The following commit has been merged into the locking/core branch of tip: Commit-ID: 5bef003538ae8621c95ac6ebfd37324373fae37d Gitweb: https://git.kernel.org/tip/5bef003538ae8621c95ac6ebfd37324373fae37d Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:09 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:17 +02:00 locking/atomic: x86: add preprocessor symbols Some atomics can be implemented in several different ways, e.g. FULL/ACQUIRE/RELEASE ordered atomics can be implemented in terms of RELAXED atomics, and ACQUIRE/RELEASE/RELAXED can be implemented in terms of FULL ordered atomics. Other atomics are optional, and don't exist in some configurations (e.g. not all architectures implement the 128-bit cmpxchg ops). Subsequent patches will require that architectures define a preprocessor symbol for any atomic (or ordering variant) which is optional. This will make the fallback ifdeffery more robust, and simplify future changes. Add the required definitions to arch/x86. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-13-mark.rutland@arm.com --- arch/x86/include/asm/cmpxchg_64.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h index 3e6e3ee..44b08b5 100644 --- a/arch/x86/include/asm/cmpxchg_64.h +++ b/arch/x86/include/asm/cmpxchg_64.h @@ -45,11 +45,13 @@ static __always_inline u128 arch_cmpxchg128(volatile u128 *ptr, u128 old, u128 n { return __arch_cmpxchg128(ptr, old, new, LOCK_PREFIX); } +#define arch_cmpxchg128 arch_cmpxchg128 static __always_inline u128 arch_cmpxchg128_local(volatile u128 *ptr, u128 old, u128 new) { return __arch_cmpxchg128(ptr, old, new,); } +#define arch_cmpxchg128_local arch_cmpxchg128_local #define __arch_try_cmpxchg128(_ptr, _oldp, _new, _lock) \ ({ \ @@ -75,11 +77,13 @@ static __always_inline bool arch_try_cmpxchg128(volatile u128 *ptr, u128 *oldp, { return __arch_try_cmpxchg128(ptr, oldp, new, LOCK_PREFIX); } +#define arch_try_cmpxchg128 arch_try_cmpxchg128 static __always_inline bool arch_try_cmpxchg128_local(volatile u128 *ptr, u128 *oldp, u128 new) { return __arch_try_cmpxchg128(ptr, oldp, new,); } +#define arch_try_cmpxchg128_local arch_try_cmpxchg128_local #define system_has_cmpxchg128() boot_cpu_has(X86_FEATURE_CX16)