From patchwork Fri Sep 12 11:21:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 388590 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 63DF514013B for ; Fri, 12 Sep 2014 21:23:40 +1000 (EST) Received: from localhost ([::1]:44197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOwz-0003Fs-0Z for incoming@patchwork.ozlabs.org; Fri, 12 Sep 2014 07:23:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOwT-0002eJ-91 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:23:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSOwN-00068V-KS for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:23:05 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:48685 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOwN-00068E-A6 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:22:59 -0400 Received: (qmail 14826 invoked by uid 89); 12 Sep 2014 11:22:56 -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.4/19357. hbedv: 8.3.24.22/7.11.171.206. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 0.910106 secs); 12 Sep 2014 11:22:56 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 12 Sep 2014 11:22:55 -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 35824206A6; Fri, 12 Sep 2014 13:21:55 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 2E4846147C; Fri, 12 Sep 2014 13:21:55 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 12 Sep 2014 13:21:51 +0200 Message-Id: <1410520912-7557-4-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1410520912-7557-1-git-send-email-pl@kamp.de> References: <1410520912-7557-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, benoit.canet@irqsave.net, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv2 3/4] block/iscsi: set max_transfer_length 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 the limit of 0xffffff for 16 byte CDBs is intentional to avoid overflows on 32-bit architectures. Signed-off-by: Peter Lieven Reviewed-by: Ronnie Sahlberg --- block/iscsi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 3e19202..a4b625c 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1455,10 +1455,18 @@ static void iscsi_close(BlockDriverState *bs) static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp) { - IscsiLun *iscsilun = bs->opaque; - /* We don't actually refresh here, but just return data queried in * iscsi_open(): iscsi targets don't change their limits. */ + + IscsiLun *iscsilun = bs->opaque; + uint32_t max_xfer_len = iscsilun->use_16_for_rw ? 0xffffff : 0xffff; + + if (iscsilun->bl.max_xfer_len) { + max_xfer_len = MIN(max_xfer_len, iscsilun->bl.max_xfer_len); + } + + bs->bl.max_transfer_length = sector_lun2qemu(max_xfer_len, iscsilun); + if (iscsilun->lbp.lbpu) { if (iscsilun->bl.max_unmap < 0xffffffff) { bs->bl.max_discard = sector_lun2qemu(iscsilun->bl.max_unmap,