From nobody Tue Dec 26 02:08:27 2023 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 4SzdV36QqWz55Kk2; Tue, 26 Dec 2023 02:08:27 +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 4SzdV33h3tz4SZJ; Tue, 26 Dec 2023 02:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556507; 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=PZxE3hHXceQcww2XbULnn2nxfHYicvw4HJd7xHh77+Y=; b=cKXkwoTi80OXDcmxdaUDI1InNSSJABwl+y2gizJPfNiqHXFboG08o84t9VwlHtqL0z8B9A CKO6MJnThy4Ri90eXNpWgJN/CYxcpGXQ2YleWmW7Liy7NfX+TGL61P4vdMdQD2HghM7WhQ Pt4sVj6pJqqTdSRyk/Bd2LDVgLWJ/1zYnnxGWNakcD4X+4orYIPslFvMq6XQJzLVnY4N0n CPTpw2ge1DLduLVdmCks7eOau+FshZNixPiYf44Sr7BgWOzHwzJDJW3BBmhc8sQPRjP5qU JHRXmKiMJYBjPwu+sjmrCU8MXmeoYWt/Dsy8xKqxWW/+2dD+BF1RfPw7FUEOdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556507; a=rsa-sha256; cv=none; b=bP9ZqL96RYZNq+aRm6GEl8AjkAduK3xFRXhk6qoWeldZ/ljrLvYVDKU+rN4qxkkZSI/ZSz e36bLxP87+vJA6xagnAbdpmRUgIhc45wSjKfM3ce9bWyIABu80+iK9j31br+6styuVKsjx OO0ZuTw1ASrRacFmB6GJ8tJZ7JH2SYE1QlmsNnv0lwA2MKNnY+aj8lMznbyAT9vnGKEkZz FmbUU7EGoaW4ZXsEdoEo1Uc1/Mbu8YkomcvmvE4aHPJlcXKqFkwTrbAWpTcduJLNlZ0Eau TRBg0Hh2o/2rMCWhqQf45tT/dPbJCj+uZV75JBEMlTMwkgD4s2pClWp6ZTi2pw== 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=1703556507; 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=PZxE3hHXceQcww2XbULnn2nxfHYicvw4HJd7xHh77+Y=; b=rnLthHgnc1aLEZE+l7cgNWrNN6XOME6Z1OEf4nUWMkK4w4Zv8G+Xvyuns7cp76js+TC8g8 SOqnzLHzeqf2NeckDRBniirpgKmE8l0mjsNmbG1iNnyD2XW/EEHDePLPBv3ZKsFLWpONAd DHWQZrndZJeIvnnw0Rv5S5GaHm/xz0BA1Irsh2TgALBPc7R2WJHCnCxwyRI+3W1L1EAYww 2IYKX0YrncFInxZN+jMh3c5eLRjG+ah/wyOO0+Uc+0Kt6Ecci+cFk2xZT40NBDS4rupwLc Z79hduRO8EQJQOQ27tILEjoBTPvBXB5n9zsZPB0DEdXLlKwXbwTa/J7A2pleCg== 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 4SzdV32l4czbWd; Tue, 26 Dec 2023 02:08:27 +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 3BQ28Rxs004765; Tue, 26 Dec 2023 02:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ28RsH004762; Tue, 26 Dec 2023 02:08:27 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:08:27 GMT Message-Id: <202312260208.3BQ28RsH004762@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: dcd747fda58a - stable/14 - nvme: Initialize HMB entries before loading them into the controller 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: dcd747fda58a4669c897822b10d4a53b802c4bb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dcd747fda58a4669c897822b10d4a53b802c4bb2 commit dcd747fda58a4669c897822b10d4a53b802c4bb2 Author: Mark Johnston AuthorDate: 2023-12-18 22:45:24 +0000 Commit: Mark Johnston 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);