From nobody Sat Jan 29 23:15:38 2022 X-Original-To: dev-commits-src-main@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 A504C197ABB5; Sat, 29 Jan 2022 23:15:39 +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 4JmVYR0CfTz3sX8; Sat, 29 Jan 2022 23:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498139; 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=c7edCegcUSMtL05VJBARROTPoTkMkamnHpD1u3RNDqs=; b=Us98EOcJEXSkID4z+fs0Go8SYsExAPIA8hgzHfc3rTSwdxcbDXEy6zK2e5Jw/zIZnVyXN0 de370IPpyGLiOhpxu/3robEVDMzZTMBu6Uqz2SUNiZQyRjM43yD15gkySMAFYCUzWD10du OSdVR2yGBdRqjtWQTN+Y0Hopk4WcTHcrGQC+wTt3pi82818s9/7hLetl211vH5/7dIASza V+0QDqOMdtIiR9qSEKGYn5D4oix4rJgmBu+DLNpxxYgjXsT/OF63Sqs3hUKQD8VGwoYmEJ A825IjMom2gF6IJJMNYSb8Yrg0bQ4L9TCaYL287g5iVO3O8nNAviNI7Oyx8DQw== 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 AFBE21E271; Sat, 29 Jan 2022 23:15:38 +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 20TNFccs008152; Sat, 29 Jan 2022 23:15:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TNFcSF008151; Sat, 29 Jan 2022 23:15:38 GMT (envelope-from git) Date: Sat, 29 Jan 2022 23:15:38 GMT Message-Id: <202201292315.20TNFcSF008151@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: 62d47feceba8 - main - bhyve nvme: Fix Namespace Specific Set Features List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 62d47feceba8d457f5a28691cfbed5b90ede30b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498139; 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=c7edCegcUSMtL05VJBARROTPoTkMkamnHpD1u3RNDqs=; b=FIfzEKaTWNoiJzs/bVF7GisZ+rG5T+9jxCcSpYFPeBNJvqXzlYLakVSxpHezuAwM8S5HbD WLH7zKZFPcWOOGOTB7Gy7p6Ubqk7FX74XA92ezONq2+saEjRW8lJCXrSsYy53y5UTt22wl 3GqBvsKun4MVA25Fvp6WJHhMK157d9FJVw0LzhSrETNDFc4/YAQTtnaUiR6hdTOt1zEemn /qQv2jt6fuR2/CF80kqWW6PZXp5PRcmwvp99Hkp7oO8V/Ms7z1VjiQZpTUr4g3dkKHswdA zmk9OeiXoJ91bRQ67hvcQMR1CkXUh0SZyQ97qxStp7Yz2y6oSz8rxVeRfFvrHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643498139; a=rsa-sha256; cv=none; b=ilf7q3Ue6a5UAjCJcqHfEq6oFYx+iwqD/adzLxKpM5k948NwofjGioQbnAK5BCeG3iBPU5 cn57rfIfBmUW9ukeZQTxA7srOdlNBOwlIEX4LI2Ls3p1U5vv2cWv95eghcRYVrajX/x8lp fcYlFZZ7PbTWQYx3nvV4FXegCbAU3qsmV5L7EAPhF2S/R/f4a3TcS2EYdwTqa7sOll9mjL ZBbFiQGqIX/0pM68yU8+0GPHxQ+jaApPVUA7fS/2qjUyQx/eF94b46dz64ioCcigKZ5Jmp btG2dQvYjMrQuUsbr/QxD7O4460jLXg4y47bpxj3B894oEfsWUnjesUHrwjQWw== 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=62d47feceba8d457f5a28691cfbed5b90ede30b6 commit 62d47feceba8d457f5a28691cfbed5b90ede30b6 Author: Chuck Tuffli AuthorDate: 2022-01-30 07:06:23 +0000 Commit: Chuck Tuffli CommitDate: 2022-01-30 07:06:23 +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 Reviewed by: imp, allanjude Tested by: jason@tubnor.net MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33566 --- 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 09425b1cace3..e5def8ef8165 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,