From nobody Mon Jan 27 18:20:27 2025 X-Original-To: dev-commits-src-branches@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 4YhcCv533zz5m3mb; Mon, 27 Jan 2025 18:20:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhcCv3drqz3rN0; Mon, 27 Jan 2025 18:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002027; 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=gZ7ktpJ5qmWuutzXUIg7Aynm5E+aqUmmj9GfkNoJ480=; b=lMuhfWh/2KSDWkJrWAv7yN8spZLndEfvludd/GS9BySDZ2CKlPd4dozRHPnjrUvNFz9Zm8 HCi5uzAPDG7aDvH/8BjLTWaK0ChCGhkm5kQVbwTrjfVokC1R8e/3oFYc6qk7fPzgseBM6v Ojwai7f39gPhOGCOT4IkmCG/zwpopj5fG7DyttSeuF597IQoNMWQ6lp2oJWI+qCH61cDIW JLsurTkORC2zkXFgY2osKvjYL/1/sB8l026ugsvHQUnQG1BE45nRJjqA3NSVUcY5LL4Htz VbQyoq8vaY9h/vLw2usmAyrJQq1DJgD5y+gOZ473MrxngkLDerz9rkYTk3EfnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002027; 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=gZ7ktpJ5qmWuutzXUIg7Aynm5E+aqUmmj9GfkNoJ480=; b=qHv+anPklWHwrGsalHfeWzu6FigN+okHMu5f88M3B1dEAAYy+wRFEbWi2S3n8hy9lYcqNW E5whlh/IMHi9Rbdsu9Zd/GhLnKBChzqaF9d4RysBL5eiPOMnFC8Vj8lgjJ8U7JJ+oZzhwo 6DruyRPu1ZPeBubzmmQds88YSRxLvW8pFoFi09b61XXXbYK8f72AW3Byyo9xC/l69koTTo wQ0hUy3TjMofuBiHH9/kaIdcaBVtysolZYnAPNBxhrNY8JJdqe/Golvk6fwSbYXen6sNVs iFbkQHnfAviz9u8Op52jLeFnG8WprHcqj6spT8F2FOU0yazcTt38VjsJkJHzyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738002027; a=rsa-sha256; cv=none; b=tf4oqkdOKUGqSDbWrpfFEXAzSg6aQvBWkelpQK3jb19X8tF9M5aBQJd+rrQGzzOazO56BG tc9Jk03uBm6boAIJmGLGota3Zjnfg5SyU97PI1DVvWFieg08eno48avxbc8ud3hCmzX2s/ pWsi7WyQofE1QwyDMgl1JDgOFglXnFCgEDIjRki41Z9Joz3WD37LcqmBm7exa6+dE4mKHX VEgw/rOkc4VDGToutp7aYJjar2Dj8eipscWArQr0DI7Px5N40VVRn5ZSSkb6g7Qs1Dn2ln ahFxA6XL7iOOwWJElVRsqwjym5gb6ivfqGDfWSMd96+MeZo2VhxWun19rBuk9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YhcCv2858zgFp; Mon, 27 Jan 2025 18:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50RIKReb002153; Mon, 27 Jan 2025 18:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIKRCd002150; Mon, 27 Jan 2025 18:20:27 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:20:27 GMT Message-Id: <202501271820.50RIKRCd002150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 19f7b2bbc4e4 - stable/14 - atomics: atomic_load_consume_ptr(): Accept pointers to const List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 19f7b2bbc4e4fec33b7e8d546dd05a79533ca8e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=19f7b2bbc4e4fec33b7e8d546dd05a79533ca8e4 commit 19f7b2bbc4e4fec33b7e8d546dd05a79533ca8e4 Author: Olivier Certner AuthorDate: 2025-01-20 13:53:35 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:19:57 +0000 atomics: atomic_load_consume_ptr(): Accept pointers to const Now that all directly-implemented loads (with acquire semantics or not) accept pointers to const, ensure that atomic_load_consume_ptr(), built on atomic_load_acq_ptr(), does so too, in the common atomics header as well as *SAN interceptors. Reviewed by: kib Fixes: 5e9a82e898d5 ("atomics: Constify loads") MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 (cherry picked from commit 8dd436fca1149ec7e56f6f06abde50a2e8796ad6) --- sys/sys/atomic_common.h | 2 +- sys/sys/atomic_san.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/atomic_common.h b/sys/sys/atomic_common.h index e03cd93c2d4a..e802b2a99630 100644 --- a/sys/sys/atomic_common.h +++ b/sys/sys/atomic_common.h @@ -133,7 +133,7 @@ * 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)) + ((__typeof(*p)) atomic_load_acq_ptr((const volatile uintptr_t *)p)) #define atomic_interrupt_fence() __compiler_membar() diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index 93a9bfcbf593..06c6c98ec8a8 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -270,7 +270,7 @@ ATOMIC_SAN_THREAD_FENCE(SAN_INTERCEPTOR_PREFIX); __DECONST(volatile uintptr_t *, (x)))) #define atomic_load_acq_ptr ATOMIC_SAN(load_acq_ptr) #define atomic_load_consume_ptr(x) \ - ((__typeof(*x))atomic_load_acq_ptr((volatile uintptr_t *)(x))) + ((__typeof(*x))atomic_load_acq_ptr((const volatile uintptr_t *)(x))) #define atomic_readandclear_ptr ATOMIC_SAN(readandclear_ptr) #define atomic_set_ptr ATOMIC_SAN(set_ptr) #define atomic_set_acq_ptr ATOMIC_SAN(set_acq_ptr)