From patchwork Fri Feb 15 10:58:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 220717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0EEDA2C0089 for ; Fri, 15 Feb 2013 22:01:03 +1100 (EST) Received: from localhost ([::1]:41316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6J2L-0007iG-8v for incoming@patchwork.ozlabs.org; Fri, 15 Feb 2013 06:01:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6J00-0006OB-Su for qemu-devel@nongnu.org; Fri, 15 Feb 2013 05:58:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6Izm-0007bX-0O for qemu-devel@nongnu.org; Fri, 15 Feb 2013 05:58:25 -0500 Received: from ssl.dlhnet.de ([91.198.192.8]:48381 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6Izl-0007bT-Nl for qemu-devel@nongnu.org; Fri, 15 Feb 2013 05:58:21 -0500 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 5C76A14D920; Fri, 15 Feb 2013 11:58:20 +0100 (CET) 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 g4Z-aiC38oKl; Fri, 15 Feb 2013 11:58:20 +0100 (CET) Received: from [172.21.12.60] (unknown [82.141.1.226]) by ssl.dlh.net (Postfix) with ESMTPSA id EC42314D7BA; Fri, 15 Feb 2013 11:58:19 +0100 (CET) Message-ID: <511E14D3.1080001@dlhnet.de> Date: Fri, 15 Feb 2013 11:58:27 +0100 From: Peter Lieven User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: kwolf@redhat.com, Paolo Bonzini , ronnie sahlberg Subject: [Qemu-devel] [PATCH] iscsi: add iscsi_truncate support 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 this patch adds iscsi_truncate which effectively allows for online resizing of iscsi volumes. for this to work you have to resize the volume on your storage and then call block_resize command in qemu which will issue a readcapacity16 to update the capacity. Signed-off-by: Peter Lieven --- block/iscsi.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index deb3b68..37f12b3 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -67,6 +67,12 @@ typedef struct IscsiAIOCB { #endif } IscsiAIOCB; +struct IscsiTask { + IscsiLun *iscsilun; + int status; + int complete; +}; + #define NOP_INTERVAL 5000 #define MAX_NOP_FAILURES 3 @@ -700,6 +706,73 @@ iscsi_getlength(BlockDriverState *bs) return len; } +static void +iscsi_readcapacity16_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *opaque) +{ + struct IscsiTask *itask = opaque; + struct scsi_readcapacity16 *rc16; + struct scsi_task *task = command_data; + + if (status != 0) { + error_report("iSCSI: Failed to read capacity of iSCSI lun. %s", + iscsi_get_error(iscsi)); + itask->status = 1; + itask->complete = 1; + scsi_free_scsi_task(task); + return; + } + + rc16 = scsi_datain_unmarshall(task); + if (rc16 == NULL) { + error_report("iSCSI: Failed to unmarshall readcapacity16 data."); + itask->status = 1; + itask->complete = 1; + scsi_free_scsi_task(task); + return; + } + + itask->iscsilun->block_size = rc16->block_length; + itask->iscsilun->num_blocks = rc16->returned_lba + 1; + + itask->status = 0; + itask->complete = 1; + scsi_free_scsi_task(task); +} + +static int iscsi_truncate(BlockDriverState *bs, int64_t offset) +{ + IscsiLun *iscsilun = bs->opaque; + struct IscsiTask itask; + struct scsi_task *task = NULL; + + if (iscsilun->type != TYPE_DISK) { + return -ENOTSUP; + } + + itask.iscsilun = iscsilun; + itask.status = 0; + itask.complete = 0; + + task = iscsi_readcapacity16_task(iscsilun->iscsi, iscsilun->lun, + iscsi_readcapacity16_cb, &itask); + if (task == NULL) { + error_report("iSCSI: failed to send readcapacity16 command."); + return -EINVAL; + } + + while (!itask.complete) { + iscsi_set_events(iscsilun); + qemu_aio_wait(); + } + + if (offset > iscsi_getlength(bs)) { + return -EINVAL; + } + + return 0; +} + static int parse_chap(struct iscsi_context *iscsi, const char *target) { QemuOptsList *list; @@ -1093,6 +1166,7 @@ static BlockDriver bdrv_iscsi = { .create_options = iscsi_create_options, .bdrv_getlength = iscsi_getlength, + .bdrv_truncate = iscsi_truncate, .bdrv_aio_readv = iscsi_aio_readv, .bdrv_aio_writev = iscsi_aio_writev,