From nobody Mon Feb 9 18:18:21 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656019650493246.86717516081308; Thu, 23 Jun 2022 14:27:30 -0700 (PDT) Received: from localhost ([::1]:40666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4UMK-0002go-Pe for importer@patchew.org; Thu, 23 Jun 2022 17:27:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4UDn-0005rr-7k; Thu, 23 Jun 2022 17:18:40 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:39333) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4UDl-00044y-IE; Thu, 23 Jun 2022 17:18:38 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id A69833200957; Thu, 23 Jun 2022 17:18:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 23 Jun 2022 17:18:36 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 23 Jun 2022 17:18:34 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1656019115; x= 1656105515; bh=Gu/2ZQo53SQ5H+1IizNlQZ3toC12z2U/p2E4Ue6509c=; b=Y iu6n7lwBCOMnl1vOMaBjY+37vrAAk9pxrXzpxm2+lR70Fm9yQw5Z0gJho2cGH+uf kCQKN0vs+bitY7XbbpW79t+WuXz7sDwWu+XDnsUa40HaOyU/cs3ZUNrcUzkI9xGx /sPjWCFgHtwCQ8oHwgEltM+2Yv0pGz5/Ah8kAJrmc9Eq0aAyAnb+Fj4zGkZJQIAD i8wyeGtyBg+eHwYyFD1UhekO4gkd905XtbId1k/eml6UX5rXSkcQxch5pR1G2Ly6 2JE9kHbSOQHOlFZhxs3Bwv/ezcxec3boi0ECG4sm8xPTXv8/4a4t5/+wnWOrWw+l JjbQ1JMT6uR71YguikxUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1656019115; x=1656105515; bh=Gu/2ZQo53SQ5H +1IizNlQZ3toC12z2U/p2E4Ue6509c=; b=TeIqED5PGxwrg/PAAgV7PwEam3ucL itnQX4OFMGV/0v4odpMSgpjYM4FtZoGtf+m63fud14wrl9uF4InTZECdAQo4Tq8i fHbT5ayXqdF1nnpvzdRwfZdGeNTtIilbZMsORqnVF1fr+o7FJ4NV7RK8UBf/qN9X ZNqiKBosgoLRsMjVaiymnJr6lQ3U48rJYfpbvbZJA4VsEtkVGgNUtjtb8nC2EIDK NvCHz8/dSqgzZyYTCeywMImZisJlD6DCgKLPcvpBKjmq0+Y98RXPWVBEVNLnhc2/ 2HrIg5LIVNBWXtcdRu5GusYwBE1kkib2MbmZSDbjW2KSD5ukCDsU3NtDg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefjedgudeitdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgr uhhsucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrg htthgvrhhnpeejgfeilefgieevheekueevheehkeefveegiefgheefgfejjeehffefgedu jedugeenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Keith Busch , Klaus Jensen , Klaus Jensen Subject: [PATCH 04/12] hw/nvme: fix numzrwa handling Date: Thu, 23 Jun 2022 23:18:13 +0200 Message-Id: <20220623211821.50534-5-its@irrelevant.dk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623211821.50534-1-its@irrelevant.dk> References: <20220623211821.50534-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=64.147.123.21; envelope-from=its@irrelevant.dk; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1656019651688100001 Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Number of ZRWA Resources should be initialized to Max Active Resources, and not the total number of zones. Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 8 ++------ hw/nvme/ns.c | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index af82daa304bf..a09700455c02 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1765,9 +1765,7 @@ static uint16_t nvme_zrm_finish(NvmeNamespace *ns, Nv= meZone *zone) =20 if (zone->d.za & NVME_ZA_ZRWA_VALID) { zone->d.za &=3D ~NVME_ZA_ZRWA_VALID; - if (ns->params.numzrwa) { - ns->zns.numzrwa++; - } + ns->zns.numzrwa++; } =20 /* fallthrough */ @@ -1807,9 +1805,7 @@ static uint16_t nvme_zrm_reset(NvmeNamespace *ns, Nvm= eZone *zone) nvme_aor_dec_active(ns); =20 if (zone->d.za & NVME_ZA_ZRWA_VALID) { - if (ns->params.numzrwa) { - ns->zns.numzrwa++; - } + ns->zns.numzrwa++; } =20 /* fallthrough */ diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c index 870c3ca1a2f0..b9b35b3c3bc9 100644 --- a/hw/nvme/ns.c +++ b/hw/nvme/ns.c @@ -286,7 +286,7 @@ static void nvme_ns_init_zoned(NvmeNamespace *ns) =20 if (ns->params.zrwas) { ns->zns.numzrwa =3D ns->params.numzrwa ? - ns->params.numzrwa : ns->num_zones; + ns->params.numzrwa : ns->params.max_active_zones; =20 ns->zns.zrwas =3D ns->params.zrwas >> ns->lbaf.ds; ns->zns.zrwafg =3D ns->params.zrwafg >> ns->lbaf.ds; @@ -294,7 +294,7 @@ static void nvme_ns_init_zoned(NvmeNamespace *ns) id_ns_z->ozcs |=3D NVME_ID_NS_ZONED_OZCS_ZRWASUP; id_ns_z->zrwacap =3D NVME_ID_NS_ZONED_ZRWACAP_EXPFLUSHSUP; =20 - id_ns_z->numzrwa =3D cpu_to_le32(ns->params.numzrwa); + id_ns_z->numzrwa =3D cpu_to_le32(ns->zns.numzrwa - 1); id_ns_z->zrwas =3D cpu_to_le16(ns->zns.zrwas); id_ns_z->zrwafg =3D cpu_to_le16(ns->zns.zrwafg); } --=20 2.36.1