From nobody Mon Aug 08 19:09:15 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 4M1m2z5YDYz4Yr2K; Mon, 8 Aug 2022 19:09:15 +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 4M1m2z4zypz3fKh; Mon, 8 Aug 2022 19:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659985755; 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=IgiGk4wEvzmMcgijdnGcvU4RYPloEIslT8n7dQHMId0=; b=hlwL0NTUO3H2GbetYORqmaenuKuX4o5ZeMEqI5c1hrO5IkVYy/2+4d8YB1jF5S39HixCiw LI/Jjs5bSlZz1Okcy/aw4mYGymlpRcNRPGtwxYynqVznEUhmX3Lr4AdNab7cXqnDkR8Nhn JDi4Pjd5InCP6CCgEseir5honmjS9hVUlV/N+xcnJpKPhmPySQ8KfwRXRKBpRyNWETH7Gs E153ul+/7UF+Uy9kQjYbeX/C1O+Q3QqEqtQwGFeISNTOJWJ4G6SqIC8N5EFNaGf9ip9taM 4HL9M03FO1HO07jTNaUoe46fYfKIuvv7OjcnoIw5YAEj31F6nezmkn4iXuyIew== 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 4M1m2z45cSz13M4; Mon, 8 Aug 2022 19:09:15 +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 278J9FHW097531; Mon, 8 Aug 2022 19:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278J9FHb097530; Mon, 8 Aug 2022 19:09:15 GMT (envelope-from git) Date: Mon, 8 Aug 2022 19:09:15 GMT Message-Id: <202208081909.278J9FHb097530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ced25caae45d - stable/13 - atomic: Add some type checking to plain atomic_load/store helpers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ced25caae45de4060acf5c3e434ddd1eb0f08b9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659985755; 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=IgiGk4wEvzmMcgijdnGcvU4RYPloEIslT8n7dQHMId0=; b=aTWHRJzUMDq711PET7g+mLPAsejF17tI8ZHDb+9NKiDTbaamfuhI9eTFkBQ7r5WqeJKPCV J9OYp/ugl4Gumn5NdxRn06cFmgTcwlO/HKcN2t0fI01+fXZgf2/O9ZupqCbP1w4roflfCi ajwyLtp/BRJ8MNq52JB76jIUhR8aPNRSFhVafoN3FkUrQ1Ce1QaU4R6QM5fBXw/YSkeKlX nGRYytR+I32UerAM+Dj4VSpbAtQEVjEbyu0JVPS0vo3med1Zi6Mrgd/N5yVJJxedBqqhHk AhTy7q+ZJnrDxPodHVR1Mvxp8OV/3XnRpXitCQRarOnl3uRImQBo7+XSRgzcow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659985755; a=rsa-sha256; cv=none; b=Q/kqAGnXB6nSAL5Kl39jzziq17cSuX4Qo1rk/p3PhoTNi3Tek5OshUspy/MuQHUC5Iy3f4 PDHLSYkzTXh+iiC3BGjR8eJsuC8ONCFDE+jtco1uiKh2SGRnxUYCMJgHBMNz753wCb/5Im 0kNtPaIVaANTB6n+R3KcbOb9273eL0kPWWaI1Yiv/LT/MFioH4bPn4r01U42MKV351HNbr trhHzHLotM3qOjrUnYNm9Z7U5S2/fF5gvWQcmi7uWVKPpgt83hGaozPELvzbQMfuWX8hwc kAM1AGM9rpuhVvfl/cg3ZW13N+h2AFuckWt+pdxhufULkHjx/rDv38sLYGM1Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ced25caae45de4060acf5c3e434ddd1eb0f08b9b commit ced25caae45de4060acf5c3e434ddd1eb0f08b9b Author: Mark Johnston AuthorDate: 2022-07-25 21:48:46 +0000 Commit: Mark Johnston CommitDate: 2022-08-08 15:00:32 +0000 atomic: Add some type checking to plain atomic_load/store helpers Reviewed by: rpokala, mjg, imp, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 30253da1a982285b0ae6e89e22369a61cf9266eb) --- sys/sys/atomic_common.h | 88 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/sys/sys/atomic_common.h b/sys/sys/atomic_common.h index e3969b241a8c..a34198fda88a 100644 --- a/sys/sys/atomic_common.h +++ b/sys/sys/atomic_common.h @@ -36,39 +36,83 @@ #error do not include this header, use machine/atomic.h #endif -#define atomic_load_char(p) (*(volatile u_char *)(p)) -#define atomic_load_short(p) (*(volatile u_short *)(p)) -#define atomic_load_int(p) (*(volatile u_int *)(p)) -#define atomic_load_long(p) (*(volatile u_long *)(p)) -#define atomic_load_ptr(p) (*(volatile __typeof(*p) *)(p)) -#define atomic_load_8(p) (*(volatile uint8_t *)(p)) -#define atomic_load_16(p) (*(volatile uint16_t *)(p)) -#define atomic_load_32(p) (*(volatile uint32_t *)(p)) -#ifdef _LP64 -#define atomic_load_64(p) (*(volatile uint64_t *)(p)) -#endif +#include +#include -#define atomic_store_char(p, v) \ +#define __atomic_load_char_relaxed(p) (*(volatile u_char *)(p)) +#define __atomic_load_short_relaxed(p) (*(volatile u_short *)(p)) +#define __atomic_load_int_relaxed(p) (*(volatile u_int *)(p)) +#define __atomic_load_long_relaxed(p) (*(volatile u_long *)(p)) +#define __atomic_load_8_relaxed(p) (*(volatile uint8_t *)(p)) +#define __atomic_load_16_relaxed(p) (*(volatile uint16_t *)(p)) +#define __atomic_load_32_relaxed(p) (*(volatile uint32_t *)(p)) +#define __atomic_load_64_relaxed(p) (*(volatile uint64_t *)(p)) + +#define __atomic_store_char_relaxed(p, v) \ (*(volatile u_char *)(p) = (u_char)(v)) -#define atomic_store_short(p, v) \ +#define __atomic_store_short_relaxed(p, v) \ (*(volatile u_short *)(p) = (u_short)(v)) -#define atomic_store_int(p, v) \ +#define __atomic_store_int_relaxed(p, v) \ (*(volatile u_int *)(p) = (u_int)(v)) -#define atomic_store_long(p, v) \ +#define __atomic_store_long_relaxed(p, v) \ (*(volatile u_long *)(p) = (u_long)(v)) -#define atomic_store_ptr(p, v) \ - (*(volatile __typeof(*p) *)(p) = (v)) -#define atomic_store_8(p, v) \ +#define __atomic_store_8_relaxed(p, v) \ (*(volatile uint8_t *)(p) = (uint8_t)(v)) -#define atomic_store_16(p, v) \ +#define __atomic_store_16_relaxed(p, v) \ (*(volatile uint16_t *)(p) = (uint16_t)(v)) -#define atomic_store_32(p, v) \ +#define __atomic_store_32_relaxed(p, v) \ (*(volatile uint32_t *)(p) = (uint32_t)(v)) -#ifdef _LP64 -#define atomic_store_64(p, v) \ +#define __atomic_store_64_relaxed(p, v) \ (*(volatile uint64_t *)(p) = (uint64_t)(v)) + +/* + * When _Generic is available, try to provide some type checking. + */ +#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \ + __has_extension(c_generic_selections) +#define __atomic_load_generic(p, t, ut, n) \ + _Generic(*(p), \ + t: __atomic_load_ ## n ## _relaxed(p), ut: __atomic_load_ ## n ## _relaxed(p)) +#define __atomic_store_generic(p, v, t, ut, n) \ + _Generic(*(p), \ + t: __atomic_store_ ## n ## _relaxed(p, v), ut: __atomic_store_ ## n ## _relaxed(p, v)) +#else +#define __atomic_load_generic(p, t, ut, n) __atomic_load_ ## n ## _relaxed(p) +#define __atomic_store_generic(p, v, t, ut, n) __atomic_store_ ## n ## _relaxed(p, v) #endif +#define atomic_load_char(p) __atomic_load_generic(p, char, u_char, char) +#define atomic_load_short(p) __atomic_load_generic(p, short, u_short, short) +#define atomic_load_int(p) __atomic_load_generic(p, int, u_int, int) +#define atomic_load_long(p) __atomic_load_generic(p, long, u_long, long) +#define atomic_load_8(p) __atomic_load_generic(p, int8_t, uint8_t, 8) +#define atomic_load_16(p) __atomic_load_generic(p, int16_t, uint16_t, 16) +#define atomic_load_32(p) __atomic_load_generic(p, int32_t, uint32_t, 32) +#ifdef __LP64__ +#define atomic_load_64(p) __atomic_load_generic(p, int64_t, uint64_t, 64) +#endif +#define atomic_store_char(p, v) \ + __atomic_store_generic(p, v, char, u_char, char) +#define atomic_store_short(p, v) \ + __atomic_store_generic(p, v, short, u_short, short) +#define atomic_store_int(p, v) \ + __atomic_store_generic(p, v, int, u_int, int) +#define atomic_store_long(p, v) \ + __atomic_store_generic(p, v, long, u_long, long) +#define atomic_store_8(p, v) \ + __atomic_store_generic(p, v, int8_t, uint8_t, 8) +#define atomic_store_16(p, v) \ + __atomic_store_generic(p, v, int16_t, uint16_t, 16) +#define atomic_store_32(p, v) \ + __atomic_store_generic(p, v, int32_t, uint32_t, 32) +#ifdef __LP64__ +#define atomic_store_64(p, v) \ + __atomic_store_generic(p, v, int64_t, uint64_t, 64) +#endif + +#define atomic_load_ptr(p) (*(volatile __typeof(*p) *)(p)) +#define atomic_store_ptr(p, v) (*(volatile __typeof(*p) *)(p) = (v)) + /* * Currently all architectures provide acquire and release fences on their own, * but they don't provide consume. Kludge below allows relevant code to stop