From patchwork Sat Jun 22 20:58:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 253434 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 99ABA2C0411 for ; Sun, 23 Jun 2013 07:01:59 +1000 (EST) Received: from localhost ([::1]:60945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUwX-0004ia-Of for incoming@patchwork.ozlabs.org; Sat, 22 Jun 2013 17:01:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUtf-00086s-0C for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:59:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqUtb-0005c9-2P for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:58:58 -0400 Received: from ssl.dlhnet.de ([91.198.192.8]:54223 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqUta-0005bz-PJ for qemu-devel@nongnu.org; Sat, 22 Jun 2013 16:58:55 -0400 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 4250F14AF5B; Sat, 22 Jun 2013 22:58:54 +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 YzDs7Rrg3rmB; Sat, 22 Jun 2013 22:58:50 +0200 (CEST) Received: from trinity64-ssd (unknown [82.141.7.8]) by ssl.dlh.net (Postfix) with ESMTP id 0AA6614AF94; Sat, 22 Jun 2013 22:58:44 +0200 (CEST) Received: by trinity64-ssd (Postfix, from userid 1000) id EDEB7202119; Sat, 22 Jun 2013 22:58:43 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sat, 22 Jun 2013 22:58:26 +0200 Message-Id: <1371934712-11714-3-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 2/8] iscsi: add bdrv_co_is_allocated 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 | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index a38a1bf..98be71e 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -56,6 +56,15 @@ typedef struct IscsiLun { uint8_t lbpws10; } IscsiLun; +typedef struct IscsiTask { + IscsiLun *iscsilun; + BlockDriverState *bs; + int status; + int complete; + Coroutine *co; + struct scsi_lba_status_descriptor lbasd; +} IscsiTask; + typedef struct IscsiAIOCB { BlockDriverAIOCB common; QEMUIOVector *qiov; @@ -805,6 +814,98 @@ iscsi_getlength(BlockDriverState *bs) return len; } +static void +iscsi_co_is_allocated_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *opaque) +{ + struct IscsiTask *iTask = opaque; + struct scsi_task *task = command_data; + struct scsi_get_lba_status *lbas = NULL; + + iTask->complete = 1; + + if (status != 0) { + error_report("iSCSI: Failed to get_lba_status on iSCSI lun. %s", + iscsi_get_error(iscsi)); + iTask->status = 1; + goto out; + } + + lbas = scsi_datain_unmarshall(task); + if (lbas == NULL) { + iTask->status = 1; + goto out; + } + + memcpy(&iTask->lbasd, &lbas->descriptors[0], + sizeof(struct scsi_lba_status_descriptor)); + + iTask->status = 0; + +out: + scsi_free_scsi_task(task); + + if (iTask->co) { + qemu_coroutine_enter(iTask->co, NULL); + } +} + +static int coroutine_fn iscsi_co_is_allocated(BlockDriverState *bs, + int64_t sector_num, + int nb_sectors, int *pnum) +{ + IscsiLun *iscsilun = bs->opaque; + struct IscsiTask iTask; + int ret; + + *pnum = nb_sectors; + + if (iscsilun->lbpme == 0) { + return 1; + } + + iTask.iscsilun = iscsilun; + iTask.status = 0; + iTask.complete = 0; + iTask.bs = bs; + + if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun, + sector_qemu2lun(sector_num, iscsilun), + 8 + 16, iscsi_co_is_allocated_cb, + &iTask) == NULL) { + *pnum = 0; + return 0; + } + + while (!iTask.complete) { + iscsi_set_events(iscsilun); + iTask.co = qemu_coroutine_self(); + qemu_coroutine_yield(); + } + + if (iTask.status != 0) { + /* in case the get_lba_status_callout fails (i.e. + * because the device is busy or the cmd is not + * supported) we pretend all blocks are allocated + * for backwards compatiblity */ + return 1; + } + + if (sector_qemu2lun(sector_num, iscsilun) != iTask.lbasd.lba) { + *pnum = 0; + return 0; + } + + *pnum = iTask.lbasd.num_blocks * (iscsilun->block_size / BDRV_SECTOR_SIZE); + if (*pnum > nb_sectors) { + *pnum = nb_sectors; + } + + return (iTask.lbasd.provisioning == SCSI_PROVISIONING_TYPE_MAPPED) ? 1 : 0; + + return ret; +} + static int parse_chap(struct iscsi_context *iscsi, const char *target) { QemuOptsList *list; @@ -1315,6 +1416,8 @@ static BlockDriver bdrv_iscsi = { .bdrv_getlength = iscsi_getlength, .bdrv_truncate = iscsi_truncate, + .bdrv_co_is_allocated = iscsi_co_is_allocated, + .bdrv_aio_readv = iscsi_aio_readv, .bdrv_aio_writev = iscsi_aio_writev, .bdrv_aio_flush = iscsi_aio_flush,