From patchwork Fri Jun 21 02:32:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 253121 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 645E92C013D for ; Fri, 21 Jun 2013 12:33:53 +1000 (EST) Received: from localhost ([::1]:37779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UprAd-0008VW-8Z for incoming@patchwork.ozlabs.org; Thu, 20 Jun 2013 22:33:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upr9c-0006LR-G6 for qemu-devel@nongnu.org; Thu, 20 Jun 2013 22:32:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upr9b-0001YO-Ii for qemu-devel@nongnu.org; Thu, 20 Jun 2013 22:32:48 -0400 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:63571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upr9b-0001YD-2w for qemu-devel@nongnu.org; Thu, 20 Jun 2013 22:32:47 -0400 Received: by mail-pa0-f45.google.com with SMTP id bi5so7116664pad.4 for ; Thu, 20 Jun 2013 19:32:46 -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=UHRQ6qOgWY43z/xbbbNvzDS2p9c71pDjMuoUYMR8b1A=; b=RXOY52XvolKSfMlSKGbjNSXBJPxWNyWD2e91rF+MW/Nemx4oe2tVda8JR/JllqFVAP 03Qd7QN4DFAt9oaSSwnzFPhjnlX5mQuL0uQSn/oHFbr/eO7OaenwJyAHKY7o5qjdZcnT kobTR4LRAJFwZU+pKczTrA2DNBktjcBU+MXSZFBqLGr90QP1lV7C65iZjiD4VDFc4wBc Mq01JzRaJk2CeFXIgrOxUGru53ze2r8ssQAWppOlV3q6rJYQs+uMxAAHP1ur5VDz04A7 hoWeCsMdkZ17T+euzMVJ0WlanvTwbv64FgX3tVxDSsTRcICmqHyfBEhHEBzuYxqxfQj4 NJ4Q== X-Received: by 10.68.98.165 with SMTP id ej5mr10071720pbb.111.1371781966196; Thu, 20 Jun 2013 19:32:46 -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 z5sm2690534pbk.0.2013.06.20.19.32.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Jun 2013 19:32:45 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Thu, 20 Jun 2013 19:32:43 -0700 From: Ronnie Sahlberg To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2013 19:32:35 -0700 Message-Id: <1371781955-2745-2-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1371781955-2745-1-git-send-email-ronniesahlberg@gmail.com> References: <1371781955-2745-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:c03::22d Cc: stefanha@gmail.com, 1191606@bugs.launchpad.net, lersek@redhat.com, Ronnie Sahlberg 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 --- block/iscsi.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 0bbf0b1..2d1cb4e 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -727,25 +727,42 @@ 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; + } } 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); return NULL; } + /* We got an iovector for writing to the target */ + if (acb->task->xfer_dir == SCSI_XFER_WRITE) { + if (acb->ioh->iovec_count > 0) { + scsi_task_set_iov_out(acb->task, + (struct scsi_iovec *) acb->ioh->dxferp, + acb->ioh->iovec_count); + } + } + /* 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 { + scsi_task_set_iov_in(acb->task, + (struct scsi_iovec *) acb->ioh->dxferp, + acb->ioh->iovec_count); + } } iscsi_set_events(iscsilun);