From patchwork Tue Jun 6 08:26:24 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: 103639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3239803vqr; Tue, 6 Jun 2023 01:40:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6AXPDIJcpw6+XhzBCCJ0YfZz78f8piXbiYXikBZH8HO3VyN6gHaXdg2bSpHi+Yn/orZtSf X-Received: by 2002:a05:620a:1b8d:b0:75d:50af:1c79 with SMTP id dv13-20020a05620a1b8d00b0075d50af1c79mr1258348qkb.39.1686040832196; Tue, 06 Jun 2023 01:40:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686040832; cv=none; d=google.com; s=arc-20160816; b=lhk+P3MRpC/NPO1Vc2WQYbrie6gBCfOPeTXutyAAOqIPzmRX519olSYYD4Pb/LQmJs DJxMcRbK6cy9cR28GU/17QGGnmCDhsLZS9kHi+jzGrFTPd9SvhM9NFoClS78uKqK8l2x uK+uUo/xXsRE7HCdYQyXcee+3SA+11kKwDDDjBnSIphYsilqQxJHgGYy36BVAJGEUWk7 uNhb8Z1JnuPvT3eNsPXexyFI4UjCCp8Bks5wzzmOsxae3+awEO6G5vmQxIbmB46zuZgN 0nyXLP27PQza+gJ7rpbOWusk6Jc2CwNr4a4Y9097XzAYBO4dA3fLDrwuB7nGBBUg6A7L Xa3Q== 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=gSpHO4Vk4xeLSiEnA0YqKwAala7mS3mcfnE/HMnWXCQ=; b=psT23BFhv2fkBJgEY7gsGNs2dEldBs4rBcjyM4xs+5NhP08WF9xZYpGXCC29Z4RTH2 BJrVVNq/ppWd/DbssbBuEOX+20ddxhdGR7wtsburiLks7gH3lgDY8th/WkxyJ2kf6gvu 1v6GwmPmhVKsiRn3jAm/Pe4M+PAOXb7yyYkJui4FH8aJLVhBr62bTr6iwzoUnxPHMf+3 6Wm45WuiVNV4CJpxbRiRY1NpzrXTKsnUTStiPhNFhEF4e5yR3GkbuVxx/6jsxDvl0FiI HdxB2h7b6NJJrChBtmCehxhoob0AF5nc8NTytWcuV3U76P6+Lm9QUd2jYzlUfmF/qRTE KebA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="t/YRPKG4"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=j2ZO3wdf; 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 t2-20020a17090ad14200b0025945de4165si3429524pjw.141.2023.06.06.01.40.19; Tue, 06 Jun 2023 01:40:32 -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="t/YRPKG4"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=j2ZO3wdf; 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 S237216AbjFFI2D (ORCPT + 99 others); Tue, 6 Jun 2023 04:28:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236855AbjFFI0i (ORCPT ); Tue, 6 Jun 2023 04:26:38 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3FA9E7B; Tue, 6 Jun 2023 01:26:29 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686039984; 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=gSpHO4Vk4xeLSiEnA0YqKwAala7mS3mcfnE/HMnWXCQ=; b=t/YRPKG4nF5j7kqolvx9YhR93FHn43fxkjvmj+zjW3nYh2oKd8S4SlY6biuCTVj4kd+Tlt iR1/8w/YX0fUpiEXyPE9dIX5dm1apuNSmR6MdcUIatHFslu+xwgREUrSvBfzIEkHhCSH5L Bfh0Yl+x4sMxqTdVfi9LgrI0TW2Rl6HB9Un2fVgv2rYBMVQYHz7XsIJq+yNgJBDJTdP2I1 z00Bl9QdCpMkEqbuCz4MOcYd2DLezZ5XqeK+D2mWaQdeD0Cd8TtfhvhrEMA8PxooILD3Mq NOJPmv/1Tl4CTpj0u+UsoyUWTAx29LIvlmTHIC1fZfL58nGMH+Pu5WWk3DmqyQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686039984; 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=gSpHO4Vk4xeLSiEnA0YqKwAala7mS3mcfnE/HMnWXCQ=; b=j2ZO3wdfsu064g0ZJfQW5XfEhQQv6Rpy/ti4hkv61FSTC7AoYZ0dYPZzMZqTz/0zwQZYOG DUXQ+RCD88vJQXDA== 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: arc: add preprocessor symbols Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-6-mark.rutland@arm.com> References: <20230605070124.3741859-6-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998443.404.13672376626762271875.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?1767845255879334353?= X-GMAIL-MSGID: =?utf-8?q?1767941951739108224?= The following commit has been merged into the locking/core branch of tip: Commit-ID: f739287ef57bc01155e556033462e9a6ff020c97 Gitweb: https://git.kernel.org/tip/f739287ef57bc01155e556033462e9a6ff020c97 Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:02 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:14 +02:00 locking/atomic: arc: 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/arc. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-6-mark.rutland@arm.com --- arch/arc/include/asm/atomic-spinlock.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arc/include/asm/atomic-spinlock.h b/arch/arc/include/asm/atomic-spinlock.h index 2c83034..89d12a6 100644 --- a/arch/arc/include/asm/atomic-spinlock.h +++ b/arch/arc/include/asm/atomic-spinlock.h @@ -81,6 +81,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ATOMIC_OPS(add, +=, add) ATOMIC_OPS(sub, -=, sub) +#define arch_atomic_fetch_add arch_atomic_fetch_add +#define arch_atomic_fetch_sub arch_atomic_fetch_sub +#define arch_atomic_add_return arch_atomic_add_return +#define arch_atomic_sub_return arch_atomic_sub_return + #undef ATOMIC_OPS #define ATOMIC_OPS(op, c_op, asm_op) \ ATOMIC_OP(op, c_op, asm_op) \ @@ -92,7 +97,11 @@ ATOMIC_OPS(or, |=, or) ATOMIC_OPS(xor, ^=, xor) #define arch_atomic_andnot arch_atomic_andnot + +#define arch_atomic_fetch_and arch_atomic_fetch_and #define arch_atomic_fetch_andnot arch_atomic_fetch_andnot +#define arch_atomic_fetch_or arch_atomic_fetch_or +#define arch_atomic_fetch_xor arch_atomic_fetch_xor #undef ATOMIC_OPS #undef ATOMIC_FETCH_OP