From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO7uL-0007vQ-4l for qemu-devel@nongnu.org; Fri, 15 Jul 2016 14:32:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bO7uI-0005v6-St for qemu-devel@nongnu.org; Fri, 15 Jul 2016 14:32:16 -0400 Received: from resqmta-po-04v.sys.comcast.net ([2001:558:fe16:19:96:114:154:163]:33749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO7uI-0005uY-OH for qemu-devel@nongnu.org; Fri, 15 Jul 2016 14:32:14 -0400 From: Eric Blake Date: Fri, 15 Jul 2016 12:32:04 -0600 Message-Id: <1468607524-19021-7-git-send-email-eblake@redhat.com> In-Reply-To: <1468607524-19021-1-git-send-email-eblake@redhat.com> References: <1468607524-19021-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v3 6/6] iscsi: Rely on block layer to break up large requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, stefanha@redhat.com, Ronnie Sahlberg , Paolo Bonzini , Peter Lieven , Max Reitz Now that the block layer honors max_request, we don't need to bother with an EINVAL on overlarge requests, but can instead assert that requests are well-behaved. Signed-off-by: Eric Blake Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi --- block/iscsi.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index cf1e9e7..bdc7ade 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -472,11 +472,8 @@ iscsi_co_writev_flags(BlockDriverState *bs, int64_t sector_num, int nb_sectors, return -EINVAL; } - if (bs->bl.max_transfer && - nb_sectors << BDRV_SECTOR_BITS > bs->bl.max_transfer) { - error_report("iSCSI Error: Write of %d sectors exceeds max_xfer_len " - "of %" PRIu32 " bytes", nb_sectors, bs->bl.max_transfer); - return -EINVAL; + if (bs->bl.max_transfer) { + assert(nb_sectors << BDRV_SECTOR_BITS <= bs->bl.max_transfer); } lba = sector_qemu2lun(sector_num, iscsilun); @@ -650,11 +647,8 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs, return -EINVAL; } - if (bs->bl.max_transfer && - nb_sectors << BDRV_SECTOR_BITS > bs->bl.max_transfer) { - error_report("iSCSI Error: Read of %d sectors exceeds max_xfer_len " - "of %" PRIu32 " bytes", nb_sectors, bs->bl.max_transfer); - return -EINVAL; + if (bs->bl.max_transfer) { + assert(nb_sectors << BDRV_SECTOR_BITS <= bs->bl.max_transfer); } if (iscsilun->lbprz && nb_sectors >= ISCSI_CHECKALLOC_THRES && -- 2.5.5