From nobody Wed Nov 23 09:44:02 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 4NHGRR2gMdz4jDBj; Wed, 23 Nov 2022 09:44:03 +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 4NHGRR1x7Hz4FTf; Wed, 23 Nov 2022 09:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669196643; 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=D/tPI2Sp3KsTo/wyu75sVCejaM2u+QsOnpZhFkhJaAs=; b=D6TPc03ILAWxmX7L1tXv5prWlcw/73pAbu/jPN3CXiSxHbuXt6sWMOBXl1aPl1xqq0+m64 kCzhSW1lcVlkNV7w2V5Ws6JjlTNMf+AFMEM4H1ogIDFDBlYKUNA6NKgyshGQREwSLuTUmi M/7wEQz/Z2D3krIjk0Q7nu6SKpju5wxX0f9e7A+bN0OMtSkQ0X3zBmHLa3jhREtdYDR34O IeUoH/P6qFnh/tAMJzNcOu4pwYP1ccJQAJ/5A8VjLIRxTSLohR2Nplfa8cE05s4WTV6nxg sihi2ynZx4W60nfUl4/EEm+3Tm/UxN7HnDeIlQlrjoqsX5tANySYhgzhncXZgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669196643; 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=D/tPI2Sp3KsTo/wyu75sVCejaM2u+QsOnpZhFkhJaAs=; b=jll0Eu2Oh+sHKs7eH9X5rvOLI6f+cU5lyx32WyO4XlY0XqAKmyoNSOAeominYiUgYxhZl7 Pe/1lSuYd50pl5ecL9nHLo2f5RrYEN+fuZ1e0DtZ7OTtkgIPRYv9iNa8lI46xdMNlab69z 735wWGsK3guif1TIH1yUJ34+EAaK5SrHXQZt3HsVb+dAbPyCSImYZP4EjKYbB20Iip3HAf zLInO/dayQg3wxMZzSsEa3LTWbifga6cgVUmEYHqdqxaQhzv76mBq4UnhXPwt7DafTXk9j McfLC3LrSGQTTV43fIEenksYkwgS/H1rlA/8+5mhIy/NuYNMRJghs8pFl5nP7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669196643; a=rsa-sha256; cv=none; b=HKXildl88FydeJ2Ka0EoWnUD+MNOKDV52GeX742jVz0rwMOqR5dpbBtEQbfvV8u4DRw8nx WlqQvniQdOX8RMdQzoZrn6h5LDe0JOJtEQm5ttSIjRzjS77NR7fGRjyyPSUbYmZLD/MKrn niNGx0CIlI+W39cEwiSVX48jzkYFg1gQUUAxrNV4qdiOh5z2A66PLTHz8nZq3BWIXaoKW7 8VlqWtDDOzGDrSrP1rreibWGqBitkVJFxBbPM7spA8j5yu0z2g5NInj3E6BPmOwkxD6uod QSYZcuN5EJVUYkzBHWAlq220XjPHbB6tK0y4+U0PoKsJZeNaqoGFD+AWSZqkoQ== 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 4NHGRR0MtrzHc8; Wed, 23 Nov 2022 09:44:03 +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 2AN9i23U015740; Wed, 23 Nov 2022 09:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AN9i23Y015739; Wed, 23 Nov 2022 09:44:02 GMT (envelope-from git) Date: Wed, 23 Nov 2022 09:44:02 GMT Message-Id: <202211230944.2AN9i23Y015739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 6637279c9534 - stable/13 - bhyve: return FEATURE_NOT_CHANGEABLE for unimplemented feature of NVMe controller 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6637279c9534a22720cd02d7d1d507e2d3f03724 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6637279c9534a22720cd02d7d1d507e2d3f03724 commit 6637279c9534a22720cd02d7d1d507e2d3f03724 Author: Wanpeng Qian AuthorDate: 2022-11-14 13:06:34 +0000 Commit: Corvin Köhne CommitDate: 2022-11-22 06:51:27 +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 (cherry picked from commit 05a21658eb15463af9427fc1f7825b2aa244b9d5) --- 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 46839078e89d..91cf919f49fd 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1848,6 +1848,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) {