From nobody Sat May 18 22:54:09 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=1605211477; cv=none; d=zohomail.com; s=zohoarc; b=PBEomo4+sZ57wyBfWf8F9/ueIL1yI1OpwYBFI3PjmyAmSwaoxxWdqMKQFPIgcBJHBX54Z7FNAdQJf351c2Ewa8pkUEzt9Xp+UwxfvDupsPIBxI7Y6r4Ws6m2Cs8MzTR4S8NmeOR4yzzWd1qOlGTFL3EAfhqBZMB3iQE7M5anCGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605211477; 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=JCrkjzOVvDiT4zbPMcXqF89wc8X7KHjhjFWUPWs9bBQ=; b=WsB0+W0FuUh0AQR7SY6c4gnfR61vYpJRSv11cXdukj5cQevq/akDwOuMzTFfioMtxbD9ntBc/hPA44/KuL6kzInxxANwzZObnQTs2vpPjRDRj6bUz1gHJDSsyptMnLL+4+FfhbjWS5MYw28Irw9pYsS4gGcfcsUiZF2FasBgdCs= 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 1605211476889581.7704610515799; Thu, 12 Nov 2020 12:04:36 -0800 (PST) Received: from localhost ([::1]:55218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdIpe-0004fA-RJ for importer@patchew.org; Thu, 12 Nov 2020 15:04:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl7-0003Dx-TA; Thu, 12 Nov 2020 14:59:53 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl4-00078B-IM; Thu, 12 Nov 2020 14:59:53 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 156CB5C01BA; Thu, 12 Nov 2020 14:59:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 12 Nov 2020 14:59:49 -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 89ACD30689DB; Thu, 12 Nov 2020 14:59:47 -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=JCrkjzOVvDiT4 zbPMcXqF89wc8X7KHjhjFWUPWs9bBQ=; b=lsC01mLeOo0BJnl8PYTIR8z3X4Yys 8sz5iJkk6c9sr+631kwAvFC0S4Y1fL382uiubwEIti2K5q+1sbtUwpyr6I1nzJa1 PHdd63x+g4ZYeHNZMK6Sn+7SqhyFbtqgQ2TyrpQAEchjk/O7qwY9fOmAa/vERAtM G/vpxhwDeoL6iPC0ECZnuaedRx+LLQeb2eUAsOdkah8wfshx8VnI2aquG4R8uRzt F3QRYdpUJsJXcmKQyyS5MlFd2xYqcvhUxy/z4BUnCcv4lQPRQhMHVH3cRxN7uh20 gQZukAAhV8Q8MdkMgvX1ruDsyrCZettTxctobsfKOxUy34QGvRMFTUcBQ== 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=JCrkjzOVvDiT4zbPMcXqF89wc8X7KHjhjFWUPWs9bBQ=; b=CKFStMm6 63mTQxHTB51C9bsiwQtFuLDkxAbkMdKxFVhHsnNKLTQ/1QkgxeTqgtyNmKonJCxy 19Fy8mymOvYGYZkeHxDo2zjMo5v3Gna15ol35MGllAoQ6q1yCqcBdQzWzXWJJ6T6 uQWTJl+AQown50rUWTXUDZh9LEoUq3N21dnH6xZMMObhMVRIKhcOPvGMWMLVS33x m8vULnr2YmXywXuaZbMsyUoCLidoAmvRvVi3/Qxxqrv0gYF0rrpODmmIALSXqgu0 B2dSdsECPbZK3SImF4KuoTsKpWINAj5e5oQLcSUytvTnr+wwZFpylfZ7m7HOmG2j lpy1p042jlC+Bw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v8 1/5] hw/block/nvme: remove superfluous NvmeCtrl parameter Date: Thu, 12 Nov 2020 20:59:41 +0100 Message-Id: <20201112195945.819915-2-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112195945.819915-1-its@irrelevant.dk> References: <20201112195945.819915-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=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 14:59:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen nvme_check_bounds has no use of the NvmeCtrl parameter; remove it. Signed-off-by: Klaus Jensen Reviewed-by: Minwoo Im --- hw/block/nvme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 01b657b1c5e2..51f35e8cf18b 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -866,8 +866,8 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, siz= e_t len) return NVME_SUCCESS; } =20 -static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, - uint64_t slba, uint32_t nlb) +static inline uint16_t nvme_check_bounds(NvmeNamespace *ns, uint64_t slba, + uint32_t nlb) { uint64_t nsze =3D le64_to_cpu(ns->id_ns.nsze); =20 @@ -943,7 +943,7 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequ= est *req) =20 trace_pci_nvme_write_zeroes(nvme_cid(req), nvme_nsid(ns), slba, nlb); =20 - status =3D nvme_check_bounds(n, ns, slba, nlb); + status =3D nvme_check_bounds(ns, slba, nlb); if (status) { trace_pci_nvme_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); return status; @@ -979,7 +979,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) goto invalid; } =20 - status =3D nvme_check_bounds(n, ns, slba, nlb); + status =3D nvme_check_bounds(ns, slba, nlb); if (status) { trace_pci_nvme_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); goto invalid; --=20 2.29.2 From nobody Sat May 18 22:54:09 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=1605211828; cv=none; d=zohomail.com; s=zohoarc; b=iMW/tmlVp2cj/4JY+MPO0WbZb4I5hoSrq26e2eympjNmJ3kbcEeElyw8AtIB6gk3Fw2O4LPkFnQkXLHr+CRIQpT5IUt+nLUnlUTyBelyKv6ke5S16wnlCHzwR3hNqnTy8ZdHd+E1m2b+RbHkC0MojrqgpyUBexy/B2EmD1oTZuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605211828; 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=QJu9EZgITufLlIAGc3RPGhI8adKjYXythScJdM//N6U=; b=TbD532k1TeTl0657ZiXWbXJ5tb+ZhKwuDATqX0EqmJfSfwTnlKkoe8uJd2dgUEHEQMIhVhJbgL9v/cbsL3KRL4k0JRElepBJreq2zo03HiNW2E5soMyUaPcUAo0rXGkqyzMGimfY0a5CqPAIVu0THH7px2cL4J/9wVW/taTA5BQ= 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 160521182847998.19714300100657; Thu, 12 Nov 2020 12:10:28 -0800 (PST) Received: from localhost ([::1]:60056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdIvK-0007Dq-WE for importer@patchew.org; Thu, 12 Nov 2020 15:10:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl9-0003EL-7M; Thu, 12 Nov 2020 14:59:55 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl6-00078K-0B; Thu, 12 Nov 2020 14:59:54 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1B5A25C017E; Thu, 12 Nov 2020 14:59:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 12 Nov 2020 14:59:50 -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 CA25330689E3; Thu, 12 Nov 2020 14:59:48 -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=QJu9EZgITufLl IAGc3RPGhI8adKjYXythScJdM//N6U=; b=HDNCeo2c+ZEqs3D9vwJVo5dpgn/TB sUGlPS+TJqx6UX7UKax/4EskAfLCnNXIOEuFpmJnX2GWPLBnLyOGYdur+FGghJVe kvqONYFrecYOiLh/zY+lKvPX6fCFWuMpDrj4I+dddKOVgPtWSPafx2Kh+brWWjrS O7K1Xl37iXEusUYql7lYSatHPQ+JhKbsTBVHIpweHs0OsINO51qt/BVqlPfzx+Px QJ3SrwxFaq4Tevmt8xUpnWNpPlv5yp4VbDJzGJOdhm0V1PNiiKeWIxQf3HTK0rDK soM86N5x3SbsoCXdgTgGRKRo6C34DQW02GGBp2f8eKQPqdMV4geU3y9fg== 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=QJu9EZgITufLlIAGc3RPGhI8adKjYXythScJdM//N6U=; b=GPasLE+G de+VjkLMytzu64ed6TYABkvQT1MxPI3FWw+tjVuGFy9TJv8VEWwcTNKYAfVEODEB fZoPwzE4R97/Tcc6asJetqgEWCBduSf2nQclSG6mX5AjMBu5dDA+DcQ6bHJ8Yfky lLEwztxErTbBhxuhcEiNHFHXRDLPwS3kRlZbGdKb3y2+wegcoKK7PlQ2B66UcmBg TVe9/QjbZtkaDcUg3j+OJoGlWns6WzvGq6ipMly0WZN9hsuxfZkbx3U5lT6kkjAB zw0pfSucwFQHULDjAIjhYPaHOnIdLfpbON89k3WrCuBl6UsbDn8C3LmecGjPVY9B +BD6rDHp7qhEqw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v8 2/5] hw/block/nvme: pull aio error handling Date: Thu, 12 Nov 2020 20:59:42 +0100 Message-Id: <20201112195945.819915-3-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112195945.819915-1-its@irrelevant.dk> References: <20201112195945.819915-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=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 14:59:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Add a new function, nvme_aio_err, to handle errors resulting from AIOs and use this from the callbacks. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 61 +++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 51f35e8cf18b..a96a996ddc0d 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -878,6 +878,41 @@ static inline uint16_t nvme_check_bounds(NvmeNamespace= *ns, uint64_t slba, return NVME_SUCCESS; } =20 +static void nvme_aio_err(NvmeRequest *req, int ret) +{ + uint16_t status =3D NVME_SUCCESS; + Error *local_err =3D NULL; + + switch (req->cmd.opcode) { + case NVME_CMD_READ: + status =3D NVME_UNRECOVERED_READ; + break; + case NVME_CMD_FLUSH: + case NVME_CMD_WRITE: + case NVME_CMD_WRITE_ZEROES: + status =3D NVME_WRITE_FAULT; + break; + default: + status =3D NVME_INTERNAL_DEV_ERROR; + break; + } + + trace_pci_nvme_err_aio(nvme_cid(req), strerror(ret), status); + + error_setg_errno(&local_err, -ret, "aio failed"); + error_report_err(local_err); + + /* + * Set the command status code to the first encountered error but allo= w a + * subsequent Internal Device Error to trump it. + */ + if (req->status && status !=3D NVME_INTERNAL_DEV_ERROR) { + return; + } + + req->status =3D status; +} + static void nvme_rw_cb(void *opaque, int ret) { NvmeRequest *req =3D opaque; @@ -887,37 +922,13 @@ static void nvme_rw_cb(void *opaque, int ret) BlockAcctCookie *acct =3D &req->acct; BlockAcctStats *stats =3D blk_get_stats(blk); =20 - Error *local_err =3D NULL; - trace_pci_nvme_rw_cb(nvme_cid(req), blk_name(blk)); =20 if (!ret) { block_acct_done(stats, acct); } else { - uint16_t status; - block_acct_failed(stats, acct); - - switch (req->cmd.opcode) { - case NVME_CMD_READ: - status =3D NVME_UNRECOVERED_READ; - break; - case NVME_CMD_FLUSH: - case NVME_CMD_WRITE: - case NVME_CMD_WRITE_ZEROES: - status =3D NVME_WRITE_FAULT; - break; - default: - status =3D NVME_INTERNAL_DEV_ERROR; - break; - } - - trace_pci_nvme_err_aio(nvme_cid(req), strerror(ret), status); - - error_setg_errno(&local_err, -ret, "aio failed"); - error_report_err(local_err); - - req->status =3D status; + nvme_aio_err(req, ret); } =20 nvme_enqueue_req_completion(nvme_cq(req), req); --=20 2.29.2 From nobody Sat May 18 22:54:09 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=1605211505; cv=none; d=zohomail.com; s=zohoarc; b=bLTCj6ExwodAg2RRjxSR2SJUI9z0gEZh/FXdLra0jOYgOXkAV1inskNi2IJhAVKgvoHZPAmVVQiATvpRpBpLqPh7BDOXqb4AStHO4qmJxQPAoC+jLano60S05YOo+qm87rEhciHRI9Asz5bhnhGqZg/WRm/DdsRtoy2EdHac+0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605211505; 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=HXxbjxpkK3OiguWsIbF7huch1510e5teY+Py8XWKLfQ=; b=RA3d+1Tzq5Rf3wtMK2r/DR2KVwC+IybeRthS8T+hQCo71R5tvz3x/TC4niVLix6B9YAY1oock2KQi8JaqQishJdLFb9WtFI+lZnrLAIxhVdDnGle5yEgkalLKFb7djmmLoPyNfFys+u5M+X1EXTlqr6/8E106hhrCK6FeeKsrL4= 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 1605211505298203.25025142700463; Thu, 12 Nov 2020 12:05:05 -0800 (PST) Received: from localhost ([::1]:55740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdIq7-0004zP-Qf for importer@patchew.org; Thu, 12 Nov 2020 15:05:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIlA-0003FR-0V; Thu, 12 Nov 2020 14:59:56 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:43823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl7-00078Y-AM; Thu, 12 Nov 2020 14:59:55 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4AFEC5C01BB; Thu, 12 Nov 2020 14:59:51 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 12 Nov 2020 14:59:51 -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 19CB630689E1; Thu, 12 Nov 2020 14:59:50 -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=HXxbjxpkK3Oig uWsIbF7huch1510e5teY+Py8XWKLfQ=; b=MrP320TTaGeiqqH0hnKbmfvvW6fzE KQ9Wyii6zcNs8H99FCEjtw3o83KdMfm64X7AOnFhorVJUjyxONpvqCfkVtssVOl2 S5LX4ZwlW5QEnVLkYASpJhXClaxnMZmscr2QJiOuOZKA00/kiunix2fMBnhHH5jN FwlTETVQS4GCAi/n3p1wrzPjLP1s/0FvCN3YZCiOkCHQjpTC5w68ojCecB0exEUt uZkv6o1kjcQOVHd+kpzAg214hPK5kcIvM4u7XoiA3PpZ9WrE83xOcKr8suYQIXp+ BD40jsSDKbgcXM9XqAZBoYoh87LbrqhVDTTpHy9IHTdmxBCA2QpqcSCVQ== 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=HXxbjxpkK3OiguWsIbF7huch1510e5teY+Py8XWKLfQ=; b=KHX1NLks Qf+xRmxrxNPRuA6QUdNXa2bGjVDWcym25TsXM/UzQwkV9vGs3pXCsHbYQ/9HDsea O8qGKOPTPi/pkx1lw2O56/iQy+actffnaNM0JdG7SNNOskUc+Y5Z5plz4zIQg2BS 7Zqbna3q62c5oYrdl7MXmX/VZwM7GhNWZSx5c4lr0Y6R30CTjdrFYyhPvmI8HPRk ygLx1MxUgchkt+9X8vWpnIOc9IBbp+eY/0yKr3l2cABDLvkp2mZe+mEpX5PEd6J3 l7ywe5La8OU6X9V0ebhxXxR+htALxD2NMRbbQoNbEKWp44EjI5uP4Bdbg+G0uEgM kSS5Pv2MgwM65w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepvd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v8 3/5] hw/block/nvme: add dulbe support Date: Thu, 12 Nov 2020 20:59:43 +0100 Message-Id: <20201112195945.819915-4-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112195945.819915-1-its@irrelevant.dk> References: <20201112195945.819915-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=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 14:59:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Add support for reporting the Deallocated or Unwritten Logical Block Error (DULBE). Rely on the block status flags reported by the block layer and consider any block with the BDRV_BLOCK_ZERO flag to be deallocated. Multiple factors affect when a Write Zeroes command result in deallocation of blocks. * the underlying file system block size * the blockdev format * the 'discard' and 'logical_block_size' parameters format | discard | wz (512B) wz (4KiB) wz (64KiB) ----------------------------------------------------- qcow2 ignore n n y qcow2 unmap n n y raw ignore n y y raw unmap n y y So, this works best with an image in raw format and 4KiB LBAs, since holes can then be punched on a per-block basis (this assumes a file system with a 4kb block size, YMMV). A qcow2 image, uses a cluster size of 64KiB by default and blocks will only be marked deallocated if a full cluster is zeroed or discarded. However, this *is* consistent with the spec since Write Zeroes "should" deallocate the block if the Deallocate attribute is set and "may" deallocate if the Deallocate attribute is not set. Thus, we always try to deallocate (the BDRV_REQ_MAY_UNMAP flag is always set). Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme-ns.h | 4 ++ include/block/nvme.h | 5 +++ hw/block/nvme-ns.c | 8 ++-- hw/block/nvme.c | 91 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 4 ++ 5 files changed, 107 insertions(+), 5 deletions(-) diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index 83734f4606e1..44bf6271b744 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -31,6 +31,10 @@ typedef struct NvmeNamespace { NvmeIdNs id_ns; =20 NvmeNamespaceParams params; + + struct { + uint32_t err_rec; + } features; } NvmeNamespace; =20 static inline uint32_t nvme_nsid(NvmeNamespace *ns) diff --git a/include/block/nvme.h b/include/block/nvme.h index 8a46d9cf015f..966c3bb304bd 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -687,6 +687,7 @@ enum NvmeStatusCodes { NVME_E2E_REF_ERROR =3D 0x0284, NVME_CMP_FAILURE =3D 0x0285, NVME_ACCESS_DENIED =3D 0x0286, + NVME_DULB =3D 0x0287, NVME_MORE =3D 0x2000, NVME_DNR =3D 0x4000, NVME_NO_COMPLETE =3D 0xffff, @@ -903,6 +904,9 @@ enum NvmeIdCtrlLpa { #define NVME_AEC_NS_ATTR(aec) ((aec >> 8) & 0x1) #define NVME_AEC_FW_ACTIVATION(aec) ((aec >> 9) & 0x1) =20 +#define NVME_ERR_REC_TLER(err_rec) (err_rec & 0xffff) +#define NVME_ERR_REC_DULBE(err_rec) (err_rec & 0x10000) + enum NvmeFeatureIds { NVME_ARBITRATION =3D 0x1, NVME_POWER_MANAGEMENT =3D 0x2, @@ -1023,6 +1027,7 @@ enum NvmeNsIdentifierType { =20 =20 #define NVME_ID_NS_NSFEAT_THIN(nsfeat) ((nsfeat & 0x1)) +#define NVME_ID_NS_NSFEAT_DULBE(nsfeat) ((nsfeat >> 2) & 0x1) #define NVME_ID_NS_FLBAS_EXTENDED(flbas) ((flbas >> 4) & 0x1) #define NVME_ID_NS_FLBAS_INDEX(flbas) ((flbas & 0xf)) #define NVME_ID_NS_MC_SEPARATE(mc) ((mc >> 1) & 0x1) diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index 31c80cdf5b5f..f1cc734c60f5 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -33,9 +33,7 @@ static void nvme_ns_init(NvmeNamespace *ns) NvmeIdNs *id_ns =3D &ns->id_ns; int lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); =20 - if (blk_get_flags(ns->blkconf.blk) & BDRV_O_UNMAP) { - ns->id_ns.dlfeat =3D 0x9; - } + ns->id_ns.dlfeat =3D 0x9; =20 id_ns->lbaf[lba_index].ds =3D 31 - clz32(ns->blkconf.logical_block_siz= e); =20 @@ -44,6 +42,9 @@ static void nvme_ns_init(NvmeNamespace *ns) /* no thin provisioning */ id_ns->ncap =3D id_ns->nsze; id_ns->nuse =3D id_ns->ncap; + + /* support DULBE */ + id_ns->nsfeat |=3D 0x4; } =20 static int nvme_ns_init_blk(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) @@ -92,6 +93,7 @@ int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error *= *errp) } =20 nvme_ns_init(ns); + if (nvme_register_namespace(n, ns, errp)) { return -1; } diff --git a/hw/block/nvme.c b/hw/block/nvme.c index a96a996ddc0d..8d75a89fd872 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -105,6 +105,7 @@ static const bool nvme_feature_support[NVME_FID_MAX] = =3D { =20 static const uint32_t nvme_feature_cap[NVME_FID_MAX] =3D { [NVME_TEMPERATURE_THRESHOLD] =3D NVME_FEAT_CAP_CHANGE, + [NVME_ERROR_RECOVERY] =3D NVME_FEAT_CAP_CHANGE | NVME_FEAT_C= AP_NS, [NVME_VOLATILE_WRITE_CACHE] =3D NVME_FEAT_CAP_CHANGE, [NVME_NUMBER_OF_QUEUES] =3D NVME_FEAT_CAP_CHANGE, [NVME_ASYNCHRONOUS_EVENT_CONF] =3D NVME_FEAT_CAP_CHANGE, @@ -878,6 +879,49 @@ static inline uint16_t nvme_check_bounds(NvmeNamespace= *ns, uint64_t slba, return NVME_SUCCESS; } =20 +static uint16_t nvme_check_dulbe(NvmeNamespace *ns, uint64_t slba, + uint32_t nlb) +{ + BlockDriverState *bs =3D blk_bs(ns->blkconf.blk); + + int64_t pnum =3D 0, bytes =3D nvme_l2b(ns, nlb); + int64_t offset =3D nvme_l2b(ns, slba); + bool zeroed; + int ret; + + Error *local_err =3D NULL; + + /* + * `pnum` holds the number of bytes after offset that shares the same + * allocation status as the byte at offset. If `pnum` is different from + * `bytes`, we should check the allocation status of the next range and + * continue this until all bytes have been checked. + */ + do { + bytes -=3D pnum; + + ret =3D bdrv_block_status(bs, offset, bytes, &pnum, NULL, NULL); + if (ret < 0) { + error_setg_errno(&local_err, -ret, "unable to get block status= "); + error_report_err(local_err); + + return NVME_INTERNAL_DEV_ERROR; + } + + zeroed =3D !!(ret & BDRV_BLOCK_ZERO); + + trace_pci_nvme_block_status(offset, bytes, pnum, ret, zeroed); + + if (zeroed) { + return NVME_DULB; + } + + offset +=3D pnum; + } while (pnum !=3D bytes); + + return NVME_SUCCESS; +} + static void nvme_aio_err(NvmeRequest *req, int ret) { uint16_t status =3D NVME_SUCCESS; @@ -996,6 +1040,15 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) goto invalid; } =20 + if (acct =3D=3D BLOCK_ACCT_READ) { + if (NVME_ERR_REC_DULBE(ns->features.err_rec)) { + status =3D nvme_check_dulbe(ns, slba, nlb); + if (status) { + goto invalid; + } + } + } + status =3D nvme_map_dptr(n, data_size, req); if (status) { goto invalid; @@ -1643,6 +1696,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeReq= uest *req) uint8_t fid =3D NVME_GETSETFEAT_FID(dw10); NvmeGetFeatureSelect sel =3D NVME_GETFEAT_SELECT(dw10); uint16_t iv; + NvmeNamespace *ns; =20 static const uint32_t nvme_feature_default[NVME_FID_MAX] =3D { [NVME_ARBITRATION] =3D NVME_ARB_AB_NOLIMIT, @@ -1705,6 +1759,18 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeRe= quest *req) } =20 return NVME_INVALID_FIELD | NVME_DNR; + case NVME_ERROR_RECOVERY: + if (!nvme_nsid_valid(n, nsid)) { + return NVME_INVALID_NSID | NVME_DNR; + } + + ns =3D nvme_ns(n, nsid); + if (unlikely(!ns)) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + result =3D ns->features.err_rec; + goto out; case NVME_VOLATILE_WRITE_CACHE: result =3D n->features.vwc; trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled"); @@ -1777,7 +1843,7 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *= n, NvmeRequest *req) =20 static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req) { - NvmeNamespace *ns; + NvmeNamespace *ns =3D NULL; =20 NvmeCmd *cmd =3D &req->cmd; uint32_t dw10 =3D le32_to_cpu(cmd->cdw10); @@ -1785,6 +1851,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeReq= uest *req) uint32_t nsid =3D le32_to_cpu(cmd->nsid); uint8_t fid =3D NVME_GETSETFEAT_FID(dw10); uint8_t save =3D NVME_SETFEAT_SAVE(dw10); + int i; =20 trace_pci_nvme_setfeat(nvme_cid(req), nsid, fid, save, dw11); =20 @@ -1844,11 +1911,31 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeR= equest *req) NVME_LOG_SMART_INFO); } =20 + break; + case NVME_ERROR_RECOVERY: + if (nsid =3D=3D NVME_NSID_BROADCAST) { + for (i =3D 1; i <=3D n->num_namespaces; i++) { + ns =3D nvme_ns(n, i); + + if (!ns) { + continue; + } + + if (NVME_ID_NS_NSFEAT_DULBE(ns->id_ns.nsfeat)) { + ns->features.err_rec =3D dw11; + } + } + + break; + } + + assert(ns); + ns->features.err_rec =3D dw11; break; case NVME_VOLATILE_WRITE_CACHE: n->features.vwc =3D dw11 & 0x1; =20 - for (int i =3D 1; i <=3D n->num_namespaces; i++) { + for (i =3D 1; i <=3D n->num_namespaces; i++) { ns =3D nvme_ns(n, i); if (!ns) { continue; diff --git a/hw/block/trace-events b/hw/block/trace-events index c1537e3ac0b0..1ffe0b3f76b5 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -43,6 +43,10 @@ pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t = opcode, const char *opna pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nsid, uint32_t nlb, u= int64_t count, uint64_t lba) "cid %"PRIu16" opname '%s' nsid %"PRIu32" nlb = %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_rw_cb(uint16_t cid, const char *blkname) "cid %"PRIu16" blk '%s'" pci_nvme_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t= nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" +pci_nvme_block_status(int64_t offset, int64_t bytes, int64_t pnum, int ret= , bool zeroed) "offset %"PRId64" bytes %"PRId64" pnum %"PRId64" ret 0x%x ze= roed %d" +pci_nvme_dsm(uint16_t cid, uint32_t nsid, uint32_t nr, uint32_t attr) "cid= %"PRIu16" nsid %"PRIu32" nr %"PRIu32" attr 0x%"PRIx32"" +pci_nvme_dsm_deallocate(uint16_t cid, uint32_t nsid, uint64_t slba, uint32= _t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" +pci_nvme_aio_discard_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t q= size, uint16_t qflags) "create submission queue, addr=3D0x%"PRIx64", sqid= =3D%"PRIu16", cqid=3D%"PRIu16", qsize=3D%"PRIu16", qflags=3D%"PRIu16"" pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t= size, uint16_t qflags, int ien) "create completion queue, addr=3D0x%"PRIx6= 4", cqid=3D%"PRIu16", vector=3D%"PRIu16", qsize=3D%"PRIu16", qflags=3D%"PRI= u16", ien=3D%d" pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=3D%"PRIu16"" --=20 2.29.2 From nobody Sat May 18 22:54:09 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=1605212150; cv=none; d=zohomail.com; s=zohoarc; b=chk0gcx4ZffXnJmgI4gp7GKFEaGfVGV1Kbhbj97/zwaT4kkF/JUZlkc+ajlOsjlTgvAlofWIVCE84fwVgG70OQ9b4YXpn393FIphUdC4+ONnflXmf+yp21A7A4hUmHkl+/BRRaSj5xJ1pHFHEcrQe+QQKSbhPBWgF3gxD+mvL24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605212150; 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=TqqiMr2dKOOQqB3CmCfppdNgvzCDBb0OHgbBfuuJd7U=; b=Qi1YVUTJyUytNkeF0VS/W55DU4ylWU+S0EjMEpayztIoSemSDk4sFn1sp4SaXd8PqBre0xx4WZrM+6N6FdziE4v0dBq3Jix50Qs8ax+COzbwHXaxbdcL1mEOYYgCFioKz7J/EEIzrh7i9MquZtk0dv3u02z/HaBz34nh9anAqXM= 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 1605212150690307.91256583044594; Thu, 12 Nov 2020 12:15:50 -0800 (PST) Received: from localhost ([::1]:36772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdJ0X-00019G-IH for importer@patchew.org; Thu, 12 Nov 2020 15:15:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl9-0003Er-LR; Thu, 12 Nov 2020 14:59:55 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl7-00078o-TT; Thu, 12 Nov 2020 14:59:55 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 180735C0178; Thu, 12 Nov 2020 14:59:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 12 Nov 2020 14:59:53 -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 5C19B30689E1; Thu, 12 Nov 2020 14:59:51 -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=TqqiMr2dKOOQq B3CmCfppdNgvzCDBb0OHgbBfuuJd7U=; b=q8Im0pVTocXwBR0xgxGZ+egpiTIPh T4JmhIVRzYiPvoZiw8nqys2d7cmnpD7RK/OUavjdrGELjk9wU1vFXENpdQEuAf6h 43wO4prtH39ttZLHbVsFYRDkS5PDhnaUli9m1sJ4WphtdaYVzKy8GCA7neiT1R4G TRadTx3KtCI87ajPcC0oG061ugUeEf8KcGgYvrRV+40fcHICDGOHE71NlzMeFCuR ToKLQqcIxUxdOqB5u6Vw9OPo3aiuVRaEgc6KlOl4DIcutVtUpHa86WK5RiV/XsKS VXGoUM3SGZRqE9FwIWp+lMCz4Zf0rjGpsY5On+c7qv41J8+5EeIQxzocA== 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=TqqiMr2dKOOQqB3CmCfppdNgvzCDBb0OHgbBfuuJd7U=; b=C353OQCS eFDMNoY5XVGBoBKrW0EIEMhBlccDYcNkoHq3bF7tMZgmfiEH1KdC8WsghJiKgezQ PvDdCSDD7D3TL7pK06sqEnl/Zmyr8mCbBI4KNkCDhF5LfP0knw2PE3+LElYRqZRf 59bCfZx/knZUkgq95mbM5zo9so0s4/nSonnU75PgZqE95tptVvqG6y/hgWhVv+ht tNr6YOP1RuguAWn0POXpmehFKwdPA4bn0RCyv3JetyGftRm+TMUSSvJWKJMAIMnI spsHYVXoUmHJqtnQrQ71D6FFOoqVrF3atJTY9o8IZ8RYdFIqaFt2uw1AIfLszmRx V3a194Z7FFO7yg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepvd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v8 4/5] nvme: add namespace I/O optimization fields to shared header Date: Thu, 12 Nov 2020 20:59:44 +0100 Message-Id: <20201112195945.819915-5-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112195945.819915-1-its@irrelevant.dk> References: <20201112195945.819915-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=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 14:59:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 , Stefan Hajnoczi , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen This adds the NPWG, NPWA, NPDG, NPDA and NOWS family of fields to the shared nvme.h header for use by later patches. Signed-off-by: Klaus Jensen Cc: Stefan Hajnoczi Cc: Fam Zheng Reviewed-by: Stefan Hajnoczi Reviewed-by: Minwoo Im --- include/block/nvme.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index 966c3bb304bd..e95ff6ca9b37 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -990,7 +990,12 @@ typedef struct QEMU_PACKED NvmeIdNs { uint16_t nabspf; uint16_t noiob; uint8_t nvmcap[16]; - uint8_t rsvd64[40]; + uint16_t npwg; + uint16_t npwa; + uint16_t npdg; + uint16_t npda; + uint16_t nows; + uint8_t rsvd74[30]; uint8_t nguid[16]; uint64_t eui64; NvmeLBAF lbaf[16]; --=20 2.29.2 From nobody Sat May 18 22:54:09 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=1605211834; cv=none; d=zohomail.com; s=zohoarc; b=ehbqn3b/iB6+9u+vXgIQdCRPh3HdTYd3Y4sfBlLJIdXf3esoP8l9l5OBCyW1u5VU1GKSMP5AS6XZDgxzBqmU6reTukHRo1xeiu3e74pnB44gaPMNim9dqjbsz3gttJFanUUX7/K+t2DfGYAksJVjNcErGe+llh1qXU5MS9V5hRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605211834; 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=iVkidqtcwFOoxhT/gqh/wRXIMvZcNUGIJ9h+LWPxQx8=; b=TloPtAEHng6drTV35b4tZAaJZufg9TSoJ8ISAjbsvmnauIt+3f0kaVvJ+7FjSBfvVdWVUIJoCcLYj57on3ExMQyBAOVAQ7DTQ32NHKcKEgGF3WS6GpkyYzfN1gKYRUINp6QZmXaCaqqNS2bfaO5UL5F5HmWxjjjbMIu5T/XilMw= 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 1605211834351619.0335731874354; Thu, 12 Nov 2020 12:10:34 -0800 (PST) Received: from localhost ([::1]:60162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdIvR-0007GU-3x for importer@patchew.org; Thu, 12 Nov 2020 15:10:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIlB-0003HU-09; Thu, 12 Nov 2020 14:59:57 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:52685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdIl8-000795-Ul; Thu, 12 Nov 2020 14:59:56 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 335BC5C010E; Thu, 12 Nov 2020 14:59:54 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 12 Nov 2020 14:59:54 -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 D242230689E4; Thu, 12 Nov 2020 14:59:52 -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=iVkidqtcwFOox hT/gqh/wRXIMvZcNUGIJ9h+LWPxQx8=; b=CV0AeAQIIAmEgN5nuqkUji+7aaaZU 8lGJva05hgzBJttygrjJwGX3YMmnc1pAN0v35mx2bT23dtgCk4mjwLT8/YR37a2n fYJYKSXDDukd+8WgXNnmXhM7JgGR6CsOZZECq7oM8C0jrn3bBlbB4QvTKeYxKc3V 4zMCKOt9nIC5BW9jImFmFdpyGDD82ZDOMd/WLhh2xlRa7D8Y+RwRIQPIHueKAH3G TxJFZGYTAod86gLV2AvmjFmG57sYup6KnIgg9IP8Xzyx3WKbo+Afn+TcK+4dPjY5 1yhgahE8q7xuT2D6alAApuHupco5Yjz56PAk+zKwIcFZnyjGXxIikBFrw== 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=iVkidqtcwFOoxhT/gqh/wRXIMvZcNUGIJ9h+LWPxQx8=; b=JxhjTURl pESlfh99MrV9CelnB5oya2mgyR60U1/cyxr/qg1p8Tu6tVRg0g0MgACH7H/xWKTn 9Z7oXtcDGuNF9aKQB4rYxu/UV5jqTSFk2/E0mg+hFHQBjjJ3aENqFfXRe4arvPIB ohc82h/ZDj3H268FrJ4QKH6vttJL/7JGHIx6BxkeeVgl5yNVqSE8ZnCkFW4k2H7c RJw9lSBtCOAQu5pzB5mW0bcvWBrxpxabbXIpFCKomETzyDMa2BReZKpMC5//z6EL qKLpcejnlUbWhhejF51rJPIq3/edMogzmXwo9rkXo7Hmk1Vj9jZYmveFo+yl0O2q 4gWcbGwD+YBHUA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvfedguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffev gfeknecukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepvd enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v8 5/5] hw/block/nvme: add the dataset management command Date: Thu, 12 Nov 2020 20:59:45 +0100 Message-Id: <20201112195945.819915-6-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112195945.819915-1-its@irrelevant.dk> References: <20201112195945.819915-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=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 14:59:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Add support for the Dataset Management command and the Deallocate attribute. Deallocation results in discards being sent to the underlying block device. Whether of not the blocks are actually deallocated is affected by the same factors as Write Zeroes (see previous commit). format | discard | dsm (512B) dsm (4KiB) dsm (64KiB) -------------------------------------------------------- qcow2 ignore n n n qcow2 unmap n n y raw ignore n n n raw unmap n y y Again, a raw format and 4KiB LBAs are preferable. In order to set the Namespace Preferred Deallocate Granularity and Alignment fields (NPDG and NPDA), choose a sane minimum discard granularity of 4KiB. If we are using a passthru device supporting discard at a 512B granularity, user should set the discard_granularity property explicitly. NPDG and NPDA will also account for the cluster_size of the block driver if required (i.e. for QCOW2). See NVM Express 1.3d, Section 6.7 ("Dataset Management command"). Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme.h | 2 + hw/block/nvme-ns.c | 30 ++++++++++++-- hw/block/nvme.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 125 insertions(+), 5 deletions(-) diff --git a/hw/block/nvme.h b/hw/block/nvme.h index e080a2318a50..574333caa3f9 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -28,6 +28,7 @@ typedef struct NvmeRequest { struct NvmeNamespace *ns; BlockAIOCB *aiocb; uint16_t status; + void *opaque; NvmeCqe cqe; NvmeCmd cmd; BlockAcctCookie acct; @@ -60,6 +61,7 @@ static inline const char *nvme_io_opc_str(uint8_t opc) case NVME_CMD_WRITE: return "NVME_NVM_CMD_WRITE"; case NVME_CMD_READ: return "NVME_NVM_CMD_READ"; case NVME_CMD_WRITE_ZEROES: return "NVME_NVM_CMD_WRITE_ZEROES"; + case NVME_CMD_DSM: return "NVME_NVM_CMD_DSM"; default: return "NVME_NVM_CMD_UNKNOWN"; } } diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index f1cc734c60f5..2d69b5177b51 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -28,10 +28,14 @@ #include "nvme.h" #include "nvme-ns.h" =20 -static void nvme_ns_init(NvmeNamespace *ns) +#define MIN_DISCARD_GRANULARITY (4 * KiB) + +static int nvme_ns_init(NvmeNamespace *ns, Error **errp) { + BlockDriverInfo bdi; NvmeIdNs *id_ns =3D &ns->id_ns; int lba_index =3D NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); + int npdg; =20 ns->id_ns.dlfeat =3D 0x9; =20 @@ -43,8 +47,19 @@ static void nvme_ns_init(NvmeNamespace *ns) id_ns->ncap =3D id_ns->nsze; id_ns->nuse =3D id_ns->ncap; =20 - /* support DULBE */ - id_ns->nsfeat |=3D 0x4; + /* support DULBE and I/O optimization fields */ + id_ns->nsfeat |=3D (0x4 | 0x10); + + npdg =3D ns->blkconf.discard_granularity / ns->blkconf.logical_block_s= ize; + + if (bdrv_get_info(blk_bs(ns->blkconf.blk), &bdi) >=3D 0 && + bdi.cluster_size > ns->blkconf.discard_granularity) { + npdg =3D bdi.cluster_size / ns->blkconf.logical_block_size; + } + + id_ns->npda =3D id_ns->npdg =3D npdg - 1; + + return 0; } =20 static int nvme_ns_init_blk(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) @@ -59,6 +74,11 @@ static int nvme_ns_init_blk(NvmeCtrl *n, NvmeNamespace *= ns, Error **errp) return -1; } =20 + if (ns->blkconf.discard_granularity =3D=3D -1) { + ns->blkconf.discard_granularity =3D + MAX(ns->blkconf.logical_block_size, MIN_DISCARD_GRANULARITY); + } + ns->size =3D blk_getlength(ns->blkconf.blk); if (ns->size < 0) { error_setg_errno(errp, -ns->size, "could not get blockdev size"); @@ -92,7 +112,9 @@ int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error = **errp) return -1; } =20 - nvme_ns_init(ns); + if (nvme_ns_init(ns, errp)) { + return -1; + } =20 if (nvme_register_namespace(n, ns, errp)) { return -1; diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 8d75a89fd872..f7f888402b06 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -242,6 +242,7 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *= cq) static void nvme_req_clear(NvmeRequest *req) { req->ns =3D NULL; + req->opaque =3D NULL; memset(&req->cqe, 0x0, sizeof(req->cqe)); req->status =3D NVME_SUCCESS; } @@ -978,6 +979,99 @@ static void nvme_rw_cb(void *opaque, int ret) nvme_enqueue_req_completion(nvme_cq(req), req); } =20 +static void nvme_aio_discard_cb(void *opaque, int ret) +{ + NvmeRequest *req =3D opaque; + uintptr_t *discards =3D (uintptr_t *)&req->opaque; + + trace_pci_nvme_aio_discard_cb(nvme_cid(req)); + + if (ret) { + nvme_aio_err(req, ret); + } + + (*discards)--; + + if (*discards) { + return; + } + + nvme_enqueue_req_completion(nvme_cq(req), req); +} + +static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeNamespace *ns =3D req->ns; + NvmeDsmCmd *dsm =3D (NvmeDsmCmd *) &req->cmd; + + uint32_t attr =3D le32_to_cpu(dsm->attributes); + uint32_t nr =3D (le32_to_cpu(dsm->nr) & 0xff) + 1; + + uint16_t status =3D NVME_SUCCESS; + + trace_pci_nvme_dsm(nvme_cid(req), nvme_nsid(ns), nr, attr); + + if (attr & NVME_DSMGMT_AD) { + int64_t offset; + size_t len; + NvmeDsmRange range[nr]; + uintptr_t *discards =3D (uintptr_t *)&req->opaque; + + status =3D nvme_dma(n, (uint8_t *)range, sizeof(range), + DMA_DIRECTION_TO_DEVICE, req); + if (status) { + return status; + } + + /* + * AIO callbacks may be called immediately, so initialize discards= to 1 + * to make sure the the callback does not complete the request bef= ore + * all discards have been issued. + */ + *discards =3D 1; + + for (int i =3D 0; i < nr; i++) { + uint64_t slba =3D le64_to_cpu(range[i].slba); + uint32_t nlb =3D le32_to_cpu(range[i].nlb); + + if (nvme_check_bounds(ns, slba, nlb)) { + trace_pci_nvme_err_invalid_lba_range(slba, nlb, + ns->id_ns.nsze); + continue; + } + + trace_pci_nvme_dsm_deallocate(nvme_cid(req), nvme_nsid(ns), sl= ba, + nlb); + + offset =3D nvme_l2b(ns, slba); + len =3D nvme_l2b(ns, nlb); + + while (len) { + size_t bytes =3D MIN(BDRV_REQUEST_MAX_BYTES, len); + + (*discards)++; + + blk_aio_pdiscard(ns->blkconf.blk, offset, bytes, + nvme_aio_discard_cb, req); + + offset +=3D bytes; + len -=3D bytes; + } + } + + /* account for the 1-initialization */ + (*discards)--; + + if (*discards) { + status =3D NVME_NO_COMPLETE; + } else { + status =3D req->status; + } + } + + return status; +} + static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req) { block_acct_start(blk_get_stats(req->ns->blkconf.blk), &req->acct, 0, @@ -1107,6 +1201,8 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest = *req) case NVME_CMD_WRITE: case NVME_CMD_READ: return nvme_rw(n, req); + case NVME_CMD_DSM: + return nvme_dsm(n, req); default: trace_pci_nvme_err_invalid_opc(req->cmd.opcode); return NVME_INVALID_OPCODE | NVME_DNR; @@ -2831,7 +2927,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->cqes =3D (0x4 << 4) | 0x4; id->nn =3D cpu_to_le32(n->num_namespaces); id->oncs =3D cpu_to_le16(NVME_ONCS_WRITE_ZEROES | NVME_ONCS_TIMESTAMP | - NVME_ONCS_FEATURES); + NVME_ONCS_FEATURES | NVME_ONCS_DSM); =20 id->vwc =3D 0x1; id->sgls =3D cpu_to_le32(NVME_CTRL_SGLS_SUPPORT_NO_ALIGN | --=20 2.29.2