From nobody Tue Aug 16 16:17:22 2022 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 4M6brz1h1Cz4Ym02; Tue, 16 Aug 2022 16:17:23 +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 4M6brz0yyMz3bpm; Tue, 16 Aug 2022 16:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660666643; 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=nsnBJDJXzt/TC+moL/GtCoOWJ6klf65M/jyr8tbsG+8=; b=B5DC01OFulBw9GdseO85DGaaC8kUjPydBXfl12UIlHP5oKmnMlG39TcuEt9o9KtwvcgZRi TvQf5l8YTPgdDSB3qQqtze9L/likYDXcNlg6u8cvKyQPlP5TxrnTFIjPflLmj1S4xLwywn 06BoOeWui0A4dMq6NNVp+r8joeOJcmng15fGDi/M1HFPpM+ZJsnY1ZWWruGH3dC6MQkpAC cmlmIzLFjQrJxIkM/YPrv93yU7008KZx9on4jw3/HBdiCjY+H/bHfkB8uLFDto0juehobD EGmhrNxYC1EF0USLtETjvxCzmLLdwVMB9O4sOmYjKgvPgJcZBxRPN7z7REUTHw== 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 4M6brz02lWzFW1; Tue, 16 Aug 2022 16:17:23 +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 27GGHMcc047065; Tue, 16 Aug 2022 16:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27GGHMrn047064; Tue, 16 Aug 2022 16:17:22 GMT (envelope-from git) Date: Tue, 16 Aug 2022 16:17:22 GMT Message-Id: <202208161617.27GGHMrn047064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 715f82e4f5c5 - main - bhyve nvme: Support minimal Controller list 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 715f82e4f5c51c04314904dee8090c8abbbe2156 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660666643; 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=nsnBJDJXzt/TC+moL/GtCoOWJ6klf65M/jyr8tbsG+8=; b=SNCSE+3meramt9oUtBQog+mwW3rP6sBEG6IBsjdIkik3nuIPaTqbplaixxU6b4wIyEclQ8 sb/J/nSGO2RTpoloMTj6vljQmoGwAHZ1j35o0SxkcgSa2oApB2dNtun3cthcC4fSCRA3VG jE+WomMzeqmPIVUSIlOHLSOcJqdXtxhA1pmOyjRsKGbLWucZ6XDQUj+nZ2cv4MBqnjT+Pr IPnuKpnsm3I+nSjZkyW/V0ZkYhYTK65g7D2P7ShtyhLmxd/hCIWALrJr7j+24w3YiwykxC q97VvNnaf7jXQZQrQHHinved7IDAWBSCFTQDwXgapHoPeZKBFqF21hpzj+5xxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660666643; a=rsa-sha256; cv=none; b=lyyOY81vQkiNnMQbsyhU43a+/3JF3jlTELJIzIswrBXI5mOMSkKGWPxmTEf+ysTtjo6mEp /wS3jUMNXEa2IXHAPlwzt4R/XXoZr3HGoBLqhPwwJrQ7+NHf+lNNn2ABInwNPSIWWePGqP AugvqCXPzgFCFPLyQgo5bPX6PRPbp4cjK4K9kikXj2XujlI72pjdbUG+47/bFe+jfXrj6t pUaz1E7mUKpMTGQpBXMPHTUnCJODxAxpeKbhffPfqVLPEtsTesnZYnE6Aw0jOuyvPFKrPK +68AvPpKlU+JxMJTlQdDI0kaZbtbZ+ZRwgneZRRTeLWdKBMCL3yiKagfEJftqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=715f82e4f5c51c04314904dee8090c8abbbe2156 commit 715f82e4f5c51c04314904dee8090c8abbbe2156 Author: Chuck Tuffli AuthorDate: 2022-08-16 16:15:53 +0000 Commit: Chuck Tuffli CommitDate: 2022-08-16 16:15:53 +0000 bhyve nvme: Support minimal Controller list Controllers must support the Identify Controller list if they support Namespace Management. But the UNH NVMe tests use this command regardless of whether the device under test supports Namespace Management. This implementation returns an empty Controller list (i.e., Number of Identifiers is zero). Fixes UNH Test 1.1.2 Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36193 --- usr.sbin/bhyve/pci_nvme.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 7701d0b932ee..d6490fade178 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1569,6 +1569,15 @@ nvme_opc_identify(struct pci_nvme_softc* sc, struct nvme_command* command, ((uint8_t *)dest)[1] = sizeof(uint64_t); bcopy(sc->nsdata.eui64, ((uint8_t *)dest) + 4, sizeof(uint64_t)); break; + case 0x13: + /* + * Controller list is optional but used by UNH tests. Return + * a valid but empty list. + */ + dest = vm_map_gpa(sc->nsc_pi->pi_vmctx, command->prp1, + sizeof(uint16_t) * 2048); + memset(dest, 0, sizeof(uint16_t) * 2048); + break; default: DPRINTF("%s unsupported identify command requested 0x%x", __func__, command->cdw10 & 0xFF);