From nobody Tue Dec 17 14:11:24 2024 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 4YCJdT0JbWz5hH3k; Tue, 17 Dec 2024 14:11:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YCJdS6rTpz4lhH; Tue, 17 Dec 2024 14:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734444685; 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=xeppPUGkJHwzOPjQI5mkrnVobevtZ4uSxfKB4GPIhZY=; b=ieN1LHp+DpcG4SuIyQTWseQ9YvkuIIq6FGY9vflalJ62Ps35t2GnJyHe19xGVbPOs+rdMC jaRee/RS+YZcK3s4Y89QVHyY4bDxK3D3c1SXfufaKKj98nWQW3bxYGoTZwQzd6vkGryoYl W9v0/lwfZ10WmcwDmkx2BoHYbWvVDN+RnHJMssdv2PESBd2SzNRVE3608jR6Ws+Oz0yJqF idyc15u52WKRe/3usHSLwFXbRDLTCtMOOw0vzjgoUXywKrNSV3agils2tBTX9I8HpenGFZ UpMktOYrBN5F0QjQu5w/Zm5YrLA1cnuE0Olynyh1jIb61SDAIi0Uzgt0WJpojg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734444685; 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=xeppPUGkJHwzOPjQI5mkrnVobevtZ4uSxfKB4GPIhZY=; b=BwteLqbWIpZFuKOFCl1HAnsY9wijc7z7iUw87Eai3zStZJmvYaK9QPHOgpAM6xchdqaziq MzaaANvNk5culB/iAmyWosjYVSW6rdSlDCebQiXOQUMFmJ+s9IrvECnAYK73rTiZ+/dubD r1Skkk8x//e3oJ9X+GbPfSqH7PPylCjELUva1dmHezTfWjlMFnD/qjUhk132GVJFiG/RFa 8S7HSrmZazp6i6DK0SFiR0pfc1IY8osGY9+16E7NHMYMVPHGDcmP3qN4+swSdBxvmyfzoX JTvB/e4kibGUlcNjYJ+0Z8wbs8+zT7jPf2BnNVLK80UipHLmB+0AO5RF2Upd4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734444685; a=rsa-sha256; cv=none; b=KiZ4mBwe0M0lULEwJsqdUKXsMEziIxNG0lcwfiQYFQyXUil6StYMDkE+DSWlcc9NAIqFF7 Y7Df5hvsfl8Qe1NUE0u0nSaQlqf9kFtQPwCxhy2cb8YzPr9aQcxWMcpkQkJLj7DNUr2s9t RTJZkU4+pC+GxARNoUEbSnj6zI9HeoZ7KPe4e+NZhksCxijES1qXvZayQsNC6sjkcJsFBU 0IpoTVxuANCZbP+rtQFVT8TmYk5+LT0x7XYzO4CWaBOVtetYIkLnVkAu9y76toxHkGq70f b1Gurn1vynV62RtJP2zkvttdju11hiMAFUuo5B+QqKmxs8P/wQTq8Uc+YRkePA== 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 4YCJdS6S9tzR2s; Tue, 17 Dec 2024 14:11:24 +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 4BHEBOFd086055; Tue, 17 Dec 2024 14:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BHEBOTY086052; Tue, 17 Dec 2024 14:11:24 GMT (envelope-from git) Date: Tue, 17 Dec 2024 14:11:24 GMT Message-Id: <202412171411.4BHEBOTY086052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fa5f4c10a8ce - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6 commit fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6 Author: Mark Johnston AuthorDate: 2024-12-17 14:05:00 +0000 Commit: Mark Johnston CommitDate: 2024-12-17 14:07:40 +0000 atomic: Update interceptor function signatures after commit 5e9a82e898d5 Fixes: 5e9a82e898d5 ("atomics: Constify loads") --- 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 9f8a7bfccd40..0edb631d1475 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -760,7 +760,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 5d0e6607403c..cca5fadc5afe 100644 --- a/sys/kern/subr_csan.c +++ b/sys/kern/subr_csan.c @@ -440,7 +440,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 1c18a4a4f8e5..0c4e589ec1e6 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)