From patchwork Tue Jun 17 05:57:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 360337 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9C04114009C for ; Tue, 17 Jun 2014 15:58:16 +1000 (EST) Received: from localhost ([::1]:47512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwmPO-0003gp-DZ for incoming@patchwork.ozlabs.org; Tue, 17 Jun 2014 01:58:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwmOy-0003AH-6B for qemu-devel@nongnu.org; Tue, 17 Jun 2014 01:57:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwmOq-0002yP-Tp for qemu-devel@nongnu.org; Tue, 17 Jun 2014 01:57:48 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:42906 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwmOq-0002xl-JM for qemu-devel@nongnu.org; Tue, 17 Jun 2014 01:57:40 -0400 Received: (qmail 30744 invoked by uid 89); 17 Jun 2014 05:57:37 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.3/19106. hbedv: 8.3.20.10/7.11.155.62. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/4.0):. Processed in 1.132478 secs); 17 Jun 2014 05:57:37 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 17 Jun 2014 05:57:36 -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 854222000D; Tue, 17 Jun 2014 07:57:06 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 7C8CB5FD57; Tue, 17 Jun 2014 07:57:06 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 17 Jun 2014 07:57:03 +0200 Message-Id: <1402984623-5443-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 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, pbonzini@redhat.com, Peter Lieven , stefanha@redhat.com Subject: [Qemu-devel] [PATCH] block/iscsi: use 16 byte CDBs also for big requests 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 READ10, WRITE10, WRITESAME10 only support requests up to 65536 blocks. This is 32MB for 512-Byte sectors. Change to READ16, WRITE16, WRITESAME16 just in case such a big request is issued. Signed-off-by: Peter Lieven --- block/iscsi.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 2e56748..e93a02f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -382,7 +382,7 @@ static int coroutine_fn iscsi_co_writev(BlockDriverState *bs, #endif iscsi_co_init_iscsitask(iscsilun, &iTask); retry: - if (iscsilun->use_16_for_rw) { + if (iscsilun->use_16_for_rw || num_sectors > 0xffff) { iTask.task = iscsi_write16_task(iscsilun->iscsi, iscsilun->lun, lba, data, num_sectors * iscsilun->block_size, iscsilun->block_size, 0, 0, 0, 0, 0, @@ -578,7 +578,7 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs, iscsi_co_init_iscsitask(iscsilun, &iTask); retry: - if (iscsilun->use_16_for_rw) { + if (iscsilun->use_16_for_rw || num_sectors > 0xffff) { iTask.task = iscsi_read16_task(iscsilun->iscsi, iscsilun->lun, lba, num_sectors * iscsilun->block_size, iscsilun->block_size, 0, 0, 0, 0, 0, @@ -924,9 +924,9 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, { IscsiLun *iscsilun = bs->opaque; struct IscsiTask iTask; - uint64_t lba; - uint32_t nb_blocks; - bool use_16_for_ws = iscsilun->use_16_for_rw; + uint64_t lba = sector_qemu2lun(sector_num, iscsilun); + uint32_t nb_blocks = sector_qemu2lun(nb_sectors, iscsilun); + bool use_16_for_ws = iscsilun->use_16_for_rw || nb_blocks > 0xffff; if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { return -EINVAL; @@ -950,9 +950,6 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, return -ENOTSUP; } - lba = sector_qemu2lun(sector_num, iscsilun); - nb_blocks = sector_qemu2lun(nb_sectors, iscsilun); - if (iscsilun->zeroblock == NULL) { iscsilun->zeroblock = g_malloc0(iscsilun->block_size); }