From nobody Tue Nov 15 07:26:07 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 4NBHm01WHkz4hBHS; Tue, 15 Nov 2022 07:26:08 +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 4NBHm00zD7z3hFv; Tue, 15 Nov 2022 07:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668497168; 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=WaPup7KT9ERuwpKAMTRQ3AF9ygsEbtcdxo4UPqe/oMA=; b=Bn/pSrZJ08QGK7LRW150ieiY24uUZKjBiYt1REmnwI9uaqremp8I2onP7Zo0IqBnAt+Fv4 qFEIyd/F8crZ9f9vNg65jgyGttX0vyB6I2CjNcXCtP+HUtxRq6lztt7bzfMsuJ/FQ1PP8U jxpNWBvPAbMma3MjHBr8IxXgvxwqwePUu2Grbbg6dTy7dVmnM2HdSKMl+taBe+Akqbz4tt VcbL0OLH5Yr2PvgJaKbPJ6qi5CPs1WUr4S6dq3iXm6GxDitYCT/QuoWCintL0E74DBrxj1 Qt5egbVDqwAF9K1M4EtUvq2Wbf1YhyDU2Hn5yHuG/AotgtBvgd362DAgNkkpXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668497168; 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=WaPup7KT9ERuwpKAMTRQ3AF9ygsEbtcdxo4UPqe/oMA=; b=F1jxe2KLoIApPn0S5Z6rTLQJpABObF9TDQXkTeANfHQf9H4OludeWhq5BCC9MH2SVhfWHJ EJTjGNBIC3ywIyfpWtdsSJLo5hnBi+nwG/BcVy6wUH/Yys5Va36ZsH5HIQKuMNILIqpeOy HRIdEO/Hbc6fwmMna7iLaEeU7ASLjlUl4CC86wOaB9eTEea4jVqvAZbaAEbedp/wM4Z1Qt r56DNzKcJIpgOGg6pAIhY/NJ90aOfLzWX0XnRclZ8iQeZQVS5i68v3Cl9SLNHRnwQPP+a+ nGM2etIxpg+t9CmZoqe2fTo3PD7bZ0fyc7G5Z4eMFhUvMyCjNZceAhqg7JgnzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668497168; a=rsa-sha256; cv=none; b=NWYUjxyK5NefjyhS4jzk4f3N7JruywRHp0ubDEzF68Ben4jkACSL/bsw8Ki0s7Bop0Pjus y/6lB5A7/i8nCieWa3Ts9d2CeXb6kBh3KPxUHrut8vjp8a0X4EKIEvqqWDt1LPrIbEGKWI bRGP8vRX2ou9dKHaWsN0HjR1sRcqUINCUkI8RJ1B8IoqcQIPXoMu/Z/4eYoi9+eUBFp+2C 6R2i90Xj3rAt9rZLMo13gGKgFDnJA9puo8r6lV0eZTTGbvCw4dgqsoaQWixJio+0KOnIOf 99LfErPGLXBFT+Z/4ONt3exkdMsFBfTX0r5ue+RbVSEQbEVs4/NmH0cX5HyMPw== 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 4NBHm0047hz1CfM; Tue, 15 Nov 2022 07:26:08 +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 2AF7Q7gY046120; Tue, 15 Nov 2022 07:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AF7Q7g9046119; Tue, 15 Nov 2022 07:26:07 GMT (envelope-from git) Date: Tue, 15 Nov 2022 07:26:07 GMT Message-Id: <202211150726.2AF7Q7g9046119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 05a21658eb15 - main - bhyve: return FEATURE_NOT_CHANGEABLE for unimplemented feature of NVMe controller 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05a21658eb15463af9427fc1f7825b2aa244b9d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=05a21658eb15463af9427fc1f7825b2aa244b9d5 commit 05a21658eb15463af9427fc1f7825b2aa244b9d5 Author: Wanpeng Qian AuthorDate: 2022-11-14 13:06:34 +0000 Commit: Corvin Köhne CommitDate: 2022-11-15 06:48:25 +0000 bhyve: return FEATURE_NOT_CHANGEABLE for unimplemented feature of NVMe controller Set Feature is a feature specified function. Currently only some features have the set procedure. For features that are not handled by the controller, we should return a FEATURE_NOT_CHANGEABLE error message. Approved by: manu (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D32802 --- 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 1cc9838c112f..c9fde4ac7876 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1885,6 +1885,11 @@ nvme_opc_set_features(struct pci_nvme_softc *sc, struct nvme_command *command, if (feat->set) feat->set(sc, feat, command, compl); + else { + pci_nvme_status_tc(&compl->status, NVME_SCT_COMMAND_SPECIFIC, + NVME_SC_FEATURE_NOT_CHANGEABLE); + return (1); + } DPRINTF("%s: status=%#x cdw11=%#x", __func__, compl->status, command->cdw11); if (compl->status == NVME_SC_SUCCESS) {