From owner-dev-commits-src-main@freebsd.org Wed Aug 11 20:44:50 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 89B6565B1A3; Wed, 11 Aug 2021 20:44:50 +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 4GlMJL2jgZz4Vj6; Wed, 11 Aug 2021 20:44:50 +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 F2F3516041; Wed, 11 Aug 2021 20:44:49 +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 17BKinBw092319; Wed, 11 Aug 2021 20:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17BKinoG092318; Wed, 11 Aug 2021 20:44:49 GMT (envelope-from git) Date: Wed, 11 Aug 2021 20:44:49 GMT Message-Id: <202108112044.17BKinoG092318@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: 710c055673b3 - main - virtio: Add KMSAN hooks for network and block devices 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: 710c055673b3a39ff6e5fdf0bef49437d1e0c9a3 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:50 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=710c055673b3a39ff6e5fdf0bef49437d1e0c9a3 commit 710c055673b3a39ff6e5fdf0bef49437d1e0c9a3 Author: Mark Johnston AuthorDate: 2021-08-11 20:23:25 +0000 Commit: Mark Johnston CommitDate: 2021-08-11 20:41:38 +0000 virtio: Add KMSAN hooks for network and block devices This ensures that host-written data is marked as initialized. Sponsored by: The FreeBSD Foundation --- sys/dev/virtio/block/virtio_blk.c | 3 +++ sys/dev/virtio/network/if_vtnet.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index 8a5558f4571d..e4a20bfc3031 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -1151,6 +1152,8 @@ vtblk_bio_done(struct vtblk_softc *sc, struct bio *bp, int error) bp->bio_resid = bp->bio_bcount; bp->bio_error = error; bp->bio_flags |= BIO_ERROR; + } else { + kmsan_mark_bio(bp, KMSAN_STATE_INITED); } if (bp->bio_driver1 != NULL) { diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index e65914c5184f..bbda5cb90707 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -36,9 +36,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include +#include #include +#include #include #include #include @@ -2107,6 +2108,8 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) continue; } + kmsan_mark_mbuf(m, KMSAN_STATE_INITED); + /* * Save an endian swapped version of the header prior to it * being stripped. The header is always at the start of the