From nobody Sat Sep 21 05:24:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1607416721; cv=none; d=zohomail.com; s=zohoarc; b=daDpPNLHKyafEMl68jKikGr58+U0bc7xhEsEEbMP/YrpuaeheWHcaOVqQYdy1ksP8LZNZ6e78diY+qKcmMW6QPyek0iTxcqMAWE0tiqNPzOk/UQoAmLp0eGo4/5n9O5GZwWvtBnaUI0JmJMPe+BJp/7YK6YLkQaFZT+5cSUOtuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607416721; 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=XWSkIOq0ba1eYTUG7cxvZ7Stv0m5aUspv8OHOLQ5kHA=; b=WySB40KNAIWJvht/GjTB8qEmVf8FPgEh0feRlrVsmv47zUlgLlJ0FB8IJkUOzA1B7LWoOx8GAPqEbw4Rfq2VsYsfNh7G7R7CFkLWZNinTTeBvB8Xo0vlzZ5yToEV1wCZwHyE489pNGCiYXIEvkKRtE6XybFmKdLf86t7R8hTVPA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607416721125570.5955719203673; Tue, 8 Dec 2020 00:38:41 -0800 (PST) Received: from localhost ([::1]:54450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmYW7-0004Hk-Sw for importer@patchew.org; Tue, 08 Dec 2020 03:38:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmYRW-0002kQ-61; Tue, 08 Dec 2020 03:33:54 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:56359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmYRQ-0007XQ-UU; Tue, 08 Dec 2020 03:33:53 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 889F3A9E; Tue, 8 Dec 2020 03:33:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 08 Dec 2020 03:33:47 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id C4A3624005D; Tue, 8 Dec 2020 03:33:43 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=XWSkIOq0ba1eY TUG7cxvZ7Stv0m5aUspv8OHOLQ5kHA=; b=yQQaRVz/1+tlptQHsQlpqUjyugKYX imx+2ApU02Y7h+FOigo44qhg3mk08RMrZXX/l4y++PTuqdLj5Y2i0ee1ORr+/tew IRy2S6Y0Wo90iG6J/B4MuOclbvxZIjz3FcYiPUBB938eR+HizJvVQR5NpJoRlbga UoWeNFyazLMQnhaH2CGvveNkJfHuqX6cSOsZ6CSHVr6+DGdU0wJTgs9PCXVUAfJ9 /+xaRf1HRfXhFJ09BLb3IwkIvGcK2ccbubkYKzqXu8ZkdRZfzMGhC6pePGw3lCoO 4UqOkoMEATd7AKAkbfnXusw2vPk0RLb1W8hcj8qTDjirBmr3yOpMrI/aQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=XWSkIOq0ba1eYTUG7cxvZ7Stv0m5aUspv8OHOLQ5kHA=; b=UngZzMzj GlKs2ZpDpfnUoA9vZwwV92QlFXwldtk2aKNLckx7oQ46AsOe5ubtapQmVAFUcyVK 1bvPgcAqvpuBrP7u/46dTOoXPGe/KAD5lHWpLfI5SMJyghiQ5iWn/ZBtUBgYv3lZ 07VFPuSkx+d4YXQQd28aGBo8UbovZcgrK9dRXcnp+dlEu/FTU3vO8wHRc8c82aj1 XGVGtP07a+jm/N2f7Ns520NaBF8EakbVUA1x0idhKGzd/6K0c3Zc9CId02J0CgG7 kS/9kndlC5QemDmVD99R7vo/Jv1xgq5sSGvobVDeLaSUWO7VYrUJxrkFWHzZ5qag 0KQIzN51XhhBSQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejhedguddvvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v3 1/2] nvme: updated shared header for copy command Date: Tue, 8 Dec 2020 09:33:38 +0100 Message-Id: <20201208083339.29792-2-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208083339.29792-1-its@irrelevant.dk> References: <20201208083339.29792-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=64.147.123.25; envelope-from=its@irrelevant.dk; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Minwoo Im , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Add new data structures and types for the Simple Copy command. Signed-off-by: Klaus Jensen Cc: Stefan Hajnoczi Cc: Fam Zheng Reviewed-by: Minwoo Im Acked-by: Stefan Hajnoczi --- include/block/nvme.h | 45 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index e95ff6ca9b37..be3aca913a1d 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -472,6 +472,7 @@ enum NvmeIoCommands { NVME_CMD_COMPARE =3D 0x05, NVME_CMD_WRITE_ZEROES =3D 0x08, NVME_CMD_DSM =3D 0x09, + NVME_CMD_COPY =3D 0x19, }; =20 typedef struct QEMU_PACKED NvmeDeleteQ { @@ -603,6 +604,35 @@ typedef struct QEMU_PACKED NvmeDsmRange { uint64_t slba; } NvmeDsmRange; =20 +enum { + NVME_COPY_FORMAT_0 =3D 0x0, +}; + +typedef struct NvmeCopyCmd { + uint8_t opcode; + uint8_t flags; + uint16_t cid; + uint32_t nsid; + uint32_t rsvd2[4]; + NvmeCmdDptr dptr; + uint64_t sdlba; + uint32_t cdw12; + uint32_t cdw13; + uint32_t ilbrt; + uint16_t lbat; + uint16_t lbatm; +} NvmeCopyCmd; + +typedef struct NvmeCopySourceRange { + uint8_t rsvd0[8]; + uint64_t slba; + uint16_t nlb; + uint8_t rsvd18[6]; + uint32_t eilbrt; + uint16_t elbat; + uint16_t elbatm; +} NvmeCopySourceRange; + enum NvmeAsyncEventRequest { NVME_AER_TYPE_ERROR =3D 0, NVME_AER_TYPE_SMART =3D 1, @@ -680,6 +710,7 @@ enum NvmeStatusCodes { NVME_CONFLICTING_ATTRS =3D 0x0180, NVME_INVALID_PROT_INFO =3D 0x0181, NVME_WRITE_TO_RO =3D 0x0182, + NVME_CMD_SIZE_LIMIT =3D 0x0183, NVME_WRITE_FAULT =3D 0x0280, NVME_UNRECOVERED_READ =3D 0x0281, NVME_E2E_GUARD_ERROR =3D 0x0282, @@ -831,7 +862,7 @@ typedef struct QEMU_PACKED NvmeIdCtrl { uint8_t nvscc; uint8_t rsvd531; uint16_t acwu; - uint8_t rsvd534[2]; + uint16_t ocfs; uint32_t sgls; uint8_t rsvd540[228]; uint8_t subnqn[256]; @@ -854,6 +885,11 @@ enum NvmeIdCtrlOncs { NVME_ONCS_FEATURES =3D 1 << 4, NVME_ONCS_RESRVATIONS =3D 1 << 5, NVME_ONCS_TIMESTAMP =3D 1 << 6, + NVME_ONCS_COPY =3D 1 << 8, +}; + +enum NvmeIdCtrlOcfs { + NVME_OCFS_COPY_FORMAT_0 =3D 1 << 0, }; =20 enum NvmeIdCtrlFrmw { @@ -995,7 +1031,10 @@ typedef struct QEMU_PACKED NvmeIdNs { uint16_t npdg; uint16_t npda; uint16_t nows; - uint8_t rsvd74[30]; + uint16_t mssrl; + uint32_t mcl; + uint8_t msrc; + uint8_t rsvd81[23]; uint8_t nguid[16]; uint64_t eui64; NvmeLBAF lbaf[16]; @@ -1059,6 +1098,7 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeAerResult) !=3D 4); QEMU_BUILD_BUG_ON(sizeof(NvmeCqe) !=3D 16); QEMU_BUILD_BUG_ON(sizeof(NvmeDsmRange) !=3D 16); + QEMU_BUILD_BUG_ON(sizeof(NvmeCopySourceRange) !=3D 32); QEMU_BUILD_BUG_ON(sizeof(NvmeCmd) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeDeleteQ) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeCreateCq) !=3D 64); @@ -1066,6 +1106,7 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeIdentify) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeRwCmd) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeDsmCmd) !=3D 64); + QEMU_BUILD_BUG_ON(sizeof(NvmeCopyCmd) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeRangeType) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeErrorLog) !=3D 64); QEMU_BUILD_BUG_ON(sizeof(NvmeFwSlotInfoLog) !=3D 512); --=20 2.29.2