From nobody Mon Feb 21 21:57:53 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 C607A19EAF9C; Mon, 21 Feb 2022 21:57:53 +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 4K2bl53tsZz4gRJ; Mon, 21 Feb 2022 21:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480673; 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=PstP2fmTQRayD8p9LuXhd8a4JbF0oPtepNIZNYBWRzc=; b=AyOsnvoDe3KcJoCAjPNCxMcIoqDLE3BpJx8Q9FD5FxTcmLAKzDaO1tTB/oWv2BGBgdkdBD 8aR3iDT73xfULQL6Osh0NYUFyZbvcZBVDlo7/VUbTcwXkfKpkqwVs/n5BNniWDC5PTeYVl KaKSaMdl0OaVHmg8tmBdsSJCNMK8dyXeeMmQa77o9vSs9zMgewCHwZ72kcbjjrOC5B0B+X h0CCCRCAotaJ/B2vK5UXKqSxENHz22PlHwqsHz6mERqpRc0iBu4qYIZEOQTc5RyyycN8+j bAKKDdr/NSfj//a36UAbOgF7vHkaeAiNknGb0Gp5lixo9nksaAmBv2D6TPKtBg== 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 57D2A1849B; Mon, 21 Feb 2022 21:57:53 +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 21LLvrPE052036; Mon, 21 Feb 2022 21:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LLvrR8052035; Mon, 21 Feb 2022 21:57:53 GMT (envelope-from git) Date: Mon, 21 Feb 2022 21:57:53 GMT Message-Id: <202202212157.21LLvrR8052035@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: 29f50a83cc52 - stable/13 - bhyve nvme: Fix Namespace Specific Set Features 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: 29f50a83cc524d42340fffc9972e84f9f58fc33b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480673; 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=PstP2fmTQRayD8p9LuXhd8a4JbF0oPtepNIZNYBWRzc=; b=HH61KnadVulhwbmQ4j6oPnFe3cP72SQE8jnwpzdamimjt/vMgW7jhpZlVu4/0Xbu0a6tfQ 5Ax8Dz9kTCZVQtqRnUcfeahU2/5/hVehZby4BRT7O1VyYVXXjL69D4zI4fO+2w6KwDtB3i hwj6Ki3I8KUbBwwMR0v6g73ztt5E8ir+qkarhxef+WcF2yErXkEMr415sDmZKu2VauBavh Jht4bp45G3zyRRaJ6+EObU+jEJJWLEVYXjyI8RFRjIPzyAgt3X2LYnE/+lQwOZUyukePoN 9dOv3DelIXxwSiCtYuYPEGP/ZtJ+bQPSMvS/PeZAgTGP6tGHoINV3oSJUFS8sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645480673; a=rsa-sha256; cv=none; b=SpR+f7AoMtPdn5nadWf5xoAVJ+4MUhtQTh07Et+bkTZimhxoulBxdqhn4BFaiWXdx2U1c2 WTuL2RpUT8kXWURfXVFqna2m+fkLPUzYVENbIsfxMNE0uqJOd8yLtWZEKYmoc2Ksa9OVso BvBrpUmV8WAMCqSFKH/46swTj0sEGhMv57fJr4AKGLEr0VrOYj52rK8MK6SooCVIlbEw8p V/Yy6kI1RQjS+PV6eYVjjO0xV9NA9M+kPT1xMzR6N0u2C7rjs1Kr//tE4/urfuFG03FVAO 6NOxshIxZcycWvFNHBOPDRRoqP3LRD5NYCG2z/qHvo6o4GbjxPfokiGmcCNBZw== 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=29f50a83cc524d42340fffc9972e84f9f58fc33b commit 29f50a83cc524d42340fffc9972e84f9f58fc33b Author: Chuck Tuffli AuthorDate: 2022-01-30 07:06:23 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-22 03:25:34 +0000 bhyve nvme: Fix Namespace Specific Set Features Return an error if the feature specified in Set Features is Namespace specific but the Namespace ID uses the Global Namespace tag. Fixes UNH Test 1.2.7 (cherry picked from commit 62d47feceba8d457f5a28691cfbed5b90ede30b6) --- usr.sbin/bhyve/pci_nvme.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 0ce26f0adfee..e1de57c26e84 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1660,6 +1660,11 @@ nvme_opc_set_features(struct pci_nvme_softc *sc, struct nvme_command *command, } feat = &sc->feat[fid]; + if (feat->namespace_specific && (nsid == NVME_GLOBAL_NAMESPACE_TAG)) { + pci_nvme_status_genc(&compl->status, NVME_SC_INVALID_FIELD); + return (1); + } + if (!feat->namespace_specific && !((nsid == 0) || (nsid == NVME_GLOBAL_NAMESPACE_TAG))) { pci_nvme_status_tc(&compl->status, NVME_SCT_COMMAND_SPECIFIC,