From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885713; cv=none; d=zohomail.com; s=zohoarc; b=TweXbd15mItXfWrfgaAsjye9+mQJgX52vfGcCYj0F2sBl0jtjxMJ4uveX/Wvc/zoPV0kC0k0hOCrRVRw8qD5UhupyCdBY7x/qqMKA/pL0vW9r29a9aC9E0N54sfnTkTKOSYONvSkUBiMallyUc3JzUoCOQGol4EziQfjS+fJThU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885713; 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=UKFjCmB1+RKLT3BiI4n0OhHIhB+1xXyaWbJ52LWZt5E=; b=f2lxfOMeYfIREzZOuDSJu26rNHAWQifxKhxKWnPV/QF3O2VeuwD44AidFaYWdJGlczhSV8/U2w5RZQI+1r8aYHIFbnhXR6On3eIG2hZkFgISk7qMcMt4HDAMEsXPIV6RoaXzJN5u7vNphlsAmBxOEMGYvZT1hAIVeInm1NTxmVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600885713720785.8386983074739; Wed, 23 Sep 2020 11:28:33 -0700 (PDT) Received: from localhost ([::1]:45280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9VI-00032i-Ae for importer@patchew.org; Wed, 23 Sep 2020 14:28:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Nx-0004w8-7i; Wed, 23 Sep 2020 14:20:58 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Nt-00087W-LT; Wed, 23 Sep 2020 14:20:56 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:11 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:06:56 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886176; x=1632422176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BYQ28XH8Ylx9Dq0KVPfvBpBWZp+s9KZQXJ7UPhfutPQ=; b=bT90MOzqUNHAZGkkWF0Xl4HYDE9tQLrAXqvPHUeOyyFCf+Em/jmvgicZ lPiWMwNZHxTKOWLsXYPEJdUkJHu+jy3DlUJOFNQq84kxg7KFxc8F5v0ef PkVwhXLbdOVC6EfAFnANTVyfVsGXDzcGsScl+9K1MFfv6XzCl1wKKZGgB B2ioBzuwMmZ5pH1eaCEATgry3gqSlBnvyp+h0XngegJ3+li6Kk+piMcKa 8q04YugtseRJ1lFvERQInVKHQwNdKsVeM9OG5erPUWbUouUyDAGtz0+iv HdccHdp42pzNvxT2ZZsyREarbqEp3vUpAoMHsZs3w7ltf+eCoVc6ReCD0 w==; IronPort-SDR: TiHUSmltTziy/7j1qOPpkAix79fxamHQUCgQF4kACKxjKT0mlgaBXLJk3b+JXzajEaySOUHTwP GhGIOhqKmaWchZs9nKR9HI2Of3X8XiCCF64VaTJj1BHMf46cohUYZk6PHlpG8DXXj+Zk3oZilO RK3xmUiL995Yd+9AeRgJGFD3jsP/LbPcd+M2rKdcHfsQ/XROgwRQC63jJeKQh/0QfahuREuZQw eZsDD9FFZhXKxgMc8NjqDdCgMHDYPYcWaK4u7WQZnRgWRObnZkmgmBjp4ynvw018Sx4LRMFpAn K0k= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496337" IronPort-SDR: C3iNJLdz73zPLik5kncSLPqdYqBl1uAQn3rzY4++wryxDVv6XMQAO4MedtATsxg/vo6TpXU86H WW3MBRqfyXpg== IronPort-SDR: C98WqivzRrZP8+CiQ9nZMdxF9CZO784NGohbNFFi1Zjh/3QAQfW/U9nFkBvL+8ZjaLrAd8G2di 3UcBUV2H1yuQ== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 01/14] hw/block/nvme: Report actual LBA data shift in LBAF Date: Thu, 24 Sep 2020 03:20:08 +0900 Message-Id: <20200923182021.3724-2-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 7 minutes in the future.) Content-Type: text/plain; charset="utf-8" Calculate the data shift value to report based on the set value of logical_block_size device property. In the process, use a local variable to calculate the LBA format index instead of the hardcoded value 0. This makes the code more readable and it will make it easier to add support for multiple LBA formats in the future. Signed-off-by: Dmitry Fomichev Reviewed-by: Klaus Jensen --- hw/block/nvme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 63078f6009..f60e968c4a 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -2203,6 +2203,7 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeName= space *ns, Error **errp) { int64_t bs_size; NvmeIdNs *id_ns =3D &ns->id_ns; + int lba_index; =20 bs_size =3D blk_getlength(n->conf.blk); if (bs_size < 0) { @@ -2212,7 +2213,8 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeName= space *ns, Error **errp) =20 n->ns_size =3D bs_size; =20 - id_ns->lbaf[0].ds =3D BDRV_SECTOR_BITS; + lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); + id_ns->lbaf[lba_index].ds =3D 31 - clz32(n->conf.logical_block_size); id_ns->nsze =3D cpu_to_le64(nvme_ns_nlbas(n, ns)); =20 /* no thin provisioning */ --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886052; cv=none; d=zohomail.com; s=zohoarc; b=HX17/25r9nR2GuugbJ69ezgaEjghh+yq9gGAtFyQKOmjC5ud3RpD4soHO3kxjW17NZu32KExgDZ6HOObT5s8DfLpze8ESXfP9tkb84pr78VXgzumvnwLeyvefyMT3VP4CFBRY/vimVtbLllvlt/UzzrYuACZQDyGanQAsLBdHRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886052; 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=mpP5Vnqclt1fhsLVW/4EmaHobaW2kLQD8oTsJ0jHKH8=; b=hjIKv45+DvQjqHWk8Gx/k9E0wlt+18bN4jM1bXrYLi2cr+bkYpE2vgwIGdr0r//5jAQoaYlSaHjURP3XqhNVpkly5LW7JyBcQ8YBvyyMSkDh5YDAIhH0qRhpDAMysvwFq5bP1Upv87vRuz36zodTMSEXoO3tRiMZ8MDg/zTuGiM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160088605209943.74237491257736; Wed, 23 Sep 2020 11:34:12 -0700 (PDT) Received: from localhost ([::1]:57180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9ak-0008JZ-Kc for importer@patchew.org; Wed, 23 Sep 2020 14:34:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Ny-0004wM-RH; Wed, 23 Sep 2020 14:20:58 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Nv-00087h-JM; Wed, 23 Sep 2020 14:20:58 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:15 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:06:58 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886179; x=1632422179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3L1xJrdrnoIaUBLZiVws5W3GT63gHksGAR+Pnb5390Y=; b=UBUW1ZBIR6dh9f/eeYcP0aLCfTi0xxRbxSJXiErYNjgUpotXhUsZd0lS uODDkIBf/xiDDd/Iiw+epnil9fkfNCKlA6SmhaT43vA+A2rXDDmb7Ro0j cSd3x+KiXJwd+pkpSIUuLZ1uuLFFwy4Nw7FOA28s3dhalk7d3mbGY7C7d /qAcHut0LVbKo35qmk6GhXkBkXtY9d+ovB87IiqOl4/nsKLJWaSvhQWya r9HothsxZbmN7KTy1d3/vMxfkFiXcvumGVEr+pzIrQ+4nEP9otvNgp1cz ihUJDCct7KVV+Tgn5i3ctqngHwg7NdwBO7ZHSxPLvv4wAV66tBLoROf2s Q==; IronPort-SDR: Q/SIMtSniVSpnA8PQnqUXBPl1821hZSOzsf+W8L9MCNAuLBcdDmZQJi0XiUchmcjmXmUdaBVJS sgeKFeon37DQoW9uT1vnD8F6XMlQIsYE1MuseNCb2BLUBVNVBALvCgTyiiXL81p+pep/VVEO5T 3TfyIV4ndanQHncvfAjHycNzVtWd/Y1K3KR/wiSYnusi71OIbnd7f8AOd/yV56HkyHgSShh+rn auJZrSEgY0pLjXDqB5LdU+4ff6bF428vQQNs9ab5wTw/f5HQNci3qzWuT7jTsc3cFSyHOxj7aJ bfg= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496340" IronPort-SDR: RPj6njuSFkbl/3OJPL44czUW08DQDx5BYQGrI+4kpoZ7wEYPHS+/ZghSAJ8lWS94GiD9nF4uKo IOWCJz36LNyg== IronPort-SDR: OkEkcxQGLK9kVBOgQxRamOz6AuYkhMsom8Sjeenp+axT/KX6hmBc1RwJK5JfrMRqU3fgFGB/vi Dme+5LroF6jw== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 02/14] hw/block/nvme: Add Commands Supported and Effects log Date: Thu, 24 Sep 2020 03:20:09 +0900 Message-Id: <20200923182021.3724-3-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is -127 seconds in the future.) Content-Type: text/plain; charset="utf-8" This log page becomes necessary to implement to allow checking for Zone Append command support in Zoned Namespace Command Set. This commit adds the code to report this log page for NVM Command Set only. The parts that are specific to zoned operation will be added later in the series. Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 44 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 2 ++ include/block/nvme.h | 19 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index f60e968c4a..7807f296d3 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -957,6 +957,46 @@ static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t r= ae, uint32_t buf_len, DMA_DIRECTION_FROM_DEVICE, req); } =20 +static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint32_t buf_len, + uint64_t off, NvmeRequest *req) +{ + NvmeCmd *cmd =3D &req->cmd; + uint64_t prp1 =3D le64_to_cpu(cmd->dptr.prp1); + uint64_t prp2 =3D le64_to_cpu(cmd->dptr.prp2); + NvmeEffectsLog cmd_eff_log =3D {}; + uint32_t *iocs =3D cmd_eff_log.iocs; + uint32_t *acs =3D cmd_eff_log.acs; + uint32_t trans_len; + + trace_pci_nvme_cmd_supp_and_effects_log_read(); + + if (off >=3D sizeof(cmd_eff_log)) { + trace_pci_nvme_err_invalid_effects_log_offset(off); + return NVME_INVALID_FIELD | NVME_DNR; + } + + acs[NVME_ADM_CMD_DELETE_SQ] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_CREATE_SQ] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_DELETE_CQ] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_CREATE_CQ] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_IDENTIFY] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_SET_FEATURES] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_GET_FEATURES] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_GET_LOG_PAGE] =3D NVME_CMD_EFFECTS_CSUPP; + acs[NVME_ADM_CMD_ASYNC_EV_REQ] =3D NVME_CMD_EFFECTS_CSUPP; + + iocs[NVME_CMD_FLUSH] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBC= C; + iocs[NVME_CMD_WRITE_ZEROES] =3D NVME_CMD_EFFECTS_CSUPP | + NVME_CMD_EFFECTS_LBCC; + iocs[NVME_CMD_WRITE] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBC= C; + iocs[NVME_CMD_READ] =3D NVME_CMD_EFFECTS_CSUPP; + + trans_len =3D MIN(sizeof(cmd_eff_log) - off, buf_len); + + return nvme_dma_prp(n, ((uint8_t *)&cmd_eff_log) + off, trans_len, + prp1, prp2, DMA_DIRECTION_FROM_DEVICE, req); +} + static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest *req) { NvmeCmd *cmd =3D &req->cmd; @@ -1000,6 +1040,8 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest= *req) return nvme_smart_info(n, rae, len, off, req); case NVME_LOG_FW_SLOT_INFO: return nvme_fw_log_info(n, len, off, req); + case NVME_LOG_CMD_EFFECTS: + return nvme_cmd_effects(n, len, off, req); default: trace_pci_nvme_err_invalid_log_page(nvme_cid(req), lid); return NVME_INVALID_FIELD | NVME_DNR; @@ -2350,7 +2392,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->acl =3D 3; id->aerl =3D n->params.aerl; id->frmw =3D (NVME_NUM_FW_SLOTS << 1) | NVME_FRMW_SLOT1_RO; - id->lpa =3D NVME_LPA_EXTENDED; + id->lpa =3D NVME_LPA_CSE | NVME_LPA_EXTENDED; =20 /* recommended default value (~70 C) */ id->wctemp =3D cpu_to_le16(NVME_TEMPERATURE_WARNING); diff --git a/hw/block/trace-events b/hw/block/trace-events index 72cf2d15cb..79c9da652d 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -83,6 +83,7 @@ pci_nvme_mmio_start_success(void) "setting controller ena= ble bit succeeded" pci_nvme_mmio_stopped(void) "cleared controller enable bit" pci_nvme_mmio_shutdown_set(void) "shutdown bit set" pci_nvme_mmio_shutdown_cleared(void) "shutdown bit cleared" +pci_nvme_cmd_supp_and_effects_log_read(void) "commands supported and effec= ts log read" =20 # nvme traces for error conditions pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %zu" @@ -95,6 +96,7 @@ pci_nvme_err_invalid_ns(uint32_t ns, uint32_t limit) "inv= alid namespace %u not w pci_nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" pci_nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx= 8"" pci_nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limi= t) "Invalid LBA start=3D%"PRIu64" len=3D%"PRIu64" limit=3D%"PRIu64"" +pci_nvme_err_invalid_effects_log_offset(uint64_t ofs) "commands supported = and effects log offset must be 0, got %"PRIu64"" pci_nvme_err_invalid_del_sq(uint16_t qid) "invalid submission queue deleti= on, sid=3D%"PRIu16"" pci_nvme_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submis= sion queue, invalid cqid=3D%"PRIu16"" pci_nvme_err_invalid_create_sq_sqid(uint16_t sqid) "failed creating submis= sion queue, invalid sqid=3D%"PRIu16"" diff --git a/include/block/nvme.h b/include/block/nvme.h index 65e68a82c8..71126ae1ff 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -734,10 +734,27 @@ enum NvmeSmartWarn { NVME_SMART_FAILED_VOLATILE_MEDIA =3D 1 << 4, }; =20 +typedef struct NvmeEffectsLog { + uint32_t acs[256]; + uint32_t iocs[256]; + uint8_t resv[2048]; +} NvmeEffectsLog; + +enum { + NVME_CMD_EFFECTS_CSUPP =3D 1 << 0, + NVME_CMD_EFFECTS_LBCC =3D 1 << 1, + NVME_CMD_EFFECTS_NCC =3D 1 << 2, + NVME_CMD_EFFECTS_NIC =3D 1 << 3, + NVME_CMD_EFFECTS_CCC =3D 1 << 4, + NVME_CMD_EFFECTS_CSE_MASK =3D 3 << 16, + NVME_CMD_EFFECTS_UUID_SEL =3D 1 << 19, +}; + enum NvmeLogIdentifier { NVME_LOG_ERROR_INFO =3D 0x01, NVME_LOG_SMART_INFO =3D 0x02, NVME_LOG_FW_SLOT_INFO =3D 0x03, + NVME_LOG_CMD_EFFECTS =3D 0x05, }; =20 typedef struct QEMU_PACKED NvmePSD { @@ -849,6 +866,7 @@ enum NvmeIdCtrlFrmw { }; =20 enum NvmeIdCtrlLpa { + NVME_LPA_CSE =3D 1 << 1, NVME_LPA_EXTENDED =3D 1 << 2, }; =20 @@ -1048,6 +1066,7 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeErrorLog) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeFwSlotInfoLog) !=3D 512); QEMU_BUILD_BUG_ON(sizeof(NvmeSmartLog) !=3D 512); + QEMU_BUILD_BUG_ON(sizeof(NvmeEffectsLog) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdCtrl) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNs) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeSglDescriptor) !=3D 16); --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886237; cv=none; d=zohomail.com; s=zohoarc; b=k44dTXgoML25yWLU5ha8HZniAfNAyTiYHnU2h8B28KIYC8HINVLI23Jh9EfuK4ORac1DeCYrdVJY0NVy+q0kEgjQDhS38QuBWh1ZW1IL/9I/G4iLCwM9jP+SywE0/tjkvENsq5FNDT/CBoQIE0a+H9T3XxP3e1UddhSXrxX+P8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886237; 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=fVo8vBL0XrtpclRTugfd0hsuo5WrdkFIr7BFl5leD1w=; b=fIhTqQVcvtS4k4IlIbRTGYhdOYr/CVRwFsatIpG6CbSVGM045e/QehBuw4qY2GPX+d0cWy8Q52d78VsCTAiM3GNUtn6zeU16v0gb3gutUO+tx6FZ2WfAiX0j8QuR8qaBa2A05MkcyLX0UxlBFYoDmf3pkfr2lnrQbxHbF6dpI30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886237809499.41134370966574; Wed, 23 Sep 2020 11:37:17 -0700 (PDT) Received: from localhost ([::1]:36872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9dk-0003Qs-HH for importer@patchew.org; Wed, 23 Sep 2020 14:37:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O1-0004xk-9j; Wed, 23 Sep 2020 14:21:02 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Ny-00087W-Gh; Wed, 23 Sep 2020 14:21:00 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:18 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:01 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886184; x=1632422184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xdpXusWybkFA9Rs2pAr0H5eIRfH4rvQ8cawqr2z0APg=; b=YA0tYJpgoqDQP/9yg3N+VLCstVAeDTyJMxN26S0LGZZuCfDZAwmQxD8v P4TWHHXHjTN/zHj+DCM8zM7qeuzN3kOVS6WAhh74AbFOQABoSRpS2Szd9 WfugraCDBL1QqTQe40KXdPLGHI8C7kTOgxFHsXmjvYRW5EN3Pp88EaAZ0 5S1JtCiSD3DKEJFUJ1Q05VCH0Fhz2ojs+DtoTYKCnlMO3bPDNM5weX4pT JsvPVVKTnvndTZRYGjfc7BQdUGQ+1l9bGi+sPUAQYYKCS5E1r1mUDzP8L 4jq5RiRZs+ZNsd+pywXNq2fmMCrUhSI2vcMcwaNBQQBKEw2YP86qhbO3p A==; IronPort-SDR: Tb5UpFutWoOLVk58sMUaY4fWVHvq9ZLdmamcDOjcTryWuECtPbB2+yjPauRC+8SxqJXcWaGoNI Pn2suUtWZgGhyadgF3JPjm9zP1EB0tqdVhedD+0HVoKQgcjR/HNIG+1L5A7qsNGM9e8dsImJrN l+aFhTsJ9bzkDnDNkJrAEMKSTyyIF0SSomhv7n9c7/7jeuhG2cjBURVs/cgsbVPb7eN5xpR0GC XE/32gpA4peZaiatcKHq1jqmpnRf+kW0ab6QLzOTcqp1IBxNaX8WpwJCusJ/cA2ZPyED6MbFba hmw= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496343" IronPort-SDR: A53e7vhDOdMU0ZB8ACiu9S71PJr/EdtdvJQtUcuYoVU3xul4OHsqBeaxQ4gfkkk2RkkTYopIzc 21Q9NwRksUsg== IronPort-SDR: q6ZWsI8gXxGsKy7C783rzTgwK84Yf0iJu2I43vgl0RVHKxJm01VpkTgiH32g/bfDLcWEMEKTuB oDopo5bDRXyw== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 03/14] hw/block/nvme: Introduce the Namespace Types definitions Date: Thu, 24 Sep 2020 03:20:10 +0900 Message-Id: <20200923182021.3724-4-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Niklas Cassel Define the structures and constants required to implement Namespace Types support. Signed-off-by: Niklas Cassel Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 2 +- hw/block/nvme.h | 3 ++ include/block/nvme.h | 74 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 7807f296d3..96cd520feb 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1259,7 +1259,7 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl = *n, NvmeRequest *req) * here. */ ns_descrs->uuid.hdr.nidt =3D NVME_NIDT_UUID; - ns_descrs->uuid.hdr.nidl =3D NVME_NIDT_UUID_LEN; + ns_descrs->uuid.hdr.nidl =3D NVME_NIDL_UUID; stl_be_p(&ns_descrs->uuid.v, nsid); =20 return nvme_dma_prp(n, list, NVME_IDENTIFY_DATA_SIZE, prp1, prp2, diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 52ba794f2e..c1deac9667 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -64,6 +64,9 @@ typedef struct NvmeCQueue { =20 typedef struct NvmeNamespace { NvmeIdNs id_ns; + uint32_t nsid; + uint8_t csi; + QemuUUID uuid; } NvmeNamespace; =20 static inline NvmeLBAF *nvme_ns_lbaf(NvmeNamespace *ns) diff --git a/include/block/nvme.h b/include/block/nvme.h index 71126ae1ff..74cc11782e 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -51,6 +51,11 @@ enum NvmeCapMask { CAP_PMR_MASK =3D 0x1, }; =20 +enum NvmeCapCssBits { + CAP_CSS_NVM =3D 0x01, + CAP_CSS_CSI_SUPP =3D 0x40, +}; + #define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK) #define NVME_CAP_CQR(cap) (((cap) >> CAP_CQR_SHIFT) & CAP_CQR_MASK) #define NVME_CAP_AMS(cap) (((cap) >> CAP_AMS_SHIFT) & CAP_AMS_MASK) @@ -102,6 +107,12 @@ enum NvmeCcMask { CC_IOCQES_MASK =3D 0xf, }; =20 +enum NvmeCcCss { + CSS_NVM_ONLY =3D 0, + CSS_CSI =3D 6, + CSS_ADMIN_ONLY =3D 7, +}; + #define NVME_CC_EN(cc) ((cc >> CC_EN_SHIFT) & CC_EN_MASK) #define NVME_CC_CSS(cc) ((cc >> CC_CSS_SHIFT) & CC_CSS_MASK) #define NVME_CC_MPS(cc) ((cc >> CC_MPS_SHIFT) & CC_MPS_MASK) @@ -110,6 +121,21 @@ enum NvmeCcMask { #define NVME_CC_IOSQES(cc) ((cc >> CC_IOSQES_SHIFT) & CC_IOSQES_MASK) #define NVME_CC_IOCQES(cc) ((cc >> CC_IOCQES_SHIFT) & CC_IOCQES_MASK) =20 +#define NVME_SET_CC_EN(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_EN_MASK) << CC_EN_SHIFT) +#define NVME_SET_CC_CSS(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_CSS_MASK) << CC_CSS_SHIFT) +#define NVME_SET_CC_MPS(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_MPS_MASK) << CC_MPS_SHIFT) +#define NVME_SET_CC_AMS(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_AMS_MASK) << CC_AMS_SHIFT) +#define NVME_SET_CC_SHN(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_SHN_MASK) << CC_SHN_SHIFT) +#define NVME_SET_CC_IOSQES(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_IOSQES_MASK) << CC_IOSQES_SHIFT) +#define NVME_SET_CC_IOCQES(cc, val) \ + (cc |=3D (uint32_t)((val) & CC_IOCQES_MASK) << CC_IOCQES_SHIFT) + enum NvmeCstsShift { CSTS_RDY_SHIFT =3D 0, CSTS_CFS_SHIFT =3D 1, @@ -524,8 +550,13 @@ typedef struct QEMU_PACKED NvmeIdentify { uint64_t rsvd2[2]; uint64_t prp1; uint64_t prp2; - uint32_t cns; - uint32_t rsvd11[5]; + uint8_t cns; + uint8_t rsvd10; + uint16_t ctrlid; + uint16_t nvmsetid; + uint8_t rsvd11; + uint8_t csi; + uint32_t rsvd12[4]; } NvmeIdentify; =20 typedef struct QEMU_PACKED NvmeRwCmd { @@ -645,6 +676,7 @@ enum NvmeStatusCodes { NVME_MD_SGL_LEN_INVALID =3D 0x0010, NVME_SGL_DESCR_TYPE_INVALID =3D 0x0011, NVME_INVALID_USE_OF_CMB =3D 0x0012, + NVME_CMD_SET_CMB_REJECTED =3D 0x002b, NVME_LBA_RANGE =3D 0x0080, NVME_CAP_EXCEEDED =3D 0x0081, NVME_NS_NOT_READY =3D 0x0082, @@ -771,11 +803,15 @@ typedef struct QEMU_PACKED NvmePSD { =20 #define NVME_IDENTIFY_DATA_SIZE 4096 =20 -enum { - NVME_ID_CNS_NS =3D 0x0, - NVME_ID_CNS_CTRL =3D 0x1, - NVME_ID_CNS_NS_ACTIVE_LIST =3D 0x2, - NVME_ID_CNS_NS_DESCR_LIST =3D 0x3, +enum NvmeIdCns { + NVME_ID_CNS_NS =3D 0x00, + NVME_ID_CNS_CTRL =3D 0x01, + NVME_ID_CNS_NS_ACTIVE_LIST =3D 0x02, + NVME_ID_CNS_NS_DESCR_LIST =3D 0x03, + NVME_ID_CNS_CS_NS =3D 0x05, + NVME_ID_CNS_CS_CTRL =3D 0x06, + NVME_ID_CNS_CS_NS_ACTIVE_LIST =3D 0x07, + NVME_ID_CNS_IO_COMMAND_SET =3D 0x1c, }; =20 typedef struct QEMU_PACKED NvmeIdCtrl { @@ -922,6 +958,7 @@ enum NvmeFeatureIds { NVME_WRITE_ATOMICITY =3D 0xa, NVME_ASYNCHRONOUS_EVENT_CONF =3D 0xb, NVME_TIMESTAMP =3D 0xe, + NVME_COMMAND_SET_PROFILE =3D 0x19, NVME_SOFTWARE_PROGRESS_MARKER =3D 0x80, NVME_FID_MAX =3D 0x100, }; @@ -1006,18 +1043,26 @@ typedef struct QEMU_PACKED NvmeIdNsDescr { uint8_t rsvd2[2]; } NvmeIdNsDescr; =20 -enum { - NVME_NIDT_EUI64_LEN =3D 8, - NVME_NIDT_NGUID_LEN =3D 16, - NVME_NIDT_UUID_LEN =3D 16, +enum NvmeNsIdentifierLength { + NVME_NIDL_EUI64 =3D 8, + NVME_NIDL_NGUID =3D 16, + NVME_NIDL_UUID =3D 16, + NVME_NIDL_CSI =3D 1, }; =20 enum NvmeNsIdentifierType { - NVME_NIDT_EUI64 =3D 0x1, - NVME_NIDT_NGUID =3D 0x2, - NVME_NIDT_UUID =3D 0x3, + NVME_NIDT_EUI64 =3D 0x01, + NVME_NIDT_NGUID =3D 0x02, + NVME_NIDT_UUID =3D 0x03, + NVME_NIDT_CSI =3D 0x04, }; =20 +enum NvmeCsi { + NVME_CSI_NVM =3D 0x00, +}; + +#define NVME_SET_CSI(vec, csi) (vec |=3D (uint8_t)(1 << (csi))) + /*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10) #define NVME_ID_NS_DLFEAT_WRITE_ZEROES(dlfeat) ((dlfeat) & 0x08) @@ -1068,6 +1113,7 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeSmartLog) !=3D 512); QEMU_BUILD_BUG_ON(sizeof(NvmeEffectsLog) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdCtrl) !=3D 4096); + QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) !=3D 4); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNs) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeSglDescriptor) !=3D 16); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) !=3D 4); --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885499; cv=none; d=zohomail.com; s=zohoarc; b=b6CKZq9sfyHaMzw/fuDzP9S8nEfTT2kkLzylxPxU+T8by30EfsiWKNTfu0T/uRLAC8NANayzEww3I/mZ7U7cniBV91DWU1g66jQUFBmc/dXvQtRGhXxfQM1H9XLcPNyNtmRaugK8SshYi1pK8YWRhk6DJ7DhlKySZUje3PGq3ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885499; h=Content-Type: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=2Rm+2XOoLKTDv30aLbfrOMcpx5npbwlRDA99D7mBagU=; b=Lj8znflcGQVjyc7jyW23ECcxkEmSF16/rqEv4hjAWivWKAhnG4x6SlO1pw1oBPe/fX6W5hMG++j88U6RdNUx+7WqBmo2Z9I3lsWDjtXChnLVzJLWvNoJiQe7KCdcZT35prAa76LsXJbcYNh/IyCeVrbMhSfGrTGZ/HbPfnDwNxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600885499323915.1752894876932; Wed, 23 Sep 2020 11:24:59 -0700 (PDT) Received: from localhost ([::1]:38200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9Rp-0008Cy-SL for importer@patchew.org; Wed, 23 Sep 2020 14:24:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O2-0004y3-5t; Wed, 23 Sep 2020 14:21:02 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Nz-00086G-Dp; Wed, 23 Sep 2020 14:21:01 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:21 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:03 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886185; x=1632422185; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IAhlEP13HbhNfj4M5mv95R567EMtXnN0TBb732KkDp4=; b=HuVBFn973p9UlNsETMrXmc4UkNJB5ljcq9z4FBmVfs2Li28BjhNxJlwn HWx/4unUIhqHW+HjMK1LO4s61JaphkxApwR8j0KBfVoeNku5X1jcY+lXR OZMR4t4GULnUgBe7IsRxUmgkdwXLQ1OAuDLmH+KP/mBPdcOBpf2PkpwSu jqF7JbTDP2OEcMmQVxdfpnxwXxPnZ5oGdo85YdpIgyjane122nQpEWpEL z4pbA2YXFwQPf1Hh3oo3q9Rk7B5cawtzoZXCXLWCeKDHvPwU42MiMKe3v IdozRt9i4pJv8v+6TGkIoRivMJiWKjKy4ogcEDHy/Awstt4IYd+ygLwvs Q==; IronPort-SDR: s9qCNnQt5oFgbsbEgESLsrgzKt3aeUIZ73u5csvDlLw/RMKm3AJ/OUtcThWdsub5NGH4FiUEty YGj+N2GoCJUHVUoMQ7dQzwbqDygV1kM74fAjHVqwYsydvjQ2m5rXX7jrsh1JrhIDuD0l5ePhHY Kj26XvU/PLl1VVscIBt3TY5iaCNwtLb7wXgzL8VtS7o1iK29lF5U73PiQVQTwsPVECIH22xHyD Vp5WCjDgnOz2mRdT8r+aI0wAzzQrTyyRWwh9jhouY4vu1QE+Bjcx2CaCuVdO7hJsgH2PWBFOil ZMw= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496347" IronPort-SDR: uMedfqluOMBixqCZ9kd99VKQEnost8vVYn04Lk1pQ71C22sAFNW2O1wBc9gGfaLvxR7qS/EbKf KDoEfgFGEzQA== IronPort-SDR: 3hmEsuhgtwj6x1nTdEv7Qrg3PXRex/7q2Jp1i2KtPzPoA7nhENvgQyBqJT72aKgSaPZcXLWjSG ksuiUlKiG2cg== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 04/14] hw/block/nvme: Define trace events related to NS Types Date: Thu, 24 Sep 2020 03:20:11 +0900 Message-Id: <20200923182021.3724-5-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 11 minutes in the future.) A few trace events are defined that are relevant to implementing Namespace Types (NVMe TP 4056). Signed-off-by: Dmitry Fomichev Reviewed-by: Klaus Jensen Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/trace-events | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/block/trace-events b/hw/block/trace-events index 79c9da652d..2414dcbc79 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -46,8 +46,12 @@ pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_= t vector, uint16_t size, pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=3D%"PRIu16"" pci_nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=3D%"PRIu16"" pci_nvme_identify_ctrl(void) "identify controller" +pci_nvme_identify_ctrl_csi(uint8_t csi) "identify controller, csi=3D0x%"PR= Ix8"" pci_nvme_identify_ns(uint32_t ns) "nsid %"PRIu32"" +pci_nvme_identify_ns_csi(uint32_t ns, uint8_t csi) "nsid=3D%"PRIu32", csi= =3D0x%"PRIx8"" pci_nvme_identify_nslist(uint32_t ns) "nsid %"PRIu32"" +pci_nvme_identify_nslist_csi(uint16_t ns, uint8_t csi) "nsid=3D%"PRIu16", = csi=3D0x%"PRIx8"" +pci_nvme_identify_cmd_set(void) "identify i/o command set" pci_nvme_identify_ns_descr_list(uint32_t ns) "nsid %"PRIu32"" pci_nvme_get_log(uint16_t cid, uint8_t lid, uint8_t lsp, uint8_t rae, uint= 32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" lsp 0x%"PRIx8" rae 0x= %"PRIx8" len %"PRIu32" off %"PRIu64"" pci_nvme_getfeat(uint16_t cid, uint8_t fid, uint8_t sel, uint32_t cdw11) "= cid %"PRIu16" fid 0x%"PRIx8" sel 0x%"PRIx8" cdw11 0x%"PRIx32"" @@ -84,6 +88,8 @@ pci_nvme_mmio_stopped(void) "cleared controller enable bi= t" pci_nvme_mmio_shutdown_set(void) "shutdown bit set" pci_nvme_mmio_shutdown_cleared(void) "shutdown bit cleared" pci_nvme_cmd_supp_and_effects_log_read(void) "commands supported and effec= ts log read" +pci_nvme_css_nvm_cset_selected_by_host(uint32_t cc) "NVM command set selec= ted by host, bar.cc=3D0x%"PRIx32"" +pci_nvme_css_all_csets_sel_by_host(uint32_t cc) "all supported command set= s selected by host, bar.cc=3D0x%"PRIx32"" =20 # nvme traces for error conditions pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %zu" @@ -97,6 +103,9 @@ pci_nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x= %"PRIx8"" pci_nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx= 8"" pci_nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limi= t) "Invalid LBA start=3D%"PRIu64" len=3D%"PRIu64" limit=3D%"PRIu64"" pci_nvme_err_invalid_effects_log_offset(uint64_t ofs) "commands supported = and effects log offset must be 0, got %"PRIu64"" +pci_nvme_err_change_css_when_enabled(void) "changing CC.CSS while controll= er is enabled" +pci_nvme_err_only_nvm_cmd_set_avail(void) "setting 110b CC.CSS, but only N= VM command set is enabled" +pci_nvme_err_invalid_iocsci(uint32_t idx) "unsupported command set combina= tion index %"PRIu32"" pci_nvme_err_invalid_del_sq(uint16_t qid) "invalid submission queue deleti= on, sid=3D%"PRIu16"" pci_nvme_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submis= sion queue, invalid cqid=3D%"PRIu16"" pci_nvme_err_invalid_create_sq_sqid(uint16_t sqid) "failed creating submis= sion queue, invalid sqid=3D%"PRIu16"" @@ -152,6 +161,7 @@ pci_nvme_ub_db_wr_invalid_cq(uint32_t qid) "completion = queue doorbell write for pci_nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "complet= ion queue doorbell write value beyond queue size, cqid=3D%"PRIu32", new_hea= d=3D%"PRIu16", ignoring" pci_nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell writ= e for nonexistent queue, sqid=3D%"PRIu32", ignoring" pci_nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submiss= ion queue doorbell write value beyond queue size, sqid=3D%"PRIu32", new_hea= d=3D%"PRIu16", ignoring" +pci_nvme_ub_unknown_css_value(void) "unknown value in cc.css field" =20 # xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s= d%up%u" --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885917; cv=none; d=zohomail.com; s=zohoarc; b=ATkvpv4kqElNHf7fagxTxfTuR+46aaTUo3vzZTVU9rVR9gKYz0jLfcKKu/eFAIr/2dVV9GkAyAhZIltpRBXXja2MCHt+5yc6QhWAJjk7PqZHo+msVCf9B2puGPwbut2sr4Nct2Aa5vTSrLDbW59FiZO8sFJNC3wvGAY6VKHHp0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885917; 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=st3j/xfrdiNvczrgK6Rk0gFBct+H4pl8Drh5m71DFH0=; b=a0s0oxkdtjbskZL5fsl5pRDHS03IzhWR0fNkfhZd+Ph05l5OWgxwQf03hoDo1KxL1QfN46xcUbuwPyZZT6kiiz3NgwNhTiE9VkXiOghhKT4CBHlxn4uHXjy8+/RbGWlAQE9U1pioJ+5TJbuZFxhb9IviXjDBwNvl6Q88qjzCQ9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600885917601904.2547157312855; Wed, 23 Sep 2020 11:31:57 -0700 (PDT) Received: from localhost ([::1]:53642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9Ya-0006io-1e for importer@patchew.org; Wed, 23 Sep 2020 14:31:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O3-0004zE-Ip; Wed, 23 Sep 2020 14:21:03 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O1-00087h-0G; Wed, 23 Sep 2020 14:21:03 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:25 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:05 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:56 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886188; x=1632422188; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qi/iVB5mxYaS41B2kxv5wS0js21a8adSbknuqPoXaF0=; b=QFP0DI3cz58Cm+nqEeB08NMbTzb7GnKXM8R+wJQveZuRDOujCTFzxq8j uAaG3b41U+9TKZ+iGOpbr7d1n3RV/nrP/CEheYbqzMqRLfuYidjf02lT8 V0jwOjH0QVFDw8oQjsW4McxoQHuNfUrcEwzRRU8Mx4dFCTqYqzKT517pi AqrL2X7xzMeI+r/HYUNBIhcF7KZAvwE7fEQ/V9SjjA6kgS2sU9pn8kzMT z4Ev0B4fZN9bLVf8RBbxX9eGFwg0VfqJ/P1ROWBUX4hZN1y/ciINmB6O6 DW4fHUIQ5mZ4DMk8YgagS+tiPYH9Mrth61Ui5rdBqOfh9qgzkL6dFsytA w==; IronPort-SDR: 72ggEafsmcLFwceI0UUeMDLNJ+7Q5A64eZ5eo3/miKLtqwiN7thfIbefWsuJaFQChWs8cypQeI UaYOU8gzsAQBuCWfLTrBg0iIDCnpd8XiDFOiFz1Lj4h9RHmOMczfdaf0q8kkXQcloWFXrqgrDS 2EngLpQjIG0eeKzWC+oVXOrwPzZ+TQfZBVV0JGJIuLCE9Pj5zGhKeOgSGo/LrdEbmSciUsy7h8 C4RItlsnKOqVcQf/hc/skKLhwEm82/uVEyqKbq+MsKgah3f/ZOKcu7vlY+MoUTnnfF4Od+p5wn 0fI= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496352" IronPort-SDR: rRPvh5YT4P3r1egoEaYURxwqlyjWCW8OIMmP7IcHyC5QDHhuCvSi6HXy+5vweUDNQsjkseNRep paBxI6VUoSWw== IronPort-SDR: UbgLp49Sn1pjEOtHdGLSNzzrFeh5WgNB/VjUaVOVNETLYd5TqUJsfQuOr5XVZv0Ok0W/kLfHPE mYXdgOFUNGUA== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 05/14] hw/block/nvme: Add support for Namespace Types Date: Thu, 24 Sep 2020 03:20:12 +0900 Message-Id: <20200923182021.3724-6-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 4 minutes in the future.) Content-Type: text/plain; charset="utf-8" From: Niklas Cassel Namespace Types introduce a new command set, "I/O Command Sets", that allows the host to retrieve the command sets associated with a namespace. Introduce support for the command set and enable detection for the NVM Command Set. The new workflows for identify commands rely heavily on zero-filled identify structs. E.g., certain CNS commands are defined to return a zero-filled identify struct when an inactive namespace NSID is supplied. Add a helper function in order to avoid code duplication when reporting zero-filled identify structures. Signed-off-by: Niklas Cassel Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 204 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 184 insertions(+), 20 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 96cd520feb..e0f885498d 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1153,6 +1153,15 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequ= est *req) return NVME_SUCCESS; } =20 +static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n, uint64_t prp1, + uint64_t prp2, NvmeRequest *req) +{ + uint8_t id[NVME_IDENTIFY_DATA_SIZE] =3D {}; + + return nvme_dma_prp(n, id, sizeof(id), prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); +} + static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; @@ -1165,6 +1174,21 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, Nvme= Request *req) prp2, DMA_DIRECTION_FROM_DEVICE, req); } =20 +static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + uint64_t prp1 =3D le64_to_cpu(c->prp1); + uint64_t prp2 =3D le64_to_cpu(c->prp2); + + trace_pci_nvme_identify_ctrl_csi(c->csi); + + if (c->csi =3D=3D NVME_CSI_NVM) { + return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) { NvmeNamespace *ns; @@ -1181,11 +1205,37 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeR= equest *req) } =20 ns =3D &n->namespaces[nsid - 1]; + assert(nsid =3D=3D ns->nsid); =20 return nvme_dma_prp(n, (uint8_t *)&ns->id_ns, sizeof(ns->id_ns), prp1, prp2, DMA_DIRECTION_FROM_DEVICE, req); } =20 +static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + NvmeNamespace *ns; + uint32_t nsid =3D le32_to_cpu(c->nsid); + uint64_t prp1 =3D le64_to_cpu(c->prp1); + uint64_t prp2 =3D le64_to_cpu(c->prp2); + + trace_pci_nvme_identify_ns_csi(nsid, c->csi); + + if (unlikely(nsid =3D=3D 0 || nsid > n->num_namespaces)) { + trace_pci_nvme_err_invalid_ns(nsid, n->num_namespaces); + return NVME_INVALID_NSID | NVME_DNR; + } + + ns =3D &n->namespaces[nsid - 1]; + assert(nsid =3D=3D ns->nsid); + + if (c->csi =3D=3D NVME_CSI_NVM) { + return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } + + return NVME_INVALID_FIELD | NVME_DNR; +} + static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; @@ -1225,23 +1275,51 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, N= vmeRequest *req) return ret; } =20 +static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + static const int data_len =3D NVME_IDENTIFY_DATA_SIZE; + uint32_t min_nsid =3D le32_to_cpu(c->nsid); + uint64_t prp1 =3D le64_to_cpu(c->prp1); + uint64_t prp2 =3D le64_to_cpu(c->prp2); + uint32_t *list; + uint16_t ret; + int i, j =3D 0; + + trace_pci_nvme_identify_nslist_csi(min_nsid, c->csi); + + if (c->csi !=3D NVME_CSI_NVM) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + list =3D g_malloc0(data_len); + for (i =3D 0; i < n->num_namespaces; i++) { + if (i < min_nsid) { + continue; + } + list[j++] =3D cpu_to_le32(i + 1); + if (j =3D=3D data_len / sizeof(uint32_t)) { + break; + } + } + ret =3D nvme_dma_prp(n, (uint8_t *)list, data_len, prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); + g_free(list); + return ret; +} + static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + NvmeNamespace *ns; uint32_t nsid =3D le32_to_cpu(c->nsid); uint64_t prp1 =3D le64_to_cpu(c->prp1); uint64_t prp2 =3D le64_to_cpu(c->prp2); - - uint8_t list[NVME_IDENTIFY_DATA_SIZE]; - - struct data { - struct { - NvmeIdNsDescr hdr; - uint8_t v[16]; - } uuid; - }; - - struct data *ns_descrs =3D (struct data *)list; + void *buf_ptr; + NvmeIdNsDescr *desc; + static const int data_len =3D NVME_IDENTIFY_DATA_SIZE; + uint8_t *buf; + uint16_t status; =20 trace_pci_nvme_identify_ns_descr_list(nsid); =20 @@ -1250,7 +1328,11 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl= *n, NvmeRequest *req) return NVME_INVALID_NSID | NVME_DNR; } =20 - memset(list, 0x0, sizeof(list)); + ns =3D &n->namespaces[nsid - 1]; + assert(nsid =3D=3D ns->nsid); + + buf =3D g_malloc0(data_len); + buf_ptr =3D buf; =20 /* * Because the NGUID and EUI64 fields are 0 in the Identify Namespace = data @@ -1258,12 +1340,44 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtr= l *n, NvmeRequest *req) * Namespace Identification Descriptor. Add a very basic Namespace UUID * here. */ - ns_descrs->uuid.hdr.nidt =3D NVME_NIDT_UUID; - ns_descrs->uuid.hdr.nidl =3D NVME_NIDL_UUID; - stl_be_p(&ns_descrs->uuid.v, nsid); + desc =3D buf_ptr; + desc->nidt =3D NVME_NIDT_UUID; + desc->nidl =3D NVME_NIDL_UUID; + buf_ptr +=3D sizeof(*desc); + memcpy(buf_ptr, ns->uuid.data, NVME_NIDL_UUID); + buf_ptr +=3D NVME_NIDL_UUID; =20 - return nvme_dma_prp(n, list, NVME_IDENTIFY_DATA_SIZE, prp1, prp2, - DMA_DIRECTION_FROM_DEVICE, req); + desc =3D buf_ptr; + desc->nidt =3D NVME_NIDT_CSI; + desc->nidl =3D NVME_NIDL_CSI; + buf_ptr +=3D sizeof(*desc); + *(uint8_t *)buf_ptr =3D NVME_CSI_NVM; + + status =3D nvme_dma_prp(n, buf, data_len, prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); + g_free(buf); + return status; +} + +static uint16_t nvme_identify_cmd_set(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + uint64_t prp1 =3D le64_to_cpu(c->prp1); + uint64_t prp2 =3D le64_to_cpu(c->prp2); + static const int data_len =3D NVME_IDENTIFY_DATA_SIZE; + uint32_t *list; + uint8_t *ptr; + uint16_t status; + + trace_pci_nvme_identify_cmd_set(); + + list =3D g_malloc0(data_len); + ptr =3D (uint8_t *)list; + NVME_SET_CSI(*ptr, NVME_CSI_NVM); + status =3D nvme_dma_prp(n, (uint8_t *)list, data_len, prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); + g_free(list); + return status; } =20 static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) @@ -1273,12 +1387,20 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequ= est *req) switch (le32_to_cpu(c->cns)) { case NVME_ID_CNS_NS: return nvme_identify_ns(n, req); + case NVME_ID_CNS_CS_NS: + return nvme_identify_ns_csi(n, req); case NVME_ID_CNS_CTRL: return nvme_identify_ctrl(n, req); + case NVME_ID_CNS_CS_CTRL: + return nvme_identify_ctrl_csi(n, req); case NVME_ID_CNS_NS_ACTIVE_LIST: return nvme_identify_nslist(n, req); + case NVME_ID_CNS_CS_NS_ACTIVE_LIST: + return nvme_identify_nslist_csi(n, req); case NVME_ID_CNS_NS_DESCR_LIST: return nvme_identify_ns_descr_list(n, req); + case NVME_ID_CNS_IO_COMMAND_SET: + return nvme_identify_cmd_set(n, req); default: trace_pci_nvme_err_invalid_identify_cns(le32_to_cpu(c->cns)); return NVME_INVALID_FIELD | NVME_DNR; @@ -1460,6 +1582,9 @@ defaults: result |=3D NVME_INTVC_NOCOALESCING; } =20 + break; + case NVME_COMMAND_SET_PROFILE: + result =3D 0; break; default: result =3D nvme_feature_default[fid]; @@ -1584,6 +1709,12 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRe= quest *req) break; case NVME_TIMESTAMP: return nvme_set_feature_timestamp(n, req); + case NVME_COMMAND_SET_PROFILE: + if (dw11 & 0x1ff) { + trace_pci_nvme_err_invalid_iocsci(dw11 & 0x1ff); + return NVME_CMD_SET_CMB_REJECTED | NVME_DNR; + } + break; default: return NVME_FEAT_NOT_CHANGEABLE | NVME_DNR; } @@ -1845,6 +1976,30 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offse= t, uint64_t data, break; case 0x14: /* CC */ trace_pci_nvme_mmio_cfg(data & 0xffffffff); + + if (NVME_CC_CSS(data) !=3D NVME_CC_CSS(n->bar.cc)) { + if (NVME_CC_EN(n->bar.cc)) { + NVME_GUEST_ERR(pci_nvme_err_change_css_when_enabled, + "changing selected command set when enabled= "); + } else { + switch (NVME_CC_CSS(data)) { + case CSS_NVM_ONLY: + trace_pci_nvme_css_nvm_cset_selected_by_host(data & + 0xfffffff= f); + break; + case CSS_CSI: + NVME_SET_CC_CSS(n->bar.cc, CSS_CSI); + trace_pci_nvme_css_all_csets_sel_by_host(data & 0xffff= ffff); + break; + case CSS_ADMIN_ONLY: + break; + default: + NVME_GUEST_ERR(pci_nvme_ub_unknown_css_value, + "unknown value in CC.CSS field"); + } + } + } + /* Windows first sends data, then sends enable bit */ if (!NVME_CC_EN(data) && !NVME_CC_EN(n->bar.cc) && !NVME_CC_SHN(data) && !NVME_CC_SHN(n->bar.cc)) @@ -2255,6 +2410,8 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeName= space *ns, Error **errp) =20 n->ns_size =3D bs_size; =20 + ns->csi =3D NVME_CSI_NVM; + qemu_uuid_generate(&ns->uuid); /* TODO make UUIDs persistent */ lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); id_ns->lbaf[lba_index].ds =3D 31 - clz32(n->conf.logical_block_size); id_ns->nsze =3D cpu_to_le64(nvme_ns_nlbas(n, ns)); @@ -2419,7 +2576,11 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *p= ci_dev) NVME_CAP_SET_MQES(n->bar.cap, 0x7ff); NVME_CAP_SET_CQR(n->bar.cap, 1); NVME_CAP_SET_TO(n->bar.cap, 0xf); - NVME_CAP_SET_CSS(n->bar.cap, 1); + /* + * The device now always supports NS Types, but all commands + * that support CSI field will only handle NVM Command Set. + */ + NVME_CAP_SET_CSS(n->bar.cap, (CAP_CSS_NVM | CAP_CSS_CSI_SUPP)); NVME_CAP_SET_MPSMAX(n->bar.cap, 4); =20 n->bar.vs =3D NVME_SPEC_VER; @@ -2429,6 +2590,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) static void nvme_realize(PCIDevice *pci_dev, Error **errp) { NvmeCtrl *n =3D NVME(pci_dev); + NvmeNamespace *ns; Error *local_err =3D NULL; =20 int i; @@ -2454,8 +2616,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error *= *errp) =20 nvme_init_ctrl(n, pci_dev); =20 - for (i =3D 0; i < n->num_namespaces; i++) { - nvme_init_namespace(n, &n->namespaces[i], &local_err); + ns =3D n->namespaces; + for (i =3D 0; i < n->num_namespaces; i++, ns++) { + ns->nsid =3D i + 1; + nvme_init_namespace(n, ns, &local_err); if (local_err) { error_propagate(errp, local_err); return; --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886183; cv=none; d=zohomail.com; s=zohoarc; b=V/hojhBfYeKbJF8ZIaJouUW/tiv7x9d10bqJuy05DAEsWXRpVC1tO+wvMqUboFEJMNj5HBGy8vh6xP3BHvzRdNBqTW1fSHtONH0g6QL7JDfSA+XQ1xIONmM1tA8m5c4WZby+eX6EjP6NrBQOhPPvPb4JK141UWYaRmEMUkFtY/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886183; 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=vYrrVZ3n5byisF48JQgPOgB1Cl9Qx2NhGs9UtTl2HoQ=; b=Glk/qkwGPobXniGXgL1oyzxdDuipPKwyGUZjX0uNug8PqZ4iPy4jOn+aZyEQ2F0DvjaEmTiC6hNTeXbQJ/kh0Q+IdweNdabLkumPFCZ69+bVZqQ/hsKTx3h/zk8i1SpDxXtEqzBk7+/d321dUrcErEYWi9k1BPBICFUrWdXcXPM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886183946763.3289404791825; Wed, 23 Sep 2020 11:36:23 -0700 (PDT) Received: from localhost ([::1]:34294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9cs-0002Iq-Ej for importer@patchew.org; Wed, 23 Sep 2020 14:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O5-00050I-AJ; Wed, 23 Sep 2020 14:21:05 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O2-00087W-VZ; Wed, 23 Sep 2020 14:21:04 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:28 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:07 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:20:59 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886191; x=1632422191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=s6cDsW3WbSkWhspWjAxerfP9yy04QK9FuNgm9yBdiXc=; b=pxA7w//rCVlPHv3h2lg409V+2S2na9yV9j1/NKBBSLz+YDGfbrUPOIUL n4vdU5LZdf76Qa8cbNIn9218gRGgQNh9W0awDbAGnN8dQBkwh3Ok6JY0x HKT7fGiPmr7pKT3UwRCCQ1E4vlY1wjSfFgD70nRKLdcxCG6Csy13Ze9+h isYyPLMnrvA3q3xyOPMBDbj3o3TJcxAXH7d2+d5nkon9jgx4ws+dJjDvF aU+UE3J7r577XDSIlEejnHbEpnGjqWRc9erM2v58d8oBGUaDw3hRxqHsE YWK6NQfv9xZNZpj59T9bv40dvmfsvlns4w/WxFmFDfM/jGDBKrpN/YFYa g==; IronPort-SDR: Ghg0c3hKVLd9GRhmrJifBmGZwBrQF8ApwueoaBhgUtfuqvFL6mCLzfCeRXzC9FXYcGVy+hKqF/ 4uRsOmc/zHOcHz1mUGt9WQCAkXYsettegTpOZ8zv30G9GsYJ57kgkW8vdvFRm4oZnHUk7tI+BF HV+lYQYzkuSGj497FzZVMEpnGu4FWSSwH7rSMIL2DOGzY9F8JwM2counL/Jtd0hR3IO0TlONQa BZGXGKu4ANWzBwCAjvRmd1SXvhhhcEyD6NtiqNBatfj71h74R6zf23L3aJgqH4pK4YZf6v0cPw IbE= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496355" IronPort-SDR: tkrUQUTiXHrVtT7dGiEagH7mwADsTTvZuwsI42aNiShHLGVvX4ZjqvGK16and2yV6YuZmV+aKd C7JAXToFDyIQ== IronPort-SDR: 5plRlXxzd730vhK1bjz8r9YeN32XZpIRIfaPaN9Ggt4qzo/ztapJDGCl7t3jUvmxBhiE2pwXei 9cTdh1LpDwOg== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 06/14] hw/block/nvme: Add support for active/inactive namespaces Date: Thu, 24 Sep 2020 03:20:13 +0900 Message-Id: <20200923182021.3724-7-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is -8 seconds in the future.) Content-Type: text/plain; charset="utf-8" From: Niklas Cassel In NVMe, a namespace is active if it exists and is attached to the controller. CAP.CSS (together with the I/O Command Set data structure) defines what command sets are supported by the controller. CC.CSS (together with Set Profile) can be set to enable a subset of the available command sets. The namespaces belonging to a disabled command set will not be able to attach to the controller, and will thus be inactive. E.g., if the user sets CC.CSS to Admin Only, NVM namespaces should be marked as inactive. The identify namespace, the identify namespace CSI specific, and the namesp= ace list commands have two different versions, one that only shows active namespaces, and the other version that shows existing namespaces, regardless of whether the namespace is attached or not. Add an attached member to struct NvmeNamespace, and implement the missing C= NS commands. The added functionality will also simplify the implementation of namespace management in the future, since namespace management can also attach and detach namespaces. Signed-off-by: Niklas Cassel Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 54 ++++++++++++++++++++++++++++++++++++-------- hw/block/nvme.h | 1 + include/block/nvme.h | 20 +++++++++------- 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index e0f885498d..6c231b20f9 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1189,7 +1189,8 @@ static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, N= vmeRequest *req) return NVME_INVALID_FIELD | NVME_DNR; } =20 -static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) +static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req, + bool only_active) { NvmeNamespace *ns; NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; @@ -1207,11 +1208,16 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeR= equest *req) ns =3D &n->namespaces[nsid - 1]; assert(nsid =3D=3D ns->nsid); =20 + if (only_active && !ns->attached) { + return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } + return nvme_dma_prp(n, (uint8_t *)&ns->id_ns, sizeof(ns->id_ns), prp1, prp2, DMA_DIRECTION_FROM_DEVICE, req); } =20 -static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req) +static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req, + bool only_active) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; NvmeNamespace *ns; @@ -1229,6 +1235,10 @@ static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, Nv= meRequest *req) ns =3D &n->namespaces[nsid - 1]; assert(nsid =3D=3D ns->nsid); =20 + if (only_active && !ns->attached) { + return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } + if (c->csi =3D=3D NVME_CSI_NVM) { return nvme_rpt_empty_id_struct(n, prp1, prp2, req); } @@ -1236,7 +1246,8 @@ static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, Nvm= eRequest *req) return NVME_INVALID_FIELD | NVME_DNR; } =20 -static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) +static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req, + bool only_active) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; static const int data_len =3D NVME_IDENTIFY_DATA_SIZE; @@ -1261,7 +1272,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, Nvm= eRequest *req) =20 list =3D g_malloc0(data_len); for (i =3D 0; i < n->num_namespaces; i++) { - if (i < min_nsid) { + if (i < min_nsid || (only_active && !n->namespaces[i].attached)) { continue; } list[j++] =3D cpu_to_le32(i + 1); @@ -1275,7 +1286,8 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, Nvm= eRequest *req) return ret; } =20 -static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req) +static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req, + bool only_active) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; static const int data_len =3D NVME_IDENTIFY_DATA_SIZE; @@ -1294,7 +1306,8 @@ static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n,= NvmeRequest *req) =20 list =3D g_malloc0(data_len); for (i =3D 0; i < n->num_namespaces; i++) { - if (i < min_nsid) { + if (i < min_nsid || c->csi !=3D n->namespaces[i].csi || + (only_active && !n->namespaces[i].attached)) { continue; } list[j++] =3D cpu_to_le32(i + 1); @@ -1386,17 +1399,25 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequ= est *req) =20 switch (le32_to_cpu(c->cns)) { case NVME_ID_CNS_NS: - return nvme_identify_ns(n, req); + return nvme_identify_ns(n, req, true); case NVME_ID_CNS_CS_NS: - return nvme_identify_ns_csi(n, req); + return nvme_identify_ns_csi(n, req, true); + case NVME_ID_CNS_NS_PRESENT: + return nvme_identify_ns(n, req, false); + case NVME_ID_CNS_CS_NS_PRESENT: + return nvme_identify_ns_csi(n, req, false); case NVME_ID_CNS_CTRL: return nvme_identify_ctrl(n, req); case NVME_ID_CNS_CS_CTRL: return nvme_identify_ctrl_csi(n, req); case NVME_ID_CNS_NS_ACTIVE_LIST: - return nvme_identify_nslist(n, req); + return nvme_identify_nslist(n, req, true); case NVME_ID_CNS_CS_NS_ACTIVE_LIST: - return nvme_identify_nslist_csi(n, req); + return nvme_identify_nslist_csi(n, req, true); + case NVME_ID_CNS_NS_PRESENT_LIST: + return nvme_identify_nslist(n, req, false); + case NVME_ID_CNS_CS_NS_PRESENT_LIST: + return nvme_identify_nslist_csi(n, req, false); case NVME_ID_CNS_NS_DESCR_LIST: return nvme_identify_ns_descr_list(n, req); case NVME_ID_CNS_IO_COMMAND_SET: @@ -1838,6 +1859,7 @@ static int nvme_start_ctrl(NvmeCtrl *n) { uint32_t page_bits =3D NVME_CC_MPS(n->bar.cc) + 12; uint32_t page_size =3D 1 << page_bits; + int i; =20 if (unlikely(n->cq[0])) { trace_pci_nvme_err_startfail_cq(); @@ -1924,6 +1946,18 @@ static int nvme_start_ctrl(NvmeCtrl *n) nvme_init_sq(&n->admin_sq, n, n->bar.asq, 0, 0, NVME_AQA_ASQS(n->bar.aqa) + 1); =20 + for (i =3D 0; i < n->num_namespaces; i++) { + n->namespaces[i].attached =3D false; + switch (n->namespaces[i].csi) { + case NVME_CSI_NVM: + if (NVME_CC_CSS(n->bar.cc) =3D=3D CSS_NVM_ONLY || + NVME_CC_CSS(n->bar.cc) =3D=3D CSS_CSI) { + n->namespaces[i].attached =3D true; + } + break; + } + } + nvme_set_timestamp(n, 0ULL); =20 QTAILQ_INIT(&n->aer_queue); diff --git a/hw/block/nvme.h b/hw/block/nvme.h index c1deac9667..71e4344471 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -66,6 +66,7 @@ typedef struct NvmeNamespace { NvmeIdNs id_ns; uint32_t nsid; uint8_t csi; + bool attached; QemuUUID uuid; } NvmeNamespace; =20 diff --git a/include/block/nvme.h b/include/block/nvme.h index 74cc11782e..f8356394f5 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -804,14 +804,18 @@ typedef struct QEMU_PACKED NvmePSD { #define NVME_IDENTIFY_DATA_SIZE 4096 =20 enum NvmeIdCns { - NVME_ID_CNS_NS =3D 0x00, - NVME_ID_CNS_CTRL =3D 0x01, - NVME_ID_CNS_NS_ACTIVE_LIST =3D 0x02, - NVME_ID_CNS_NS_DESCR_LIST =3D 0x03, - NVME_ID_CNS_CS_NS =3D 0x05, - NVME_ID_CNS_CS_CTRL =3D 0x06, - NVME_ID_CNS_CS_NS_ACTIVE_LIST =3D 0x07, - NVME_ID_CNS_IO_COMMAND_SET =3D 0x1c, + NVME_ID_CNS_NS =3D 0x00, + NVME_ID_CNS_CTRL =3D 0x01, + NVME_ID_CNS_NS_ACTIVE_LIST =3D 0x02, + NVME_ID_CNS_NS_DESCR_LIST =3D 0x03, + NVME_ID_CNS_CS_NS =3D 0x05, + NVME_ID_CNS_CS_CTRL =3D 0x06, + NVME_ID_CNS_CS_NS_ACTIVE_LIST =3D 0x07, + NVME_ID_CNS_NS_PRESENT_LIST =3D 0x10, + NVME_ID_CNS_NS_PRESENT =3D 0x11, + NVME_ID_CNS_CS_NS_PRESENT_LIST =3D 0x1a, + NVME_ID_CNS_CS_NS_PRESENT =3D 0x1b, + NVME_ID_CNS_IO_COMMAND_SET =3D 0x1c, }; =20 typedef struct QEMU_PACKED NvmeIdCtrl { --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885738; cv=none; d=zohomail.com; s=zohoarc; b=GrDzgbx9JnQIdPuDMvj5b4ZZCrXSlZc3zVtNQ3sZ8kmcDyMczD0YHzcDjbIfX58ffIv/8kUaZ3IvhveVwX6LbaNtjLZ3ozzsVf46x8Z49VxjvM6oMaG8c87YNjptekvD95Nz9Tb2S1mIy48pKLfXFGDc7tWePb5EnxMGWWwh6fM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885738; 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=mAI7LutLbG5rGoSXHdd1Sv3rvVyLjfduufftWXPQwP8=; b=MnpXFRBlOQuKhL+8MLYf9sDVqeWa49ON1+X/u+E7EPklZAHLWmxmujLOlQS8W8EEydvxCn0lpIXqXunulpncLLEjG77mYcyOg9bKSVSLz/hbp2+2sTkBHO1E5qRZW/gU5vBrRPcG7MUPHWah9ZLzukQSAYXOJjkroL5x4F8m8mA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160088573853777.03509056913856; Wed, 23 Sep 2020 11:28:58 -0700 (PDT) Received: from localhost ([::1]:46580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9Vh-0003ZF-4k for importer@patchew.org; Wed, 23 Sep 2020 14:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O8-00056w-4e; Wed, 23 Sep 2020 14:21:08 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O5-0008Do-8z; Wed, 23 Sep 2020 14:21:07 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:32 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:10 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:01 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886194; x=1632422194; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=199sUUh5EtHQdVjH8Or0sO4K4O1nxN4iy26w+M1SiZ0=; b=gPoxDwaDcYhpCo8eHg3jkNKucLf6YjQQf83znxY5RtQZmCERVQFBbRHR To5xNrq/nIqEFs0NUDEtare55D9yXQ70dSa4gv7NBf0yHhHYyViiQfRO1 +2pUeDH68eIyGfE5LUcZFImcD63uXbHAJzl0hKWDiOky6pUBt8cEyGay5 SyUmv8v+tAcJfFLd+1Xfz051xRQcgrnQF2nNYebpiUu9jndcF0hfw+hVn lGXxA4aQG5AAUYuER1Dgk+9Jriro9Xt07VWhw65kG6jElQsy+hY+Le9kO KMiITIWHV0Pwgyr8HHyBxFxxNVShShE48Wd9QUIBsJA9ts7XnyQfLP1xC g==; IronPort-SDR: 44dJnRgu+OL66B9x52H5vZrdiIGcZenkiPtxuEohH8cg65J+YGpSzqXsU8T2FmpgDSJevjfbA8 XavxncfKK6SaZQpkXjJ/0e+feM3sQh4aFl1y8riRR9k09E1nbnRTsiVvIIFntXTs5ZP+A1Gpdh urKnVC0MoR+6uRybnPPHZeeO0mtZuvxgRwId6v2Z/nbzd2q1wV0sFtD4RDYd/XZ1LbVD33DIV+ lC7pxHTobL4yemMA26K30srcwS20G0Z4pBC3menzn1d/e9+PYiWP2m28YxnQBRHqVn6mmPw5Wo fVQ= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496361" IronPort-SDR: GoSXorgayj2/WCi+Yvb2EIE/y4lnY6h33iUYu5KRqfclWXm1o+ZunEntC03SDJXxnBsjH/KkVN 4bsgTOsw4PUQ== IronPort-SDR: ZXKbp67ea3UVhraalE0Ixgj92IdwWMJjhaM7Sy0f374xenJniNYNDW5kPtj81HGowDP+JPfQCA rn0kSIHVFYIg== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 07/14] hw/block/nvme: Make Zoned NS Command Set definitions Date: Thu, 24 Sep 2020 03:20:14 +0900 Message-Id: <20200923182021.3724-8-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 7 minutes in the future.) Content-Type: text/plain; charset="utf-8" Define values and structures that are needed to support Zoned Namespace Command Set (NVMe TP 4053) in PCI NVMe controller emulator. All new protocol definitions are located in include/block/nvme.h and everything added that is specific to this implementation is kept in hw/block/nvme.h. In order to improve scalability, all open, closed and full zones are organized in separate linked lists. Consequently, almost all zone operations don't require scanning of the entire zone array (which potentially can be quite large) - it is only necessary to enumerate one or more zone lists. Zone lists are designed to be position-independent as they can be persisted to the backing file as a part of zone metadata. NvmeZoneList struct defined in this patch serves as a head of every zone list. NvmeZone structure encapsulates NvmeZoneDescriptor defined in Zoned Command Set specification and adds a few more fields that are internal to this implementation. Signed-off-by: Niklas Cassel Signed-off-by: Hans Holmberg Signed-off-by: Ajay Joshi Signed-off-by: Matias Bjorling Signed-off-by: Shin'ichiro Kawasaki Signed-off-by: Alexey Bogoslavsky Signed-off-by: Dmitry Fomichev --- hw/block/nvme.h | 124 +++++++++++++++++++++++++++++++++++++++++++ include/block/nvme.h | 107 +++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+) diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 71e4344471..d9f307f0ed 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -3,6 +3,9 @@ =20 #include "block/nvme.h" =20 +#define NVME_DEFAULT_ZONE_SIZE 128 /* MiB */ +#define NVME_DEFAULT_MAX_ZA_SIZE 128 /* KiB */ + typedef struct NvmeParams { char *serial; uint32_t num_queues; /* deprecated since 5.1 */ @@ -12,6 +15,13 @@ typedef struct NvmeParams { uint8_t aerl; uint32_t aer_max_queued; uint8_t mdts; + + bool zoned; + bool cross_zone_read; + uint8_t fill_pattern; + uint32_t zasl_kb; + uint64_t zone_size_mb; + uint64_t zone_capacity_mb; } NvmeParams; =20 typedef struct NvmeAsyncEvent { @@ -24,6 +34,7 @@ typedef struct NvmeRequest { struct NvmeNamespace *ns; BlockAIOCB *aiocb; uint16_t status; + int64_t fill_ofs; NvmeCqe cqe; NvmeCmd cmd; BlockAcctCookie acct; @@ -62,12 +73,36 @@ typedef struct NvmeCQueue { QTAILQ_HEAD(, NvmeRequest) req_list; } NvmeCQueue; =20 +typedef struct NvmeZone { + NvmeZoneDescr d; + uint64_t w_ptr; + uint32_t next; + uint32_t prev; + uint8_t rsvd80[8]; +} NvmeZone; + +#define NVME_ZONE_LIST_NIL UINT_MAX + +typedef struct NvmeZoneList { + uint32_t head; + uint32_t tail; + uint32_t size; + uint8_t rsvd12[4]; +} NvmeZoneList; + typedef struct NvmeNamespace { NvmeIdNs id_ns; uint32_t nsid; uint8_t csi; bool attached; QemuUUID uuid; + + NvmeIdNsZoned *id_ns_zoned; + NvmeZone *zone_array; + NvmeZoneList *exp_open_zones; + NvmeZoneList *imp_open_zones; + NvmeZoneList *closed_zones; + NvmeZoneList *full_zones; } NvmeNamespace; =20 static inline NvmeLBAF *nvme_ns_lbaf(NvmeNamespace *ns) @@ -126,6 +161,15 @@ typedef struct NvmeCtrl { QTAILQ_HEAD(, NvmeAsyncEvent) aer_queue; int aer_queued; =20 + int zone_file_fd; + uint32_t num_zones; + uint64_t zone_size; + uint64_t zone_capacity; + uint64_t zone_array_size; + uint32_t zone_size_log2; + uint32_t zasl_bs; + uint8_t zasl; + NvmeNamespace *namespaces; NvmeSQueue **sq; NvmeCQueue **cq; @@ -141,4 +185,84 @@ static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, Nvme= Namespace *ns) return n->ns_size >> nvme_ns_lbads(ns); } =20 +static inline uint8_t nvme_get_zone_state(NvmeZone *zone) +{ + return zone->d.zs >> 4; +} + +static inline void nvme_set_zone_state(NvmeZone *zone, enum NvmeZoneState = state) +{ + zone->d.zs =3D state << 4; +} + +static inline uint64_t nvme_zone_rd_boundary(NvmeCtrl *n, NvmeZone *zone) +{ + return zone->d.zslba + n->zone_size; +} + +static inline uint64_t nvme_zone_wr_boundary(NvmeZone *zone) +{ + return zone->d.zslba + zone->d.zcap; +} + +static inline bool nvme_wp_is_valid(NvmeZone *zone) +{ + uint8_t st =3D nvme_get_zone_state(zone); + + return st !=3D NVME_ZONE_STATE_FULL && + st !=3D NVME_ZONE_STATE_READ_ONLY && + st !=3D NVME_ZONE_STATE_OFFLINE; +} + +/* + * Initialize a zone list head. + */ +static inline void nvme_init_zone_list(NvmeZoneList *zl) +{ + zl->head =3D NVME_ZONE_LIST_NIL; + zl->tail =3D NVME_ZONE_LIST_NIL; + zl->size =3D 0; +} + +/* + * Initialize the number of entries contained in a zone list. + */ +static inline uint32_t nvme_zone_list_size(NvmeZoneList *zl) +{ + return zl->size; +} + +/* + * Check if the zone is not currently included into any zone list. + */ +static inline bool nvme_zone_not_in_list(NvmeZone *zone) +{ + return (bool)(zone->prev =3D=3D 0 && zone->next =3D=3D 0); +} + +/* + * Return the zone at the head of zone list or NULL if the list is empty. + */ +static inline NvmeZone *nvme_peek_zone_head(NvmeNamespace *ns, NvmeZoneLis= t *zl) +{ + if (zl->head =3D=3D NVME_ZONE_LIST_NIL) { + return NULL; + } + return &ns->zone_array[zl->head]; +} + +/* + * Return the next zone in the list. + */ +static inline NvmeZone *nvme_next_zone_in_list(NvmeNamespace *ns, NvmeZone= *z, + NvmeZoneList *zl) +{ + assert(!nvme_zone_not_in_list(z)); + + if (z->next =3D=3D NVME_ZONE_LIST_NIL) { + return NULL; + } + return &ns->zone_array[z->next]; +} + #endif /* HW_NVME_H */ diff --git a/include/block/nvme.h b/include/block/nvme.h index f8356394f5..ced66cf4eb 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -488,6 +488,9 @@ enum NvmeIoCommands { NVME_CMD_COMPARE =3D 0x05, NVME_CMD_WRITE_ZEROES =3D 0x08, NVME_CMD_DSM =3D 0x09, + NVME_CMD_ZONE_MGMT_SEND =3D 0x79, + NVME_CMD_ZONE_MGMT_RECV =3D 0x7a, + NVME_CMD_ZONE_APPEND =3D 0x7d, }; =20 typedef struct QEMU_PACKED NvmeDeleteQ { @@ -677,6 +680,7 @@ enum NvmeStatusCodes { NVME_SGL_DESCR_TYPE_INVALID =3D 0x0011, NVME_INVALID_USE_OF_CMB =3D 0x0012, NVME_CMD_SET_CMB_REJECTED =3D 0x002b, + NVME_INVALID_CMD_SET =3D 0x002c, NVME_LBA_RANGE =3D 0x0080, NVME_CAP_EXCEEDED =3D 0x0081, NVME_NS_NOT_READY =3D 0x0082, @@ -701,6 +705,14 @@ enum NvmeStatusCodes { NVME_CONFLICTING_ATTRS =3D 0x0180, NVME_INVALID_PROT_INFO =3D 0x0181, NVME_WRITE_TO_RO =3D 0x0182, + NVME_ZONE_BOUNDARY_ERROR =3D 0x01b8, + NVME_ZONE_FULL =3D 0x01b9, + NVME_ZONE_READ_ONLY =3D 0x01ba, + NVME_ZONE_OFFLINE =3D 0x01bb, + NVME_ZONE_INVALID_WRITE =3D 0x01bc, + NVME_ZONE_TOO_MANY_ACTIVE =3D 0x01bd, + NVME_ZONE_TOO_MANY_OPEN =3D 0x01be, + NVME_ZONE_INVAL_TRANSITION =3D 0x01bf, NVME_WRITE_FAULT =3D 0x0280, NVME_UNRECOVERED_READ =3D 0x0281, NVME_E2E_GUARD_ERROR =3D 0x0282, @@ -885,6 +897,11 @@ typedef struct QEMU_PACKED NvmeIdCtrl { uint8_t vs[1024]; } NvmeIdCtrl; =20 +typedef struct NvmeIdCtrlZoned { + uint8_t zasl; + uint8_t rsvd1[4095]; +} NvmeIdCtrlZoned; + enum NvmeIdCtrlOacs { NVME_OACS_SECURITY =3D 1 << 0, NVME_OACS_FORMAT =3D 1 << 1, @@ -1009,6 +1026,12 @@ typedef struct QEMU_PACKED NvmeLBAF { uint8_t rp; } NvmeLBAF; =20 +typedef struct QEMU_PACKED NvmeLBAFE { + uint64_t zsze; + uint8_t zdes; + uint8_t rsvd9[7]; +} NvmeLBAFE; + #define NVME_NSID_BROADCAST 0xffffffff =20 typedef struct QEMU_PACKED NvmeIdNs { @@ -1063,10 +1086,24 @@ enum NvmeNsIdentifierType { =20 enum NvmeCsi { NVME_CSI_NVM =3D 0x00, + NVME_CSI_ZONED =3D 0x02, }; =20 #define NVME_SET_CSI(vec, csi) (vec |=3D (uint8_t)(1 << (csi))) =20 +typedef struct QEMU_PACKED NvmeIdNsZoned { + uint16_t zoc; + uint16_t ozcs; + uint32_t mar; + uint32_t mor; + uint32_t rrl; + uint32_t frl; + uint8_t rsvd20[2796]; + NvmeLBAFE lbafe[16]; + uint8_t rsvd3072[768]; + uint8_t vs[256]; +} NvmeIdNsZoned; + /*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC(dlfeat) ((dlfeat) & 0x10) #define NVME_ID_NS_DLFEAT_WRITE_ZEROES(dlfeat) ((dlfeat) & 0x08) @@ -1098,6 +1135,71 @@ enum NvmeIdNsDps { DPS_FIRST_EIGHT =3D 8, }; =20 +enum NvmeZoneAttr { + NVME_ZA_FINISHED_BY_CTLR =3D 1 << 0, + NVME_ZA_FINISH_RECOMMENDED =3D 1 << 1, + NVME_ZA_RESET_RECOMMENDED =3D 1 << 2, + NVME_ZA_ZD_EXT_VALID =3D 1 << 7, +}; + +typedef struct QEMU_PACKED NvmeZoneReportHeader { + uint64_t nr_zones; + uint8_t rsvd[56]; +} NvmeZoneReportHeader; + +enum NvmeZoneReceiveAction { + NVME_ZONE_REPORT =3D 0, + NVME_ZONE_REPORT_EXTENDED =3D 1, +}; + +enum NvmeZoneReportType { + NVME_ZONE_REPORT_ALL =3D 0, + NVME_ZONE_REPORT_EMPTY =3D 1, + NVME_ZONE_REPORT_IMPLICITLY_OPEN =3D 2, + NVME_ZONE_REPORT_EXPLICITLY_OPEN =3D 3, + NVME_ZONE_REPORT_CLOSED =3D 4, + NVME_ZONE_REPORT_FULL =3D 5, + NVME_ZONE_REPORT_READ_ONLY =3D 6, + NVME_ZONE_REPORT_OFFLINE =3D 7, +}; + +enum NvmeZoneType { + NVME_ZONE_TYPE_RESERVED =3D 0x00, + NVME_ZONE_TYPE_SEQ_WRITE =3D 0x02, +}; + +enum NvmeZoneSendAction { + NVME_ZONE_ACTION_RSD =3D 0x00, + NVME_ZONE_ACTION_CLOSE =3D 0x01, + NVME_ZONE_ACTION_FINISH =3D 0x02, + NVME_ZONE_ACTION_OPEN =3D 0x03, + NVME_ZONE_ACTION_RESET =3D 0x04, + NVME_ZONE_ACTION_OFFLINE =3D 0x05, + NVME_ZONE_ACTION_SET_ZD_EXT =3D 0x10, +}; + +typedef struct QEMU_PACKED NvmeZoneDescr { + uint8_t zt; + uint8_t zs; + uint8_t za; + uint8_t rsvd3[5]; + uint64_t zcap; + uint64_t zslba; + uint64_t wp; + uint8_t rsvd32[32]; +} NvmeZoneDescr; + +enum NvmeZoneState { + NVME_ZONE_STATE_RESERVED =3D 0x00, + NVME_ZONE_STATE_EMPTY =3D 0x01, + NVME_ZONE_STATE_IMPLICITLY_OPEN =3D 0x02, + NVME_ZONE_STATE_EXPLICITLY_OPEN =3D 0x03, + NVME_ZONE_STATE_CLOSED =3D 0x04, + NVME_ZONE_STATE_READ_ONLY =3D 0x0D, + NVME_ZONE_STATE_FULL =3D 0x0E, + NVME_ZONE_STATE_OFFLINE =3D 0x0F, +}; + static inline void _nvme_check_size(void) { QEMU_BUILD_BUG_ON(sizeof(NvmeBar) !=3D 4096); @@ -1117,9 +1219,14 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeSmartLog) !=3D 512); QEMU_BUILD_BUG_ON(sizeof(NvmeEffectsLog) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdCtrl) !=3D 4096); + QEMU_BUILD_BUG_ON(sizeof(NvmeIdCtrlZoned) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) !=3D 4); + QEMU_BUILD_BUG_ON(sizeof(NvmeLBAF) !=3D 4); + QEMU_BUILD_BUG_ON(sizeof(NvmeLBAFE) !=3D 16); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNs) !=3D 4096); + QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsZoned) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeSglDescriptor) !=3D 16); QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsDescr) !=3D 4); + QEMU_BUILD_BUG_ON(sizeof(NvmeZoneDescr) !=3D 64); } #endif --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885414; cv=none; d=zohomail.com; s=zohoarc; b=S7PUwlNxrgxD8csoaH1aBa8T9s0E/Vqbf465IRT2Ui+PGkbpWvia235yRw0J855uPvu/aKtqrd3vYA6JxbCYiQCSyWL1wFZT6Ia+lLJY/E3cnXWkuWZRCMpEYk5nd+8gvODE0lMTpy6NKH5LMNKlbNvPeXGXs5bUxwO6ZNV4NoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885414; 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=46oU/jeTkRccYiMBb1amSCHg0U3pDclymZAt4/ldIfM=; b=ZjGu0cArz1ODeJaYA+Kg+tVjsaFZkWD3BZ8dfbZlCQCLRKnfvRY6tq/eAWkUxLl1P0iE222pViVYwBHQubC+CIX8DTeEkbXngGjm32wLi15BoR2tYqNbEKVWhZZhzdwqm+b+D6ZyqUlblMj/9lJFRjyAqzjGZEjcOY8NJsV/FnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600885414642289.8012294109087; Wed, 23 Sep 2020 11:23:34 -0700 (PDT) Received: from localhost ([::1]:35272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9QT-0006yH-AW for importer@patchew.org; Wed, 23 Sep 2020 14:23:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O9-0005AC-9T; Wed, 23 Sep 2020 14:21:09 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O6-00087W-Vq; Wed, 23 Sep 2020 14:21:08 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:35 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:12 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886197; x=1632422197; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jsS0Qmbf7IOzITobP9sBEEdGOMLsAU/G1rgEijwm2vw=; b=P1mq5LirgmYdqdP7yCvBIAmF7vdKvwVVhW/jxHgEZsAcjRW9J3BNeuxd DzkjDTg+EoIK5vUCmKwk61Iiuik3Htr6Fu1VgyU+C+t0OVwb3f6FG85lo JQ0QOnsvf2jShQNecpNYx3P6GVSJigGewKRyGb9V/c4jUOx9rBrbJ/UYf 5b0yR0C8kNC4w7Pluf7nXQ7vCvUXd2lUEuntl/W/FhWt0owbq2Pi5usyI NZds1BoY3EInX7k5mWsT2X4r8Re6siqkZNi3ONz+WkDGTi0jHavP9yiiw Dy4neb2fpVJXYOEC3AcU7ZlO+lo8gi1zmlLXE3zLLGFKgV2h9FX/bkopp g==; IronPort-SDR: w8RGRuwgFS8IV4osWOoJrxalZF2k43epFjFtqr9KgZ8Yspnp2pDmppIauTzv3WnoDP15PDQeUX UVffd47U1K6WKqDiku9Sk76f7iiXzvWzwm31bBKlI1d9IEarmvteiY1DWZjfr/LGq8NxyXCDUo paQgkp9biz6lQjQZl2Y++/fj/TMVWMxjquKdAzmnj6AHoQn8GaIHO1lgB+38I30dRj9zGks8uS paK7U1U6GF0mYKG6f+SgyuB2q++zQ4AMPbiljrNkoqT/HCnQBy+l08SxgA8Pb4GlDMmlH7Y7bT fYU= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496367" IronPort-SDR: 4ov7DhMf/9C744osrq6xVErf7l9Ta0Ip84joFx2uWULk7oq2magQjWq21bvYeWF7XCjtznIh2c gBKOhgzR3hIQ== IronPort-SDR: podYXOkS4c9UqlXGNf6f0Wt8W12kjxaXU3mpM03NFzDzfmEc4o+46SnXc5zF5i/FlDhxaa2+jU EHzxMwvVqfQw== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 08/14] hw/block/nvme: Define Zoned NS Command Set trace events Date: Thu, 24 Sep 2020 03:20:15 +0900 Message-Id: <20200923182021.3724-9-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 13 minutes in the future.) Content-Type: text/plain; charset="utf-8" The Zoned Namespace Command Set / Namespace Types implementation that is being introduced in this series adds a good number of trace events. Combine all tracepoint definitions into a separate patch to make reviewing more convenient. Signed-off-by: Dmitry Fomichev --- hw/block/trace-events | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/hw/block/trace-events b/hw/block/trace-events index 2414dcbc79..53c7a2fd1f 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -90,6 +90,17 @@ pci_nvme_mmio_shutdown_cleared(void) "shutdown bit clear= ed" pci_nvme_cmd_supp_and_effects_log_read(void) "commands supported and effec= ts log read" pci_nvme_css_nvm_cset_selected_by_host(uint32_t cc) "NVM command set selec= ted by host, bar.cc=3D0x%"PRIx32"" pci_nvme_css_all_csets_sel_by_host(uint32_t cc) "all supported command set= s selected by host, bar.cc=3D0x%"PRIx32"" +pci_nvme_open_zone(uint64_t slba, uint32_t zone_idx, int all) "open zone, = slba=3D%"PRIu64", idx=3D%"PRIu32", all=3D%"PRIi32"" +pci_nvme_close_zone(uint64_t slba, uint32_t zone_idx, int all) "close zone= , slba=3D%"PRIu64", idx=3D%"PRIu32", all=3D%"PRIi32"" +pci_nvme_finish_zone(uint64_t slba, uint32_t zone_idx, int all) "finish zo= ne, slba=3D%"PRIu64", idx=3D%"PRIu32", all=3D%"PRIi32"" +pci_nvme_reset_zone(uint64_t slba, uint32_t zone_idx, int all) "reset zone= , slba=3D%"PRIu64", idx=3D%"PRIu32", all=3D%"PRIi32"" +pci_nvme_offline_zone(uint64_t slba, uint32_t zone_idx, int all) "offline = zone, slba=3D%"PRIu64", idx=3D%"PRIu32", all=3D%"PRIi32"" +pci_nvme_set_descriptor_extension(uint64_t slba, uint32_t zone_idx) "set z= one descriptor extension, slba=3D%"PRIu64", idx=3D%"PRIu32"" +pci_nvme_zd_extension_set(uint32_t zone_idx) "set descriptor extension for= zone_idx=3D%"PRIu32"" +pci_nvme_power_on_close(uint32_t state, uint64_t slba) "zone state=3D%"PRI= u32", slba=3D%"PRIu64" transitioned to Closed state" +pci_nvme_power_on_reset(uint32_t state, uint64_t slba) "zone state=3D%"PRI= u32", slba=3D%"PRIu64" transitioned to Empty state" +pci_nvme_power_on_full(uint32_t state, uint64_t slba) "zone state=3D%"PRIu= 32", slba=3D%"PRIu64" transitioned to Full state" +pci_nvme_mapped_zone_file(char *zfile_name, int ret) "mapped zone file %s,= error %d" =20 # nvme traces for error conditions pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %zu" @@ -102,9 +113,23 @@ pci_nvme_err_invalid_ns(uint32_t ns, uint32_t limit) "= invalid namespace %u not w pci_nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" pci_nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx= 8"" pci_nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limi= t) "Invalid LBA start=3D%"PRIu64" len=3D%"PRIu64" limit=3D%"PRIu64"" +pci_nvme_err_unaligned_zone_cmd(uint8_t action, uint64_t slba, uint64_t zs= lba) "unaligned zone op 0x%"PRIx32", got slba=3D%"PRIu64", zslba=3D%"PRIu64= "" +pci_nvme_err_invalid_zone_state_transition(uint8_t state, uint8_t action, = uint64_t slba, uint8_t attrs) "0x%"PRIx32"->0x%"PRIx32", slba=3D%"PRIu64", = attrs=3D0x%"PRIx32"" +pci_nvme_err_write_not_at_wp(uint64_t slba, uint64_t zone, uint64_t wp) "w= riting at slba=3D%"PRIu64", zone=3D%"PRIu64", but wp=3D%"PRIu64"" +pci_nvme_err_append_not_at_start(uint64_t slba, uint64_t zone) "appending = at slba=3D%"PRIu64", but zone=3D%"PRIu64"" +pci_nvme_err_zone_write_not_ok(uint64_t slba, uint32_t nlb, uint32_t statu= s) "slba=3D%"PRIu64", nlb=3D%"PRIu32", status=3D0x%"PRIx16"" +pci_nvme_err_zone_read_not_ok(uint64_t slba, uint32_t nlb, uint32_t status= ) "slba=3D%"PRIu64", nlb=3D%"PRIu32", status=3D0x%"PRIx16"" +pci_nvme_err_append_too_large(uint64_t slba, uint32_t nlb, uint8_t zasl) "= slba=3D%"PRIu64", nlb=3D%"PRIu32", zasl=3D%"PRIu8"" +pci_nvme_err_insuff_active_res(uint32_t max_active) "max_active=3D%"PRIu32= " zone limit exceeded" +pci_nvme_err_insuff_open_res(uint32_t max_open) "max_open=3D%"PRIu32" zone= limit exceeded" +pci_nvme_err_zone_file_invalid(int error) "validation error=3D%"PRIi32"" +pci_nvme_err_zd_extension_map_error(uint32_t zone_idx) "can't map descript= or extension for zone_idx=3D%"PRIu32"" +pci_nvme_err_invalid_changed_zone_list_offset(uint64_t ofs) "changed zone = list log offset must be 0, got %"PRIu64"" +pci_nvme_err_invalid_changed_zone_list_len(uint32_t len) "changed zone lis= t log size is 4096, got %"PRIu32"" pci_nvme_err_invalid_effects_log_offset(uint64_t ofs) "commands supported = and effects log offset must be 0, got %"PRIu64"" pci_nvme_err_change_css_when_enabled(void) "changing CC.CSS while controll= er is enabled" pci_nvme_err_only_nvm_cmd_set_avail(void) "setting 110b CC.CSS, but only N= VM command set is enabled" +pci_nvme_err_only_zoned_cmd_set_avail(void) "setting 001b CC.CSS, but only= ZONED+NVM command set is enabled" pci_nvme_err_invalid_iocsci(uint32_t idx) "unsupported command set combina= tion index %"PRIu32"" pci_nvme_err_invalid_del_sq(uint16_t qid) "invalid submission queue deleti= on, sid=3D%"PRIu16"" pci_nvme_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submis= sion queue, invalid cqid=3D%"PRIu16"" @@ -138,6 +163,7 @@ pci_nvme_err_startfail_sqent_too_large(uint8_t log2ps, = uint8_t maxlog2ps) "nvme_ pci_nvme_err_startfail_asqent_sz_zero(void) "nvme_start_ctrl failed becaus= e the admin submission queue size is zero" pci_nvme_err_startfail_acqent_sz_zero(void) "nvme_start_ctrl failed becaus= e the admin completion queue size is zero" pci_nvme_err_startfail(void) "setting controller enable bit failed" +pci_nvme_err_invalid_mgmt_action(int action) "action=3D0x%"PRIx8"" =20 # Traces for undefined behavior pci_nvme_ub_mmiowr_misaligned32(uint64_t offset) "MMIO write not 32-bit al= igned, offset=3D0x%"PRIx64"" --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885709; cv=none; d=zohomail.com; s=zohoarc; b=IKMt+RTlghLCCLefbVo74rBSY6kB3rc/u4YleEHYHzLxho+BjRAUUPYxqrJz51nHEiWrolXkDznY2mixXlkxpJrhmjx6VghADiZPO01HMOSb2QAGMYhA5KQn09LkJfPyinmELqmvBw3KAQeOM9CwhiS8+rtnYCsP9eBxqVc4WYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885709; 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=ZS5DLTCW/NNelSHVG64pgXKHiNoXod9yNKorYcbdr8Y=; b=CYk9c+Fn94tnd2gQUbBIii5y/3Lc3RTAhQvLbtcF39Xmdou2l37bQ/YxmksiOJiBwWvuLp7udxltc7y2USX1zJa+i/w71MKPKR1dz9SvC7VEwXV/GHN4GsqqKYzoKIzXAL1VLdFHWh7IPJ8ns7gCygrFmR3rcn1b8PnMTwAH2S4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600885709505507.9130936827203; Wed, 23 Sep 2020 11:28:29 -0700 (PDT) Received: from localhost ([::1]:44604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9VD-0002j1-PO for importer@patchew.org; Wed, 23 Sep 2020 14:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OH-0005JZ-Ue; Wed, 23 Sep 2020 14:21:19 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9O9-0008Do-GT; Wed, 23 Sep 2020 14:21:15 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:39 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:14 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886200; x=1632422200; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X6q/8gnLU9actpS30MHNXIiDaBPxaWHaiBFO1EliTW4=; b=dH3x6ytz5JQAgOPxqlxgjTMqOwhJT/Jpcf0FmhQTasjC7NQrDi776r63 yloGKt4Nl+vWUJmg5MqMgCzl+HbQMQbauK+RQ6BPwFXN7IgjHFRh5mGwo Xddp7npOoomR4VTG2hXJs1TQZloY8bGFOvZgCmsJm2dViUhWnZaF6abzN 1GNzHtExYdwAT+iGwVpILlzqBBFkKp+I0tZz8reblA0vQCqaUwfd9aZKx YDdtpCH0lumZUvfpymXBgdreDXJPQsOBmcJfY6TI9QzN0VHwNwwC+KnCb fBkOhqaQMPqALo6Y5tFsiYNdElPJ9FPLnVi/Qhw8UbvlrbqGAyKnqLx8+ A==; IronPort-SDR: ibbDX4XE1+xk4hC1KbE5/Ii1d6H3RpRkccd+iXEnXSDLG+f05ClANmRoEaZp/L4fMdWjSNu4z4 v5J5IBdwSZJ0VMa+Kn/3v9rT+54rdGVWlE+/RZy4hQulyVnHGff6VXLtZRl7+CGr1dNOVeLcwr HTRb6UTAOkQmGszGIbj41917sYjTBOkNUB3buVl1MYVhd9IobVEg8D5XI5yTbq+lr5OYFbu8Do K7NQEiyF77sKBSLHbYgvHBXjjNqlBHMgdoFFeXe0ZheVMIIZi993aEyCoYdexfviit2f1pK9dy zpo= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496373" IronPort-SDR: PVniSsi9UrxmNL4O9gjngg66wYaVsmnXQY12NailU3u1r7uhqmnTRrwXlhrLbydTEJ3Cjhn6Il 0YOco+/lLRtQ== IronPort-SDR: A9ku0JXRWCQi08vgJ991nBbRu7oqpRsrsiwPc/V7DQ54sAWfA6UqjfozbM7RLKEOTf3DlF0hJd ARYHNJ94id3w== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 09/14] hw/block/nvme: Support Zoned Namespace Command Set Date: Thu, 24 Sep 2020 03:20:16 +0900 Message-Id: <20200923182021.3724-10-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 8 minutes in the future.) Content-Type: text/plain; charset="utf-8" The emulation code has been changed to advertise NVM Command Set when "zoned" device property is not set (default) and Zoned Namespace Command Set otherwise. Handlers for three new NVMe commands introduced in Zoned Namespace Command Set specification are added, namely for Zone Management Receive, Zone Management Send and Zone Append. Device initialization code has been extended to create a proper configuration for zoned operation using device properties. Read/Write command handler is modified to only allow writes at the write pointer if the namespace is zoned. For Zone Append command, writes implicitly happen at the write pointer and the starting write pointer value is returned as the result of the command. Write Zeroes handler is modified to add zoned checks that are identical to those done as a part of Write flow. The code to support for Zone Descriptor Extensions is not included in this commit and ZDES 0 is always reported. A later commit in this series will add ZDE support. This commit doesn't yet include checks for active and open zone limits. It is assumed that there are no limits on either active or open zones. Signed-off-by: Niklas Cassel Signed-off-by: Hans Holmberg Signed-off-by: Ajay Joshi Signed-off-by: Chaitanya Kulkarni Signed-off-by: Matias Bjorling Signed-off-by: Aravind Ramesh Signed-off-by: Shin'ichiro Kawasaki Signed-off-by: Adam Manzanares Signed-off-by: Dmitry Fomichev --- block/nvme.c | 2 +- hw/block/nvme.c | 1057 ++++++++++++++++++++++++++++++++++++++++-- include/block/nvme.h | 6 +- 3 files changed, 1026 insertions(+), 39 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 05485fdd11..7a513c9a17 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -333,7 +333,7 @@ static inline int nvme_translate_error(const NvmeCqe *c) { uint16_t status =3D (le16_to_cpu(c->status) >> 1) & 0xFF; if (status) { - trace_nvme_error(le32_to_cpu(c->result), + trace_nvme_error(le32_to_cpu(c->result32), le16_to_cpu(c->sq_head), le16_to_cpu(c->sq_id), le16_to_cpu(c->cid), diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 6c231b20f9..287984dd37 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -53,6 +53,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" +#include "crypto/random.h" #include "hw/block/block.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" @@ -125,6 +126,96 @@ static uint16_t nvme_sqid(NvmeRequest *req) return le16_to_cpu(req->sq->sqid); } =20 +/* + * Add a zone to the tail of a zone list. + */ +static void nvme_add_zone_tail(NvmeCtrl *n, NvmeNamespace *ns, NvmeZoneLis= t *zl, + NvmeZone *zone) +{ + uint32_t idx =3D (uint32_t)(zone - ns->zone_array); + + assert(nvme_zone_not_in_list(zone)); + + if (!zl->size) { + zl->head =3D zl->tail =3D idx; + zone->next =3D zone->prev =3D NVME_ZONE_LIST_NIL; + } else { + ns->zone_array[zl->tail].next =3D idx; + zone->prev =3D zl->tail; + zone->next =3D NVME_ZONE_LIST_NIL; + zl->tail =3D idx; + } + zl->size++; +} + +/* + * Remove a zone from a zone list. The zone must be linked in the list. + */ +static void nvme_remove_zone(NvmeCtrl *n, NvmeNamespace *ns, NvmeZoneList = *zl, + NvmeZone *zone) +{ + uint32_t idx =3D (uint32_t)(zone - ns->zone_array); + + assert(!nvme_zone_not_in_list(zone)); + + --zl->size; + if (zl->size =3D=3D 0) { + zl->head =3D NVME_ZONE_LIST_NIL; + zl->tail =3D NVME_ZONE_LIST_NIL; + } else if (idx =3D=3D zl->head) { + zl->head =3D zone->next; + ns->zone_array[zl->head].prev =3D NVME_ZONE_LIST_NIL; + } else if (idx =3D=3D zl->tail) { + zl->tail =3D zone->prev; + ns->zone_array[zl->tail].next =3D NVME_ZONE_LIST_NIL; + } else { + ns->zone_array[zone->next].prev =3D zone->prev; + ns->zone_array[zone->prev].next =3D zone->next; + } + + zone->prev =3D zone->next =3D 0; +} + +static void nvme_assign_zone_state(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + if (!nvme_zone_not_in_list(zone)) { + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + nvme_remove_zone(n, ns, ns->exp_open_zones, zone); + break; + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_remove_zone(n, ns, ns->imp_open_zones, zone); + break; + case NVME_ZONE_STATE_CLOSED: + nvme_remove_zone(n, ns, ns->closed_zones, zone); + break; + case NVME_ZONE_STATE_FULL: + nvme_remove_zone(n, ns, ns->full_zones, zone); + } + } + + nvme_set_zone_state(zone, state); + + switch (state) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + nvme_add_zone_tail(n, ns, ns->exp_open_zones, zone); + break; + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_add_zone_tail(n, ns, ns->imp_open_zones, zone); + break; + case NVME_ZONE_STATE_CLOSED: + nvme_add_zone_tail(n, ns, ns->closed_zones, zone); + break; + case NVME_ZONE_STATE_FULL: + nvme_add_zone_tail(n, ns, ns->full_zones, zone); + case NVME_ZONE_STATE_READ_ONLY: + break; + default: + zone->d.za =3D 0; + } +} + static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) { hwaddr low =3D n->ctrl_mem.addr; @@ -524,7 +615,7 @@ static void nvme_process_aers(void *opaque) =20 req =3D n->aer_reqs[n->outstanding_aers]; =20 - result =3D (NvmeAerResult *) &req->cqe.result; + result =3D (NvmeAerResult *) &req->cqe.result32; result->event_type =3D event->result.event_type; result->event_info =3D event->result.event_info; result->log_page =3D event->result.log_page; @@ -595,6 +686,195 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n,= NvmeNamespace *ns, return NVME_SUCCESS; } =20 +static void nvme_fill_data(QEMUSGList *qsg, QEMUIOVector *iov, + uint64_t offset, uint8_t pattern) +{ + ScatterGatherEntry *entry; + uint32_t len, ent_len; + + if (qsg->nsg > 0) { + entry =3D qsg->sg; + for (len =3D qsg->size; len > 0; len -=3D ent_len) { + ent_len =3D MIN(len, entry->len); + if (offset > ent_len) { + offset -=3D ent_len; + } else if (offset !=3D 0) { + dma_memory_set(qsg->as, entry->base + offset, + pattern, ent_len - offset); + offset =3D 0; + } else { + dma_memory_set(qsg->as, entry->base, pattern, ent_len); + } + entry++; + } + } else if (iov->iov) { + qemu_iovec_memset(iov, offset, pattern, + iov_size(iov->iov, iov->niov) - offset); + } +} + +static uint16_t nvme_check_zone_write(NvmeZone *zone, uint64_t slba, + uint32_t nlb) +{ + uint16_t status; + + if (unlikely((slba + nlb) > nvme_zone_wr_boundary(zone))) { + return NVME_ZONE_BOUNDARY_ERROR; + } + + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_EMPTY: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_CLOSED: + status =3D NVME_SUCCESS; + break; + case NVME_ZONE_STATE_FULL: + status =3D NVME_ZONE_FULL; + break; + case NVME_ZONE_STATE_OFFLINE: + status =3D NVME_ZONE_OFFLINE; + break; + case NVME_ZONE_STATE_READ_ONLY: + status =3D NVME_ZONE_READ_ONLY; + break; + default: + assert(false); + } + return status; +} + +static uint16_t nvme_check_zone_read(NvmeCtrl *n, NvmeZone *zone, uint64_t= slba, + uint32_t nlb, bool zone_x_ok) +{ + uint64_t lba =3D slba, count; + uint16_t status; + uint8_t zs; + + do { + if (!zone_x_ok && (lba + nlb > nvme_zone_rd_boundary(n, zone))) { + return NVME_ZONE_BOUNDARY_ERROR | NVME_DNR; + } + + zs =3D nvme_get_zone_state(zone); + switch (zs) { + case NVME_ZONE_STATE_EMPTY: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_FULL: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_READ_ONLY: + status =3D NVME_SUCCESS; + break; + case NVME_ZONE_STATE_OFFLINE: + status =3D NVME_ZONE_OFFLINE | NVME_DNR; + break; + default: + assert(false); + } + if (status !=3D NVME_SUCCESS) { + break; + } + + if (lba + nlb > nvme_zone_rd_boundary(n, zone)) { + count =3D nvme_zone_rd_boundary(n, zone) - lba; + } else { + count =3D nlb; + } + + lba +=3D count; + nlb -=3D count; + zone++; + } while (nlb); + + return status; +} + +static inline uint32_t nvme_zone_idx(NvmeCtrl *n, uint64_t slba) +{ + return n->zone_size_log2 > 0 ? slba >> n->zone_size_log2 : + slba / n->zone_size; +} + +static bool nvme_finalize_zoned_write(NvmeCtrl *n, NvmeRequest *req, + bool failed) +{ + NvmeRwCmd *rw =3D (NvmeRwCmd *)&req->cmd; + NvmeNamespace *ns; + NvmeZone *zone; + uint64_t slba, start_wp =3D req->cqe.result64; + uint32_t nlb, zone_idx; + uint8_t zs; + + if (rw->opcode !=3D NVME_CMD_WRITE && + rw->opcode !=3D NVME_CMD_ZONE_APPEND && + rw->opcode !=3D NVME_CMD_WRITE_ZEROES) { + return false; + } + + slba =3D le64_to_cpu(rw->slba); + nlb =3D le16_to_cpu(rw->nlb) + 1; + zone_idx =3D nvme_zone_idx(n, slba); + assert(zone_idx < n->num_zones); + ns =3D req->ns; + zone =3D &ns->zone_array[zone_idx]; + + if (!failed && zone->w_ptr < start_wp + nlb) { + /* + * A preceding queued write to the zone has failed, + * now this write is not at the WP, fail it too. + */ + failed =3D true; + } + + if (failed) { + if (zone->w_ptr > start_wp) { + zone->w_ptr =3D start_wp; + } + req->cqe.result64 =3D 0; + } else if (zone->w_ptr =3D=3D nvme_zone_wr_boundary(zone)) { + zs =3D nvme_get_zone_state(zone); + switch (zs) { + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_EMPTY: + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_FULL); + /* fall through */ + case NVME_ZONE_STATE_FULL: + break; + default: + assert(false); + } + zone->d.wp =3D zone->w_ptr; + } else { + zone->d.wp +=3D nlb; + } + + return failed; +} + +static uint64_t nvme_advance_zone_wp(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint32_t nlb) +{ + uint64_t result =3D zone->w_ptr; + uint8_t zs; + + zone->w_ptr +=3D nlb; + + if (zone->w_ptr < nvme_zone_wr_boundary(zone)) { + zs =3D nvme_get_zone_state(zone); + switch (zs) { + case NVME_ZONE_STATE_EMPTY: + case NVME_ZONE_STATE_CLOSED: + nvme_assign_zone_state(n, ns, zone, + NVME_ZONE_STATE_IMPLICITLY_OPEN); + } + } + + return result; +} + static void nvme_rw_cb(void *opaque, int ret) { NvmeRequest *req =3D opaque; @@ -605,9 +885,24 @@ static void nvme_rw_cb(void *opaque, int ret) trace_pci_nvme_rw_cb(nvme_cid(req)); =20 if (!ret) { - block_acct_done(blk_get_stats(n->conf.blk), &req->acct); - req->status =3D NVME_SUCCESS; + if (n->params.zoned) { + if (nvme_finalize_zoned_write(n, req, false)) { + ret =3D EIO; + block_acct_failed(blk_get_stats(n->conf.blk), &req->acct); + req->status =3D NVME_ZONE_INVALID_WRITE; + } else if (req->fill_ofs >=3D 0) { + nvme_fill_data(&req->qsg, &req->iov, req->fill_ofs, + n->params.fill_pattern); + } + } + if (!ret) { + block_acct_done(blk_get_stats(n->conf.blk), &req->acct); + req->status =3D NVME_SUCCESS; + } } else { + if (n->params.zoned) { + nvme_finalize_zoned_write(n, req, true); + } block_acct_failed(blk_get_stats(n->conf.blk), &req->acct); req->status =3D NVME_INTERNAL_DEV_ERROR; } @@ -628,12 +923,14 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRe= quest *req) { NvmeRwCmd *rw =3D (NvmeRwCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; + NvmeZone *zone =3D NULL; const uint8_t lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); const uint8_t data_shift =3D ns->id_ns.lbaf[lba_index].ds; uint64_t slba =3D le64_to_cpu(rw->slba); uint32_t nlb =3D le16_to_cpu(rw->nlb) + 1; uint64_t offset =3D slba << data_shift; uint32_t count =3D nlb << data_shift; + uint32_t zone_idx; uint16_t status; =20 trace_pci_nvme_write_zeroes(nvme_cid(req), slba, nlb); @@ -644,25 +941,51 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRe= quest *req) return status; } =20 + if (n->params.zoned) { + zone_idx =3D nvme_zone_idx(n, slba); + assert(zone_idx < n->num_zones); + zone =3D &ns->zone_array[zone_idx]; + + status =3D nvme_check_zone_write(zone, slba, nlb); + if (status !=3D NVME_SUCCESS) { + trace_pci_nvme_err_zone_write_not_ok(slba, nlb, status); + return status | NVME_DNR; + } + + assert(nvme_wp_is_valid(zone)); + if (unlikely(slba !=3D zone->w_ptr)) { + trace_pci_nvme_err_write_not_at_wp(slba, zone->d.zslba, + zone->w_ptr); + return NVME_ZONE_INVALID_WRITE | NVME_DNR; + } + } + block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, BLOCK_ACCT_WRITE); req->aiocb =3D blk_aio_pwrite_zeroes(n->conf.blk, offset, count, BDRV_REQ_MAY_UNMAP, nvme_rw_cb, re= q); + + if (n->params.zoned) { + req->cqe.result64 =3D nvme_advance_zone_wp(n, ns, zone, nlb); + } + return NVME_NO_COMPLETE; } =20 -static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) +static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req, bool append) { NvmeRwCmd *rw =3D (NvmeRwCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; + NvmeZone *zone =3D NULL; uint32_t nlb =3D le32_to_cpu(rw->nlb) + 1; uint64_t slba =3D le64_to_cpu(rw->slba); =20 uint8_t lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); uint8_t data_shift =3D ns->id_ns.lbaf[lba_index].ds; uint64_t data_size =3D (uint64_t)nlb << data_shift; - uint64_t data_offset =3D slba << data_shift; - int is_write =3D rw->opcode =3D=3D NVME_CMD_WRITE ? 1 : 0; + uint64_t data_offset; + uint32_t zone_idx =3D 0; + bool is_write =3D rw->opcode =3D=3D NVME_CMD_WRITE || append; enum BlockAcctType acct =3D is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_R= EAD; uint16_t status; =20 @@ -682,11 +1005,77 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *re= q) return status; } =20 + if (n->params.zoned) { + zone_idx =3D nvme_zone_idx(n, slba); + assert(zone_idx < n->num_zones); + zone =3D &ns->zone_array[zone_idx]; + + if (is_write) { + status =3D nvme_check_zone_write(zone, slba, nlb); + if (status !=3D NVME_SUCCESS) { + trace_pci_nvme_err_zone_write_not_ok(slba, nlb, status); + return status | NVME_DNR; + } + + assert(nvme_wp_is_valid(zone)); + if (append) { + if (unlikely(slba !=3D zone->d.zslba)) { + trace_pci_nvme_err_append_not_at_start(slba, zone->d.z= slba); + return NVME_ZONE_INVALID_WRITE | NVME_DNR; + } + if (data_size > (n->page_size << n->zasl)) { + trace_pci_nvme_err_append_too_large(slba, nlb, n->zasl= ); + return NVME_INVALID_FIELD | NVME_DNR; + } + slba =3D zone->w_ptr; + } else if (unlikely(slba !=3D zone->w_ptr)) { + trace_pci_nvme_err_write_not_at_wp(slba, zone->d.zslba, + zone->w_ptr); + return NVME_ZONE_INVALID_WRITE | NVME_DNR; + } + req->fill_ofs =3D -1LL; + } else { + status =3D nvme_check_zone_read(n, zone, slba, nlb, + n->params.cross_zone_read); + if (status !=3D NVME_SUCCESS) { + trace_pci_nvme_err_zone_read_not_ok(slba, nlb, status); + return status | NVME_DNR; + } + + if (slba + nlb > zone->w_ptr) { + /* + * All or some data is read above the WP. Need to + * fill out the buffer area that has no backing data + * with a predefined data pattern (zeros by default) + */ + if (slba >=3D zone->w_ptr) { + req->fill_ofs =3D 0; + } else { + req->fill_ofs =3D ((zone->w_ptr - slba) << data_shift); + } + } else { + req->fill_ofs =3D -1LL; + } + } + } else if (append) { + trace_pci_nvme_err_invalid_opc(rw->opcode); + return NVME_INVALID_OPCODE | NVME_DNR; + } + if (nvme_map_dptr(n, data_size, req)) { block_acct_invalid(blk_get_stats(n->conf.blk), acct); return NVME_INVALID_FIELD | NVME_DNR; } =20 + if (unlikely(n->params.zoned && req->fill_ofs =3D=3D 0)) { + /* No backend I/O necessary, only need to fill the buffer */ + nvme_fill_data(&req->qsg, &req->iov, 0, n->params.fill_pattern); + req->status =3D NVME_SUCCESS; + return NVME_SUCCESS; + } + + data_offset =3D slba << data_shift; + if (req->qsg.nsg > 0) { block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->qsg.= size, acct); @@ -705,9 +1094,388 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *re= q) req); } =20 + if (n->params.zoned && is_write) { + req->cqe.result64 =3D nvme_advance_zone_wp(n, ns, zone, nlb); + } + return NVME_NO_COMPLETE; } =20 +static uint16_t nvme_get_mgmt_zone_slba_idx(NvmeCtrl *n, NvmeNamespace *ns, + NvmeCmd *c, uint64_t *slba, + uint32_t *zone_idx) +{ + uint32_t dw10 =3D le32_to_cpu(c->cdw10); + uint32_t dw11 =3D le32_to_cpu(c->cdw11); + + if (!n->params.zoned) { + trace_pci_nvme_err_invalid_opc(c->opcode); + return NVME_INVALID_OPCODE | NVME_DNR; + } + + *slba =3D ((uint64_t)dw11) << 32 | dw10; + if (unlikely(*slba >=3D ns->id_ns.nsze)) { + trace_pci_nvme_err_invalid_lba_range(*slba, 0, ns->id_ns.nsze); + *slba =3D 0; + return NVME_LBA_RANGE | NVME_DNR; + } + + *zone_idx =3D nvme_zone_idx(n, *slba); + assert(*zone_idx < n->num_zones); + + return NVME_SUCCESS; +} + +static uint16_t nvme_open_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + switch (state) { + case NVME_ZONE_STATE_EMPTY: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_EXPLICITLY_OPE= N); + /* fall through */ + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + +static bool nvme_cond_open_all(uint8_t state) +{ + return state =3D=3D NVME_ZONE_STATE_CLOSED; +} + +static uint16_t nvme_close_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + switch (state) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_CLOSED); + /* fall through */ + case NVME_ZONE_STATE_CLOSED: + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + +static bool nvme_cond_close_all(uint8_t state) +{ + return state =3D=3D NVME_ZONE_STATE_IMPLICITLY_OPEN || + state =3D=3D NVME_ZONE_STATE_EXPLICITLY_OPEN; +} + +static uint16_t nvme_finish_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + switch (state) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_EMPTY: + zone->w_ptr =3D nvme_zone_wr_boundary(zone); + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_FULL); + /* fall through */ + case NVME_ZONE_STATE_FULL: + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + +static bool nvme_cond_finish_all(uint8_t state) +{ + return state =3D=3D NVME_ZONE_STATE_IMPLICITLY_OPEN || + state =3D=3D NVME_ZONE_STATE_EXPLICITLY_OPEN || + state =3D=3D NVME_ZONE_STATE_CLOSED; +} + +static uint16_t nvme_reset_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + switch (state) { + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + case NVME_ZONE_STATE_CLOSED: + case NVME_ZONE_STATE_FULL: + zone->w_ptr =3D zone->d.zslba; + zone->d.wp =3D zone->w_ptr; + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_EMPTY); + /* fall through */ + case NVME_ZONE_STATE_EMPTY: + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + +static bool nvme_cond_reset_all(uint8_t state) +{ + return state =3D=3D NVME_ZONE_STATE_IMPLICITLY_OPEN || + state =3D=3D NVME_ZONE_STATE_EXPLICITLY_OPEN || + state =3D=3D NVME_ZONE_STATE_CLOSED || + state =3D=3D NVME_ZONE_STATE_FULL; +} + +static uint16_t nvme_offline_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + switch (state) { + case NVME_ZONE_STATE_READ_ONLY: + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_OFFLINE); + /* fall through */ + case NVME_ZONE_STATE_OFFLINE: + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + +static bool nvme_cond_offline_all(uint8_t state) +{ + return state =3D=3D NVME_ZONE_STATE_READ_ONLY; +} + +typedef uint16_t (*op_handler_t)(NvmeCtrl *, NvmeNamespace *, NvmeZone *, + uint8_t); +typedef bool (*need_to_proc_zone_t)(uint8_t); + +static uint16_t name_do_zone_op(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state, bool all, + op_handler_t op_hndlr, + need_to_proc_zone_t proc_zone) +{ + int i; + uint16_t status =3D 0; + + if (!all) { + status =3D op_hndlr(n, ns, zone, state); + } else { + for (i =3D 0; i < n->num_zones; i++, zone++) { + state =3D nvme_get_zone_state(zone); + if (proc_zone(state)) { + status =3D op_hndlr(n, ns, zone, state); + if (status !=3D NVME_SUCCESS) { + break; + } + } + } + } + + return status; +} + +static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeCmd *cmd =3D (NvmeCmd *)&req->cmd; + NvmeNamespace *ns =3D req->ns; + uint32_t dw13 =3D le32_to_cpu(cmd->cdw13); + uint64_t slba =3D 0; + uint32_t zone_idx =3D 0; + uint16_t status; + uint8_t action, state; + bool all; + NvmeZone *zone; + + action =3D dw13 & 0xff; + all =3D dw13 & 0x100; + + req->status =3D NVME_SUCCESS; + + if (!all) { + status =3D nvme_get_mgmt_zone_slba_idx(n, ns, cmd, &slba, &zone_id= x); + if (status) { + return status; + } + } + + zone =3D &ns->zone_array[zone_idx]; + if (slba !=3D zone->d.zslba) { + trace_pci_nvme_err_unaligned_zone_cmd(action, slba, zone->d.zslba); + return NVME_INVALID_FIELD | NVME_DNR; + } + state =3D nvme_get_zone_state(zone); + + switch (action) { + + case NVME_ZONE_ACTION_OPEN: + trace_pci_nvme_open_zone(slba, zone_idx, all); + status =3D name_do_zone_op(n, ns, zone, state, all, + nvme_open_zone, nvme_cond_open_all); + break; + + case NVME_ZONE_ACTION_CLOSE: + trace_pci_nvme_close_zone(slba, zone_idx, all); + status =3D name_do_zone_op(n, ns, zone, state, all, + nvme_close_zone, nvme_cond_close_all); + break; + + case NVME_ZONE_ACTION_FINISH: + trace_pci_nvme_finish_zone(slba, zone_idx, all); + status =3D name_do_zone_op(n, ns, zone, state, all, + nvme_finish_zone, nvme_cond_finish_all); + break; + + case NVME_ZONE_ACTION_RESET: + trace_pci_nvme_reset_zone(slba, zone_idx, all); + status =3D name_do_zone_op(n, ns, zone, state, all, + nvme_reset_zone, nvme_cond_reset_all); + break; + + case NVME_ZONE_ACTION_OFFLINE: + trace_pci_nvme_offline_zone(slba, zone_idx, all); + status =3D name_do_zone_op(n, ns, zone, state, all, + nvme_offline_zone, nvme_cond_offline_all); + break; + + case NVME_ZONE_ACTION_SET_ZD_EXT: + trace_pci_nvme_set_descriptor_extension(slba, zone_idx); + return NVME_INVALID_FIELD | NVME_DNR; + break; + + default: + trace_pci_nvme_err_invalid_mgmt_action(action); + status =3D NVME_INVALID_FIELD; + } + + if (status =3D=3D NVME_ZONE_INVAL_TRANSITION) { + trace_pci_nvme_err_invalid_zone_state_transition(state, action, sl= ba, + zone->d.za); + } + if (status) { + status |=3D NVME_DNR; + } + + return status; +} + +static bool nvme_zone_matches_filter(uint32_t zafs, NvmeZone *zl) +{ + int zs =3D nvme_get_zone_state(zl); + + switch (zafs) { + case NVME_ZONE_REPORT_ALL: + return true; + case NVME_ZONE_REPORT_EMPTY: + return (zs =3D=3D NVME_ZONE_STATE_EMPTY); + case NVME_ZONE_REPORT_IMPLICITLY_OPEN: + return (zs =3D=3D NVME_ZONE_STATE_IMPLICITLY_OPEN); + case NVME_ZONE_REPORT_EXPLICITLY_OPEN: + return (zs =3D=3D NVME_ZONE_STATE_EXPLICITLY_OPEN); + case NVME_ZONE_REPORT_CLOSED: + return (zs =3D=3D NVME_ZONE_STATE_CLOSED); + case NVME_ZONE_REPORT_FULL: + return (zs =3D=3D NVME_ZONE_STATE_FULL); + case NVME_ZONE_REPORT_READ_ONLY: + return (zs =3D=3D NVME_ZONE_STATE_READ_ONLY); + case NVME_ZONE_REPORT_OFFLINE: + return (zs =3D=3D NVME_ZONE_STATE_OFFLINE); + default: + return false; + } +} + +static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeCmd *cmd =3D (NvmeCmd *)&req->cmd; + NvmeNamespace *ns =3D req->ns; + uint64_t prp1 =3D le64_to_cpu(cmd->dptr.prp1); + uint64_t prp2 =3D le64_to_cpu(cmd->dptr.prp2); + /* cdw12 is zero-based number of dwords to return. Convert to bytes */ + uint32_t len =3D (le32_to_cpu(cmd->cdw12) + 1) << 2; + uint32_t dw13 =3D le32_to_cpu(cmd->cdw13); + uint32_t zone_idx, zra, zrasf, partial; + uint64_t max_zones, nr_zones =3D 0; + uint16_t ret; + uint64_t slba; + NvmeZoneDescr *z; + NvmeZone *zs; + NvmeZoneReportHeader *header; + void *buf, *buf_p; + size_t zone_entry_sz; + + req->status =3D NVME_SUCCESS; + + ret =3D nvme_get_mgmt_zone_slba_idx(n, ns, cmd, &slba, &zone_idx); + if (ret) { + return ret; + } + + if (len < sizeof(NvmeZoneReportHeader)) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + zra =3D dw13 & 0xff; + if (!(zra =3D=3D NVME_ZONE_REPORT || zra =3D=3D NVME_ZONE_REPORT_EXTEN= DED)) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + if (zra =3D=3D NVME_ZONE_REPORT_EXTENDED) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + zrasf =3D (dw13 >> 8) & 0xff; + if (zrasf > NVME_ZONE_REPORT_OFFLINE) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + partial =3D (dw13 >> 16) & 0x01; + + zone_entry_sz =3D sizeof(NvmeZoneDescr); + + max_zones =3D (len - sizeof(NvmeZoneReportHeader)) / zone_entry_sz; + buf =3D g_malloc0(len); + + header =3D (NvmeZoneReportHeader *)buf; + buf_p =3D buf + sizeof(NvmeZoneReportHeader); + + while (zone_idx < n->num_zones && nr_zones < max_zones) { + zs =3D &ns->zone_array[zone_idx]; + + if (!nvme_zone_matches_filter(zrasf, zs)) { + zone_idx++; + continue; + } + + z =3D (NvmeZoneDescr *)buf_p; + buf_p +=3D sizeof(NvmeZoneDescr); + nr_zones++; + + z->zt =3D zs->d.zt; + z->zs =3D zs->d.zs; + z->zcap =3D cpu_to_le64(zs->d.zcap); + z->zslba =3D cpu_to_le64(zs->d.zslba); + z->za =3D zs->d.za; + + if (nvme_wp_is_valid(zs)) { + z->wp =3D cpu_to_le64(zs->d.wp); + } else { + z->wp =3D cpu_to_le64(~0ULL); + } + + zone_idx++; + } + + if (!partial) { + for (; zone_idx < n->num_zones; zone_idx++) { + zs =3D &ns->zone_array[zone_idx]; + if (nvme_zone_matches_filter(zrasf, zs)) { + nr_zones++; + } + } + } + header->nr_zones =3D cpu_to_le64(nr_zones); + + ret =3D nvme_dma_prp(n, (uint8_t *)buf, len, prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); + g_free(buf); + + return ret; +} + static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req) { uint32_t nsid =3D le32_to_cpu(req->cmd.nsid); @@ -726,9 +1494,15 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest = *req) return nvme_flush(n, req); case NVME_CMD_WRITE_ZEROES: return nvme_write_zeroes(n, req); + case NVME_CMD_ZONE_APPEND: + return nvme_rw(n, req, true); case NVME_CMD_WRITE: case NVME_CMD_READ: - return nvme_rw(n, req); + return nvme_rw(n, req, false); + case NVME_CMD_ZONE_MGMT_SEND: + return nvme_zone_mgmt_send(n, req); + case NVME_CMD_ZONE_MGMT_RECV: + return nvme_zone_mgmt_recv(n, req); default: trace_pci_nvme_err_invalid_opc(req->cmd.opcode); return NVME_INVALID_OPCODE | NVME_DNR; @@ -957,7 +1731,7 @@ static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t r= ae, uint32_t buf_len, DMA_DIRECTION_FROM_DEVICE, req); } =20 -static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint32_t buf_len, +static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint8_t csi, uint32_t buf_le= n, uint64_t off, NvmeRequest *req) { NvmeCmd *cmd =3D &req->cmd; @@ -985,11 +1759,19 @@ static uint16_t nvme_cmd_effects(NvmeCtrl *n, uint32= _t buf_len, acs[NVME_ADM_CMD_GET_LOG_PAGE] =3D NVME_CMD_EFFECTS_CSUPP; acs[NVME_ADM_CMD_ASYNC_EV_REQ] =3D NVME_CMD_EFFECTS_CSUPP; =20 - iocs[NVME_CMD_FLUSH] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBC= C; - iocs[NVME_CMD_WRITE_ZEROES] =3D NVME_CMD_EFFECTS_CSUPP | - NVME_CMD_EFFECTS_LBCC; - iocs[NVME_CMD_WRITE] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBC= C; - iocs[NVME_CMD_READ] =3D NVME_CMD_EFFECTS_CSUPP; + if (NVME_CC_CSS(n->bar.cc) !=3D CSS_ADMIN_ONLY) { + iocs[NVME_CMD_FLUSH] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS= _LBCC; + iocs[NVME_CMD_WRITE_ZEROES] =3D NVME_CMD_EFFECTS_CSUPP | + NVME_CMD_EFFECTS_LBCC; + iocs[NVME_CMD_WRITE] =3D NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS= _LBCC; + iocs[NVME_CMD_READ] =3D NVME_CMD_EFFECTS_CSUPP; + } + if (csi =3D=3D NVME_CSI_ZONED && NVME_CC_CSS(n->bar.cc) =3D=3D CSS_CSI= ) { + iocs[NVME_CMD_ZONE_APPEND] =3D NVME_CMD_EFFECTS_CSUPP | + NVME_CMD_EFFECTS_LBCC; + iocs[NVME_CMD_ZONE_MGMT_SEND] =3D NVME_CMD_EFFECTS_CSUPP; + iocs[NVME_CMD_ZONE_MGMT_RECV] =3D NVME_CMD_EFFECTS_CSUPP; + } =20 trans_len =3D MIN(sizeof(cmd_eff_log) - off, buf_len); =20 @@ -1008,6 +1790,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest= *req) uint8_t lid =3D dw10 & 0xff; uint8_t lsp =3D (dw10 >> 8) & 0xf; uint8_t rae =3D (dw10 >> 15) & 0x1; + uint8_t csi =3D le32_to_cpu(cmd->cdw14) >> 24; uint32_t numdl, numdu; uint64_t off, lpol, lpou; size_t len; @@ -1041,7 +1824,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest= *req) case NVME_LOG_FW_SLOT_INFO: return nvme_fw_log_info(n, len, off, req); case NVME_LOG_CMD_EFFECTS: - return nvme_cmd_effects(n, len, off, req); + return nvme_cmd_effects(n, csi, len, off, req); default: trace_pci_nvme_err_invalid_log_page(nvme_cid(req), lid); return NVME_INVALID_FIELD | NVME_DNR; @@ -1162,6 +1945,16 @@ static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n= , uint64_t prp1, DMA_DIRECTION_FROM_DEVICE, req); } =20 +static inline bool nvme_csi_has_nvm_support(NvmeNamespace *ns) +{ + switch (ns->csi) { + case NVME_CSI_NVM: + case NVME_CSI_ZONED: + return true; + } + return false; +} + static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; @@ -1177,13 +1970,22 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, Nvm= eRequest *req) static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c =3D (NvmeIdentify *)&req->cmd; + NvmeIdCtrlZoned *id; uint64_t prp1 =3D le64_to_cpu(c->prp1); uint64_t prp2 =3D le64_to_cpu(c->prp2); + uint16_t ret; =20 trace_pci_nvme_identify_ctrl_csi(c->csi); =20 if (c->csi =3D=3D NVME_CSI_NVM) { return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } else if (c->csi =3D=3D NVME_CSI_ZONED && n->params.zoned) { + id =3D g_malloc0(sizeof(*id)); + id->zasl =3D n->zasl; + ret =3D nvme_dma_prp(n, (uint8_t *)id, sizeof(*id), prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); + g_free(id); + return ret; } =20 return NVME_INVALID_FIELD | NVME_DNR; @@ -1212,8 +2014,12 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRe= quest *req, return nvme_rpt_empty_id_struct(n, prp1, prp2, req); } =20 - return nvme_dma_prp(n, (uint8_t *)&ns->id_ns, sizeof(ns->id_ns), prp1, - prp2, DMA_DIRECTION_FROM_DEVICE, req); + if (c->csi =3D=3D NVME_CSI_NVM && nvme_csi_has_nvm_support(ns)) { + return nvme_dma_prp(n, (uint8_t *)&ns->id_ns, sizeof(ns->id_ns), p= rp1, + prp2, DMA_DIRECTION_FROM_DEVICE, req); + } + + return NVME_INVALID_CMD_SET | NVME_DNR; } =20 static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, NvmeRequest *req, @@ -1239,8 +2045,12 @@ static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, Nv= meRequest *req, return nvme_rpt_empty_id_struct(n, prp1, prp2, req); } =20 - if (c->csi =3D=3D NVME_CSI_NVM) { + if (c->csi =3D=3D NVME_CSI_NVM && nvme_csi_has_nvm_support(ns)) { return nvme_rpt_empty_id_struct(n, prp1, prp2, req); + } else if (c->csi =3D=3D NVME_CSI_ZONED && ns->csi =3D=3D NVME_CSI_ZON= ED) { + return nvme_dma_prp(n, (uint8_t *)ns->id_ns_zoned, + sizeof(*ns->id_ns_zoned), prp1, prp2, + DMA_DIRECTION_FROM_DEVICE, req); } =20 return NVME_INVALID_FIELD | NVME_DNR; @@ -1300,7 +2110,7 @@ static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n,= NvmeRequest *req, =20 trace_pci_nvme_identify_nslist_csi(min_nsid, c->csi); =20 - if (c->csi !=3D NVME_CSI_NVM) { + if (c->csi !=3D NVME_CSI_NVM && c->csi !=3D NVME_CSI_ZONED) { return NVME_INVALID_FIELD | NVME_DNR; } =20 @@ -1364,7 +2174,7 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl = *n, NvmeRequest *req) desc->nidt =3D NVME_NIDT_CSI; desc->nidl =3D NVME_NIDL_CSI; buf_ptr +=3D sizeof(*desc); - *(uint8_t *)buf_ptr =3D NVME_CSI_NVM; + *(uint8_t *)buf_ptr =3D ns->csi; =20 status =3D nvme_dma_prp(n, buf, data_len, prp1, prp2, DMA_DIRECTION_FROM_DEVICE, req); @@ -1387,6 +2197,9 @@ static uint16_t nvme_identify_cmd_set(NvmeCtrl *n, Nv= meRequest *req) list =3D g_malloc0(data_len); ptr =3D (uint8_t *)list; NVME_SET_CSI(*ptr, NVME_CSI_NVM); + if (n->params.zoned) { + NVME_SET_CSI(*ptr, NVME_CSI_ZONED); + } status =3D nvme_dma_prp(n, (uint8_t *)list, data_len, prp1, prp2, DMA_DIRECTION_FROM_DEVICE, req); g_free(list); @@ -1432,7 +2245,7 @@ static uint16_t nvme_abort(NvmeCtrl *n, NvmeRequest *= req) { uint16_t sqid =3D le32_to_cpu(req->cmd.cdw10) & 0xffff; =20 - req->cqe.result =3D 1; + req->cqe.result32 =3D 1; if (nvme_check_sqid(n, sqid)) { return NVME_INVALID_FIELD | NVME_DNR; } @@ -1613,7 +2426,7 @@ defaults: } =20 out: - req->cqe.result =3D cpu_to_le32(result); + req->cqe.result32 =3D cpu_to_le32(result); return NVME_SUCCESS; } =20 @@ -1722,8 +2535,8 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeReq= uest *req) ((dw11 >> 16) & 0xFFFF) + 1, n->params.max_ioqpairs, n->params.max_ioqpairs); - req->cqe.result =3D cpu_to_le32((n->params.max_ioqpairs - 1) | - ((n->params.max_ioqpairs - 1) << 16)= ); + req->cqe.result32 =3D cpu_to_le32((n->params.max_ioqpairs - 1) | + ((n->params.max_ioqpairs - 1) << 1= 6)); break; case NVME_ASYNCHRONOUS_EVENT_CONF: n->features.async_config =3D dw11; @@ -1955,6 +2768,20 @@ static int nvme_start_ctrl(NvmeCtrl *n) n->namespaces[i].attached =3D true; } break; + case NVME_CSI_ZONED: + if (NVME_CC_CSS(n->bar.cc) =3D=3D CSS_CSI) { + n->namespaces[i].attached =3D true; + } + break; + } + } + + if (n->params.zoned) { + if (!n->zasl_bs) { + assert(n->params.mdts); + n->zasl =3D n->params.mdts; + } else { + n->zasl =3D 31 - clz32(n->zasl_bs / n->page_size); } } =20 @@ -2018,12 +2845,18 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offs= et, uint64_t data, } else { switch (NVME_CC_CSS(data)) { case CSS_NVM_ONLY: - trace_pci_nvme_css_nvm_cset_selected_by_host(data & - 0xfffffff= f); + if (n->params.zoned) { + NVME_GUEST_ERR(pci_nvme_err_only_zoned_cmd_set_ava= il, + "only NVM+ZONED command set can be selected= "); break; + } + trace_pci_nvme_css_nvm_cset_selected_by_host(data & + 0xffffffff); + break; case CSS_CSI: NVME_SET_CC_CSS(n->bar.cc, CSS_CSI); - trace_pci_nvme_css_all_csets_sel_by_host(data & 0xffff= ffff); + trace_pci_nvme_css_all_csets_sel_by_host(data & + 0xffffffff); break; case CSS_ADMIN_ONLY: break; @@ -2355,6 +3188,129 @@ static const MemoryRegionOps nvme_cmb_ops =3D { }, }; =20 +static int nvme_init_zone_meta(NvmeCtrl *n, NvmeNamespace *ns, + uint64_t capacity) +{ + NvmeZone *zone; + uint64_t start =3D 0, zone_size =3D n->zone_size; + int i; + + ns->zone_array =3D g_malloc0(n->zone_array_size); + ns->exp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->imp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->closed_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->full_zones =3D g_malloc0(sizeof(NvmeZoneList)); + zone =3D ns->zone_array; + + nvme_init_zone_list(ns->exp_open_zones); + nvme_init_zone_list(ns->imp_open_zones); + nvme_init_zone_list(ns->closed_zones); + nvme_init_zone_list(ns->full_zones); + + for (i =3D 0; i < n->num_zones; i++, zone++) { + if (start + zone_size > capacity) { + zone_size =3D capacity - start; + } + zone->d.zt =3D NVME_ZONE_TYPE_SEQ_WRITE; + nvme_set_zone_state(zone, NVME_ZONE_STATE_EMPTY); + zone->d.za =3D 0; + zone->d.zcap =3D n->zone_capacity; + zone->d.zslba =3D start; + zone->d.wp =3D start; + zone->w_ptr =3D start; + zone->prev =3D 0; + zone->next =3D 0; + start +=3D zone_size; + } + + return 0; +} + +static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error **errp) +{ + uint64_t zone_size, zone_cap; + uint32_t nz; + + if (n->params.zone_size_mb) { + zone_size =3D n->params.zone_size_mb; + } else { + zone_size =3D NVME_DEFAULT_ZONE_SIZE; + } + if (n->params.zone_capacity_mb) { + zone_cap =3D n->params.zone_capacity_mb; + } else { + zone_cap =3D zone_size; + } + n->zone_size =3D zone_size * MiB / n->conf.logical_block_size; + n->zone_capacity =3D zone_cap * MiB / n->conf.logical_block_size; + if (n->zone_capacity > n->zone_size) { + error_setg(errp, "zone capacity exceeds zone size"); + return; + } + + nz =3D DIV_ROUND_UP(n->ns_size / n->conf.logical_block_size, n->zone_s= ize); + n->num_zones =3D nz; + n->zone_array_size =3D sizeof(NvmeZone) * nz; + n->zone_size_log2 =3D 0; + if (is_power_of_2(n->zone_size)) { + n->zone_size_log2 =3D 63 - clz64(n->zone_size); + } + + if (!n->params.zasl_kb) { + n->zasl_bs =3D n->params.mdts ? 0 : NVME_DEFAULT_MAX_ZA_SIZE * KiB; + } else { + n->zasl_bs =3D n->params.zasl_kb * KiB; + } + + return; +} + +static int nvme_zoned_init_ns(NvmeCtrl *n, NvmeNamespace *ns, int lba_inde= x, + Error **errp) +{ + int ret; + + ret =3D nvme_init_zone_meta(n, ns, n->num_zones * n->zone_size); + if (ret) { + error_setg(errp, "could not init zone metadata"); + return -1; + } + + ns->id_ns_zoned =3D g_malloc0(sizeof(*ns->id_ns_zoned)); + + /* MAR/MOR are zeroes-based, 0xffffffff means no limit */ + ns->id_ns_zoned->mar =3D 0xffffffff; + ns->id_ns_zoned->mor =3D 0xffffffff; + ns->id_ns_zoned->zoc =3D 0; + ns->id_ns_zoned->ozcs =3D n->params.cross_zone_read ? 0x01 : 0x00; + + ns->id_ns_zoned->lbafe[lba_index].zsze =3D cpu_to_le64(n->zone_size); + ns->id_ns_zoned->lbafe[lba_index].zdes =3D 0; + + if (n->params.fill_pattern =3D=3D 0) { + ns->id_ns.dlfeat =3D 0x01; + } else if (n->params.fill_pattern =3D=3D 0xff) { + ns->id_ns.dlfeat =3D 0x02; + } + + return 0; +} + +static void nvme_zoned_clear(NvmeCtrl *n) +{ + int i; + + for (i =3D 0; i < n->num_namespaces; i++) { + NvmeNamespace *ns =3D &n->namespaces[i]; + g_free(ns->id_ns_zoned); + g_free(ns->zone_array); + g_free(ns->exp_open_zones); + g_free(ns->imp_open_zones); + g_free(ns->closed_zones); + g_free(ns->full_zones); + } +} + static void nvme_check_constraints(NvmeCtrl *n, Error **errp) { NvmeParams *params =3D &n->params; @@ -2423,18 +3379,13 @@ static void nvme_init_state(NvmeCtrl *n) =20 static void nvme_init_blk(NvmeCtrl *n, Error **errp) { + int64_t bs_size; + if (!blkconf_blocksizes(&n->conf, errp)) { return; } blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk), false, errp); -} - -static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **er= rp) -{ - int64_t bs_size; - NvmeIdNs *id_ns =3D &ns->id_ns; - int lba_index; =20 bs_size =3D blk_getlength(n->conf.blk); if (bs_size < 0) { @@ -2443,6 +3394,12 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNam= espace *ns, Error **errp) } =20 n->ns_size =3D bs_size; +} + +static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **er= rp) +{ + NvmeIdNs *id_ns =3D &ns->id_ns; + int lba_index; =20 ns->csi =3D NVME_CSI_NVM; qemu_uuid_generate(&ns->uuid); /* TODO make UUIDs persistent */ @@ -2450,8 +3407,18 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNam= espace *ns, Error **errp) id_ns->lbaf[lba_index].ds =3D 31 - clz32(n->conf.logical_block_size); id_ns->nsze =3D cpu_to_le64(nvme_ns_nlbas(n, ns)); =20 + if (n->params.zoned) { + ns->csi =3D NVME_CSI_ZONED; + id_ns->ncap =3D cpu_to_le64(n->zone_capacity * n->num_zones); + if (nvme_zoned_init_ns(n, ns, lba_index, errp) !=3D 0) { + return; + } + } else { + ns->csi =3D NVME_CSI_NVM; + id_ns->ncap =3D id_ns->nsze; + } + /* no thin provisioning */ - id_ns->ncap =3D id_ns->nsze; id_ns->nuse =3D id_ns->ncap; } =20 @@ -2611,8 +3578,9 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) NVME_CAP_SET_CQR(n->bar.cap, 1); NVME_CAP_SET_TO(n->bar.cap, 0xf); /* - * The device now always supports NS Types, but all commands - * that support CSI field will only handle NVM Command Set. + * The device now always supports NS Types, even when "zoned" property + * is set to zero. If this is the case, all commands that support CSI + * field only handle NVM Command Set. */ NVME_CAP_SET_CSS(n->bar.cap, (CAP_CSS_NVM | CAP_CSS_CSI_SUPP)); NVME_CAP_SET_MPSMAX(n->bar.cap, 4); @@ -2648,6 +3616,13 @@ static void nvme_realize(PCIDevice *pci_dev, Error *= *errp) return; } =20 + if (n->params.zoned) { + nvme_zoned_init_ctrl(n, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } nvme_init_ctrl(n, pci_dev); =20 ns =3D n->namespaces; @@ -2666,6 +3641,9 @@ static void nvme_exit(PCIDevice *pci_dev) NvmeCtrl *n =3D NVME(pci_dev); =20 nvme_clear_ctrl(n); + if (n->params.zoned) { + nvme_zoned_clear(n); + } g_free(n->namespaces); g_free(n->cq); g_free(n->sq); @@ -2693,6 +3671,13 @@ static Property nvme_props[] =3D { DEFINE_PROP_UINT8("aerl", NvmeCtrl, params.aerl, 3), DEFINE_PROP_UINT32("aer_max_queued", NvmeCtrl, params.aer_max_queued, = 64), DEFINE_PROP_UINT8("mdts", NvmeCtrl, params.mdts, 7), + DEFINE_PROP_BOOL("zoned", NvmeCtrl, params.zoned, false), + DEFINE_PROP_UINT64("zone_size", NvmeCtrl, params.zone_size_mb, + NVME_DEFAULT_ZONE_SIZE), + DEFINE_PROP_UINT64("zone_capacity", NvmeCtrl, params.zone_capacity_mb,= 0), + DEFINE_PROP_UINT32("zone_append_size_limit", NvmeCtrl, params.zasl_kb,= 0), + DEFINE_PROP_BOOL("cross_zone_read", NvmeCtrl, params.cross_zone_read, = true), + DEFINE_PROP_UINT8("fill_pattern", NvmeCtrl, params.fill_pattern, 0), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/include/block/nvme.h b/include/block/nvme.h index ced66cf4eb..f630dfd163 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -651,8 +651,10 @@ typedef struct QEMU_PACKED NvmeAerResult { } NvmeAerResult; =20 typedef struct QEMU_PACKED NvmeCqe { - uint32_t result; - uint32_t rsvd; + union { + uint64_t result64; + uint32_t result32; + }; uint16_t sq_head; uint16_t sq_id; uint16_t cid; --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886010; cv=none; d=zohomail.com; s=zohoarc; b=RE+3V7jzXP8wDwoEip4OmDsJk9bRJbjl6H02SwLUlEmhd2WOBE/4N25T8vtLVtRw1JY3mKQxTk7WN/86YmueB3Y3jy4kt7L6OuDWu1vTqj5V6udok7TGtiLI9toFlJdXsJi+pAWIGF4I2J4ed9Bs7vgNLRxF7gFMTBtwukJL0qg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886010; 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=tPivsAKT+UYp+EeAk6Sa2ctfB4HLDHIwGwHgFiXLsPc=; b=DmpshjKQY2OHnpFYTetU4gknUSveJIbq0rzZJcb6NxzIkuQ1xdVFyln2L+SSDsi6l091hvcbSHudwRHXfrghjFW80jHukZCfo/l7n9fdtJt96QPrnheXwsEXqZxJVATn3GhMS13GldPmzSoImIeseSMjxaDgXC5ihAioEp317FA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886010361176.0040328626112; Wed, 23 Sep 2020 11:33:30 -0700 (PDT) Received: from localhost ([::1]:56468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9a4-0007yd-U7 for importer@patchew.org; Wed, 23 Sep 2020 14:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9ON-0005K5-Ia; Wed, 23 Sep 2020 14:21:27 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OB-00087W-N2; Wed, 23 Sep 2020 14:21:19 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:42 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:17 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886204; x=1632422204; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QkzN7lGoIWsEexi9yg8wqovOFvAfUWLQb90Kt3NZ/UI=; b=N3RI05tj4MGYk++0CJFl5TUSmKmSUb84E8tngmSvuRDFrP5MZnXiWdYI +pTS6zieRMTw12ZlbF086QLhVgql2aQN9MAs1dJ7Z4ij/cJMN6ndWHqCm Eskz5BbVHBCyBcWS+BXCcEuTGpLuF4n/VoGUUN0Kx5N6BukPsGvGSw/70 RItIHEuNQaEAPvUOvIuw/8W0YMKaLLwL+MJpo9Qhj9fwYijlIpnn0jzQr z8LLg6nVgdJXf3kgmyJbprpsfDts8lnb8BuTL2Byk49udakujkd6JWYsH 2GlNTwCWdJD5qDGb6WFrhsmBuFnd4o8FarkopJhnLDiQ5zMxFVltDf/xC g==; IronPort-SDR: 1O5qru+/sp5YCadnESwN7I1JksWMrpnkP3USBZ4lyHHZ84VTDIinKeXZxcbdJe9Qf++3rFvlFu bRH3VipKfysT5fMWxX9KKRerlg5UhRGwJWxCOULgbGCK/HJn8VLUuKbiLYgmXj7SIl9IF1xkSh vHNkA4vWkhRzNoM0ieW1UVpc/8aP/vV/i/Cpe1gtDqajmtjs37SAm9nR6ABh/SIhwQfmgt+daC DfdteaeVpYQ3yj1vpkogKJFcBM1lOcphETryIsae28UjJ0qQ/U/hGE5hbkIc2ArTnu2qfATs4u LkM= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496378" IronPort-SDR: xGqCHuQZ7vYSG5ISiI6g/eNStuvabkXzDU31/Hkv7ViMVsRNM0YU9x00EY8c7c4ZpRZPKh30gP ZDRawLsuOCFg== IronPort-SDR: t8oRNKQN0ZrL0xOHO7uF+/8S3y0OkAoL7EgyYsUvLqlJFWffN1ixPm8MYjm7h/I8v05EstUfCZ 6VWnp1MQKp/g== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 10/14] hw/block/nvme: Introduce max active and open zone limits Date: Thu, 24 Sep 2020 03:20:17 +0900 Message-Id: <20200923182021.3724-11-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 3 minutes in the future.) Content-Type: text/plain; charset="utf-8" Added two module properties, "max_active" and "max_open" to control the maximum number of zones that can be active or open. Once these variables are set to non-default values, these limits are checked during I/O and Too Many Active or Too Many Open command status is returned if they are exceeded. Signed-off-by: Hans Holmberg Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 179 +++++++++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 4 ++ 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 287984dd37..3f397a3ea7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -176,6 +176,87 @@ static void nvme_remove_zone(NvmeCtrl *n, NvmeNamespac= e *ns, NvmeZoneList *zl, zone->prev =3D zone->next =3D 0; } =20 +/* + * Take the first zone out from a list, return NULL if the list is empty. + */ +static NvmeZone *nvme_remove_zone_head(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZoneList *zl) +{ + NvmeZone *zone =3D nvme_peek_zone_head(ns, zl); + + if (zone) { + --zl->size; + if (zl->size =3D=3D 0) { + zl->head =3D NVME_ZONE_LIST_NIL; + zl->tail =3D NVME_ZONE_LIST_NIL; + } else { + zl->head =3D zone->next; + ns->zone_array[zl->head].prev =3D NVME_ZONE_LIST_NIL; + } + zone->prev =3D zone->next =3D 0; + } + + return zone; +} + +/* + * Check if we can open a zone without exceeding open/active limits. + * AOR stands for "Active and Open Resources" (see TP 4053 section 2.5). + */ +static int nvme_aor_check(NvmeCtrl *n, NvmeNamespace *ns, + uint32_t act, uint32_t opn) +{ + if (n->params.max_active_zones !=3D 0 && + ns->nr_active_zones + act > n->params.max_active_zones) { + trace_pci_nvme_err_insuff_active_res(n->params.max_active_zones); + return NVME_ZONE_TOO_MANY_ACTIVE | NVME_DNR; + } + if (n->params.max_open_zones !=3D 0 && + ns->nr_open_zones + opn > n->params.max_open_zones) { + trace_pci_nvme_err_insuff_open_res(n->params.max_open_zones); + return NVME_ZONE_TOO_MANY_OPEN | NVME_DNR; + } + + return NVME_SUCCESS; +} + +static inline void nvme_aor_inc_open(NvmeCtrl *n, NvmeNamespace *ns) +{ + assert(ns->nr_open_zones >=3D 0); + if (n->params.max_open_zones) { + ns->nr_open_zones++; + assert(ns->nr_open_zones <=3D n->params.max_open_zones); + } +} + +static inline void nvme_aor_dec_open(NvmeCtrl *n, NvmeNamespace *ns) +{ + if (n->params.max_open_zones) { + assert(ns->nr_open_zones > 0); + ns->nr_open_zones--; + } + assert(ns->nr_open_zones >=3D 0); +} + +static inline void nvme_aor_inc_active(NvmeCtrl *n, NvmeNamespace *ns) +{ + assert(ns->nr_active_zones >=3D 0); + if (n->params.max_active_zones) { + ns->nr_active_zones++; + assert(ns->nr_active_zones <=3D n->params.max_active_zones); + } +} + +static inline void nvme_aor_dec_active(NvmeCtrl *n, NvmeNamespace *ns) +{ + if (n->params.max_active_zones) { + assert(ns->nr_active_zones > 0); + ns->nr_active_zones--; + assert(ns->nr_active_zones >=3D ns->nr_open_zones); + } + assert(ns->nr_active_zones >=3D 0); +} + static void nvme_assign_zone_state(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone, uint8_t state) { @@ -790,6 +871,41 @@ static uint16_t nvme_check_zone_read(NvmeCtrl *n, Nvme= Zone *zone, uint64_t slba, return status; } =20 +static void nvme_auto_transition_zone(NvmeCtrl *n, NvmeNamespace *ns, + bool implicit, bool adding_active) +{ + NvmeZone *zone; + + if (implicit && n->params.max_open_zones && + ns->nr_open_zones =3D=3D n->params.max_open_zones) { + zone =3D nvme_remove_zone_head(n, ns, ns->imp_open_zones); + if (zone) { + /* + * Automatically close this implicitly open zone. + */ + nvme_aor_dec_open(n, ns); + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_CLOSED); + } + } +} + +static uint16_t nvme_auto_open_zone(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone) +{ + uint16_t status =3D NVME_SUCCESS; + uint8_t zs =3D nvme_get_zone_state(zone); + + if (zs =3D=3D NVME_ZONE_STATE_EMPTY) { + nvme_auto_transition_zone(n, ns, true, true); + status =3D nvme_aor_check(n, ns, 1, 1); + } else if (zs =3D=3D NVME_ZONE_STATE_CLOSED) { + nvme_auto_transition_zone(n, ns, true, false); + status =3D nvme_aor_check(n, ns, 0, 1); + } + + return status; +} + static inline uint32_t nvme_zone_idx(NvmeCtrl *n, uint64_t slba) { return n->zone_size_log2 > 0 ? slba >> n->zone_size_log2 : @@ -837,7 +953,11 @@ static bool nvme_finalize_zoned_write(NvmeCtrl *n, Nvm= eRequest *req, switch (zs) { case NVME_ZONE_STATE_IMPLICITLY_OPEN: case NVME_ZONE_STATE_EXPLICITLY_OPEN: + nvme_aor_dec_open(n, ns); + /* fall through */ case NVME_ZONE_STATE_CLOSED: + nvme_aor_dec_active(n, ns); + /* fall through */ case NVME_ZONE_STATE_EMPTY: nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_FULL); /* fall through */ @@ -866,7 +986,10 @@ static uint64_t nvme_advance_zone_wp(NvmeCtrl *n, Nvme= Namespace *ns, zs =3D nvme_get_zone_state(zone); switch (zs) { case NVME_ZONE_STATE_EMPTY: + nvme_aor_inc_active(n, ns); + /* fall through */ case NVME_ZONE_STATE_CLOSED: + nvme_aor_inc_open(n, ns); nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_IMPLICITLY_OPEN); } @@ -958,6 +1081,11 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRe= quest *req) zone->w_ptr); return NVME_ZONE_INVALID_WRITE | NVME_DNR; } + + status =3D nvme_auto_open_zone(n, ns, zone); + if (status !=3D NVME_SUCCESS) { + return status; + } } =20 block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0, @@ -1033,6 +1161,12 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *re= q, bool append) zone->w_ptr); return NVME_ZONE_INVALID_WRITE | NVME_DNR; } + + status =3D nvme_auto_open_zone(n, ns, zone); + if (status !=3D NVME_SUCCESS) { + return status; + } + req->fill_ofs =3D -1LL; } else { status =3D nvme_check_zone_read(n, zone, slba, nlb, @@ -1129,9 +1263,27 @@ static uint16_t nvme_get_mgmt_zone_slba_idx(NvmeCtrl= *n, NvmeNamespace *ns, static uint16_t nvme_open_zone(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone, uint8_t state) { + uint16_t status; + switch (state) { case NVME_ZONE_STATE_EMPTY: + nvme_auto_transition_zone(n, ns, false, true); + status =3D nvme_aor_check(n, ns, 1, 0); + if (status !=3D NVME_SUCCESS) { + return status; + } + nvme_aor_inc_active(n, ns); + /* fall through */ case NVME_ZONE_STATE_CLOSED: + status =3D nvme_aor_check(n, ns, 0, 1); + if (status !=3D NVME_SUCCESS) { + if (state =3D=3D NVME_ZONE_STATE_EMPTY) { + nvme_aor_dec_active(n, ns); + } + return status; + } + nvme_aor_inc_open(n, ns); + /* fall through */ case NVME_ZONE_STATE_IMPLICITLY_OPEN: nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_EXPLICITLY_OPE= N); /* fall through */ @@ -1153,6 +1305,7 @@ static uint16_t nvme_close_zone(NvmeCtrl *n, NvmeNam= espace *ns, switch (state) { case NVME_ZONE_STATE_EXPLICITLY_OPEN: case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_aor_dec_open(n, ns); nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_CLOSED); /* fall through */ case NVME_ZONE_STATE_CLOSED: @@ -1174,7 +1327,11 @@ static uint16_t nvme_finish_zone(NvmeCtrl *n, NvmeNa= mespace *ns, switch (state) { case NVME_ZONE_STATE_EXPLICITLY_OPEN: case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_aor_dec_open(n, ns); + /* fall through */ case NVME_ZONE_STATE_CLOSED: + nvme_aor_dec_active(n, ns); + /* fall through */ case NVME_ZONE_STATE_EMPTY: zone->w_ptr =3D nvme_zone_wr_boundary(zone); nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_FULL); @@ -1199,7 +1356,11 @@ static uint16_t nvme_reset_zone(NvmeCtrl *n, NvmeNam= espace *ns, switch (state) { case NVME_ZONE_STATE_EXPLICITLY_OPEN: case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_aor_dec_open(n, ns); + /* fall through */ case NVME_ZONE_STATE_CLOSED: + nvme_aor_dec_active(n, ns); + /* fall through */ case NVME_ZONE_STATE_FULL: zone->w_ptr =3D zone->d.zslba; zone->d.wp =3D zone->w_ptr; @@ -3262,6 +3423,18 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error = **errp) n->zasl_bs =3D n->params.zasl_kb * KiB; } =20 + /* Make sure that the values of all Zoned Command Set properties are s= ane */ + if (n->params.max_open_zones > nz) { + warn_report("max_open_zones value %u exceeds the number of zones %= u," + " adjusting", n->params.max_open_zones, nz); + n->params.max_open_zones =3D nz; + } + if (n->params.max_active_zones > nz) { + warn_report("max_active_zones value %u exceeds the number of zones= %u," + " adjusting", n->params.max_active_zones, nz); + n->params.max_active_zones =3D nz; + } + return; } =20 @@ -3279,8 +3452,8 @@ static int nvme_zoned_init_ns(NvmeCtrl *n, NvmeNamesp= ace *ns, int lba_index, ns->id_ns_zoned =3D g_malloc0(sizeof(*ns->id_ns_zoned)); =20 /* MAR/MOR are zeroes-based, 0xffffffff means no limit */ - ns->id_ns_zoned->mar =3D 0xffffffff; - ns->id_ns_zoned->mor =3D 0xffffffff; + ns->id_ns_zoned->mar =3D cpu_to_le32(n->params.max_active_zones - 1); + ns->id_ns_zoned->mor =3D cpu_to_le32(n->params.max_open_zones - 1); ns->id_ns_zoned->zoc =3D 0; ns->id_ns_zoned->ozcs =3D n->params.cross_zone_read ? 0x01 : 0x00; =20 @@ -3676,6 +3849,8 @@ static Property nvme_props[] =3D { NVME_DEFAULT_ZONE_SIZE), DEFINE_PROP_UINT64("zone_capacity", NvmeCtrl, params.zone_capacity_mb,= 0), DEFINE_PROP_UINT32("zone_append_size_limit", NvmeCtrl, params.zasl_kb,= 0), + DEFINE_PROP_UINT32("max_active", NvmeCtrl, params.max_active_zones, 0), + DEFINE_PROP_UINT32("max_open", NvmeCtrl, params.max_open_zones, 0), DEFINE_PROP_BOOL("cross_zone_read", NvmeCtrl, params.cross_zone_read, = true), DEFINE_PROP_UINT8("fill_pattern", NvmeCtrl, params.fill_pattern, 0), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/block/nvme.h b/hw/block/nvme.h index d9f307f0ed..6efd566cb2 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -22,6 +22,8 @@ typedef struct NvmeParams { uint32_t zasl_kb; uint64_t zone_size_mb; uint64_t zone_capacity_mb; + uint32_t max_active_zones; + uint32_t max_open_zones; } NvmeParams; =20 typedef struct NvmeAsyncEvent { @@ -103,6 +105,8 @@ typedef struct NvmeNamespace { NvmeZoneList *imp_open_zones; NvmeZoneList *closed_zones; NvmeZoneList *full_zones; + int32_t nr_open_zones; + int32_t nr_active_zones; } NvmeNamespace; =20 static inline NvmeLBAF *nvme_ns_lbaf(NvmeNamespace *ns) --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886404; cv=none; d=zohomail.com; s=zohoarc; b=lyYQbu1N81cs0HIhKV1GEahzpd/hqIgo2cw9PqoEUmXFIzBEKyhBhOdb6ENDEBS3S7ApYFF7g98Zyz4v7V4OvHg+25iac30tPJx4mWRzYGus8xDdZSsgigmsvXtnpKk5chq2u+fC4dft9hBoKY0OB5MeYS0ZIpU9wyqzAoC02vQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886404; 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=j/4HUpW5SsGTLQ4NuC+P5oNW252YvCH30inDCgtx9u4=; b=mLI0WjpT/MqN30a9PrwrKiq83o4vu5DYFliLvpzuWQa8mjJiRcBnm3xGDxfKwK61yB4OlaSL8y9V94/e7CDysSBIv+B7L8vcCW0ge6Gq+0z2qbRF2WK96MpVqUBpg7EFnm0oQmtrfidxIpPevdAPDaKTlX005VS/gpI2/DtMBRA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886404512942.4306393724312; Wed, 23 Sep 2020 11:40:04 -0700 (PDT) Received: from localhost ([::1]:45342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9gP-0006xA-AV for importer@patchew.org; Wed, 23 Sep 2020 14:40:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OR-0005KN-BC; Wed, 23 Sep 2020 14:21:29 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OI-0008F1-0A; Wed, 23 Sep 2020 14:21:23 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:46 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:19 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886213; x=1632422213; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h+DUx/2xur/9+jUIyiBVthvru0eNYGzdmdNyCfTuSxU=; b=jjh/ef31qqSzBph7jPTB6cmgvB5k6HDCkIJqH4WRAXb/xVqMsscKlJWN SM9en+wGvAx0zTxsuWlpcSEJ5mZw6kXrggnpSkYNjgNmz5gbMZHP/FQS6 /hSSYhkUwlE1KZKRorcVWx3k4P8J8MmL8jmsgWTKItpwdd8te0834hc0W 0X2RiRFb5L3Zwhhnjb/pG+6SPbEiCbGOlkYP2eNFQnCki6Wh5ilCoeo48 lVwKT6bscNLJokUKz6C3HgawuJWi/+W41jyVkrKg9d24PyGVoLXZB/BF4 6h8Z92gemZmnwl2pLop4SIECqLheBSWRg6yZL+sRPrwHqGTMDFsF3lJwJ Q==; IronPort-SDR: pj3K6jo4rsx9ip7irX/4v+FUhfrBHwMEacNMLT7iwO+2bCTDorpL7KtgIiXFZu6oICAK+LcEOo zRYUUZAjb95Mrifmx3vUOZ7v6eI4NpeFaVahPXRm7kj+eFTJe+9Ze66LwOEdYBI5S5TnVdG74G PV+We2db3ikBcVUzVj/BsrTPRkzZozy0h/+8ATMUsvA2+86BH3xpPTANb7A53G88xBbQQD7CiK JjDlLvdsB6LD03hi06Zo5UGO5jAb8l53g9IOi7ezyvnCQugdc1X/X4o8cn2J1OMnr7gYqHIJFS KMI= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496383" IronPort-SDR: 1ME5p9uY5Zyev67PB1WxVRC1ETtbZtvO3vZ4aSCbSLv61DzZ1VA5FP7FpNNTqfrQsk9OcDdpBx WKupgBW08PHg== IronPort-SDR: 9BAyg2Ruov874EmcDR9Z5ozalr+qL56CirO0hdjazn5iSnldLI52QIQgXEv38KLPywpSn5OBNe mckLh+iOa20w== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 11/14] hw/block/nvme: Support Zone Descriptor Extensions Date: Thu, 24 Sep 2020 03:20:18 +0900 Message-Id: <20200923182021.3724-12-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Zone Descriptor Extension is a label that can be assigned to a zone. It can be set to an Empty zone and it stays assigned until the zone is reset. This commit adds a new optional module property, "zone_descr_ext_size". Its value must be a multiple of 64 bytes. If this value is non-zero, it becomes possible to assign extensions of that size to any Empty zones. The default value for this property is 0, therefore setting extensions is disabled by default. Signed-off-by: Hans Holmberg Signed-off-by: Dmitry Fomichev Reviewed-by: Klaus Jensen --- hw/block/nvme.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++--- hw/block/nvme.h | 8 ++++++ 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 3f397a3ea7..cfa791aa72 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1400,6 +1400,26 @@ static bool nvme_cond_offline_all(uint8_t state) return state =3D=3D NVME_ZONE_STATE_READ_ONLY; } =20 +static uint16_t nvme_set_zd_ext(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, uint8_t state) +{ + uint16_t status; + + if (state =3D=3D NVME_ZONE_STATE_EMPTY) { + nvme_auto_transition_zone(n, ns, false, true); + status =3D nvme_aor_check(n, ns, 1, 0); + if (status !=3D NVME_SUCCESS) { + return status; + } + nvme_aor_inc_active(n, ns); + zone->d.za |=3D NVME_ZA_ZD_EXT_VALID; + nvme_assign_zone_state(n, ns, zone, NVME_ZONE_STATE_CLOSED); + return NVME_SUCCESS; + } + + return NVME_ZONE_INVAL_TRANSITION; +} + typedef uint16_t (*op_handler_t)(NvmeCtrl *, NvmeNamespace *, NvmeZone *, uint8_t); typedef bool (*need_to_proc_zone_t)(uint8_t); @@ -1434,12 +1454,14 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nv= meRequest *req) NvmeCmd *cmd =3D (NvmeCmd *)&req->cmd; NvmeNamespace *ns =3D req->ns; uint32_t dw13 =3D le32_to_cpu(cmd->cdw13); + uint64_t prp1, prp2; uint64_t slba =3D 0; uint32_t zone_idx =3D 0; uint16_t status; uint8_t action, state; bool all; NvmeZone *zone; + uint8_t *zd_ext; =20 action =3D dw13 & 0xff; all =3D dw13 & 0x100; @@ -1494,7 +1516,24 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, Nvm= eRequest *req) =20 case NVME_ZONE_ACTION_SET_ZD_EXT: trace_pci_nvme_set_descriptor_extension(slba, zone_idx); - return NVME_INVALID_FIELD | NVME_DNR; + if (all || !n->params.zd_extension_size) { + return NVME_INVALID_FIELD | NVME_DNR; + } + zd_ext =3D nvme_get_zd_extension(n, ns, zone_idx); + prp1 =3D le64_to_cpu(cmd->dptr.prp1); + prp2 =3D le64_to_cpu(cmd->dptr.prp2); + status =3D nvme_dma_prp(n, zd_ext, n->params.zd_extension_size, + prp1, prp2, DMA_DIRECTION_TO_DEVICE, req); + if (status) { + trace_pci_nvme_err_zd_extension_map_error(zone_idx); + return status; + } + + status =3D nvme_set_zd_ext(n, ns, zone, state); + if (status =3D=3D NVME_SUCCESS) { + trace_pci_nvme_zd_extension_set(zone_idx); + return status; + } break; =20 default: @@ -1574,7 +1613,7 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, Nvme= Request *req) return NVME_INVALID_FIELD | NVME_DNR; } =20 - if (zra =3D=3D NVME_ZONE_REPORT_EXTENDED) { + if (zra =3D=3D NVME_ZONE_REPORT_EXTENDED && !n->params.zd_extension_si= ze) { return NVME_INVALID_FIELD | NVME_DNR; } =20 @@ -1586,6 +1625,9 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, Nvme= Request *req) partial =3D (dw13 >> 16) & 0x01; =20 zone_entry_sz =3D sizeof(NvmeZoneDescr); + if (zra =3D=3D NVME_ZONE_REPORT_EXTENDED) { + zone_entry_sz +=3D n->params.zd_extension_size; + } =20 max_zones =3D (len - sizeof(NvmeZoneReportHeader)) / zone_entry_sz; buf =3D g_malloc0(len); @@ -1617,6 +1659,14 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, Nvm= eRequest *req) z->wp =3D cpu_to_le64(~0ULL); } =20 + if (zra =3D=3D NVME_ZONE_REPORT_EXTENDED) { + if (zs->d.za & NVME_ZA_ZD_EXT_VALID) { + memcpy(buf_p, nvme_get_zd_extension(n, ns, zone_idx), + n->params.zd_extension_size); + } + buf_p +=3D n->params.zd_extension_size; + } + zone_idx++; } =20 @@ -2727,7 +2777,6 @@ static uint16_t nvme_aer(NvmeCtrl *n, NvmeRequest *re= q) =20 n->aer_reqs[n->outstanding_aers] =3D req; n->outstanding_aers++; - if (!QTAILQ_EMPTY(&n->aer_queue)) { nvme_process_aers(n); } @@ -3361,6 +3410,7 @@ static int nvme_init_zone_meta(NvmeCtrl *n, NvmeNames= pace *ns, ns->imp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); ns->closed_zones =3D g_malloc0(sizeof(NvmeZoneList)); ns->full_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->zd_extensions =3D g_malloc0(n->params.zd_extension_size * n->num_z= ones); zone =3D ns->zone_array; =20 nvme_init_zone_list(ns->exp_open_zones); @@ -3434,6 +3484,17 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error = **errp) " adjusting", n->params.max_active_zones, nz); n->params.max_active_zones =3D nz; } + if (n->params.zd_extension_size) { + if (n->params.zd_extension_size & 0x3f) { + error_setg(errp, + "zone descriptor extension size must be a multiple of 64B"= ); + return; + } + if ((n->params.zd_extension_size >> 6) > 0xff) { + error_setg(errp, "zone descriptor extension size is too large"= ); + return; + } + } =20 return; } @@ -3458,7 +3519,8 @@ static int nvme_zoned_init_ns(NvmeCtrl *n, NvmeNamesp= ace *ns, int lba_index, ns->id_ns_zoned->ozcs =3D n->params.cross_zone_read ? 0x01 : 0x00; =20 ns->id_ns_zoned->lbafe[lba_index].zsze =3D cpu_to_le64(n->zone_size); - ns->id_ns_zoned->lbafe[lba_index].zdes =3D 0; + ns->id_ns_zoned->lbafe[lba_index].zdes =3D + n->params.zd_extension_size >> 6; /* Units of 64B */ =20 if (n->params.fill_pattern =3D=3D 0) { ns->id_ns.dlfeat =3D 0x01; @@ -3481,6 +3543,7 @@ static void nvme_zoned_clear(NvmeCtrl *n) g_free(ns->imp_open_zones); g_free(ns->closed_zones); g_free(ns->full_zones); + g_free(ns->zd_extensions); } } =20 @@ -3849,6 +3912,8 @@ static Property nvme_props[] =3D { NVME_DEFAULT_ZONE_SIZE), DEFINE_PROP_UINT64("zone_capacity", NvmeCtrl, params.zone_capacity_mb,= 0), DEFINE_PROP_UINT32("zone_append_size_limit", NvmeCtrl, params.zasl_kb,= 0), + DEFINE_PROP_UINT32("zone_descr_ext_size", NvmeCtrl, + params.zd_extension_size, 0), DEFINE_PROP_UINT32("max_active", NvmeCtrl, params.max_active_zones, 0), DEFINE_PROP_UINT32("max_open", NvmeCtrl, params.max_open_zones, 0), DEFINE_PROP_BOOL("cross_zone_read", NvmeCtrl, params.cross_zone_read, = true), diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 6efd566cb2..0e82fca815 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -24,6 +24,7 @@ typedef struct NvmeParams { uint64_t zone_capacity_mb; uint32_t max_active_zones; uint32_t max_open_zones; + uint32_t zd_extension_size; } NvmeParams; =20 typedef struct NvmeAsyncEvent { @@ -105,6 +106,7 @@ typedef struct NvmeNamespace { NvmeZoneList *imp_open_zones; NvmeZoneList *closed_zones; NvmeZoneList *full_zones; + uint8_t *zd_extensions; int32_t nr_open_zones; int32_t nr_active_zones; } NvmeNamespace; @@ -218,6 +220,12 @@ static inline bool nvme_wp_is_valid(NvmeZone *zone) st !=3D NVME_ZONE_STATE_OFFLINE; } =20 +static inline uint8_t *nvme_get_zd_extension(NvmeCtrl *n, NvmeNamespace *n= s, + uint32_t zone_idx) +{ + return &ns->zd_extensions[zone_idx * n->params.zd_extension_size]; +} + /* * Initialize a zone list head. */ --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886610; cv=none; d=zohomail.com; s=zohoarc; b=Pl7Vt/kduBXTDdBI3FylCCpvlnpmPKWCHUODGqGggKzHs6Lg81027KDYf7TXHREJ+j+2uEJa5gXnB3o4p5n6eSY7iS23+YZQgppJkKWXoCkaJk7u5o3Uf3sCJQuWYJswtEYdMBOp+PA1Aj1A6H16J/BMsimLuBiyLcBoaWrdU90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886610; 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=9ll5FqK34NQ6TnZRtr3GOsBjl8cRAisa8m4J8Tq879k=; b=AGF2TL5jODc6AikQKKIcYAhegP8d0Kw2WPGjiZwPGf0+YZUAOEKVkmQKVxi+DZL320RrGJKYPu1r0b4qyQ4gt7bZfsS71mcS0INYl1ctddg9yBBEkcdhPw4ZiU8m3T2iiwFcZ+xXbtD6W6AXXCZkP8m3ZZ3LnmEAbWObV70m0nk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886610078900.6562658953372; Wed, 23 Sep 2020 11:43:30 -0700 (PDT) Received: from localhost ([::1]:53552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9jk-00029B-RC for importer@patchew.org; Wed, 23 Sep 2020 14:43:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OW-0005L5-GD; Wed, 23 Sep 2020 14:21:32 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9ON-0008Do-OU; Wed, 23 Sep 2020 14:21:29 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:49 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:21 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886222; x=1632422222; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=heHV++v8E6HwHnAu5ZAWVQgWA8TtUTfjxGveKUGmoqA=; b=Wi0kts5c2IeXrrHZJJp0A93vLX5CZQRFV8lnaSsg6+M35PXCwRnMv3Ho pduZaWTkf7gDZkizB8RB3dO2f8Wosc/p4Tx1fYji+xfu+wcUDcLQjsQJI o47RjlTL4Z+QDAaWK568mhZocY1ELiHL/xKjsaxEL3ND/sOEPmmCHDNz2 meMWncp5z2qaCS2BDTh9Q+5wkssFRNGaks0jJVm8MeJ8C8L+aYKv3iDiA rdP3dn5qnV7Z3f4AoqRqIq0dcMdarE5/7ZcE9678gBRbtlwgt+lCuSSSm SOvTtxZtZTorwjNZ7bK2VelBD0wu8VV0Di6VbpkMGoPPnGOlJttNtsvhj A==; IronPort-SDR: Whjg1hs9Z6uJdnXme4UFFHTDYBxwToCIF2Ru95sxE9NXuKhHEAzucHzwSDA2rtH8SajiWEobwv 7hfCBLPt1T6/aEXBlLPi0v+BCWiaqKQs74dbuDaXTMSsok5/SQZM0OdJIbEDHm9Oe7h6OsE3sv b4QdPPe18EwbCuHQhfEvz3rqmeeStsbyThucWFdeZthDzlzJhGB3nLAglhCOmTqYxQDZcCzC71 ZDrwqwRqV3k27Jx1WpOXMIRYVYpvn2KjcU2OGpc+yeLKoBppk3xNmNFo7YiokgKlAJqq5UBW96 hQE= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496388" IronPort-SDR: VjLK9eH3psGBlRJWyVtIrimYkuA2iWQxWVPpGbnaVQdC8I6lyZ50nQc0kOtJor4Nha1R0iMPmN kW+sOOQUHrRw== IronPort-SDR: Cf6Xt2AX9XIphGJxOdNVHfm0b5CvXzUB9RoMEHmUZH7IhLZT5GNPeLNj9y3e29roIeXgZZfoCO TS5GbenvUqOA== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 12/14] hw/block/nvme: Add injection of Offline/Read-Only zones Date: Thu, 24 Sep 2020 03:20:19 +0900 Message-Id: <20200923182021.3724-13-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" ZNS specification defines two zone conditions for the zones that no longer can function properly, possibly because of flash wear or other internal fault. It is useful to be able to "inject" a small number of such zones for testing purposes. This commit defines two optional device properties, "offline_zones" and "rdonly_zones". Users can assign non-zero values to these variables to specify the number of zones to be initialized as Offline or Read-Only. The actual number of injected zones may be smaller than the requested amount - Read-Only and Offline counts are expected to be much smaller than the total number of zones on a drive. Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ hw/block/nvme.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index cfa791aa72..4630be38d7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -3402,8 +3402,11 @@ static int nvme_init_zone_meta(NvmeCtrl *n, NvmeName= space *ns, uint64_t capacity) { NvmeZone *zone; + Error *err; uint64_t start =3D 0, zone_size =3D n->zone_size; + uint32_t rnd; int i; + uint16_t zs; =20 ns->zone_array =3D g_malloc0(n->zone_array_size); ns->exp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); @@ -3434,6 +3437,37 @@ static int nvme_init_zone_meta(NvmeCtrl *n, NvmeName= space *ns, start +=3D zone_size; } =20 + /* If required, make some zones Offline or Read Only */ + + for (i =3D 0; i < n->params.nr_offline_zones; i++) { + do { + qcrypto_random_bytes(&rnd, sizeof(rnd), &err); + rnd %=3D n->num_zones; + } while (rnd < n->params.max_open_zones); + zone =3D &ns->zone_array[rnd]; + zs =3D nvme_get_zone_state(zone); + if (zs !=3D NVME_ZONE_STATE_OFFLINE) { + nvme_set_zone_state(zone, NVME_ZONE_STATE_OFFLINE); + } else { + i--; + } + } + + for (i =3D 0; i < n->params.nr_rdonly_zones; i++) { + do { + qcrypto_random_bytes(&rnd, sizeof(rnd), &err); + rnd %=3D n->num_zones; + } while (rnd < n->params.max_open_zones); + zone =3D &ns->zone_array[rnd]; + zs =3D nvme_get_zone_state(zone); + if (zs !=3D NVME_ZONE_STATE_OFFLINE && + zs !=3D NVME_ZONE_STATE_READ_ONLY) { + nvme_set_zone_state(zone, NVME_ZONE_STATE_READ_ONLY); + } else { + i--; + } + } + return 0; } =20 @@ -3484,6 +3518,16 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error = **errp) " adjusting", n->params.max_active_zones, nz); n->params.max_active_zones =3D nz; } + if (n->params.max_open_zones < nz) { + if (n->params.nr_offline_zones > nz - n->params.max_open_zones) { + n->params.nr_offline_zones =3D nz - n->params.max_open_zones; + } + if (n->params.nr_rdonly_zones > + nz - n->params.max_open_zones - n->params.nr_offline_zones) { + n->params.nr_rdonly_zones =3D + nz - n->params.max_open_zones - n->params.nr_offline_zones; + } + } if (n->params.zd_extension_size) { if (n->params.zd_extension_size & 0x3f) { error_setg(errp, @@ -3916,6 +3960,8 @@ static Property nvme_props[] =3D { params.zd_extension_size, 0), DEFINE_PROP_UINT32("max_active", NvmeCtrl, params.max_active_zones, 0), DEFINE_PROP_UINT32("max_open", NvmeCtrl, params.max_open_zones, 0), + DEFINE_PROP_UINT32("offline_zones", NvmeCtrl, params.nr_offline_zones,= 0), + DEFINE_PROP_UINT32("rdonly_zones", NvmeCtrl, params.nr_rdonly_zones, 0= ), DEFINE_PROP_BOOL("cross_zone_read", NvmeCtrl, params.cross_zone_read, = true), DEFINE_PROP_UINT8("fill_pattern", NvmeCtrl, params.fill_pattern, 0), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 0e82fca815..dea0c12792 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -25,6 +25,8 @@ typedef struct NvmeParams { uint32_t max_active_zones; uint32_t max_open_zones; uint32_t zd_extension_size; + uint32_t nr_offline_zones; + uint32_t nr_rdonly_zones; } NvmeParams; =20 typedef struct NvmeAsyncEvent { --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600885972; cv=none; d=zohomail.com; s=zohoarc; b=LEeEiwQ3GS4aNmbSx07yqOuPTaWhMzwrf394Ngi6pUYG6LMjPMZmG1Lyxzz1lRNXgw6SlSDZwvB9sDDN72mebq3J8Y89hdm0NhmQcYkiw8z5MbUCtghO1by8wyNymhim5NSdC3+MBfXO81SmHbGFla1NVLLE10mk01ddc3H1P8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600885972; 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=OBy8Yld7QPbmGGJJ8MBsRDlXm4+GU2FIiJke8CBe4S0=; b=kZVWkRkalbg5LHbnVw1pHkOtgC4yZY3y4BW/lqojV+5H0MhdeZVg6FPFChzx5QM5UkVaViNwWBGzyfPVh6r8HynQ39sST0BbBnK8lQk60+LutGnjRt+2C/cgEixv1r+CGURig82rCEkaaMYhaS5hYHV4wWy+sE98d8olxvkPXXg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160088597228929.12165567964348; Wed, 23 Sep 2020 11:32:52 -0700 (PDT) Received: from localhost ([::1]:54962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9ZS-0007Ic-Rl for importer@patchew.org; Wed, 23 Sep 2020 14:32:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OZ-0005MK-Bs; Wed, 23 Sep 2020 14:21:36 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9OT-00087W-HV; Wed, 23 Sep 2020 14:21:34 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:52 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:23 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886231; x=1632422231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3KetV6nK27WeNS7OUUDqKj4KIVGYy59etCGap2IOGJU=; b=Puno4wCm3WbBZTBsx6jWRXCbz/gd+72HO9mM+gg2xb0MgzaAUhkr3vhG 2Vs28b8rSDVrXmfKXUBTYXryf69dIBTL7h8Odup0LoVMSnXGqTHZR70r3 VYsjsgOHAyRfGncmJivOTiU6KQSm0nyHcEmSLMJGJTt6z23SAVQL35USp NnITbGQiuKKzhcl6dICmfK+4uXO2ossVyn/wMEYZanFDGLWC92hSX9YKT jS0PG+LKTWOWWAg/e8U8OI32+sYjUlmiDSgkCFdtfuKbVeEGvkgVQaLwx LoEf3C0eDyQFcEs4EjRtpAKJ+ho6c0BibW0M+I++V02HX87XSMHKTUOQZ A==; IronPort-SDR: fFC8/wzLwiqyA8yTrPKi37gATe3ZxNM6Kf5MYFjWvHxcaat95/okWW/av3p7Y7ZeyRS2oSRca2 KWMmOrGGoWZL+sM4OVAPT5VkVAQia3WDH5aAeMjrgOiG+wT2ckIeshRGUKFCJyT6HOTZhDbUps D8n5V4h2Uun1z9xnTPUirzXuTGe2TtDmKtppQ0MrkQpb/tLBcm3qQtKCA6vm2DoRLXWiAOSovd ohFebPqTu6aNn/OTAdFSee1X6KQ6e5auJywVzqnaB/2pJbQm1rzc68dXhciKqgd3Ic99dujewm tv8= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496390" IronPort-SDR: lHTv8xJSU7ZtuVfXJjBCnumZVi1UYIZq1gotLaTzLNxiK+SryZge0zATiji2ppOdW37i7lJEsx tXP5us3BT7oQ== IronPort-SDR: 8YxnkWUupWPL0NP+z/p8pKj7Yih6Xt3SCA6wjCTSDWurS78+V/4v/vioX20DCLa8Je5O0lDCts Myv2EtCfO3sA== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 13/14] hw/block/nvme: Use zone metadata file for persistence Date: Thu, 24 Sep 2020 03:20:20 +0900 Message-Id: <20200923182021.3724-14-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is more than 4 minutes in the future.) Content-Type: text/plain; charset="utf-8" A ZNS drive that is emulated by this module is currently initialized with all zones Empty upon startup. However, actual ZNS SSDs save the state and condition of all zones in their internal NVRAM in the event of power loss. When such a drive is powered up again, it closes or finishes all zones that were open at the moment of shutdown. Besides that, the write pointer position as well as the state and condition of all zones is preserved across power-downs. This commit adds the capability to have a persistent zone metadata to the device. The new optional module property, "zone_file", is introduced. If added to the command line, this property specifies the name of the file that stores the zone metadata. If "zone_file" is omitted, the device will be initialized with all zones empty, the same as before. If zone metadata is configured to be persistent, then zone descriptor extensions also persist across controller shutdowns. Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 377 +++++++++++++++++++++++++++++++++++++++--- hw/block/nvme.h | 38 +++++ hw/block/trace-events | 1 + 3 files changed, 395 insertions(+), 21 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 4630be38d7..5f55e86a9a 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -111,6 +111,8 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = =3D { }; =20 static void nvme_process_sq(void *opaque); +static void nvme_sync_zone_file(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, int len); =20 static uint16_t nvme_cid(NvmeRequest *req) { @@ -146,6 +148,7 @@ static void nvme_add_zone_tail(NvmeCtrl *n, NvmeNamespa= ce *ns, NvmeZoneList *zl, zl->tail =3D idx; } zl->size++; + nvme_set_zone_meta_dirty(n, ns, true); } =20 /* @@ -162,12 +165,15 @@ static void nvme_remove_zone(NvmeCtrl *n, NvmeNamespa= ce *ns, NvmeZoneList *zl, if (zl->size =3D=3D 0) { zl->head =3D NVME_ZONE_LIST_NIL; zl->tail =3D NVME_ZONE_LIST_NIL; + nvme_set_zone_meta_dirty(n, ns, true); } else if (idx =3D=3D zl->head) { zl->head =3D zone->next; ns->zone_array[zl->head].prev =3D NVME_ZONE_LIST_NIL; + nvme_set_zone_meta_dirty(n, ns, true); } else if (idx =3D=3D zl->tail) { zl->tail =3D zone->prev; ns->zone_array[zl->tail].next =3D NVME_ZONE_LIST_NIL; + nvme_set_zone_meta_dirty(n, ns, true); } else { ns->zone_array[zone->next].prev =3D zone->prev; ns->zone_array[zone->prev].next =3D zone->next; @@ -194,6 +200,7 @@ static NvmeZone *nvme_remove_zone_head(NvmeCtrl *n, Nvm= eNamespace *ns, ns->zone_array[zl->head].prev =3D NVME_ZONE_LIST_NIL; } zone->prev =3D zone->next =3D 0; + nvme_set_zone_meta_dirty(n, ns, true); } =20 return zone; @@ -290,11 +297,13 @@ static void nvme_assign_zone_state(NvmeCtrl *n, NvmeN= amespace *ns, break; case NVME_ZONE_STATE_FULL: nvme_add_zone_tail(n, ns, ns->full_zones, zone); + /* fall through */ case NVME_ZONE_STATE_READ_ONLY: break; default: zone->d.za =3D 0; } + nvme_sync_zone_file(n, ns, zone, sizeof(NvmeZone)); } =20 static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) @@ -3398,9 +3407,114 @@ static const MemoryRegionOps nvme_cmb_ops =3D { }, }; =20 -static int nvme_init_zone_meta(NvmeCtrl *n, NvmeNamespace *ns, +static int nvme_validate_zone_file(NvmeCtrl *n, NvmeNamespace *ns, + uint64_t capacity) +{ + NvmeZoneMeta *meta =3D ns->zone_meta; + NvmeZone *zone =3D ns->zone_array; + uint64_t start =3D 0, zone_size =3D n->zone_size; + int i, n_imp_open =3D 0, n_exp_open =3D 0, n_closed =3D 0, n_full =3D = 0; + + if (meta->magic !=3D NVME_ZONE_META_MAGIC) { + return 1; + } + if (meta->version !=3D NVME_ZONE_META_VER) { + return 2; + } + if (meta->zone_size !=3D zone_size) { + return 3; + } + if (meta->zone_capacity !=3D n->zone_capacity) { + return 4; + } + if (meta->nr_offline_zones !=3D n->params.nr_offline_zones) { + return 5; + } + if (meta->nr_rdonly_zones !=3D n->params.nr_rdonly_zones) { + return 6; + } + if (meta->lba_size !=3D n->conf.logical_block_size) { + return 7; + } + if (meta->zd_extension_size !=3D n->params.zd_extension_size) { + return 8; + } + + for (i =3D 0; i < n->num_zones; i++, zone++) { + if (start + zone_size > capacity) { + zone_size =3D capacity - start; + } + if (zone->d.zt !=3D NVME_ZONE_TYPE_SEQ_WRITE) { + return 9; + } + if (zone->d.zcap !=3D n->zone_capacity) { + return 10; + } + if (zone->d.zslba !=3D start) { + return 11; + } + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_EMPTY: + case NVME_ZONE_STATE_OFFLINE: + case NVME_ZONE_STATE_READ_ONLY: + if (zone->d.wp !=3D start) { + return 12; + } + break; + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + if (zone->d.wp < start || + zone->d.wp >=3D zone->d.zslba + zone->d.zcap) { + return 13; + } + n_imp_open++; + break; + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + if (zone->d.wp < start || + zone->d.wp >=3D zone->d.zslba + zone->d.zcap) { + return 13; + } + n_exp_open++; + break; + case NVME_ZONE_STATE_CLOSED: + if (zone->d.wp < start || + zone->d.wp >=3D zone->d.zslba + zone->d.zcap) { + return 13; + } + n_closed++; + break; + case NVME_ZONE_STATE_FULL: + if (zone->d.wp !=3D zone->d.zslba + zone->d.zcap) { + return 14; + } + n_full++; + break; + default: + return 15; + } + + start +=3D zone_size; + } + + if (n_exp_open !=3D nvme_zone_list_size(ns->exp_open_zones)) { + return 16; + } + if (n_imp_open !=3D nvme_zone_list_size(ns->imp_open_zones)) { + return 17; + } + if (n_closed !=3D nvme_zone_list_size(ns->closed_zones)) { + return 18; + } + if (n_full !=3D nvme_zone_list_size(ns->full_zones)) { + return 19; + } + + return 0; +} + +static int nvme_init_zone_file(NvmeCtrl *n, NvmeNamespace *ns, uint64_t capacity) { + NvmeZoneMeta *meta =3D ns->zone_meta; NvmeZone *zone; Error *err; uint64_t start =3D 0, zone_size =3D n->zone_size; @@ -3408,18 +3522,33 @@ static int nvme_init_zone_meta(NvmeCtrl *n, NvmeNam= espace *ns, int i; uint16_t zs; =20 - ns->zone_array =3D g_malloc0(n->zone_array_size); - ns->exp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); - ns->imp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); - ns->closed_zones =3D g_malloc0(sizeof(NvmeZoneList)); - ns->full_zones =3D g_malloc0(sizeof(NvmeZoneList)); - ns->zd_extensions =3D g_malloc0(n->params.zd_extension_size * n->num_z= ones); + if (n->params.zone_file) { + meta->magic =3D NVME_ZONE_META_MAGIC; + meta->version =3D NVME_ZONE_META_VER; + meta->zone_size =3D zone_size; + meta->zone_capacity =3D n->zone_capacity; + meta->lba_size =3D n->conf.logical_block_size; + meta->nr_offline_zones =3D n->params.nr_offline_zones; + meta->nr_rdonly_zones =3D n->params.nr_rdonly_zones; + meta->zd_extension_size =3D n->params.zd_extension_size; + } else { + ns->zone_array =3D g_malloc0(n->zone_array_size); + ns->exp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->imp_open_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->closed_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->full_zones =3D g_malloc0(sizeof(NvmeZoneList)); + ns->zd_extensions =3D + g_malloc0(n->params.zd_extension_size * n->num_zones); + } zone =3D ns->zone_array; =20 nvme_init_zone_list(ns->exp_open_zones); nvme_init_zone_list(ns->imp_open_zones); nvme_init_zone_list(ns->closed_zones); nvme_init_zone_list(ns->full_zones); + if (n->params.zone_file) { + nvme_set_zone_meta_dirty(n, ns, true); + } =20 for (i =3D 0; i < n->num_zones; i++, zone++) { if (start + zone_size > capacity) { @@ -3471,7 +3600,196 @@ static int nvme_init_zone_meta(NvmeCtrl *n, NvmeNam= espace *ns, return 0; } =20 -static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error **errp) +static void nvme_open_zone_file(NvmeCtrl *n, bool *init_meta, Error **errp) +{ +#ifdef CONFIG_POSIX + + struct stat statbuf; + Error *local_err =3D NULL; + size_t fsize; + int ret; + + ret =3D stat(n->params.zone_file, &statbuf); + if (ret && errno =3D=3D ENOENT) { + *init_meta =3D true; + } else if (!S_ISREG(statbuf.st_mode)) { + error_setg(errp, "\"%s\" is not a regular file", + n->params.zone_file); + return; + } + + n->zone_file_fd =3D open(n->params.zone_file, + O_RDWR | O_LARGEFILE | O_BINARY | O_CREAT, 0644= ); + if (n->zone_file_fd < 0) { + error_setg_errno(errp, errno, "failed to create zone file \"%s\"", + n->params.zone_file); + return; + } + + fsize =3D n->meta_size * n->num_namespaces; + + if (stat(n->params.zone_file, &statbuf)) { + error_setg_errno(errp, errno, "can't stat zone file \"%s\"", + n->params.zone_file); + return; + } + if (statbuf.st_size !=3D fsize) { + ret =3D ftruncate(n->zone_file_fd, fsize); + if (ret < 0) { + error_setg_errno(errp, errno, "can't truncate zone file \"%s\"= ", + n->params.zone_file); + return; + } + *init_meta =3D true; + } + + memory_region_init_ram_from_fd(&n->zone_mem, OBJECT(n), "nvme-zone-met= a", + fsize, true, n->zone_file_fd, &local_er= r); + if (local_err) { + error_propagate(errp, local_err); + } + + if (*init_meta) { + trace_pci_nvme_initialized_zone_file(n->params.zone_file); + } + return; + +#else + + error_setg(errp, "zone metadata file not supported on this host"); + +#endif /* CONFIG_POSIX */ +} + +static int nvme_map_zone_file(NvmeCtrl *n, NvmeNamespace *ns, bool *init_m= eta) +{ + ns->zone_meta =3D (void *)memory_region_get_ram_ptr(&n->zone_mem) + + n->meta_size * (ns->nsid - 1); + + ns->zone_array =3D (NvmeZone *)(ns->zone_meta + 1); + ns->exp_open_zones =3D &ns->zone_meta->exp_open_zones; + ns->imp_open_zones =3D &ns->zone_meta->imp_open_zones; + ns->closed_zones =3D &ns->zone_meta->closed_zones; + ns->full_zones =3D &ns->zone_meta->full_zones; + + if (n->params.zd_extension_size) { + ns->zd_extensions =3D (uint8_t *)(ns->zone_meta + 1); + ns->zd_extensions +=3D n->zone_array_size; + } + + return 0; +} + +static void nvme_sync_zone_file(NvmeCtrl *n, NvmeNamespace *ns, + NvmeZone *zone, int len) +{ + uintptr_t z =3D (uintptr_t)zone, off =3D z - (uintptr_t)ns->zone_meta; + + memory_region_msync(&n->zone_mem, off, len); + + if (nvme_zone_meta_dirty(n, ns)) { + nvme_set_zone_meta_dirty(n, ns, false); + memory_region_msync(&n->zone_mem, 0, sizeof(NvmeZoneMeta)); + } +} + +/* + * Close or finish all the zones that might be still open after power-down. + */ +static void nvme_prepare_zones(NvmeCtrl *n, NvmeNamespace *ns) +{ + NvmeZone *zone; + uint32_t set_state; + int i; + + assert(!ns->nr_active_zones); + assert(!ns->nr_open_zones); + + zone =3D ns->zone_array; + for (i =3D 0; i < n->num_zones; i++, zone++) { + switch (nvme_get_zone_state(zone)) { + case NVME_ZONE_STATE_IMPLICITLY_OPEN: + nvme_remove_zone(n, ns, ns->imp_open_zones, zone); + break; + case NVME_ZONE_STATE_EXPLICITLY_OPEN: + nvme_remove_zone(n, ns, ns->exp_open_zones, zone); + break; + case NVME_ZONE_STATE_CLOSED: + nvme_aor_inc_active(n, ns); + /* fall through */ + default: + continue; + } + + if (zone->d.za & NVME_ZA_ZD_EXT_VALID) { + set_state =3D NVME_ZONE_STATE_CLOSED; + } else if (zone->d.wp =3D=3D zone->d.zslba) { + set_state =3D NVME_ZONE_STATE_EMPTY; + } else if (n->params.max_active_zones =3D=3D 0 || + ns->nr_active_zones < n->params.max_active_zones) { + set_state =3D NVME_ZONE_STATE_CLOSED; + } else { + set_state =3D NVME_ZONE_STATE_FULL; + } + + switch (set_state) { + case NVME_ZONE_STATE_CLOSED: + trace_pci_nvme_power_on_close(nvme_get_zone_state(zone), + zone->d.zslba); + nvme_aor_inc_active(n, ns); + nvme_add_zone_tail(n, ns, ns->closed_zones, zone); + break; + case NVME_ZONE_STATE_EMPTY: + trace_pci_nvme_power_on_reset(nvme_get_zone_state(zone), + zone->d.zslba); + break; + case NVME_ZONE_STATE_FULL: + trace_pci_nvme_power_on_full(nvme_get_zone_state(zone), + zone->d.zslba); + zone->d.wp =3D nvme_zone_wr_boundary(zone); + } + + zone->w_ptr =3D zone->d.wp; + nvme_set_zone_state(zone, set_state); + } +} + +static int nvme_load_zone_meta(NvmeCtrl *n, NvmeNamespace *ns, + uint64_t capacity, bool init_meta) +{ + int ret =3D 0; + + if (n->params.zone_file) { + ret =3D nvme_map_zone_file(n, ns, &init_meta); + trace_pci_nvme_mapped_zone_file(n->params.zone_file, ret); + if (ret < 0) { + return ret; + } + + if (!init_meta) { + ret =3D nvme_validate_zone_file(n, ns, capacity); + if (ret) { + trace_pci_nvme_err_zone_file_invalid(ret); + init_meta =3D true; + } + } + } else { + init_meta =3D true; + } + + if (init_meta) { + ret =3D nvme_init_zone_file(n, ns, capacity); + } else { + nvme_prepare_zones(n, ns); + } + if (!ret && n->params.zone_file) { + nvme_sync_zone_file(n, ns, ns->zone_array, n->zone_array_size); + } + + return ret; +} + +static void nvme_zoned_init_ctrl(NvmeCtrl *n, bool *init_meta, Error **err= p) { uint64_t zone_size, zone_cap; uint32_t nz; @@ -3501,6 +3819,10 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error = **errp) n->zone_size_log2 =3D 63 - clz64(n->zone_size); } =20 + n->meta_size =3D sizeof(NvmeZoneMeta) + n->zone_array_size + + nz * n->params.zd_extension_size; + n->meta_size =3D ROUND_UP(n->meta_size, qemu_real_host_page_size); + if (!n->params.zasl_kb) { n->zasl_bs =3D n->params.mdts ? 0 : NVME_DEFAULT_MAX_ZA_SIZE * KiB; } else { @@ -3540,17 +3862,22 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error= **errp) } } =20 + if (n->params.zone_file) { + nvme_open_zone_file(n, init_meta, errp); + } + return; } =20 static int nvme_zoned_init_ns(NvmeCtrl *n, NvmeNamespace *ns, int lba_inde= x, - Error **errp) + bool init_meta, Error **errp) { int ret; =20 - ret =3D nvme_init_zone_meta(n, ns, n->num_zones * n->zone_size); + ret =3D nvme_load_zone_meta(n, ns, n->num_zones * n->zone_size, + init_meta); if (ret) { - error_setg(errp, "could not init zone metadata"); + error_setg(errp, "could not load/init zone metadata"); return -1; } =20 @@ -3579,15 +3906,20 @@ static void nvme_zoned_clear(NvmeCtrl *n) { int i; =20 + if (n->params.zone_file) { + close(n->zone_file_fd); + } for (i =3D 0; i < n->num_namespaces; i++) { NvmeNamespace *ns =3D &n->namespaces[i]; g_free(ns->id_ns_zoned); - g_free(ns->zone_array); - g_free(ns->exp_open_zones); - g_free(ns->imp_open_zones); - g_free(ns->closed_zones); - g_free(ns->full_zones); - g_free(ns->zd_extensions); + if (!n->params.zone_file) { + g_free(ns->zone_array); + g_free(ns->exp_open_zones); + g_free(ns->imp_open_zones); + g_free(ns->closed_zones); + g_free(ns->full_zones); + g_free(ns->zd_extensions); + } } } =20 @@ -3676,7 +4008,8 @@ static void nvme_init_blk(NvmeCtrl *n, Error **errp) n->ns_size =3D bs_size; } =20 -static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **er= rp) +static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, bool init_= meta, + Error **errp) { NvmeIdNs *id_ns =3D &ns->id_ns; int lba_index; @@ -3690,7 +4023,7 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeName= space *ns, Error **errp) if (n->params.zoned) { ns->csi =3D NVME_CSI_ZONED; id_ns->ncap =3D cpu_to_le64(n->zone_capacity * n->num_zones); - if (nvme_zoned_init_ns(n, ns, lba_index, errp) !=3D 0) { + if (nvme_zoned_init_ns(n, ns, lba_index, init_meta, errp) !=3D 0) { return; } } else { @@ -3874,6 +4207,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) NvmeCtrl *n =3D NVME(pci_dev); NvmeNamespace *ns; Error *local_err =3D NULL; + bool init_meta =3D false; =20 int i; =20 @@ -3897,7 +4231,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) } =20 if (n->params.zoned) { - nvme_zoned_init_ctrl(n, &local_err); + nvme_zoned_init_ctrl(n, &init_meta, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -3908,7 +4242,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **= errp) ns =3D n->namespaces; for (i =3D 0; i < n->num_namespaces; i++, ns++) { ns->nsid =3D i + 1; - nvme_init_namespace(n, ns, &local_err); + nvme_init_namespace(n, ns, init_meta, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -3956,6 +4290,7 @@ static Property nvme_props[] =3D { NVME_DEFAULT_ZONE_SIZE), DEFINE_PROP_UINT64("zone_capacity", NvmeCtrl, params.zone_capacity_mb,= 0), DEFINE_PROP_UINT32("zone_append_size_limit", NvmeCtrl, params.zasl_kb,= 0), + DEFINE_PROP_STRING("zone_file", NvmeCtrl, params.zone_file), DEFINE_PROP_UINT32("zone_descr_ext_size", NvmeCtrl, params.zd_extension_size, 0), DEFINE_PROP_UINT32("max_active", NvmeCtrl, params.max_active_zones, 0), diff --git a/hw/block/nvme.h b/hw/block/nvme.h index dea0c12792..021c049e1f 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -18,6 +18,7 @@ typedef struct NvmeParams { =20 bool zoned; bool cross_zone_read; + char *zone_file; uint8_t fill_pattern; uint32_t zasl_kb; uint64_t zone_size_mb; @@ -95,6 +96,27 @@ typedef struct NvmeZoneList { uint8_t rsvd12[4]; } NvmeZoneList; =20 +#define NVME_ZONE_META_MAGIC 0x3aebaa70 +#define NVME_ZONE_META_VER 1 + +typedef struct NvmeZoneMeta { + uint32_t magic; + uint32_t version; + uint64_t zone_size; + uint64_t zone_capacity; + uint32_t nr_offline_zones; + uint32_t nr_rdonly_zones; + uint32_t lba_size; + uint32_t rsvd40; + NvmeZoneList exp_open_zones; + NvmeZoneList imp_open_zones; + NvmeZoneList closed_zones; + NvmeZoneList full_zones; + uint8_t zd_extension_size; + uint8_t dirty; + uint8_t rsvd594[3990]; +} NvmeZoneMeta; + typedef struct NvmeNamespace { NvmeIdNs id_ns; uint32_t nsid; @@ -104,6 +126,7 @@ typedef struct NvmeNamespace { =20 NvmeIdNsZoned *id_ns_zoned; NvmeZone *zone_array; + NvmeZoneMeta *zone_meta; NvmeZoneList *exp_open_zones; NvmeZoneList *imp_open_zones; NvmeZoneList *closed_zones; @@ -169,8 +192,10 @@ typedef struct NvmeCtrl { QTAILQ_HEAD(, NvmeAsyncEvent) aer_queue; int aer_queued; =20 + MemoryRegion zone_mem; int zone_file_fd; uint32_t num_zones; + size_t meta_size; uint64_t zone_size; uint64_t zone_capacity; uint64_t zone_array_size; @@ -279,4 +304,17 @@ static inline NvmeZone *nvme_next_zone_in_list(NvmeNam= espace *ns, NvmeZone *z, return &ns->zone_array[z->next]; } =20 +static inline bool nvme_zone_meta_dirty(NvmeCtrl *n, NvmeNamespace *ns) +{ + return n->params.zone_file ? ns->zone_meta->dirty : false; +} + +static inline void nvme_set_zone_meta_dirty(NvmeCtrl *n, NvmeNamespace *ns, + bool yesno) +{ + if (n->params.zone_file) { + ns->zone_meta->dirty =3D yesno; + } +} + #endif /* HW_NVME_H */ diff --git a/hw/block/trace-events b/hw/block/trace-events index 53c7a2fd1f..7ee983b9df 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -100,6 +100,7 @@ pci_nvme_zd_extension_set(uint32_t zone_idx) "set descr= iptor extension for zone_ pci_nvme_power_on_close(uint32_t state, uint64_t slba) "zone state=3D%"PRI= u32", slba=3D%"PRIu64" transitioned to Closed state" pci_nvme_power_on_reset(uint32_t state, uint64_t slba) "zone state=3D%"PRI= u32", slba=3D%"PRIu64" transitioned to Empty state" pci_nvme_power_on_full(uint32_t state, uint64_t slba) "zone state=3D%"PRIu= 32", slba=3D%"PRIu64" transitioned to Full state" +pci_nvme_initialized_zone_file(char *zfile_name) "mapped zone file %s" pci_nvme_mapped_zone_file(char *zfile_name, int ret) "mapped zone file %s,= error %d" =20 # nvme traces for error conditions --=20 2.21.0 From nobody Thu May 16 00:08:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1600886239; cv=none; d=zohomail.com; s=zohoarc; b=avEoysjROs2bb4Z6J58aiGAvpCqI3olGO4lEYeu1K7KRNCorJd+SRuOdwxPDpz9zvkdg7CuZqnGWcIhouoChVBaYOQtAQ+LUi34H2hOq1FJ6G6C0LDXd2n9aNgz5O7hNquk+24YnK0wP28piqNPpOFE5lRBi7E3/OvL7BLoAtsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600886239; 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=i3bHr7MSfCtkpdpPy9tFdriHyNhGNVtjiCnZzH2XR2s=; b=QbKytBihlzX44fWdiZ+bqPY9c74XEtOA+a/MZPAt41bsjghwneQayDpiECVyY9ne4Wj5ybSKMKW45/RjXOmLrxYn9e1NTSdMNKfO/Ozh8BCmWKtoSc/2eaZa3fLdbDRIwEqc3y36OjrhdqcZttnP1Lf7Rm8mKQr9JBh6/kaCrI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600886239120412.45861828112606; Wed, 23 Sep 2020 11:37:19 -0700 (PDT) Received: from localhost ([::1]:36970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL9dl-0003TJ-SO for importer@patchew.org; Wed, 23 Sep 2020 14:37:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9Op-0005kh-Om; Wed, 23 Sep 2020 14:21:51 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:35078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL9On-0008F1-Ip; Wed, 23 Sep 2020 14:21:51 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2020 02:36:56 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:07:26 -0700 Received: from unknown (HELO redsun50.ssa.fujisawa.hgst.com) ([10.149.66.24]) by uls-op-cesaip02.wdc.com with ESMTP; 23 Sep 2020 11:21:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1600886261; x=1632422261; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGHyu/b43oLezr+EFogfZjXlFa5wC/fZyJChOGCNuBQ=; b=lhgyVMGGi0mfUupIjHZfqxq/iKgBfmHb1eVhDQQ+aJnwDO4XKRA4KLTG Li+O/V+AOAaKtJqSu5PA34Y0vB43/H/0wBNypumUFG4/7Ys90HLCPhb1q ijnbuzqu5XacBx01giGmC9WGEgCX9V4J3xdKoz90aEUpv/4YaV4p9I0bv uJsH/eF8I+BVa9UmWj/T+ZwxJLXaIjnlwPUdyw7aSQcVgklJG9hSR24w+ O13rp/WYDd/rHLXkoRx/cduXhQGfvott2eyiE4auC4GvULW/jL8Zp/i1T lUhJbRjDPaGDVJWN8vNKntlRnhCxeD+qTT+S6NO4Tv1OSmaJZ/R1itJVw g==; IronPort-SDR: cS7bsEojAH7EQOD2eHLpkekPj/8LCio5fab2hO0vTS4QNIqFzZWtXQ5GWULXJ+aVXQs1YgFghS r1ZorVilAmL/jROvvNxn6MFikfVC0fU91CIQRGSN1BI2ibW4aOau++P/HUJzMNTDg18wcUA4Et eqXPCPUF44bDu0TVcNV+wAjT36pY9CssCpRLhHu8ftkxvM7PRZyCs/2jPzgGEaObMN7Pe20AXh BhbxlGQAtRwvmVuIGT0O8lThf5lFmYUGudlcsJK31CSZcwjdfexQDJb8cGI5tUJoJtW1a1ybyh U3U= X-IronPort-AV: E=Sophos;i="5.77,293,1596470400"; d="scan'208";a="251496394" IronPort-SDR: ndSK29w+fmShXuWsoSsZeB7hofrOSFCCFQXieqDljXzoyhDU/501XO9Giddn8cabuv1vB2NekT gHN60KnP4ovg== IronPort-SDR: DVTFOOIvNAEc+8gl2mrIqIJIKEOUnEp+oZYp/AMXSU2qhnidRxDoVsymNDDdT8XA90oyuW1vGq h1CDe6y8wi3A== WDCIronportException: Internal From: Dmitry Fomichev To: Keith Busch , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Maxim Levitsky , Fam Zheng Subject: [PATCH v4 14/14] hw/block/nvme: Document zoned parameters in usage text Date: Thu, 24 Sep 2020 03:20:21 +0900 Message-Id: <20200923182021.3724-15-dmitry.fomichev@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200923182021.3724-1-dmitry.fomichev@wdc.com> References: <20200923182021.3724-1-dmitry.fomichev@wdc.com> 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=68.232.143.124; envelope-from=prvs=5287de305=dmitry.fomichev@wdc.com; helo=esa2.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 14:20:48 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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: Niklas Cassel , Damien Le Moal , qemu-block@nongnu.org, Dmitry Fomichev , qemu-devel@nongnu.org, Alistair Francis , Matias Bjorling Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Signature date is -22 seconds in the future.) Content-Type: text/plain; charset="utf-8" Added brief descriptions of the new device properties that are now available to users to configure features of Zoned Namespace Command Set in the emulator. This patch is for documentation only, no functionality change. Signed-off-by: Dmitry Fomichev --- hw/block/nvme.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5f55e86a9a..f1cadc76fb 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -9,7 +9,7 @@ */ =20 /** - * Reference Specs: http://www.nvmexpress.org, 1.2, 1.1, 1.0e + * Reference Specs: http://www.nvmexpress.org, 1.4, 1.3, 1.2, 1.1, 1.0e * * https://nvmexpress.org/developers/nvme-specification/ */ @@ -22,7 +22,7 @@ * [pmrdev=3D,] \ * max_ioqpairs=3D, \ * aerl=3D, aer_max_queued=3D, \ - * mdts=3D + * mdts=3D, zoned=3D * * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at * offset 0 in BAR2 and supports only WDS, RDS and SQS for now. @@ -48,6 +48,45 @@ * completion when there are no oustanding AERs. When the maximum number= of * enqueued events are reached, subsequent events will be dropped. * + * Setting `zoned` to true makes the device to support zoned namespaces. + * In this case, of the following options are available to configure zoned + * operation: + * zone_size=3D + * + * zone_capacity=3D + * The value 0 (default) forces zone capacity to be the same as zo= ne + * size. The value of this property may not exceed zone size. + * + * zone_file=3D + * Zone metadata file, if specified, allows zone information + * to be persistent across shutdowns and restarts. + * + * zone_descr_ext_size=3D + * This value needs to be specified in 64B units. If it is zero, + * namespace(s) will not support zone descriptor extensions. + * + * max_active=3D + * + * max_open=3D + * + * zone_append_size_limit=3D + * The maximum I/O size that can be supported by Zone Append + * command. Since internally this this value is maintained as + * ZASL =3D log2( / ), some + * values assigned to this property may be rounded down and + * result in a lower maximum ZA data size being in effect. + * If MDTS property is not assigned, the default value of 128KiB is + * used as ZASL. + * + * offline_zones=3D + * + * rdonly_zones=3D + * + * cross_zone_read=3D + * + * fill_pattern=3D + * The byte pattern to return for any portions of unwritten data + * during read. */ =20 #include "qemu/osdep.h" --=20 2.21.0