From nobody Thu Dec 14 14:44:46 2023 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 4SrZrG2fj8z54421; Thu, 14 Dec 2023 14:44:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrZrG254Jz3LLB; Thu, 14 Dec 2023 14:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702565086; 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=njNz3A7LsNh84rfHYv/cepWKOvRj+mzZ2CCdkkRHAeo=; b=vIcGkTs4prHggR2BfaNAfDowh2qpdOYxaHGRPmGyZR9GXQRVw9PL9SS2h2/5AjH4YBhben kw834hCh23KG4FM/7/bMT5JJ8qAjhI2YzLTzAhVhLtlZGnHE0S0lOBLKYpZIyGhE+8ag2F yerN48mEYbjQ+a9jhrgIwCLgjzGMRPBhJkOzbJu1OVJud+NJExdf0rwj1sdT1oV5cjkCxF TQiq2Lev90mNzWjpePawDKDYfEs8MdszbtsRDxGT6YS+d2yx5Lt1EmcBZRg93YvVLlOaSa G3GxpdDpjuBlm4p5A24yijTUTZJrmKv2undJN/YUC6W4mlnqiwrV4IAjoMCOQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702565086; a=rsa-sha256; cv=none; b=jD4D3AKqQSjMsBi2p7evUmSMeG2ZOVnLTIEb+QfB6qCPQw9pQxbr5gztGkYQ6eI1mjcUpe VhtG0iWjxcBXVZAVOXwlEPvyU3MmPHdXuYwQIWgSEZHzEEqBB5XyiHEojERnGvpeyomaGm pECrp4NYycOFCCdWpO3CK0xlG9BSOq5MiWaD79gtWDUZDP2/p6RaB+sM/xfkDZGNCOVL7T IJoOoVUirSZ+5iAKZVrbBT8zrv5eMY0cMvcsTahxI3VwuAb/h78S9jPkyKlFcZlAAlO18j j1CYJD2LlNKb7hQ2mXfGN3tnueMPZ+4Eayqj720uut9yUQeuuBAD+v3w8UPvWQ== 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=1702565086; 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=njNz3A7LsNh84rfHYv/cepWKOvRj+mzZ2CCdkkRHAeo=; b=BX59UFS++/oqea3NZE3h2+e5nDZ0mOoy2Iow0C1Wxip490jxEn+W3YSqArdmlUM8CI22Un F+O+XpwYeU0iddt0EKTliMv4A8jYAFo5OMxer1Qd1PiXh37+syIRkEP0gj0qxQon/V/YNY mv6400m6jnpEzL6V83HwZOptp3mRoD8ntdI9upYthfrUvd6BK6oISHarlSLnzpPZXuTYRX 9vvCnKKiUtYj1CSVhSWlJvP6CaYy9XRq0wuRyu/W9HuDzcBrfXQf0a5TxgbVqctN2FO2UK mc6iDM3ORhcAMr1E+EuapXJ0mQYy+r3iiWDvG0ma3OA3e7XH9jp9lSTk+SXMnQ== 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 4SrZrG17GJzXJd; Thu, 14 Dec 2023 14:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEEikAc079971; Thu, 14 Dec 2023 14:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEEikVU079968; Thu, 14 Dec 2023 14:44:46 GMT (envelope-from git) Date: Thu, 14 Dec 2023 14:44:46 GMT Message-Id: <202312141444.3BEEikVU079968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c07ebf5becae - stable/14 - kmsan: Add kmsan_check_uio() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c07ebf5becae76dd9843b8a835df9f7ccd65e897 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c07ebf5becae76dd9843b8a835df9f7ccd65e897 commit c07ebf5becae76dd9843b8a835df9f7ccd65e897 Author: Mark Johnston AuthorDate: 2023-12-06 16:31:15 +0000 Commit: Mark Johnston CommitDate: 2023-12-14 14:44:38 +0000 kmsan: Add kmsan_check_uio() This was handy for some ad-hoc debugging and fits in with other kmsan_check_*() routines which operate on some kind of data container. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit be5464ae233ada46a778cc82f7107a10a7d5343b) --- share/man/man9/Makefile | 1 + share/man/man9/kmsan.9 | 5 ++++- sys/kern/subr_msan.c | 9 +++++++++ sys/sys/msan.h | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index c82ce254f681..99ec5219d8e0 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1369,6 +1369,7 @@ MLINKS+=kmsan.9 KMSAN.9 \ kmsan.9 kmsan_check_bio.9 \ kmsan.9 kmsan_check_ccb.9 \ kmsan.9 kmsan_check_mbuf.9 \ + kmsan.9 kmsan_check_uio.9 \ kmsan.9 kmsan_mark.9 \ kmsan.9 kmsan_oirg.9 MLINKS+=kobj.9 DEFINE_CLASS.9 \ diff --git a/share/man/man9/kmsan.9 b/share/man/man9/kmsan.9 index 714442e4d9fe..90faf8f82e5e 100644 --- a/share/man/man9/kmsan.9 +++ b/share/man/man9/kmsan.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 13, 2023 +.Dd December 6, 2023 .Dt KMSAN 9 .Os .Sh NAME @@ -56,6 +56,8 @@ kernel configuration file: .Fn kmsan_check_ccb "const union ccb *" "const char *descr" .Ft void .Fn kmsan_check_mbuf "const struct mbuf *" "const char *descr" +.Ft void +.Fn kmsan_check_uio "const struct uio *" "const char *descr" .Sh DESCRIPTION .Nm is a subsystem which leverages compiler instrumentation to detect uses of @@ -306,6 +308,7 @@ f(size_t osz) .Xr busdma 9 , .Xr copyout 9 , .Xr KASAN 9 , +.Xr uio 9 , .Xr uma 9 .Rs .%A Evgeniy Stepanov diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index abac71da6d64..ef3c6c10b0ba 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -587,6 +587,15 @@ kmsan_check_mbuf(const struct mbuf *m, const char *descr) } while ((m = m->m_next) != NULL); } +void +kmsan_check_uio(const struct uio *uio, const char *descr) +{ + for (int i = 0; i < uio->uio_iovcnt; i++) { + kmsan_check(uio->uio_iov[i].iov_base, uio->uio_iov[i].iov_len, + descr); + } +} + void kmsan_init(void) { diff --git a/sys/sys/msan.h b/sys/sys/msan.h index 4baa71ec8113..58110d7306e6 100644 --- a/sys/sys/msan.h +++ b/sys/sys/msan.h @@ -50,6 +50,7 @@ union ccb; struct bio; struct mbuf; struct memdesc; +struct uio; void kmsan_init(void); @@ -69,6 +70,7 @@ void kmsan_check(const void *, size_t, const char *); void kmsan_check_bio(const struct bio *, const char *); void kmsan_check_ccb(const union ccb *, const char *); void kmsan_check_mbuf(const struct mbuf *, const char *); +void kmsan_check_uio(const struct uio *, const char *); #else #define kmsan_init(u) @@ -85,6 +87,7 @@ void kmsan_check_mbuf(const struct mbuf *, const char *); #define kmsan_check_bio(b, d) #define kmsan_check_ccb(c, d) #define kmsan_check_mbuf(m, d) +#define kmsan_check_uio(u, d) #define kmsan_bus_dmamap_sync(d, op) #endif