From nobody Sat Jan 29 23:15:50 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 DBBD3197B4D4; Sat, 29 Jan 2022 23:15:52 +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 4JmVYg6QCLz3sXv; Sat, 29 Jan 2022 23:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498152; 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=pe+RxaaVGeGWnMuod4eN0WdBz9mDuyJ4+RNqgv54zvQ=; b=J/bHcBLjkyuHNSfgHfSLIiGaLOgjP6ysOEhcxaICuAli6Mgq96zhdmz/5KxQgKGd1f78ZP aI0RnPNgQX0Ljl2itrSr9xbvx29CPjGA1mJbS5HH9LlBnjRIgIyzPUS/8SwmuGqo7Ugqef mDNERbPhbDk1tvrcItwmWnajAZ+BRrIVRH1RHD1nE3sTYtNmbe8FLWfsPCcyttuRpflMZf EAGpTjQmF7Rx3Hm5oIW1kx6vNa/Dd8b8FJXQml1FBSC4UxnGrOB1L3e3seJ/f//TJPqmr0 7W+b8sYRqSiYwjX48vPXDtCDsd6Av85YCiqGcF3o5otvqIW7sELUDvF3N7EHbw== 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 046C71E4A1; Sat, 29 Jan 2022 23:15:51 +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 20TNFo4M008431; Sat, 29 Jan 2022 23:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TNFojS008430; Sat, 29 Jan 2022 23:15:50 GMT (envelope-from git) Date: Sat, 29 Jan 2022 23:15:50 GMT Message-Id: <202201292315.20TNFojS008430@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: ac678b4aaf1e - main - 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/main X-Git-Reftype: branch X-Git-Commit: ac678b4aaf1e852aa033906eabee7322d985c810 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498152; 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=pe+RxaaVGeGWnMuod4eN0WdBz9mDuyJ4+RNqgv54zvQ=; b=CV7O5nUF6PkbZIkauqoMtkP6W6BAC/L+rHaa3e+65WgEHBsKWMNXgNsPTfEcZO/W/Yukcb G+aNV6FDY0Y3HGL3oK8kZjilUwH+n2SG1NmA3tAAtm9beBgwQbCAyF5PXpZUVazRJ3EGMj I+GQRjwq3m4uJ6NSxsCr3ozwrouWuIIRtE7bIn2CwLvvuUKlKtU6UWuvBD8KSPRXCgdjH4 sQf4OgClxKdZkNkHTWum0oKcK+vsXGz14daEXkvzXvHulMarUQcNwwCONh0qci+kiWTlJ/ 70UFFIJAMhhirslDPj6K2EwaTOfuVQU/nwVvXE8GUZ7Lf6Cf7evUDaCfm9Dq8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643498152; a=rsa-sha256; cv=none; b=bM+8f1u3gxZdGDJwMpeaE5oA4kBCKm+fLo6ivW970DBUnxjj8X7d+fiS9PoSQtvKCFfFDe t/6g16aJchISlBZ2YGh4NLh63mukPIQCzX2yHKn+1YbHkCic8X+WqAeNUZiwM2R8LkwgKk 3dVqtQzdem7wg9Sf6H68EqnNiZub58pJb+MZjGoJ+3gZ8qH4dBmQUe/0vJI1MRl3ejtQoi 9jw9OvktLQV6fevEcvXKHlTTiI+Fc8SIJLEFoTgy6ZkUXdtBgxcm1RMPYKYtIizz8MVgav KoKH35uE9hKD2RJ6KpyuCNTh0A3j0rZ+QaIryK6LwRR1dDYhKIf7d9vEzqhWVQ== 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=ac678b4aaf1e852aa033906eabee7322d985c810 commit ac678b4aaf1e852aa033906eabee7322d985c810 Author: Chuck Tuffli AuthorDate: 2022-01-30 07:11:14 +0000 Commit: Chuck Tuffli CommitDate: 2022-01-30 07:11:14 +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 Reviewed by: imp, allanjude Tested by: jason@tubnor.net MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33578 --- 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 1034fe532892..8cd3a949f916 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);