From patchwork Sat Jun 22 20:58:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 253429 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 2975E2C041F for ; Sun, 23 Jun 2013 06:59:26 +1000 (EST) Received: from localhost ([::1]:52194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUu4-0008CJ-13 for incoming@patchwork.ozlabs.org; Sat, 22 Jun 2013 16:59:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUtb-00086h-Jo for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:59:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqUtX-0005Ym-NJ for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:58:55 -0400 Received: from ssl.dlhnet.de ([91.198.192.8]:54206 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUtX-0005YS-EY for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:58:51 -0400 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 2CF8F14AF9D; Sat, 22 Jun 2013 22:58:49 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ssl.dlh.net Received: from ssl.dlh.net ([127.0.0.1]) by localhost (ssl.dlh.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k6RIDbbpLSzc; Sat, 22 Jun 2013 22:58:44 +0200 (CEST) Received: from trinity64-ssd (unknown [82.141.7.8]) by ssl.dlh.net (Postfix) with ESMTP id 0964914AF5B; Sat, 22 Jun 2013 22:58:44 +0200 (CEST) Received: by trinity64-ssd (Postfix, from userid 1000) id E900D202118; Sat, 22 Jun 2013 22:58:43 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sat, 22 Jun 2013 22:58:25 +0200 Message-Id: <1371934712-11714-2-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371934712-11714-1-git-send-email-pl@kamp.de> References: <1371934712-11714-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: Kevin Wolf , pbonzini@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 1/8] iscsi: add logical block provisioning information to iscsilun 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 Reviewed-by: Paolo Bonzini --- block/iscsi.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 0bbf0b1..a38a1bf 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -49,6 +49,11 @@ typedef struct IscsiLun { uint64_t num_blocks; int events; QEMUTimer *nop_timer; + uint8_t lbpme; + uint8_t lbprz; + uint8_t lbpu; + uint8_t lbpws; + uint8_t lbpws10; } IscsiLun; typedef struct IscsiAIOCB { @@ -948,6 +953,8 @@ static int iscsi_readcapacity_sync(IscsiLun *iscsilun) } else { iscsilun->block_size = rc16->block_length; iscsilun->num_blocks = rc16->returned_lba + 1; + iscsilun->lbpme = rc16->lbpme; + iscsilun->lbprz = rc16->lbprz; } } break; @@ -1130,6 +1137,46 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) bs->sg = 1; } + if (iscsilun->lbpme) { + struct scsi_inquiry_logical_block_provisioning *inq_lbp; + int full_size; + + task = iscsi_inquiry_sync(iscsi, iscsilun->lun, 1, + SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING, + 64); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + error_report("iSCSI: Inquiry command failed : %s", + iscsi_get_error(iscsilun->iscsi)); + ret = -EINVAL; + goto out; + } + full_size = scsi_datain_getfullsize(task); + if (full_size > task->datain.size) { + scsi_free_scsi_task(task); + + /* we need more data for the full list */ + task = iscsi_inquiry_sync(iscsi, iscsilun->lun, 1, + SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING, + full_size); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + error_report("iSCSI: Inquiry command failed : %s", + iscsi_get_error(iscsilun->iscsi)); + ret = -EINVAL; + goto out; + } + } + + inq_lbp = scsi_datain_unmarshall(task); + if (inq_lbp == NULL) { + error_report("iSCSI: failed to unmarshall inquiry datain blob"); + ret = -EINVAL; + goto out; + } + iscsilun->lbpu = inq_lbp->lbpu; + iscsilun->lbpws = inq_lbp->lbpws; + iscsilun->lbpws10 = inq_lbp->lbpws10; + } + #if defined(LIBISCSI_FEATURE_NOP_COUNTER) /* Set up a timer for sending out iSCSI NOPs */ iscsilun->nop_timer = qemu_new_timer_ms(rt_clock, iscsi_nop_timed_event, iscsilun);