[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] iscsi: partly avoid iovec linearization in iscs
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2/6] iscsi: partly avoid iovec linearization in iscsi_aio_writev |
Date: |
Tue, 22 Jan 2013 15:19:52 +0100 |
From: Peter Lieven <address@hidden>
libiscsi expects all write16 data in a linear buffer. If the
iovec only contains one buffer we can skip the linearization
step as well as the additional malloc/free and pass the
buffer directly.
Reported-by: Ronnie Sahlberg <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/iscsi.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index d8382fd..259192f 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -241,8 +241,17 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num,
/* XXX we should pass the iovec to write16 to avoid the extra copy */
/* this will allow us to get rid of 'buf' completely */
size = nb_sectors * BDRV_SECTOR_SIZE;
- acb->buf = g_malloc(size);
- qemu_iovec_to_buf(acb->qiov, 0, acb->buf, size);
+ data.size = MIN(size, acb->qiov->size);
+
+ /* if the iovec only contains one buffer we can pass it directly */
+ if (acb->qiov->niov == 1) {
+ acb->buf = NULL;
+ data.data = acb->qiov->iov[0].iov_base;
+ } else {
+ acb->buf = g_malloc(data.size);
+ qemu_iovec_to_buf(acb->qiov, 0, acb->buf, data.size);
+ data.data = acb->buf;
+ }
acb->task = malloc(sizeof(struct scsi_task));
if (acb->task == NULL) {
@@ -263,9 +272,6 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num,
*(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors);
acb->task->expxferlen = size;
- data.data = acb->buf;
- data.size = size;
-
if (iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,
iscsi_aio_write16_cb,
&data,
--
1.8.1
- [Qemu-devel] [PULL 1.4 0/6] Pending SCSI patches for 1.4, Paolo Bonzini, 2013/01/22
- [Qemu-devel] [PATCH 1/6] iscsi: add iscsi_create support, Paolo Bonzini, 2013/01/22
- [Qemu-devel] [PATCH 2/6] iscsi: partly avoid iovec linearization in iscsi_aio_writev,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 4/6] scsi: fix segfault with 0-byte disk, Paolo Bonzini, 2013/01/22
- [Qemu-devel] [PATCH 5/6] lsi: use qbus_reset_all to reset SCSI bus, Paolo Bonzini, 2013/01/22
- [Qemu-devel] [PATCH 3/6] iscsi: add support for iSCSI NOPs [v2], Paolo Bonzini, 2013/01/22
- [Qemu-devel] [PATCH 6/6] scsi: Drop useless null test in scsi_unit_attention(), Paolo Bonzini, 2013/01/22