From patchwork Sat Jun 22 01:37:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 253330 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 A631E2C0404 for ; Sat, 22 Jun 2013 11:37:48 +1000 (EST) Received: from localhost ([::1]:37283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqClu-0004MF-QV for incoming@patchwork.ozlabs.org; Fri, 21 Jun 2013 21:37:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqClb-0004He-DL for qemu-devel@nongnu.org; Fri, 21 Jun 2013 21:37:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqCla-0001sv-GA for qemu-devel@nongnu.org; Fri, 21 Jun 2013 21:37:27 -0400 Received: from mail-pb0-x235.google.com ([2607:f8b0:400e:c01::235]:36216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqCla-0001sp-7V for qemu-devel@nongnu.org; Fri, 21 Jun 2013 21:37:26 -0400 Received: by mail-pb0-f53.google.com with SMTP id xb12so8553371pbc.12 for ; Fri, 21 Jun 2013 18:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=VH24nO3NE9VyPy45UH5QbgvhhW/f0TRknQ8u7vIMdM0=; b=lCd0ZQOPwu52vtR+7DrnAcEIbaRbaksGXEp5uH6yB4nPyDnLudqpO99SOVmt9wt0Xq Zed+vhzYh5853OpADBLym4KcPIWUw4h9gA8Nu83PqJzSPLh8ypcJ1TO9ICX3Gfq3f71n xDc8/gBxTuImn1i4bJxhrtN8LL4IHcgeb7yTOfndnzMWRH5fOvwfUZbyr7SgdvYzKNy2 cicOrrCkmRjOkEGbT99EKHrmTIyIPpHt5XpoXawDY7PgrttJLkq/dIwX/lP7EwabZqyB BOSc9VBte0LS/ydasL20Q/M3TemXxwv1F6iWtPPFdv2QPMHCqNWcBDt9Ku20umY7NMxX ZyEA== X-Received: by 10.66.221.163 with SMTP id qf3mr18573959pac.38.1371865045467; Fri, 21 Jun 2013 18:37:25 -0700 (PDT) Received: from ronniesahlberg@gmail.com (c-67-174-241-173.hsd1.ca.comcast.net. [67.174.241.173]) by mx.google.com with ESMTPSA id bs2sm7983725pad.17.2013.06.21.18.37.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Jun 2013 18:37:25 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Fri, 21 Jun 2013 18:37:23 -0700 From: Ronnie Sahlberg To: qemu-devel@nongnu.org Date: Fri, 21 Jun 2013 18:37:18 -0700 Message-Id: <1371865038-20821-2-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1371865038-20821-1-git-send-email-ronniesahlberg@gmail.com> References: <1371865038-20821-1-git-send-email-ronniesahlberg@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::235 Cc: stefanha@gmail.com, 1191606@bugs.launchpad.net, lersek@redhat.com, Ronnie Sahlberg , pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] Fix iSCSI crash on SG_IO with an iovector 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 Don't assume that SG_IO is always invoked with a simple buffer, check the iovec_count and if it is > 1 then we need to pass an array of iovectors to libiscsi instead of just a plain buffer. Signed-off-by: Ronnie Sahlberg Reviewed-by: Laszlo Ersek --- block/iscsi.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 7 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 0bbf0b1..cbe2e8f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -651,6 +651,9 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, { IscsiAIOCB *acb = opaque; + g_free(acb->buf); + acb->buf = NULL; + if (acb->canceled != 0) { return; } @@ -727,14 +730,36 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, memcpy(&acb->task->cdb[0], acb->ioh->cmdp, acb->ioh->cmd_len); acb->task->expxferlen = acb->ioh->dxfer_len; + data.size = 0; if (acb->task->xfer_dir == SCSI_XFER_WRITE) { - data.data = acb->ioh->dxferp; - data.size = acb->ioh->dxfer_len; + if (acb->ioh->iovec_count == 0) { + data.data = acb->ioh->dxferp; + data.size = acb->ioh->dxfer_len; + } else { +#if defined(LIBISCSI_FEATURE_IOVECTOR) + scsi_task_set_iov_out(acb->task, + (struct scsi_iovec *) acb->ioh->dxferp, + acb->ioh->iovec_count); + #else + int i; + char *buf; + struct scsi_iovec *iov = (struct scsi_iovec *)acb->ioh->dxferp; + + acb->buf = g_malloc(acb->ioh->dxfer_len); + buf = acb->buf; + for (i = 0; i < acb->ioh->iovec_count; i++) { + memcpy(buf, iov[i].iov_base, iov[i].iov_len); + buf += iov[i].iov_len; + } + data.data = acb->buf; + data.size = acb->ioh->dxfer_len; +#endif + } } + if (iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task, iscsi_aio_ioctl_cb, - (acb->task->xfer_dir == SCSI_XFER_WRITE) ? - &data : NULL, + (data.size > 0) ? &data : NULL, acb) != 0) { scsi_free_scsi_task(acb->task); qemu_aio_release(acb); @@ -743,9 +768,26 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, /* tell libiscsi to read straight into the buffer we got from ioctl */ if (acb->task->xfer_dir == SCSI_XFER_READ) { - scsi_task_add_data_in_buffer(acb->task, - acb->ioh->dxfer_len, - acb->ioh->dxferp); + if (acb->ioh->iovec_count == 0) { + scsi_task_add_data_in_buffer(acb->task, + acb->ioh->dxfer_len, + acb->ioh->dxferp); + } else { +#if defined(LIBISCSI_FEATURE_IOVECTOR) + scsi_task_set_iov_in(acb->task, + (struct scsi_iovec *) acb->ioh->dxferp, + acb->ioh->iovec_count); +#else + int i; + for (i = 0; i < acb->ioh->iovec_count; i++) { + struct scsi_iovec *iov = (struct scsi_iovec *)acb->ioh->dxferp; + + scsi_task_add_data_in_buffer(acb->task, + iov[i].iov_len, + iov[i].iov_base); + } +#endif + } } iscsi_set_events(iscsilun);