From nobody Mon May 6 18:14:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493974973076162.94090295048966; Fri, 5 May 2017 02:02:53 -0700 (PDT) Received: from localhost ([::1]:45765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Z8U-0003t1-PF for importer@patchew.org; Fri, 05 May 2017 05:02:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Z75-00037o-16 for qemu-devel@nongnu.org; Fri, 05 May 2017 05:01:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Z74-0004vW-5T for qemu-devel@nongnu.org; Fri, 05 May 2017 05:01:23 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:52753) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6Z6z-0004n7-DB; Fri, 05 May 2017 05:01:17 -0400 Received: from [85.235.16.11] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1d6Z6X-00086y-43; Fri, 05 May 2017 09:00:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=IFMM8rTyV8GQGwcC8Ey47F6DJYbsnsDxcR9Oii/U4c4=; b=rtS4u/ekLYABgqZ8VeMmC2e8F llZ/YbUtQWIhpVYvZpJ5uc52gzo4J3ObLRRCYRfKC0o3fGliFHc0wIs49k8/yewrBMHydACrLzIGQ 66OvVYrYZafwoiVgDzzRS+xchLo2KxKWqMuWOnQ6EY9R25ZMVZrwoqHqWtLAvO9N2OdlTU0aXAxtX OAk3Rg5FOlehJWTtkeu0RaZ+ciNpD36K225pxQtBuz92Q+ggmjhZBv4MboI7+RD+lDBTCdNwKjU4W djo2TRhNv6HYbnkZ0+yc/yPrsJyOYyvFeVYBML9bOmjd7NZkMi3iaxMYO2AsvbTozGWhbo7EDHDJ3 BTodSNwUw==; From: Christoph Hellwig To: keith.busch@intel.com, kwolf@redhat.com, mreitz@redhat.com Date: Fri, 5 May 2017 11:00:44 +0200 Message-Id: <20170505090044.28754-1-hch@lst.de> X-Mailer: git-send-email 2.11.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 65.50.211.133 Subject: [Qemu-devel] [PATCH] nvme: Implement Write Zeroes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Keith Busch [hch: ported over from qemu-nvme.git to mainline] Signed-off-by: Christoph Hellwig --- hw/block/nvme.c | 26 ++++++++++++++++++++++++++ hw/block/nvme.h | 1 + 2 files changed, 27 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index ae303d44e5..3f4d2bf2ba 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -227,6 +227,29 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace = *ns, NvmeCmd *cmd, return NVME_NO_COMPLETE; } =20 +static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *= cmd, + NvmeRequest *req) +{ + NvmeRwCmd *rw =3D (NvmeRwCmd *)cmd; + 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 aio_slba =3D slba << (data_shift - BDRV_SECTOR_BITS); + uint32_t aio_nlb =3D nlb << (data_shift - BDRV_SECTOR_BITS); + + if (slba + nlb > ns->id_ns.nsze) { + return NVME_LBA_RANGE | NVME_DNR; + } + + req->has_sg =3D false; + 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, aio_slba, aio_nlb, 0, + nvme_rw_cb, req); + return NVME_NO_COMPLETE; +} + static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, NvmeRequest *req) { @@ -279,6 +302,8 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeCmd *cmd, = NvmeRequest *req) switch (cmd->opcode) { case NVME_CMD_FLUSH: return nvme_flush(n, ns, cmd, req); + case NVME_CMD_WRITE_ZEROS: + return nvme_write_zeros(n, ns, cmd, req); case NVME_CMD_WRITE: case NVME_CMD_READ: return nvme_rw(n, ns, cmd, req); @@ -895,6 +920,7 @@ static int nvme_init(PCIDevice *pci_dev) id->sqes =3D (0x6 << 4) | 0x6; id->cqes =3D (0x4 << 4) | 0x4; id->nn =3D cpu_to_le32(n->num_namespaces); + id->oncs =3D cpu_to_le16(NVME_ONCS_WRITE_ZEROS); id->psd[0].mp =3D cpu_to_le16(0x9c4); id->psd[0].enlat =3D cpu_to_le32(0x10); id->psd[0].exlat =3D cpu_to_le32(0x4); diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 8fb0c10756..a0d15649f9 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -179,6 +179,7 @@ enum NvmeIoCommands { NVME_CMD_READ =3D 0x02, NVME_CMD_WRITE_UNCOR =3D 0x04, NVME_CMD_COMPARE =3D 0x05, + NVME_CMD_WRITE_ZEROS =3D 0x08, NVME_CMD_DSM =3D 0x09, }; =20 --=20 2.11.0