From patchwork Fri Sep 13 10:25:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 274713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D71D2C017A for ; Fri, 13 Sep 2013 20:29:53 +1000 (EST) Received: from localhost ([::1]:45880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQdL-0001jQ-2F for incoming@patchwork.ozlabs.org; Fri, 13 Sep 2013 06:29:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQa8-0005bA-PD for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:26:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VKQa2-0003Ij-Fy for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:26:32 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:39293 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKQa2-0003IV-5d for qemu-devel@nongnu.org; Fri, 13 Sep 2013 06:26:26 -0400 Received: (qmail 2960 invoked by uid 89); 13 Sep 2013 10:26:25 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.97.8/17847. hbedv: 8.2.12.118/7.11.102.86. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 10.263839 secs); 13 Sep 2013 10:26:25 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 13 Sep 2013 10:26:14 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id C0924206AB; Fri, 13 Sep 2013 12:25:14 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id BF59F6128B; Fri, 13 Sep 2013 12:25:16 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 13 Sep 2013 12:25:01 +0200 Message-Id: <1379067909-22984-5-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379067909-22984-1-git-send-email-pl@kamp.de> References: <1379067909-22984-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 04/12] iscsi: add .bdrv_co_write_zeroes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Lieven --- block/iscsi.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 68f99d3..3d7961d 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -56,6 +56,7 @@ typedef struct IscsiLun { uint8_t lbprz; struct scsi_inquiry_logical_block_provisioning lbp; struct scsi_inquiry_block_limits bl; + unsigned char *zeroblock; } IscsiLun; typedef struct IscsiTask { @@ -88,6 +89,7 @@ typedef struct IscsiAIOCB { #define MAX_NOP_FAILURES 3 #define ISCSI_CMD_RETRIES 5 #define ISCSI_MAX_UNMAP 131072 +#define ISCSI_MAX_WRITESAME 131072 static void iscsi_bh_cb(void *p) @@ -972,6 +974,80 @@ retry: return 0; } +static int +coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, BdrvRequestFlags flags) +{ + IscsiLun *iscsilun = bs->opaque; + struct IscsiTask iTask; + uint64_t lba; + uint32_t nb_blocks, max_ws_len; + + if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { + return -EINVAL; + } + + if (!iscsilun->lbp.lbpws) { + /* WRITE SAME is not supported by the target */ + return -ENOTSUP; + } + + lba = sector_qemu2lun(sector_num, iscsilun); + nb_blocks = sector_qemu2lun(nb_sectors, iscsilun); + + max_ws_len = iscsilun->bl.max_ws_len; + if (max_ws_len == 0xffffffff) { + max_ws_len = ISCSI_MAX_WRITESAME; + } + + if (iscsilun->zeroblock == NULL) { + iscsilun->zeroblock = g_malloc(iscsilun->block_size); + if (iscsilun->zeroblock == NULL) { + return -ENOMEM; + } + memset(iscsilun->zeroblock, 0x00, iscsilun->block_size); + } + + while (nb_blocks > 0) { + uint32_t num; + iscsi_co_init_iscsitask(iscsilun, &iTask); + num = nb_blocks; + if (num > max_ws_len) { + num = max_ws_len; + } +retry: + if (iscsi_writesame16_task(iscsilun->iscsi, iscsilun->lun, lba, + iscsilun->zeroblock, iscsilun->block_size, + num, 0, !!(flags & BDRV_REQ_MAY_UNMAP), + 0, 0, iscsi_co_generic_cb, &iTask) == NULL) { + return -EIO; + } + + while (!iTask.complete) { + iscsi_set_events(iscsilun); + qemu_coroutine_yield(); + } + + if (iTask.task != NULL) { + scsi_free_scsi_task(iTask.task); + iTask.task = NULL; + } + + if (iTask.do_retry) { + goto retry; + } + + if (iTask.status != SCSI_STATUS_GOOD) { + return -EIO; + } + + lba += num; + nb_blocks -= num; + } + + return 0; +} + static int parse_chap(struct iscsi_context *iscsi, const char *target) { QemuOptsList *list; @@ -1419,6 +1495,7 @@ static void iscsi_close(BlockDriverState *bs) } qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), NULL, NULL, NULL); iscsi_destroy_context(iscsi); + g_free(iscsilun->zeroblock); memset(iscsilun, 0, sizeof(IscsiLun)); } @@ -1524,6 +1601,7 @@ static BlockDriver bdrv_iscsi = { .bdrv_co_get_block_status = iscsi_co_get_block_status, .bdrv_co_discard = iscsi_co_discard, + .bdrv_co_write_zeroes = iscsi_co_write_zeroes, .bdrv_aio_readv = iscsi_aio_readv, .bdrv_aio_writev = iscsi_aio_writev,