From nobody Mon Feb 9 09:15:56 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=1612857837; cv=none; d=zohomail.com; s=zohoarc; b=Q598ROHUwKK3JpCmNVU9HvKBujPVy+V4o+JiOiG++DiJkag4JHl5Lfa9k84NZNMH1arwLzPAUZui+xyl0FviG6QUyS+bURfynUZrHNk5PWuNlF+zRvRv1TTd+RTB67WnffnhNfTtm/uBagmiscQJVQxGNBIBOjxfETdevqoh+G4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612857837; 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=Mlk0y9wyEEH+FfDrruesoeHuT5jNnMCFryCD1HQlUYE=; b=bRwCyZp8MxFGvZ5ZGxa/AonBBo5S188uPbgAgHqTwQH/S1DA1dYTBJqrGTS2su2Cvkw2qxdX+aYHYZgwoOGwbvwOezk7zqqnPQGfU9qtqF4INq/tRuq7+eYuS+7wMupiYKnlnvvPvSgFUuSNhqKj94vZj4iJB/1dBKFhlQFTm5A= 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 1612857837617930.9847284131478; Tue, 9 Feb 2021 00:03:57 -0800 (PST) Received: from localhost ([::1]:33938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9O04-0005Nu-DK for importer@patchew.org; Tue, 09 Feb 2021 03:03:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9NVf-0005Or-SG; Tue, 09 Feb 2021 02:32:33 -0500 Received: from wnew1-smtp.messagingengine.com ([64.147.123.26]:52413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9NVV-0005iT-Cr; Tue, 09 Feb 2021 02:32:31 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 07F93BA1; Tue, 9 Feb 2021 02:31:58 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 09 Feb 2021 02:32:00 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 176F8108005B; Tue, 9 Feb 2021 02:31:56 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=Mlk0y9wyEEH+F fDrruesoeHuT5jNnMCFryCD1HQlUYE=; b=zCnAucFrymH+FMv5ZA2YvwdyG0UKT C0GiGk3LYa7ICH7XT2ZK8gasPGuqx5jcZCSPa/AON3VZLZKli9LuF03G58Ms9LGr +3Cal6zzDuEepVyV4yWzz4NBGgwwmC7DKz5nc86MkJLObFIYvugqUmqfg7I4jzj8 t0jyS+magETaUvlyFnAjL3arpWN39KVAmp+PBiCQbtIlVB/dEdjYa7c4o8Tebv5H FH8DOL3Y9uLH7GZ6Ow1HtV7gSN8D2TzSePfz4+ktcVGL3J8OUCKOBSrFAt8aEwvz A0QTnR/S5wsBUsxF/Ll+gYkXPnCtLxNK8B9z1TPiz+ldulRz/USdL8Bdg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=Mlk0y9wyEEH+FfDrruesoeHuT5jNnMCFryCD1HQlUYE=; b=adZXqUhD 8zsYuZqIMTlYL9tNTr1SUsQfYrczhmUAQyi2/YUcASQ71bBHedwSGQJFq69DPq7M tZ6e9S8NYJoaqsYIiVA78EpNBUGlHgW1tY347UC9OqCfIHVSGSciz+hNJeUqK+WL ZK/1TuXDrbb34fdYxes/r5Yut/YakV5aUPV0pSFk7dF0Gw4XIBSg5xK0M4qutTnM GYRZ2iDZm/T6WTNzjpE17hLM+P84N7K/N0+FoWxpVCXfXsC1yH9Q79NTr8rqMPet BSGxj3B3EQJLP0oIIvcKYdcqaeFXZYugahZQGm3AvLouPqYYHDqXOHBq7u0XfnRU KKcq3SHPcAwFcg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheeggdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedune curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 23/56] hw/block/nvme: merge implicitly/explicitly opened processing masks Date: Tue, 9 Feb 2021 08:30:28 +0100 Message-Id: <20210209073101.548811-24-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209073101.548811-1-its@irrelevant.dk> References: <20210209073101.548811-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.26; envelope-from=its@irrelevant.dk; helo=wnew1-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 autolearn=ham autolearn_force=no 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Dmitry Fomichev , Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Implicitly and explicitly opended zones are always bulk processed together, so merge the two processing masks. Signed-off-by: Klaus Jensen Tested-by: Dmitry Fomichev Reviewed-by: Dmitry Fomichev --- hw/block/nvme.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 551878338e5d..a7245a7e05a1 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1740,11 +1740,10 @@ typedef uint16_t (*op_handler_t)(NvmeNamespace *, N= vmeZone *, =20 enum NvmeZoneProcessingMask { NVME_PROC_CURRENT_ZONE =3D 0, - NVME_PROC_IMP_OPEN_ZONES =3D 1 << 0, - NVME_PROC_EXP_OPEN_ZONES =3D 1 << 1, - NVME_PROC_CLOSED_ZONES =3D 1 << 2, - NVME_PROC_READ_ONLY_ZONES =3D 1 << 3, - NVME_PROC_FULL_ZONES =3D 1 << 4, + NVME_PROC_OPENED_ZONES =3D 1 << 0, + NVME_PROC_CLOSED_ZONES =3D 1 << 1, + NVME_PROC_READ_ONLY_ZONES =3D 1 << 2, + NVME_PROC_FULL_ZONES =3D 1 << 3, }; =20 static uint16_t nvme_open_zone(NvmeNamespace *ns, NvmeZone *zone, @@ -1885,10 +1884,8 @@ static uint16_t nvme_bulk_proc_zone(NvmeNamespace *n= s, NvmeZone *zone, =20 switch (zs) { case NVME_ZONE_STATE_IMPLICITLY_OPEN: - proc_zone =3D proc_mask & NVME_PROC_IMP_OPEN_ZONES; - break; case NVME_ZONE_STATE_EXPLICITLY_OPEN: - proc_zone =3D proc_mask & NVME_PROC_EXP_OPEN_ZONES; + proc_zone =3D proc_mask & NVME_PROC_OPENED_ZONES; break; case NVME_ZONE_STATE_CLOSED: proc_zone =3D proc_mask & NVME_PROC_CLOSED_ZONES; @@ -1929,15 +1926,14 @@ static uint16_t nvme_do_zone_op(NvmeNamespace *ns, = NvmeZone *zone, } } } - if (proc_mask & NVME_PROC_IMP_OPEN_ZONES) { + if (proc_mask & NVME_PROC_OPENED_ZONES) { QTAILQ_FOREACH_SAFE(zone, &ns->imp_open_zones, entry, next) { status =3D nvme_bulk_proc_zone(ns, zone, proc_mask, op_hnd= lr); if (status !=3D NVME_SUCCESS) { goto out; } } - } - if (proc_mask & NVME_PROC_EXP_OPEN_ZONES) { + QTAILQ_FOREACH_SAFE(zone, &ns->exp_open_zones, entry, next) { status =3D nvme_bulk_proc_zone(ns, zone, proc_mask, op_hnd= lr); if (status !=3D NVME_SUCCESS) { @@ -2012,7 +2008,7 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nvme= Request *req) =20 case NVME_ZONE_ACTION_CLOSE: if (all) { - proc_mask =3D NVME_PROC_IMP_OPEN_ZONES | NVME_PROC_EXP_OPEN_ZO= NES; + proc_mask =3D NVME_PROC_OPENED_ZONES; } trace_pci_nvme_close_zone(slba, zone_idx, all); status =3D nvme_do_zone_op(ns, zone, proc_mask, nvme_close_zone); @@ -2020,8 +2016,7 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nvme= Request *req) =20 case NVME_ZONE_ACTION_FINISH: if (all) { - proc_mask =3D NVME_PROC_IMP_OPEN_ZONES | NVME_PROC_EXP_OPEN_ZO= NES | - NVME_PROC_CLOSED_ZONES; + proc_mask =3D NVME_PROC_OPENED_ZONES | NVME_PROC_CLOSED_ZONES; } trace_pci_nvme_finish_zone(slba, zone_idx, all); status =3D nvme_do_zone_op(ns, zone, proc_mask, nvme_finish_zone); @@ -2029,8 +2024,8 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nvme= Request *req) =20 case NVME_ZONE_ACTION_RESET: if (all) { - proc_mask =3D NVME_PROC_IMP_OPEN_ZONES | NVME_PROC_EXP_OPEN_ZO= NES | - NVME_PROC_CLOSED_ZONES | NVME_PROC_FULL_ZONES; + proc_mask =3D NVME_PROC_OPENED_ZONES | NVME_PROC_CLOSED_ZONES | + NVME_PROC_FULL_ZONES; } trace_pci_nvme_reset_zone(slba, zone_idx, all); status =3D nvme_do_zone_op(ns, zone, proc_mask, nvme_reset_zone); --=20 2.30.0