From nobody Mon Feb 9 18:44:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586930548; cv=none; d=zohomail.com; s=zohoarc; b=Eg55Y63Bq8wOXeM1EBkXlnKOnABVbh9mItWOpSf8gPVyzq6NOnBXMYNAR3AledlVMpzBSzEAt8ymP/hs3GZ8X6PtVv7bdoKULsrW+UGDO5EzK3LCazEzDlxtXWZAeOdGxZK8YfiONrI6vgZZei2p0BkzfhToQ2cSM1s7VxxxvRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586930548; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HPxdp1viVRVGh8LHOMZOl1UtXGBU+6qjr6V8N4gcM+w=; b=bK031ypRguJdP4YLqdh5G1QDN+ToQXcJuWlLFxSeqOKuF0J33vyTD2lb84jsNLIOpsnpcqxXsm0Jd4gYMuokqxBVp/JnoGVdFsXkTB9pn+u+DO8H0e9XqdUa+EZb8QjSOpvwyH6dlkddONA/YoNKifYdw9KP555kxLbxTeTwZLU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586930548668367.2074094432429; Tue, 14 Apr 2020 23:02:28 -0700 (PDT) Received: from localhost ([::1]:43638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOb7y-0002F1-Bv for importer@patchew.org; Wed, 15 Apr 2020 02:02:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOayg-0001rU-VN for qemu-devel@nongnu.org; Wed, 15 Apr 2020 01:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOayf-0002eK-Qo for qemu-devel@nongnu.org; Wed, 15 Apr 2020 01:52:50 -0400 Received: from charlie.dont.surf ([128.199.63.193]:47318) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOayd-0002S9-FS; Wed, 15 Apr 2020 01:52:47 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by charlie.dont.surf (Postfix) with ESMTPSA id B777BBFB38; Wed, 15 Apr 2020 05:52:24 +0000 (UTC) From: Klaus Jensen To: qemu-block@nongnu.org Subject: [PATCH v7 20/48] nvme: enforce valid queue creation sequence Date: Wed, 15 Apr 2020 07:51:12 +0200 Message-Id: <20200415055140.466900-21-its@irrelevant.dk> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415055140.466900-1-its@irrelevant.dk> References: <20200415055140.466900-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 128.199.63.193 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Beata Michalska , Klaus Jensen , qemu-devel@nongnu.org, Max Reitz , Klaus Jensen , Keith Busch , Javier Gonzalez , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Support returning Command Sequence Error if Set Features on Number of Queues is called after queues have been created. Signed-off-by: Klaus Jensen Reviewed-by: Maxim Levitsky --- hw/block/nvme.c | 12 ++++++++++++ hw/block/nvme.h | 1 + 2 files changed, 13 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index f40bc861facc..d88e21a14b77 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -888,6 +888,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *c= md) cq =3D g_malloc0(sizeof(*cq)); nvme_init_cq(cq, n, prp1, cqid, vector, qsize + 1, NVME_CQ_FLAGS_IEN(qflags)); + + /* + * It is only required to set qs_created when creating a completion qu= eue; + * creating a submission queue without a matching completion queue will + * fail. + */ + n->qs_created =3D true; return NVME_SUCCESS; } =20 @@ -1202,6 +1209,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCm= d *cmd, NvmeRequest *req) blk_set_enable_write_cache(n->conf.blk, dw11 & 1); break; case NVME_NUMBER_OF_QUEUES: + if (n->qs_created) { + return NVME_CMD_SEQ_ERROR | NVME_DNR; + } + /* * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for= NCQR * and NSQR. @@ -1343,6 +1354,7 @@ static void nvme_clear_ctrl(NvmeCtrl *n) =20 n->aer_queued =3D 0; n->outstanding_aers =3D 0; + n->qs_created =3D false; =20 blk_flush(n->conf.blk); n->bar.cc =3D 0; diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 321d37aeaca4..f72ffddae160 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -99,6 +99,7 @@ typedef struct NvmeCtrl { BlockConf conf; NvmeParams params; =20 + bool qs_created; uint32_t page_size; uint16_t page_bits; uint16_t max_prp_ents; --=20 2.26.0