From nobody Mon Feb 21 21:58:05 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 B1AF019EBA3F; Mon, 21 Feb 2022 21:58:06 +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 4K2blL2bNWz4gcw; Mon, 21 Feb 2022 21:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480686; 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=xQWyacmESnn8addg2R4oQwE4JmRXySSjpES+bHhWDLE=; b=qfH4P7Nl0bHnzlFVkKGJ+WrcC+7vE6Wf3truim4jMcdRyfmQIG/kBBm80ikC9/AJII8SLr d2/yk1baKOBOkAtXh49miRfGG7JbgVxa7kJFy98uF8982W5yBolgRJfmpPYnp0Hx5ORK4a vniAghNNb7Ii6Ea1+6o7E6oqVXGMyIy+AYRIHEMvu5/1R3QpK35KrGu1Ii4UcDpM+B+b85 pm5GWem6oleJAfLwdEQeN5VlprsLvij6jH7b0S9czVwPDL1yTRy6ruqiGgHW9CeRsN0nAS LUgyBGGQ5Vv6naLhdkKYmGldvfUmXd63C+I5COVcpDzzRO53acbjDPV+ihOSvg== 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 D90BA181D7; Mon, 21 Feb 2022 21:58:05 +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 21LLw5nV052316; Mon, 21 Feb 2022 21:58:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LLw5Kp052315; Mon, 21 Feb 2022 21:58:05 GMT (envelope-from git) Date: Mon, 21 Feb 2022 21:58:05 GMT Message-Id: <202202212158.21LLw5Kp052315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: eae02d959363 - stable/13 - bhyve nvme: Fix Identify Namespace, NSID=ffffffff 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/stable/13 X-Git-Reftype: branch X-Git-Commit: eae02d959363fc575b1727ed23e6f1542802d551 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480686; 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=xQWyacmESnn8addg2R4oQwE4JmRXySSjpES+bHhWDLE=; b=iYoJHxXdHngF/d5veVzEgHf3/fKYTaPHPFKLJNbWvtPBibKms0JrFFDsV2kSyItnPk4aYP kmMfdwOZYYIiKZL0TLj/EvH+oNc3+i4OU916KqAvRvoWYr10kqkCh6rzboD2DJoR0ZMF5W 8Q2c2T2tJc18/FIBbA2FmVAmtsF0EIT94Y8TxrxPHljiYjdYJZxRA0MXsEXDVdHjxfwMPv Ae1Bn1c7MO+Ugj3NhkQ4fZCjdRxNE4m9AInYNuY1Y6TKVpcDhSeawlbyu3Q+G2rOyqOfHX J2QYJ7QnKYuENFVMirgHW6ddxKnLV0CNNO+C8kywPA2zzL3VQQJcKZnXWlYqjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645480686; a=rsa-sha256; cv=none; b=e8NnyZCf0AZb48/pH2hZkrL00vYQZ/zu6Zeb/wzIFzdKjkT+MOD0Mzblwdm4RMitcTBWQg JjV3JMMH3WRoxoOOIBtJaSC+ovZLQDlOVCkV0r+YgNyfU3bVFyrnPJ8sZ1M49gHHXxs5v7 TYsAY8HnvN+ex69upasCSFNWdiM3kuPPNVxdAjRkKqdwq+sM8UUchfhSXaljYCu4H0JfVj Zgj5u3gVF7jYKYvnEy0qPnBRvAAX+IG/sRBnAVw6h+c1QX+4+t1k7k9NPcISREUtWoFm+m YaNdx+7z++O0EtCxpC3eL36aZbQWY4W3FAQ1z0R0iU2b6ntESCTaTOJP4Qx89g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=eae02d959363fc575b1727ed23e6f1542802d551 commit eae02d959363fc575b1727ed23e6f1542802d551 Author: Chuck Tuffli AuthorDate: 2022-01-30 07:11:14 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-22 03:28:39 +0000 bhyve nvme: Fix Identify Namespace, NSID=ffffffff If the NVMe Controller doesn't support Namespace Management, it should return "Invalid Namespace or Format" when the Host request Identify Namespace with the global NSID value. Fixes UNH IOL 16.0 Test 9.1, Case 6 (cherry picked from commit ac678b4aaf1e852aa033906eabee7322d985c810) --- usr.sbin/bhyve/pci_nvme.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index ba05871f21a1..291d6676f7ce 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1482,6 +1482,12 @@ nvme_opc_identify(struct pci_nvme_softc* sc, struct nvme_command* command, switch (command->cdw10 & 0xFF) { case 0x00: /* return Identify Namespace data structure */ + /* Global NS only valid with NS Management */ + if (command->nsid == NVME_GLOBAL_NAMESPACE_TAG) { + pci_nvme_status_genc(&status, + NVME_SC_INVALID_NAMESPACE_OR_FORMAT); + break; + } nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1, command->prp2, (uint8_t *)&sc->nsdata, sizeof(sc->nsdata), NVME_COPY_TO_PRP);