From owner-dev-commits-src-branches@freebsd.org Mon Feb 1 12:40:49 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7B0524FEC39;
Mon, 1 Feb 2021 12:40:49 +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 4DTnc05kqnz3DrT;
Mon, 1 Feb 2021 12:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 973541B439;
Mon, 1 Feb 2021 12:40:44 +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 111CeiEe094868;
Mon, 1 Feb 2021 12:40:44 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111CeiX9094867;
Mon, 1 Feb 2021 12:40:44 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 12:40:44 GMT
Message-Id: <202102011240.111CeiX9094867@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Guzik <mjg@FreeBSD.org>
Subject: git: fc301c224b27 - stable/13 - atomic: add stub
atomic_load_consume_ptr
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mjg
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: fc301c224b272a522bff817e12fcbf99a7a17330
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 12:40:49 -0000
The branch stable/13 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=fc301c224b272a522bff817e12fcbf99a7a17330
commit fc301c224b272a522bff817e12fcbf99a7a17330
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-01-25 20:09:41 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-02-01 12:39:16 +0000
atomic: add stub atomic_load_consume_ptr
(cherry picked from commit 054ce2b0371042c0dbc4b3ab1d7e7795ad75d51e)
---
sys/sys/_cscan_atomic.h | 5 +++++
sys/sys/atomic_common.h | 8 ++++++++
2 files changed, 13 insertions(+)
diff --git a/sys/sys/_cscan_atomic.h b/sys/sys/_cscan_atomic.h
index 3bd9455102b1..aed96580e1e4 100644
--- a/sys/sys/_cscan_atomic.h
+++ b/sys/sys/_cscan_atomic.h
@@ -236,6 +236,11 @@ void kcsan_atomic_thread_fence_seq_cst(void);
__retptr; \
})
#define atomic_load_acq_ptr kcsan_atomic_load_acq_ptr
+#define atomic_load_consume_ptr(x) ({ \
+ __typeof(*x) __retptr; \
+ __retptr = (void *)kcsan_atomic_load_acq_ptr((volatile uintptr_t *)(x));\
+ __retptr; \
+})
#define atomic_readandclear_ptr kcsan_atomic_readandclear_ptr
#define atomic_set_ptr kcsan_atomic_set_ptr
#define atomic_set_acq_ptr kcsan_atomic_set_acq_ptr
diff --git a/sys/sys/atomic_common.h b/sys/sys/atomic_common.h
index 4c29d132c369..48f0a8b8939c 100644
--- a/sys/sys/atomic_common.h
+++ b/sys/sys/atomic_common.h
@@ -70,4 +70,12 @@
(*(volatile uint64_t *)(p) = (uint64_t)(v))
#endif
+/*
+ * Currently all architectures provide acquire and release fences on their own,
+ * but they don't provide consume. Kludge below allows relevant code to stop
+ * openly resorting to the stronger acquire fence, to be sorted out.
+ */
+#define atomic_load_consume_ptr(p) \
+ ((__typeof(*p)) atomic_load_acq_ptr((uintptr_t *)p))
+
#endif