From nobody Mon Jan 27 18:17:47 2025 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 4Yhc8r4xFHz5m3WC; Mon, 27 Jan 2025 18:17:48 +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 4Yhc8q6jwzz3pjs; Mon, 27 Jan 2025 18:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001867; 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=bPFP9nKgQoNXu1bfiJ2JQBIeLrmpAZekZLW+Ggg115o=; b=qeKgB/2LDJerJZBEwp/1NXrsNa7OePwlbKBEnSF2VRYqqjh5w5scIh+/nXeGDPg6G/Juxy l5BmQHZJoV7b4bn/aK6OZaWGBlsbMOQWdKHEBVtSvUvHYwQ673T1BtmiZ4awpVDCROqY3X 4Oz7d80B1S89kQTlnYapZdBz2CCXhKQqQ8MB40STxz/1JoCDjXLxdCp8JPYAeTvu2BK5zJ LXoOo3WEfvaBk8cyUlsrIjq72AyX3dYpWiIIORmXO13RvmFY2J11gkzScBNgzfWQsa+jhr aZLO/MfZYZXjn40I+qZ3LtzSRgI50Ktp/aCghQrVKjweGGrYHzSYCufLm7OSPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001867; 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=bPFP9nKgQoNXu1bfiJ2JQBIeLrmpAZekZLW+Ggg115o=; b=TYbTfDQSGQF7syUIPkGrXgiz44jOGPE0xDWFcrAo9xh3AUdWCcb1md896yZPBn/ILYJddU fJUmQJ8XM+ZngUu1ucLkzUdqADayqJISj3WxwL05snPDJfv8s8aRUeX2HVuAwu0qJ7WE6b ble6moQ+5psx2hjFurF5g4pQ+Hzg4Fjwf7NsHYrRvVNVpehZOj4tAwKtTAgCwXiIpr1Hua l58Sa49nelqy4Ng7NNZbjMpacAsZgSZcpKGxc+AHFkGcdkacpbbAlYkz3/55kE7IZ6T4gt O66bwZR7PAIv4loL1plLw4wodkXmVGQQW+4hKilpJbdisB2WLXRTYfeAHlUNdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738001867; a=rsa-sha256; cv=none; b=X5gyXYLpIziACJl1/J+CtnbXVGSNcFMgfJciiNFhSCtT+Xd4Qe9VgwN3wgKYyOYMbZlwf7 ACAjNDNusbYhubCsPxTADNcMwAziUV6xYVQKoc/YCRUWaEJO/1N+T5Jh3itw0D9MPKdoaT t3b5H/VrAT8+8T/aswEdZTgt4N7heIJYzCQaWHRHKKq2GxNpPdH6DW6wS/zCMTV9g2ltB0 HUZCJjDMhniMl4dcTcl8pUZKsXnfvZPBCr45Lym2pDXH0obcuNIZhlh2+1KcpXZjJ0rWQS QFkHFUZDbXzmwQqIh8xJEonE1T/zwsHYXQf2PPqfwe2GiYAjHGTC1hqXQN3nvQ== 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 4Yhc8q6GsKzfyN; Mon, 27 Jan 2025 18:17:47 +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 50RIHlGC092372; Mon, 27 Jan 2025 18:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIHlnq092369; Mon, 27 Jan 2025 18:17:47 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:17:47 GMT Message-Id: <202501271817.50RIHlnq092369@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: eb6edafe8f48 - stable/13 - atomics: atomic_load_consume_ptr(): Accept pointers to const 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: eb6edafe8f484a69ff074018e5b93e481787923e Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=eb6edafe8f484a69ff074018e5b93e481787923e commit eb6edafe8f484a69ff074018e5b93e481787923e Author: Olivier Certner AuthorDate: 2025-01-20 13:53:35 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:17:17 +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)