From patchwork Tue Jun 6 08:26:23 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: 103667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3252032vqr; Tue, 6 Jun 2023 02:07:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MsaAzV+7Wa6UK6IwS4MCJJWUfnueBBLW7oXWxLvaJx05wVxeU71BajV3SzSr/JAZSDJvR X-Received: by 2002:a05:6214:e48:b0:5f1:62d9:3368 with SMTP id o8-20020a0562140e4800b005f162d93368mr1177670qvc.30.1686042466786; Tue, 06 Jun 2023 02:07:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686042466; cv=none; d=google.com; s=arc-20160816; b=0hvpg2YnzKXgfg9EFaRBPwax4B4Gqbfrn1uSoAXoSR1LSJz8q7i0IIKI7LbTPXs0lT N+9IBZR/ZVoucZ2sBVYg2o7PRKPD3QqtxAI7PRtzTSLnlxND3IIL2j66rC9MIZ4SOqM5 o+q5KxbJLC+JXvbpZGmIwWBKoXt9SyDMBXAZhvJFI4jk59hqvriEKUpOaOk3HRdI8H4v Qgxt9fLM8ySIxwvuAw+9ewnbt1nF5Qut39j38bY/dOY6UV+cxEG8IpjPB5N6iktDi+u7 UiFmBodi7/7mLqXSwQMY2VLINIm95evwoPBtx1tmXcYElO0G1VfPNnwS2zTN91yMdtBG isoQ== 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=7BVDO/8gJZj7K/uWhJR+SLhcvYFdcQ3bv6aKP5perg4=; b=AXyE8UcMYqTqfv1kh5ENchMcF/SrAnqmfZN+FW5oa6RCIz+uaNisz67q/LBFkY4+An z/A9H6t7OSnjheIHoNfZc/no9ZqukXC2T6TE9jZn1gRiqIJowTdloNhBr809pD5wK9Dd lI0v8Ct1h9WYVpFvNYLe8AEdRypX7P0Z26BsXrCE5vdawgdAyANwfi5nscagVCX0WZyW eX8GkVyYz4wPkWpTjHwFqN3V5VpfA4vTlSVWaXMIJGnIgDyWNYaU0YtWuGP21MInoBp1 +nA1NwOQd8fVuMA+9Nlndsb3JjS/+cYPC+v7KhHZJaT46Aj81mh7H9hjCvOM/QSoA6O2 RRHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GYXxdGrv; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jyB738t1; 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 dv5-20020ad44ee5000000b006262333549esi5854326qvb.393.2023.06.06.02.07.32; Tue, 06 Jun 2023 02:07:46 -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=GYXxdGrv; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=jyB738t1; 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 S237045AbjFFI1x (ORCPT + 99 others); Tue, 6 Jun 2023 04:27:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236790AbjFFI0h (ORCPT ); Tue, 6 Jun 2023 04:26:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBC09E6D; Tue, 6 Jun 2023 01:26:27 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:23 -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=7BVDO/8gJZj7K/uWhJR+SLhcvYFdcQ3bv6aKP5perg4=; b=GYXxdGrvZCe2Apc8mBoU0ZNameLDNfiiQFEahmGUpOcE7Y9f/hDVih/qy2ZOxTydyFbdim urrhk9kEQmCbzweKezNkQ/nUa8z3rczej/8p/LkRSzghEdSwGrwjiEy2saIU6S+s49S+Gm kcznVtmHGlfi1o4AtUJyKp/qCcbedPL+pvlkFI4LPcUU2lkwPHSHXxIRCK80ik8490+nAs X2siq3lLP3f0n2gogybaOH3QoNyUjg4W+0Y1rkJ6MhsDcLcy6EFy5viPo51fwqRsdv9xYT WArDPIMIf+JL+U4A2LFBYjX8zBM0yvD72M2miuI54BjR8Wr7ZTx/MBIQi4+EZQ== 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=7BVDO/8gJZj7K/uWhJR+SLhcvYFdcQ3bv6aKP5perg4=; b=jyB738t1mJQn2Nq0aVml43g9WV8G8rgsrCJMkS8Z3bAjlOSSMM2Yh3QWiYiQ3rXxmR/3uu J7byqqz3qjCpAaBA== 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: m68k: add preprocessor symbols Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-9-mark.rutland@arm.com> References: <20230605070124.3741859-9-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998326.404.3160669405700369227.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?1767845596402287196?= X-GMAIL-MSGID: =?utf-8?q?1767943665427652739?= The following commit has been merged into the locking/core branch of tip: Commit-ID: e50f06ce2d876c740993b5e3d01e203520391ccd Gitweb: https://git.kernel.org/tip/e50f06ce2d876c740993b5e3d01e203520391ccd Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:05 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:16 +02:00 locking/atomic: m68k: 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/m68k. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-9-mark.rutland@arm.com --- arch/m68k/include/asm/atomic.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h index 190a032..4bfbc25 100644 --- a/arch/m68k/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic.h @@ -106,6 +106,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t * v) \ ATOMIC_OPS(add, +=, add) ATOMIC_OPS(sub, -=, 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, asm_op) \ ATOMIC_OP(op, c_op, asm_op) \ @@ -115,6 +120,10 @@ ATOMIC_OPS(and, &=, and) ATOMIC_OPS(or, |=, or) ATOMIC_OPS(xor, ^=, eor) +#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