From nobody Thu Jan 16 18:08:38 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 4YYrTM4Zy0z5kkqZ; Thu, 16 Jan 2025 18:08:39 +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 4YYrTL75WVz3S9F; Thu, 16 Jan 2025 18:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050919; 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=ZluBAa/b1CRl939TqlDH6pRuqMI3oX+abs71MwhPE0Y=; b=W3TgLCBPHZ6CKa+6SYlkrlcJeGk8QJAYEI5O5P79JBc24MaZ9vWrUrGfZ1QpQ+03yeVL7/ AQy3RKfI8COz6sENepCv25J+X/GBNctVM1wYzk9i2YziUiDqfdnoluCATwUaEy5gPBCI5f CStSWaP6D9qY8k4JkRXZtFytqzWQe7n9k1RL8L2A54TRIewgySSh76d//PoQ6TnvqnyhWP NFoWL5YZkjRdh1LxEbmWZfufDKlq5czeVQS2PITpIgKOmpayN0DqgCavp3gRnTSp9I+dYM NmmL6lJCG112RB6+lCbfXSwb446ctTnvycgXup/ZjjFYMPnLaEWk13dzpPv5hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050919; 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=ZluBAa/b1CRl939TqlDH6pRuqMI3oX+abs71MwhPE0Y=; b=FhojycVPeIawmuhDYxLl324rzA/tX3/AtXd34lT3nSu+hwm9EcxuTHj6ZWWR4HZ/JSNpsW gQcMQioyIGbQal3Y5aNiJUJAnVt9RWYnzTJfTr9QtqEGY0W0OdsAymDogrUmOtY/t3wULl dsbl8XLkQZ9uhM4pkVQ8JmVpaTiQRSAnp9JehWyZ690x3AgC7zWvNVtHhV3xPwSPiabwNK sO4aS1mFVF/QqiKoUW2wZ21X1z23A2QYkWtW5O3bltSe8SHl+rRGkPaNjUqJnwvPqySX0Q XiIqGh49hPyaVxqhmky/Gi6jg+IB5MBunHWvZOnH+QRuqeyN981tUGJePQTahg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737050919; a=rsa-sha256; cv=none; b=RiAq6aXXqf+X1l0+Ay9HM4AbgwaOUsnvF+mpomB6Um3wTT2IuNyGXV7aACffl8gcUMYny5 3FYRC7C2vMpVdZHB7JlvVC4ckECLXGdbdQqPUzwk4D/TSsVDdoZE5dO50U603GJxwNaQnN 3X+X9+lVIrJD24zKKTsmC1xIggJqu1Q0ZfcChE4qCew/k5WEivwqQCmhKz9QTKkYvA9e/g 6H+jggWsP8J1mrFuFaJjap+CQ2zpAYfqZ5wq3EnDXzfzml4gjyz3y+YhMzzkGpY8JXTF+Z Bo6kNw/IrS2/uqrFAvgcVrt9a8cSD9ctyHQHNOXO8KXeL4DDEs7VRRPsk8vhyg== 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 4YYrTL6bKxzk1B; Thu, 16 Jan 2025 18:08:38 +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 50GI8ckJ092862; Thu, 16 Jan 2025 18:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GI8c3X092859; Thu, 16 Jan 2025 18:08:38 GMT (envelope-from git) Date: Thu, 16 Jan 2025 18:08:38 GMT Message-Id: <202501161808.50GI8c3X092859@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: dd0fae3028d2 - stable/14 - atomic: Update interceptor function signatures after commit 5e9a82e898d5 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/14 X-Git-Reftype: branch X-Git-Commit: dd0fae3028d22ec9e9c98172aedfde46c3534186 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0fae3028d22ec9e9c98172aedfde46c3534186 commit dd0fae3028d22ec9e9c98172aedfde46c3534186 Author: Mark Johnston AuthorDate: 2024-12-17 14:05:00 +0000 Commit: Olivier Certner CommitDate: 2025-01-16 18:07:01 +0000 atomic: Update interceptor function signatures after commit 5e9a82e898d5 Fixes: 5e9a82e898d5 ("atomics: Constify loads") (cherry picked from commit fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6) --- sys/kern/subr_asan.c | 2 +- sys/kern/subr_csan.c | 2 +- sys/kern/subr_msan.c | 2 +- sys/sys/atomic_san.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index c934ff83874e..51bf1f684c79 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -750,7 +750,7 @@ kasan_casueword(volatile u_long *base, u_long oldval, u_long *oldvalp, } #define _ASAN_ATOMIC_FUNC_LOAD(name, type) \ - type kasan_atomic_load_##name(volatile type *ptr) \ + type kasan_atomic_load_##name(const volatile type *ptr) \ { \ kasan_shadow_check((uintptr_t)ptr, sizeof(type), true, \ __RET_ADDR); \ diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c index 368f8b6ba981..e8f0eeabbca6 100644 --- a/sys/kern/subr_csan.c +++ b/sys/kern/subr_csan.c @@ -441,7 +441,7 @@ kcsan_copyout(const void *kaddr, void *uaddr, size_t len) } #define _CSAN_ATOMIC_FUNC_LOAD(name, type) \ - type kcsan_atomic_load_##name(volatile type *ptr) \ + type kcsan_atomic_load_##name(const volatile type *ptr) \ { \ kcsan_access((uintptr_t)ptr, sizeof(type), false, true, \ __RET_ADDR); \ diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index b596443de2aa..07e894e4c3db 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -1220,7 +1220,7 @@ kmsan_casueword(volatile u_long *base, u_long oldval, u_long *oldvalp, } #define _MSAN_ATOMIC_FUNC_LOAD(name, type) \ - type kmsan_atomic_load_##name(volatile type *ptr) \ + type kmsan_atomic_load_##name(const volatile type *ptr) \ { \ kmsan_check_arg(sizeof(ptr), \ "atomic_load_" #name "():args"); \ diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index e22324b87623..93a9bfcbf593 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -65,10 +65,10 @@ type sp##_atomic_readandclear_##name(volatile type *) #define ATOMIC_SAN_LOAD(sp, name, type) \ - type sp##_atomic_load_##name(volatile type *) + type sp##_atomic_load_##name(const volatile type *) #define ATOMIC_SAN_LOAD_ACQ(sp, name, type) \ - type sp##_atomic_load_acq_##name(volatile type *) + type sp##_atomic_load_acq_##name(const volatile type *) #define ATOMIC_SAN_STORE(sp, name, type) \ void sp##_atomic_store_##name(volatile type *, type)