From nobody Fri Jan 17 12:27:28 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 4YZJsD75ZFz5kvtZ; Fri, 17 Jan 2025 12:27:28 +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 4YZJsD4wGPz3VD2; Fri, 17 Jan 2025 12:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116848; 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=A2F7Y1BI4LVyuRI4k8503k3dRym+sQ+miGvDB74r5M0=; b=kc1S+8BjYcW5NvQehqCtXLAVouNKd+Y5Rf0k948x5d+xCxCv5jkntPi1sQ5y75edqOrQHY yNdWgv+veCcyS2jC3fh6hTNIJXnTPsZjBSP5eOGFovuDHJeI7bmfO57SXMT+RGXRHgxJga 4GZgBdBkBFgrq10spw3HDIvCUfY3KVKK5tLj1Zz/JvG7oT/GMiUPQTHITzs0mT8eiWZdkl OhsKVXLBs7sh3kNknr57//LGSB7MFPNoJ7EdG2fR05savBVLv+X5bl5gIGV5ac4MwN1bvd /XFqJpHKxCpMhTYKAKx4VvTEmLSiOL6TOSw+SIAP+Vxh8rZZrzkXJ/rGL1KRbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116848; 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=A2F7Y1BI4LVyuRI4k8503k3dRym+sQ+miGvDB74r5M0=; b=TxmIsa9MiN+Ph3kMfsGnU3MwquqXXnUj4+IqbAylNcIUyQRdgFqjNK1TaCk3i1JUlb2BST 8pze1vUQl3Z5jiGQ7EN+0lP65adalamiW5qroJ8sbI/7OTg9zHDiE8we7+1nXvX2/fyuUM mrw5c5RG5tYYX3nDaTUhA0jKN9xTu5l/OsVMJqjsKyRGCRDVtEycJ6lGaEEVF9kdgL8fMn EQlWfWdu5T+hRLNAQwU4K2mncs5r8GWlP5Z7vnjX3bXxGD9aip+OswAf8YUgrh0KsySijL 9KEEBC+z39MOpyCRJZGPe/BvQp4DfEyK9GOr2l9rMTVUqT5p9U+iB31SG+A7XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737116848; a=rsa-sha256; cv=none; b=EW/iDgdI6aUs9TgVc0CCrxpZOTl8DUA3GzrNxRYUU1GJLRMXNXdATpeKRIyym+R0vxd0YF RILd60q8RTsKsAHV/O+efgqukRi4LcvTZ4ovn1CdsVUv51L9E1eVLAON6XR4X5SiEXxTZj tHFXHDEypfUKN1PhPB+2oeXXT+ZEUbEvoVXeTI2ZUnz40hdppztaKxrerXsYSD58OM/EP+ /T2aZzHnHYpLhsBEXg0/DE3JLw9VNVnDdC795k1dpUb9DXavbamM3nv/0yQx2XHFa32eNm WcOsbpuUPueL/JHkzusQQOcf4wr2Hw1O1dboWj056LSvnwE/iK7fhIAGkmmtcg== 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 4YZJsD4TQJz35l; Fri, 17 Jan 2025 12:27:28 +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 50HCRSDS053110; Fri, 17 Jan 2025 12:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCRSvW053107; Fri, 17 Jan 2025 12:27:28 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:27:28 GMT Message-Id: <202501171227.50HCRSvW053107@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: 273fec048302 - stable/13 - atomic: Update interceptor function signatures after commit 5e9a82e898d5 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/13 X-Git-Reftype: branch X-Git-Commit: 273fec0483025b72a4d86ed5f26f8189f1dc58d2 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=273fec0483025b72a4d86ed5f26f8189f1dc58d2 commit 273fec0483025b72a4d86ed5f26f8189f1dc58d2 Author: Mark Johnston AuthorDate: 2024-12-17 14:05:00 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 12:24:55 +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/sys/atomic_san.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 9c33d0187a6d..d7173b0af04f 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -658,7 +658,7 @@ kasan_copyout(const void *kaddr, void *uaddr, size_t len) } #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 19f64e91f9e8..b2d5c4b63f6c 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/sys/atomic_san.h b/sys/sys/atomic_san.h index eb6913296a45..22a8faa9e24e 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)