Date: Tue, 26 Dec 2023 02:08:27 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: dcd747fda58a - stable/14 - nvme: Initialize HMB entries before loading them into the controller Message-ID: <202312260208.3BQ28RsH004762@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dcd747fda58a4669c897822b10d4a53b802c4bb2 commit dcd747fda58a4669c897822b10d4a53b802c4bb2 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-12-18 22:45:24 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-12-25 16:58:19 +0000 nvme: Initialize HMB entries before loading them into the controller struct nvme_hmb_desc contains a pad field which was not getting initialized before being synced. This doesn't have much consequence but triggers a report from KMSAN, which verifies that host-filled DMA memory is initialized before it is made visible to the device. So, let's just initialize it properly. Reported by: KMSAN Reviewed by: mav, imp MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43090 (cherry picked from commit d9b7301bb791faab48b6c7733c34078427b9a374) --- sys/dev/nvme/nvme_ctrlr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 3eca24f1f6a5..5a57bbbd53af 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1037,6 +1037,8 @@ again: } for (i = 0; i < ctrlr->hmb_nchunks; i++) { + memset(&ctrlr->hmb_desc_vaddr[i], 0, + sizeof(struct nvme_hmb_desc)); ctrlr->hmb_desc_vaddr[i].addr = htole64(ctrlr->hmb_chunks[i].hmbc_paddr); ctrlr->hmb_desc_vaddr[i].size = htole32(ctrlr->hmb_chunk / ctrlr->page_size);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312260208.3BQ28RsH004762>