From nobody Mon Feb 9 19:06:23 2026 Delivered-To: importer@patchew.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=1594016439; cv=none; d=zohomail.com; s=zohoarc; b=fQWlHYBecrzGiz1/6N64zw6lPSA7I6mWJ7f27zDSzfagqjqcQqgwVbqVUKmHlj6FBAIZ5JoKjdmH3+Rgsozj0DinskXqYZIyfYev5TvgX8AArZiUwJD3lT2SRE7yn42rLrEvoXLRHGjrA/TtShgXwbtr43a0uSZCcl3slUnvVvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594016439; 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=Wf2zrN33ytB8xHcsBQdz24lTMOiL1ZFCAbNN+/UZDKo=; b=Ath2hWWkoaLWVefA5UxO6UPjul466Q0PZmFqMAbwCht9kCUBepJpqXkHrtkAngRxTkPizkl3fVQYbzE87DU0msnuG/F7OlL5Ru57mvyDH17Uvhwm+/75GtVfsH29KbmO3cwlVb1o48YMoewhHTGCruWT8hgEERmAGHtG+0Z5ErM= 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 1594016439679719.9873690044031; Sun, 5 Jul 2020 23:20:39 -0700 (PDT) Received: from localhost ([::1]:57118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsKUY-0005OM-A9 for importer@patchew.org; Mon, 06 Jul 2020 02:20:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsKNx-0001sI-DY; Mon, 06 Jul 2020 02:13:49 -0400 Received: from charlie.dont.surf ([128.199.63.193]:58142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsKNt-0000xD-Pb; Mon, 06 Jul 2020 02:13:49 -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 0CCD0BF5FF; Mon, 6 Jul 2020 06:13:19 +0000 (UTC) From: Klaus Jensen To: qemu-block@nongnu.org Subject: [PATCH v3 16/18] hw/block/nvme: enforce valid queue creation sequence Date: Mon, 6 Jul 2020 08:13:01 +0200 Message-Id: <20200706061303.246057-17-its@irrelevant.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706061303.246057-1-its@irrelevant.dk> References: <20200706061303.246057-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=128.199.63.193; envelope-from=its@irrelevant.dk; helo=charlie.dont.surf X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/06 02:13:11 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 , Dmitry Fomichev , Klaus Jensen , qemu-devel@nongnu.org, Max Reitz , Klaus Jensen , Keith Busch , Javier Gonzalez , Maxim Levitsky , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Reviewed-by: Dmitry Fomichev --- 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 af39126cd8d1..07d58aa945f2 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -946,6 +946,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 @@ -1346,6 +1353,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. @@ -1478,6 +1489,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 b93067c9e4a1..0b6a8ae66559 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -95,6 +95,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.27.0