From nobody Mon Aug 08 14:04:20 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M1dH82DD3z4Y4Sy; Mon, 8 Aug 2022 14:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M1dH81jY5z3vJV; Mon, 8 Aug 2022 14:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659967460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4A3ldnC0jaIOSjzUew5s9QepuPaN2E1cEy7LWjndP8=; b=fS4FzpNMzuwhXAc03o8dsSj3jpqT1VBEHz+Q/Vgna0T/5wB5bfK7E+GapefniB9ZAM30f4 HCuhgaq5Zcsj9FLutjqa7mgwvCRMI6VAC3MIkMc5CTUpeCDx2YDnsQMftcKkW8iD42YIX5 oJ1GmRYfCZIyGRTXjQqT8DGlXMUGYUuNEyaySQGNAe00cP/01UMhBkmthpPkX40umNKQXn 5vqVg+aROgMuFHUtAlJowJ6ageO9uSBWNAzU4Dxnq7e7H6KNwtKV8bpuUgQtWH1SayuG9I DniczYmxWi4vST/x1vdkc1CP/VQBztascKBkkUIqE9LCqeFDpS0Bl2ogqHUW2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M1dH80qVgztcK; Mon, 8 Aug 2022 14:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 278E4Ktt088863; Mon, 8 Aug 2022 14:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278E4Kox088862; Mon, 8 Aug 2022 14:04:20 GMT (envelope-from git) Date: Mon, 8 Aug 2022 14:04:20 GMT Message-Id: <202208081404.278E4Kox088862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 39da3678b1ce - main - linuxkpi: Add try_cmpxchg and atomic_try_cmpxchg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39da3678b1ce2d4fac300e022e544b1db5c117c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659967460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u4A3ldnC0jaIOSjzUew5s9QepuPaN2E1cEy7LWjndP8=; b=EacVkSSe7zIdQH+711RAFyUIP0bLVRiOn0vIohyzslWAjalR1H6WdyUp4F3/VHzu7ljlDE NERRuKlbfwhQV9z7/zxmJ2OI4g/7WG2HRJTwBzp+L3YzzAlJSS0frHKJqZicNELhqL2pM2 8NGJTY6tEY5cNmUTGFJW8dz7pn2irKSCknSXsSXSgKX8nXyTViDZffX5yWJjK4UrcUPuLl 4j/G0PZaQosftGO1sy24WfmmC0y0M/Sg/Fou+EuEoHZsR6oDvHQNWj7vAD1kke+rjqlfSO 4gF7bdvdUsT59hHpXWGT/UAeE5DPcyjQ+jUjmGGCXumvv7/30jWvs68TN2N1/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659967460; a=rsa-sha256; cv=none; b=JQY5Hqa7klX5FthmZvvQbAdd7rXQHZPrDPskju72Anx08lYCf2imSJknLRHXJ1hkSi3HaR XY44UFAb75nnXg380myju0emV64xtXxxgBufQUHCHAGeBPE3wv5JK2COOZbndPoo2nA67Z gt7ZkRQOnAyI3MOuTLzRha22JmFd5jhz11iazmxotawlkoOdEScG7OqMRIILyBIGVyuTgO kxFWs02aiEKHNRLAlnZtbiuJZNfpy2ltgNOmBLnTQ7Vttaxq/WDD/CbIk1LVHqAF9IuLNt +xZNkW2aQS5YLvMj2l1cy8rKpi80/CVY6Bm94gb7yN9xRKNRKDi6UgcvdZYTBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=39da3678b1ce2d4fac300e022e544b1db5c117c0 commit 39da3678b1ce2d4fac300e022e544b1db5c117c0 Author: Emmanuel Vadot AuthorDate: 2022-07-27 07:41:04 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-08 13:22:35 +0000 linuxkpi: Add try_cmpxchg and atomic_try_cmpxchg Needed by drm-kmod Obtain from: drm-kmod Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36015 --- sys/compat/linuxkpi/common/include/asm/atomic.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h index 7c7a2c4d4b92..d7e5338c0356 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic.h @@ -268,6 +268,28 @@ atomic_cmpxchg(atomic_t *v, int old, int new) __ret.val; \ }) +#define try_cmpxchg(p, op, n) \ +({ \ + __typeof(p) __op = (__typeof((p)))(op); \ + __typeof(*(p)) __o = *__op; \ + __typeof(*(p)) __p = __sync_val_compare_and_swap((p), (__o), (n)); \ + if (__p != __o) \ + *__op = __p; \ + (__p == __o); \ +}) + +#define __atomic_try_cmpxchg(type, _p, _po, _n) \ +({ \ + __typeof(_po) __po = (_po); \ + __typeof(*(_po)) __r, __o = *__po; \ + __r = atomic_cmpxchg##type((_p), __o, (_n)); \ + if (unlikely(__r != __o)) \ + *__po = __r; \ + likely(__r == __o); \ +}) + +#define atomic_try_cmpxchg(_p, _po, _n) __atomic_try_cmpxchg(, _p, _po, _n) + static inline int atomic_dec_if_positive(atomic_t *v) {