From owner-dev-commits-src-main@freebsd.org Wed Aug 11 20:44:46 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B0CF665B056; Wed, 11 Aug 2021 20: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 4GlMJG4c23z4VnZ; Wed, 11 Aug 2021 20:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 86467160A0; Wed, 11 Aug 2021 20:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17BKikwl092243; Wed, 11 Aug 2021 20:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17BKikKG092242; Wed, 11 Aug 2021 20:44:46 GMT (envelope-from git) Date: Wed, 11 Aug 2021 20:44:46 GMT Message-Id: <202108112044.17BKikKG092242@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: 10a8e93da158 - main - kmsan: Export kmsan_mark_mbuf() and kmsan_mark_bio() 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: 10a8e93da15889d40497bb666c2d753f38ac7b7f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2021 20:44:46 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10a8e93da15889d40497bb666c2d753f38ac7b7f commit 10a8e93da15889d40497bb666c2d753f38ac7b7f Author: Mark Johnston AuthorDate: 2021-08-11 20:22:21 +0000 Commit: Mark Johnston CommitDate: 2021-08-11 20:33:41 +0000 kmsan: Export kmsan_mark_mbuf() and kmsan_mark_bio() Sponsored by: The FreeBSD Foundation --- sys/kern/subr_msan.c | 4 ++-- sys/sys/msan.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 2b6a0d585128..81322da2be6c 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -549,7 +549,7 @@ kmsan_mark(const void *addr, size_t size, uint8_t c) kmsan_shadow_fill((uintptr_t)addr, c, size); } -static void +void kmsan_mark_bio(const struct bio *bp, uint8_t c) { kmsan_mark(bp->bio_data, bp->bio_length, c); @@ -591,7 +591,7 @@ kmsan_mark_ccb(const union ccb *ccb, uint8_t c) } } -static void +void kmsan_mark_mbuf(const struct mbuf *m, uint8_t c) { do { diff --git a/sys/sys/msan.h b/sys/sys/msan.h index 70e354323247..4baa71ec8113 100644 --- a/sys/sys/msan.h +++ b/sys/sys/msan.h @@ -62,6 +62,8 @@ void kmsan_bus_dmamap_sync(struct memdesc *, bus_dmasync_op_t); void kmsan_orig(const void *, size_t, int, uintptr_t); void kmsan_mark(const void *, size_t, uint8_t); +void kmsan_mark_bio(const struct bio *, uint8_t); +void kmsan_mark_mbuf(const struct mbuf *, uint8_t); void kmsan_check(const void *, size_t, const char *); void kmsan_check_bio(const struct bio *, const char *); @@ -77,6 +79,8 @@ void kmsan_check_mbuf(const struct mbuf *, const char *); #define kmsan_dma_load(m, b, s, o) #define kmsan_orig(p, l, c, a) #define kmsan_mark(p, l, c) +#define kmsan_mark_bio(b, c) +#define kmsan_mark_mbuf(m, c) #define kmsan_check(b, s, d) #define kmsan_check_bio(b, d) #define kmsan_check_ccb(c, d)