From nobody Tue Mar 31 15:58:43 2026 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 4flXpr5DcGz6WDsW for ; Tue, 31 Mar 2026 15:58:44 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXpq6vL2z3gfw for ; Tue, 31 Mar 2026 15:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972724; 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=AyTBvsukTXIH9Awym2+gHzlMAADBLtQREAh4dJHZiA0=; b=AtXI+OA5wQBJ7wA2wjZmrCxHhu3f2Ki9S3DnyObdZUH8FbA3jCUl4+H+GkizR+ma4DvAXV vJiQOZfNiG1kKROAWvwH4hcBVY3NKoQYET0epIpMmEa0w6WnD657kxIGR21LRtOZJnW2zV Vry1/qjU/I5EymqitNeAOvi3sSYQnuToY9qUUzdoNdPJbXGKc9eKBsx05p7guyLEKSxQ3g nLlslgjkxz79mY4uShHHWl3rpp+fGp4Ge399cgOrD2OaSxtU7MsG5JGC/eBM7584Z1uoKj j2DfnqqqClZzBlqHQc4eMNRMkLHfisgATtQFkQYvgVXrv4mT0luqSDFJwU0aVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972724; a=rsa-sha256; cv=none; b=c6y0L0gLdTGf+ch6VWQ+BqujyAUdZtq4h88hSCxGEro+RCB4IbXMEIfPWJTLUSqRYK9mnb oR1KoFAgDPUbFXj+N+n6RyvoAcvffr2AAS95igf7yo+Ri0Gd2/R1lpk+yKTlO+2kAPoban bblAcc8RfqWuYQHPwjOjBhBEAxfkaRIQtlov8GdkHvnt3epclCBk9gpKwO3S1c1cgEH52R mHPKND8+6/B/vOs5Ug+Ak2yDu0ESsLOy1Tj1g0p7Ta2I4BlZ3T4qG5n/dpmzZMwQ3Koyk+ 1AtOiXhzPuXvJZIc7T00nuSMYT5GPaMxl31NYopYmQZEccHD7lme5BMbdKVGnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972724; 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=AyTBvsukTXIH9Awym2+gHzlMAADBLtQREAh4dJHZiA0=; b=X52e8CFM+d6buiJAiHdnPmCAxm+ZSrD2ztIWp1Xt4074k1OWj+o4CG/skh3LuTV5Pa1mAl uRhcelLlfJDZwB8JIHUFF9Q3DGCIvFso6Vic0fHJxOQ+nahVLfS9HxXZii5UlF6B9/8wpe eBTjAw/NppUOX8/BlNo2dpwa27bKIMm6cu38ftCHE6VMahZrbg1Y176/x5mFo8iFtIMCJu ngzTRxRdKNpg6zUOlRwumAqCHR17o0lFB2RxBl3c61oLmnFFdtM6HEPZomR+SJkmtMAXk8 swovLtmKymE39LIalGqoj+eF94tQiJja4LKxYca6RlIpwyVMAsQnncprJhGpPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpq6MDqzc3Z for ; Tue, 31 Mar 2026 15:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a9ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2696698681a9 - stable/15 - kmsan: Implement __msan_test_shadow() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2696698681a9150c8b3216cc36dab9bd911b5f8f Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:43 +0000 Message-Id: <69cbef33.3a9ec.4dc33b77@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2696698681a9150c8b3216cc36dab9bd911b5f8f commit 2696698681a9150c8b3216cc36dab9bd911b5f8f Author: Mark Johnston AuthorDate: 2026-02-13 15:42:19 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:28 +0000 kmsan: Implement __msan_test_shadow() This is needed when building OpenZFS with KMSAN enabled, as the bundled zstd uses it. MFC after: 1 week (cherry picked from commit bf149f2e88cb3836e02ddabd9944eb58650a72ae) --- sys/kern/subr_msan.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 883dbd2b7604..dd69375f4ed1 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -662,6 +662,7 @@ void __msan_poison_alloca(const void *, uint64_t, const char *); void __msan_unpoison_alloca(const void *, uint64_t); void __msan_warning(msan_orig_t); msan_tls_t *__msan_get_context_state(void); +intptr_t __msan_test_shadow(const void *, size_t); void __msan_instrument_asm_store(const void *addr, size_t size) @@ -726,6 +727,23 @@ __msan_get_context_state(void) return (&mtd->tls[mtd->ctx]); } +intptr_t +__msan_test_shadow(const void *addr, size_t len) +{ + uint8_t *shad; + + if (__predict_false(!kmsan_enabled)) + return (-1); + if (__predict_false(kmsan_md_unsupported((vm_offset_t)addr))) + return (-1); + + shad = (uint8_t *)kmsan_md_addr_to_shad((vm_offset_t)addr); + for (size_t i = 0; i < len; i++) + if (shad[i] != 0) + return (i); + return (-1); +} + /* -------------------------------------------------------------------------- */ /*