From patchwork Tue Jun 6 08:26:22 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: 103660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3247525vqr; Tue, 6 Jun 2023 01:59:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ57I+3qAZjH2dbkhnNRFr5GBPaVN0YFFePQSFyGPVNM9ooM0QcFQUdaNowwCQfEfXVROfcx X-Received: by 2002:a17:902:db02:b0:1b1:d6e5:3dd4 with SMTP id m2-20020a170902db0200b001b1d6e53dd4mr1392906plx.48.1686041989932; Tue, 06 Jun 2023 01:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686041989; cv=none; d=google.com; s=arc-20160816; b=ZHzMx2jQ87s3/b2+qupRl3DssVRlj1P3iJ6WeAIFsvvhFNpQ8XtYbspiXHpsuvWiWh 3HTFjQ+9c1RX0EwbEUgNTZnbklPtkIeyfK38YOgVSLJ7jSS0LPEUPRdY12xzdr66UIAY jgIPrgVHr8L3YBlyE12wd5W7axAEYT+S7KELAbCz+b3+T93s9y3ReOC8DZZUtlrUySlN knN4/Q1hvvFYDL0mJNJI0izfsKmdTwPlQQuN0Rk2vAbw9kWyMv4oIrsfhktF5n8GWP+R XSVCbRWqMNE1Z/S7Xutoy5zWdWQJ0BIJjoHT8VMQ3C9HVkeD/BonZ42pRKOzTD4EuGSm JQ+g== 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=NoWRNjEC8b88vYCwf6jdo+1vsVv3EQG+11tseF6XQ8A=; b=FGl6+mijDs0tH6DlEUAiJsyMSmGYEhPIG0wS67Sr9lgXvX3TcOi5VGeq9Nmw9gUJxw xtskEmT2g7KntqX3xWULpLTEsQ4DbtCuCHuhwK60NP0u07t2bQTyZfvLawC0SlRAucz4 8Sx/71UQaX6MzB22NcV/j/hprRU4DqyV6zuppLWjEdTZYsXWkwoCw6QuckFzV12cEu3B X5ay182cE9A2cW8iDAIdCllnkoNgcxNKWbeDn8Zw7t6EcZTJfsaavQ3IZ52qauE7q8Gb hBq3RKEK0H7RqTp2MmdnBiRrj8W+S1sxvm6wOBWM0daubwemiWww7Z/CCKJ8gQAKFFKI E+Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2iC1u3US; dkim=neutral (no key) header.i=@linutronix.de; 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 h9-20020a170902f54900b001ae3fa8de08si7262664plf.576.2023.06.06.01.59.38; Tue, 06 Jun 2023 01:59:49 -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=2iC1u3US; dkim=neutral (no key) header.i=@linutronix.de; 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 S237122AbjFFI1c (ORCPT + 99 others); Tue, 6 Jun 2023 04:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236717AbjFFI0g (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 590D5E6A; Tue, 6 Jun 2023 01:26:27 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686039983; 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=NoWRNjEC8b88vYCwf6jdo+1vsVv3EQG+11tseF6XQ8A=; b=2iC1u3USQKis14ujknjnJ3aJREaQ62iPvJBAvlben6nUpHSPnee8Tyc0yU3S6PjZkok9YW srRHYcxz3r4X7e39sB5h1sCIOU5mbugusKc5JVApAFm0sxJ++taVejQElJuqLPXer4kvM/ yl6n7f9J/M4UPA6cyAIyStqJbx1kOnE/mzj7SrVv1rTINrb9YdZcTUBBWPcSVrDqOSWwe3 LwJNdAGCtaCXuE3jjKa5skQc2U218aTVgDY0f5jE09P6f7xekVBrjUZ3da2F0o5g0gojkZ nBNeDRC23c5VYNy7InOg/3wqpQqQHjCAZ/RLHoEOawniDQ7vt9QVB+jeVUCjzQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686039983; 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=NoWRNjEC8b88vYCwf6jdo+1vsVv3EQG+11tseF6XQ8A=; b=1agxxeaQdL7iw1+gI9nAJQH4LiMNUqkeGK+AXYSV720IaSdmZH0qoALUL+Lyi8bXv1fc8p iRenKF34nomAbPAQ== 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: sh: add preprocessor symbols Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-11-mark.rutland@arm.com> References: <20230605070124.3741859-11-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998249.404.992028948986196499.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?1767845256054654580?= X-GMAIL-MSGID: =?utf-8?q?1767943165543708920?= The following commit has been merged into the locking/core branch of tip: Commit-ID: 770345adc38485c688e5d832d82306a4c2da828c Gitweb: https://git.kernel.org/tip/770345adc38485c688e5d832d82306a4c2da828c Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:07 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:16 +02:00 locking/atomic: sh: 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/sh. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-11-mark.rutland@arm.com --- arch/sh/include/asm/atomic-grb.h | 9 +++++++++ arch/sh/include/asm/atomic-irq.h | 9 +++++++++ arch/sh/include/asm/atomic-llsc.h | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/arch/sh/include/asm/atomic-grb.h b/arch/sh/include/asm/atomic-grb.h index 059791f..cf1c10f 100644 --- a/arch/sh/include/asm/atomic-grb.h +++ b/arch/sh/include/asm/atomic-grb.h @@ -71,6 +71,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ATOMIC_OPS(add) ATOMIC_OPS(sub) +#define arch_atomic_add_return arch_atomic_add_return +#define arch_atomic_sub_return arch_atomic_sub_return +#define arch_atomic_fetch_add arch_atomic_fetch_add +#define arch_atomic_fetch_sub arch_atomic_fetch_sub + #undef ATOMIC_OPS #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op) @@ -78,6 +83,10 @@ ATOMIC_OPS(and) ATOMIC_OPS(or) ATOMIC_OPS(xor) +#define arch_atomic_fetch_and arch_atomic_fetch_and +#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 #undef ATOMIC_OP_RETURN diff --git a/arch/sh/include/asm/atomic-irq.h b/arch/sh/include/asm/atomic-irq.h index 7665de9..b4090cc 100644 --- a/arch/sh/include/asm/atomic-irq.h +++ b/arch/sh/include/asm/atomic-irq.h @@ -55,6 +55,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ATOMIC_OPS(add, +=) ATOMIC_OPS(sub, -=) +#define arch_atomic_add_return arch_atomic_add_return +#define arch_atomic_sub_return arch_atomic_sub_return +#define arch_atomic_fetch_add arch_atomic_fetch_add +#define arch_atomic_fetch_sub arch_atomic_fetch_sub + #undef ATOMIC_OPS #define ATOMIC_OPS(op, c_op) \ ATOMIC_OP(op, c_op) \ @@ -64,6 +69,10 @@ ATOMIC_OPS(and, &=) ATOMIC_OPS(or, |=) ATOMIC_OPS(xor, ^=) +#define arch_atomic_fetch_and arch_atomic_fetch_and +#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 #undef ATOMIC_OP_RETURN diff --git a/arch/sh/include/asm/atomic-llsc.h b/arch/sh/include/asm/atomic-llsc.h index b63dcfb..9ef1fb1 100644 --- a/arch/sh/include/asm/atomic-llsc.h +++ b/arch/sh/include/asm/atomic-llsc.h @@ -73,6 +73,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ATOMIC_OPS(add) ATOMIC_OPS(sub) +#define arch_atomic_add_return arch_atomic_add_return +#define arch_atomic_sub_return arch_atomic_sub_return +#define arch_atomic_fetch_add arch_atomic_fetch_add +#define arch_atomic_fetch_sub arch_atomic_fetch_sub + #undef ATOMIC_OPS #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op) @@ -80,6 +85,10 @@ ATOMIC_OPS(and) ATOMIC_OPS(or) ATOMIC_OPS(xor) +#define arch_atomic_fetch_and arch_atomic_fetch_and +#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 #undef ATOMIC_OP_RETURN