From patchwork Thu Apr 13 11:38:30 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: 82927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp965693vqo; Thu, 13 Apr 2023 04:39:47 -0700 (PDT) X-Google-Smtp-Source: AKy350YSkZhVbN6xbcp0CjmJ3HwPfeWnQaBZ/AqplXBboXlMrhi3gmU3JGTbtiiWFLum73RVsoGj X-Received: by 2002:a05:6a20:4ca1:b0:ec:26ee:db3f with SMTP id fq33-20020a056a204ca100b000ec26eedb3fmr1776541pzb.32.1681385986796; Thu, 13 Apr 2023 04:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681385986; cv=none; d=google.com; s=arc-20160816; b=kdnpjLW5rnrPpLnnW0BvdhdQQ0PMBEXtNzwClL/KUvmlO95xiUq7aDEDUVT5F5rIPy kijuW5F20UQtGJl23rrNmGNOs1ywdJxYV67XW012V2YmZi2aKW6h14HzFZwv3ObkteDB L6Ft4C4iz6PwaYAQu/GieCZ92D6i/ISgADZH+pl80/561CtZWA6PUjUEim31ipB+hMW7 A8HzGK3XpI3B7Je2W0hd3nVnq2n7IiIjwLhHe9NdM61/Y6Foad/knqLfjkCzzqAH7Fsq C7xaDjLHUUR+TxdzxG+RWT9RmexXZLQXxhekV0iLhCSHn/mZZTwrcWc1L/6k0b4u0GbS 55/A== 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=03BiHmxHTrTJvhJVPS97oitDTx73j+YTZIlpLkktUAk=; b=F1lLlNGvdCtwQwEPJBJzumiFfQA+8NzoFhRnuZMnxWAQS4lxNDnswyPfqrm4Kp8HmC 8/dJ9zFdt9vexhcnfh6dtv06HScdy4K0mZJPGskMTZ8Z8EO5XTh7nxPZjJ5abWBP3zcc 3i5wVyEgzoCRzMlhtKiwKRG62gZztK0ojDjO4lxEBrUUu0REq4F77V06XzWZ0aAhodyq YomT6teyPFEvEzq9URxDhG4t5+9K4r5rwqmMPPkijzH3lm4+A+5QlLoy1vu98UTVoKy3 d0U2RxzW0dvTw1NFg8pBUqM9bGyYzVsI0pgyw3NlAH1mX4fr1kQnz9etCjDUSIN9imoJ sN3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YuqX0TtN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TxFZnLiB; 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 b66-20020a62cf45000000b0062804ba6fb4si1609418pfg.58.2023.04.13.04.39.35; Thu, 13 Apr 2023 04:39: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=YuqX0TtN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TxFZnLiB; 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 S230390AbjDMLin (ORCPT + 99 others); Thu, 13 Apr 2023 07:38:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjDMLif (ORCPT ); Thu, 13 Apr 2023 07:38:35 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50F632717; Thu, 13 Apr 2023 04:38:33 -0700 (PDT) Date: Thu, 13 Apr 2023 11:38:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681385910; 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=03BiHmxHTrTJvhJVPS97oitDTx73j+YTZIlpLkktUAk=; b=YuqX0TtNzXsK2nOd/DbE8D9EryJOiV3Hg9iA4khxeifsQSJx7jTzht46LfY/vp4noLNj4o GAvB5ROq1a1mjmaVvpHWGsyOn+eSPXN2ymbpBOwmsi5s8ZLw1C5yI9Dy5ytSWVEyz3EArJ 4iGsCokAd8bCdvOP/1S96BeRFtJhXaNOEHTWl5+HDuH7DHx5xmsiv3NaQLu3LjMmi0hDdt Fe8D4nEzNh5W8S+bpAU8TywAJMSYptw3zi6IpznUeWbjioKCPi3JenabfYQZ8z8HK+QuMe RGz6E6uTaSAIqO8uFXikHUtZhPUQewmbWoFyMiVxMHjpxalHGyXhni+xIHB5XA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681385910; 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=03BiHmxHTrTJvhJVPS97oitDTx73j+YTZIlpLkktUAk=; b=TxFZnLiBj+AIhb51rekEnbxf2SrMBp2qY9VfwYdDcL4/+IQo/LjQWxNcqh7U7L8WvG7dit nvIEMJYe/8ZZrSAQ== From: "tip-bot2 for Uros Bizjak" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/arch: Wire up local_try_cmpxchg Cc: Uros Bizjak , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230405141710.3551-4-ubizjak@gmail.com> References: <20230405141710.3551-4-ubizjak@gmail.com> MIME-Version: 1.0 Message-ID: <168138591047.404.10707059865390380518.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,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?1762347046467980637?= X-GMAIL-MSGID: =?utf-8?q?1763060992632908553?= The following commit has been merged into the locking/core branch of tip: Commit-ID: 62de78f1c39a6b3f456e9dfe000b3d92b9a58ee4 Gitweb: https://git.kernel.org/tip/62de78f1c39a6b3f456e9dfe000b3d92b9a58ee4 Author: Uros Bizjak AuthorDate: Wed, 05 Apr 2023 16:17:08 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 12 Apr 2023 16:46:34 +02:00 locking/arch: Wire up local_try_cmpxchg Implement target specific support for local_try_cmpxchg and local_cmpxchg using typed C wrappers that call their _local counterpart and provide additional checking of their input arguments. Signed-off-by: Uros Bizjak Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20230405141710.3551-4-ubizjak@gmail.com --- arch/alpha/include/asm/local.h | 12 ++++++++++-- arch/loongarch/include/asm/local.h | 13 +++++++++++-- arch/mips/include/asm/local.h | 13 +++++++++++-- arch/powerpc/include/asm/local.h | 11 +++++++++++ arch/x86/include/asm/local.h | 13 +++++++++++-- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/arch/alpha/include/asm/local.h b/arch/alpha/include/asm/local.h index fab26a1..0fcaad6 100644 --- a/arch/alpha/include/asm/local.h +++ b/arch/alpha/include/asm/local.h @@ -52,8 +52,16 @@ static __inline__ long local_sub_return(long i, local_t * l) return result; } -#define local_cmpxchg(l, o, n) \ - (cmpxchg_local(&((l)->a.counter), (o), (n))) +static __inline__ long local_cmpxchg(local_t *l, long old, long new) +{ + return cmpxchg_local(&l->a.counter, old, new); +} + +static __inline__ bool local_try_cmpxchg(local_t *l, long *old, long new) +{ + return try_cmpxchg_local(&l->a.counter, (s64 *)old, new); +} + #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n))) /** diff --git a/arch/loongarch/include/asm/local.h b/arch/loongarch/include/asm/local.h index 65fbbae..83e995b 100644 --- a/arch/loongarch/include/asm/local.h +++ b/arch/loongarch/include/asm/local.h @@ -56,8 +56,17 @@ static inline long local_sub_return(long i, local_t *l) return result; } -#define local_cmpxchg(l, o, n) \ - ((long)cmpxchg_local(&((l)->a.counter), (o), (n))) +static inline long local_cmpxchg(local_t *l, long old, long new) +{ + return cmpxchg_local(&l->a.counter, old, new); +} + +static inline bool local_try_cmpxchg(local_t *l, long *old, long new) +{ + typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, __old, new); +} + #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n))) /** diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h index 08366b1..5daf6fe 100644 --- a/arch/mips/include/asm/local.h +++ b/arch/mips/include/asm/local.h @@ -94,8 +94,17 @@ static __inline__ long local_sub_return(long i, local_t * l) return result; } -#define local_cmpxchg(l, o, n) \ - ((long)cmpxchg_local(&((l)->a.counter), (o), (n))) +static __inline__ long local_cmpxchg(local_t *l, long old, long new) +{ + return cmpxchg_local(&l->a.counter, old, new); +} + +static __inline__ bool local_try_cmpxchg(local_t *l, long *old, long new) +{ + typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, __old, new); +} + #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n))) /** diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h index bc4bd19..45492fb 100644 --- a/arch/powerpc/include/asm/local.h +++ b/arch/powerpc/include/asm/local.h @@ -90,6 +90,17 @@ static __inline__ long local_cmpxchg(local_t *l, long o, long n) return t; } +static __inline__ bool local_try_cmpxchg(local_t *l, long *po, long n) +{ + long o = *po, r; + + r = local_cmpxchg(l, o, n); + if (unlikely(r != o)) + *po = r; + + return likely(r == o); +} + static __inline__ long local_xchg(local_t *l, long n) { long t; diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h index 349a47a..56d4ef6 100644 --- a/arch/x86/include/asm/local.h +++ b/arch/x86/include/asm/local.h @@ -120,8 +120,17 @@ static inline long local_sub_return(long i, local_t *l) #define local_inc_return(l) (local_add_return(1, l)) #define local_dec_return(l) (local_sub_return(1, l)) -#define local_cmpxchg(l, o, n) \ - (cmpxchg_local(&((l)->a.counter), (o), (n))) +static inline long local_cmpxchg(local_t *l, long old, long new) +{ + return cmpxchg_local(&l->a.counter, old, new); +} + +static inline bool local_try_cmpxchg(local_t *l, long *old, long new) +{ + typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; + return try_cmpxchg_local(&l->a.counter, __old, new); +} + /* Always has a lock prefix */ #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))