From patchwork Sat Apr 29 07:03:05 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: 88851 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1438365vqo; Sat, 29 Apr 2023 00:20:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5eDqCzJUQV5/3eSRCuLJkWpYZRz2GWMBL5eqeTdcmRbbyjTHv7jwg5nrscMWnr9zvv15FN X-Received: by 2002:a05:6a20:6a1b:b0:e9:5b0a:e7e7 with SMTP id p27-20020a056a206a1b00b000e95b0ae7e7mr9474206pzk.15.1682752816443; Sat, 29 Apr 2023 00:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682752816; cv=none; d=google.com; s=arc-20160816; b=fqXAFqnVzdPjcOQJWj4EMcb5fMMkj9adjYysPxHqVMFrEZoMSRCLrL+ShtrQY4tzqt llrcbQ+BAgs6odygrA++I37ISWoHJw5TuekpQHswn4H8ysbBo+PIt4hnXtTvmuFjL49H 2JwgqZffFCQkF5fo8uj7pMX0nZMiNP4XgWbnKE5tnHKZYBpKNF9hN5zBZatxa8E/PYC+ fsk2JzE3hxrbJcKEunyzJM//xk3wMo/sMRIMybHadlR6OvAG3oXbGC2McAtDZL1kOtEw vk3t1J4xke8lxmBJPxPA2jgl+gzofpqWI3kFQa2qIuCbhq3sgTpA7C2Wbpe6WrhsMtVH OPew== 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=K3mrM/QJ2Lg/FRiU9STvHmaare2Exqy7ouwgCM7hNFY=; b=aCJ1s87jylToSU4A/AU1o7SGNG44AWsmwoSxjJbw50xERDM4GRjTnmmbtANBZZcgS1 7tDRDwf61n8HxdVvUYq5TSIYxIW+RD5GcMxiMii3iWxNiAXCYypOBaPuHGUvBqSn2hKs VrGV6pgA3ueVSok2T/plSyILOpC70t680eCnzhzIexbEwtLSMufk36XeneaLGVLHMyM5 cyBi8FXbHXb49M+5KJ0C/cdqN8Qc0fTDkEVtaRwYMMrrgAbVa1t6s4nek/w74ghPgnKK GuCL8K0HL3oVF7WG+mVLgw/lqHOkl1wqrfYNeklQ/0C8QhIlnmYzT4urZojsD1dJOrIW U1Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=y79ujX+s; dkim=neutral (no key) header.i=@linutronix.de header.b=CV7f3Dxe; 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 m6-20020a17090a3f8600b0024666ca75ebsi4060656pjc.116.2023.04.29.00.20.04; Sat, 29 Apr 2023 00:20:16 -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=y79ujX+s; dkim=neutral (no key) header.i=@linutronix.de header.b=CV7f3Dxe; 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 S1347214AbjD2HDb (ORCPT + 99 others); Sat, 29 Apr 2023 03:03:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230392AbjD2HDN (ORCPT ); Sat, 29 Apr 2023 03:03:13 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFB762D4A; Sat, 29 Apr 2023 00:03:07 -0700 (PDT) Date: Sat, 29 Apr 2023 07:03:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1682751786; 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=K3mrM/QJ2Lg/FRiU9STvHmaare2Exqy7ouwgCM7hNFY=; b=y79ujX+sh0wJM+1tCjZcSeF+5rlUcIV35ATJMH05jlHBil8c6ls7V0vOLDGzvuNezjVrRq qlfT6uOkZweqjkvHNhopOyH3mCeUQlfkPAd5gN51bU+yGHY/QmOiJdZu6yeJI41/CC8yI6 ZdnDnHZfRUFf/Zo9g3VxbSTPq3Nxi1K4LD1Ai74cOPzbVbpo9YDavfMOd6mpJIdUIHmRnz oqN+lMkpud63BsEaygjc46HEGhhwTyQHE7chfgHxl0xq2UKrG7KfC6OMSsPTrJVE0Lw4tw nGy/Uw794LUTrMuSptMKxzrh1jTByz/C6D3KABLmSu9RIv1CfNaySwxlI6+cDA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1682751786; 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=K3mrM/QJ2Lg/FRiU9STvHmaare2Exqy7ouwgCM7hNFY=; b=CV7f3DxeSRd9/mosiUBEuA+aSb/WVSsavluVefXIr5VjybFoSMBLiKKOZjKnLNKyKeLG8n csuHxtLfyM3kKSAw== 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/atomic: Add generic try_cmpxchg{,64}_local() support Cc: Uros Bizjak , "Peter Zijlstra (Intel)" , Ingo Molnar , Mark Rutland , Linus Torvalds , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230405141710.3551-2-ubizjak@gmail.com> References: <20230405141710.3551-2-ubizjak@gmail.com> MIME-Version: 1.0 Message-ID: <168275178570.404.10146871888315087834.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?1764494216959185938?= X-GMAIL-MSGID: =?utf-8?q?1764494216959185938?= The following commit has been merged into the locking/core branch of tip: Commit-ID: cd6637248298aca6f9f7df489e73baa727409210 Gitweb: https://git.kernel.org/tip/cd6637248298aca6f9f7df489e73baa727409210 Author: Uros Bizjak AuthorDate: Wed, 05 Apr 2023 16:17:06 +02:00 Committer: Ingo Molnar CommitterDate: Sat, 29 Apr 2023 08:51:55 +02:00 locking/atomic: Add generic try_cmpxchg{,64}_local() support Add generic support for try_cmpxchg{,64}_local() and their falbacks. These provides the generic try_cmpxchg_local family of functions from the arch_ prefixed version, also adding explicit instrumentation. Signed-off-by: Uros Bizjak Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Acked-by: Mark Rutland Link: https://lore.kernel.org/r/20230405141710.3551-2-ubizjak@gmail.com Cc: Linus Torvalds --- include/linux/atomic/atomic-arch-fallback.h | 24 +++++++++++++++++++- include/linux/atomic/atomic-instrumented.h | 20 ++++++++++++++++- scripts/atomic/gen-atomic-fallback.sh | 4 +++- scripts/atomic/gen-atomic-instrumented.sh | 2 +- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/include/linux/atomic/atomic-arch-fallback.h b/include/linux/atomic/atomic-arch-fallback.h index 4226379..a6e4437 100644 --- a/include/linux/atomic/atomic-arch-fallback.h +++ b/include/linux/atomic/atomic-arch-fallback.h @@ -217,6 +217,28 @@ #endif /* arch_try_cmpxchg64_relaxed */ +#ifndef arch_try_cmpxchg_local +#define arch_try_cmpxchg_local(_ptr, _oldp, _new) \ +({ \ + typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \ + ___r = arch_cmpxchg_local((_ptr), ___o, (_new)); \ + if (unlikely(___r != ___o)) \ + *___op = ___r; \ + likely(___r == ___o); \ +}) +#endif /* arch_try_cmpxchg_local */ + +#ifndef arch_try_cmpxchg64_local +#define arch_try_cmpxchg64_local(_ptr, _oldp, _new) \ +({ \ + typeof(*(_ptr)) *___op = (_oldp), ___o = *___op, ___r; \ + ___r = arch_cmpxchg64_local((_ptr), ___o, (_new)); \ + if (unlikely(___r != ___o)) \ + *___op = ___r; \ + likely(___r == ___o); \ +}) +#endif /* arch_try_cmpxchg64_local */ + #ifndef arch_atomic_read_acquire static __always_inline int arch_atomic_read_acquire(const atomic_t *v) @@ -2646,4 +2668,4 @@ arch_atomic64_dec_if_positive(atomic64_t *v) #endif #endif /* _LINUX_ATOMIC_FALLBACK_H */ -// 00071fffa021cec66f6290d706d69c91df87bade +// ad2e2b4d168dbc60a73922616047a9bfa446af36 diff --git a/include/linux/atomic/atomic-instrumented.h b/include/linux/atomic/atomic-instrumented.h index 0496816..245ba66 100644 --- a/include/linux/atomic/atomic-instrumented.h +++ b/include/linux/atomic/atomic-instrumented.h @@ -2132,6 +2132,24 @@ atomic_long_dec_if_positive(atomic_long_t *v) arch_sync_cmpxchg(__ai_ptr, __VA_ARGS__); \ }) +#define try_cmpxchg_local(ptr, oldp, ...) \ +({ \ + typeof(ptr) __ai_ptr = (ptr); \ + typeof(oldp) __ai_oldp = (oldp); \ + instrument_atomic_write(__ai_ptr, sizeof(*__ai_ptr)); \ + instrument_atomic_write(__ai_oldp, sizeof(*__ai_oldp)); \ + arch_try_cmpxchg_local(__ai_ptr, __ai_oldp, __VA_ARGS__); \ +}) + +#define try_cmpxchg64_local(ptr, oldp, ...) \ +({ \ + typeof(ptr) __ai_ptr = (ptr); \ + typeof(oldp) __ai_oldp = (oldp); \ + instrument_atomic_write(__ai_ptr, sizeof(*__ai_ptr)); \ + instrument_atomic_write(__ai_oldp, sizeof(*__ai_oldp)); \ + arch_try_cmpxchg64_local(__ai_ptr, __ai_oldp, __VA_ARGS__); \ +}) + #define cmpxchg_double(ptr, ...) \ ({ \ typeof(ptr) __ai_ptr = (ptr); \ @@ -2149,4 +2167,4 @@ atomic_long_dec_if_positive(atomic_long_t *v) }) #endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ -// 1b485de9cbaa4900de59e14ee2084357eaeb1c3a +// 97fe4d79aa058d2164df824632cbc4f716d2a407 diff --git a/scripts/atomic/gen-atomic-fallback.sh b/scripts/atomic/gen-atomic-fallback.sh index 3a07695..6e853f0 100755 --- a/scripts/atomic/gen-atomic-fallback.sh +++ b/scripts/atomic/gen-atomic-fallback.sh @@ -225,6 +225,10 @@ for cmpxchg in "cmpxchg" "cmpxchg64"; do gen_try_cmpxchg_fallbacks "${cmpxchg}" done +for cmpxchg in "cmpxchg_local" "cmpxchg64_local"; do + gen_try_cmpxchg_fallback "${cmpxchg}" "" +done + grep '^[a-z]' "$1" | while read name meta args; do gen_proto "${meta}" "${name}" "atomic" "int" ${args} done diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh index 77c0652..c8165e9 100755 --- a/scripts/atomic/gen-atomic-instrumented.sh +++ b/scripts/atomic/gen-atomic-instrumented.sh @@ -173,7 +173,7 @@ for xchg in "xchg" "cmpxchg" "cmpxchg64" "try_cmpxchg" "try_cmpxchg64"; do done done -for xchg in "cmpxchg_local" "cmpxchg64_local" "sync_cmpxchg"; do +for xchg in "cmpxchg_local" "cmpxchg64_local" "sync_cmpxchg" "try_cmpxchg_local" "try_cmpxchg64_local" ; do gen_xchg "${xchg}" "" "" printf "\n" done