Commit 11c29918 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'bonzini/scsi-next' into staging 

# By Paolo Bonzini (1) and Peter Lieven (1)
# Via Paolo Bonzini
* bonzini/scsi-next:
  iscsi: add support for iovectors
  iscsi: do not leak acb->buf when commands are aborted
parents b37a2e45 7371d56f

block/iscsi.c

+41 −10
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ iscsi_bh_cb(void *p) 


    qemu_bh_delete(acb->bh);



    g_free(acb->buf);

    acb->buf = NULL;



    if (acb->canceled == 0) {

        acb->common.cb(acb->common.opaque, acb->status);

    }
@@ -198,6 +201,7 @@ iscsi_aio_write16_cb(struct iscsi_context *iscsi, int status, 
    trace_iscsi_aio_write16_cb(iscsi, status, acb, acb->canceled);



    g_free(acb->buf);

    acb->buf = NULL;



    if (acb->canceled != 0) {

        return;
@@ -230,7 +234,10 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, 
    size_t size;

    uint32_t num_sectors;

    uint64_t lba;

#if !defined(LIBISCSI_FEATURE_IOVECTOR)

    struct iscsi_data data;

#endif

    int ret;



    acb = qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque);

    trace_iscsi_aio_writev(iscsi, sector_num, nb_sectors, opaque, acb);
@@ -241,21 +248,23 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, 
    acb->canceled   = 0;

    acb->bh         = NULL;

    acb->status     = -EINPROGRESS;

    acb->buf        = NULL;



    /* 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;



#if !defined(LIBISCSI_FEATURE_IOVECTOR)

    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;

    }

#endif



    acb->task = malloc(sizeof(struct scsi_task));

    if (acb->task == NULL) {
@@ -276,16 +285,28 @@ iscsi_aio_writev(BlockDriverState *bs, int64_t sector_num, 
    *(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors);

    acb->task->expxferlen = size;



    if (iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,

#if defined(LIBISCSI_FEATURE_IOVECTOR)

    ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,

                                   iscsi_aio_write16_cb,

                                   NULL,

                                   acb);

#else

    ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,

                                   iscsi_aio_write16_cb,

                                   &data,

                                 acb) != 0) {

                                   acb);

#endif

    if (ret != 0) {

        scsi_free_scsi_task(acb->task);

        g_free(acb->buf);

        qemu_aio_release(acb);

        return NULL;

    }



#if defined(LIBISCSI_FEATURE_IOVECTOR)

    scsi_task_set_iov_out(acb->task, (struct scsi_iovec*) acb->qiov->iov, acb->qiov->niov);

#endif



    iscsi_set_events(iscsilun);



    return &acb->common;
@@ -323,7 +344,10 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, 
    struct iscsi_context *iscsi = iscsilun->iscsi;

    IscsiAIOCB *acb;

    size_t qemu_read_size;

#if !defined(LIBISCSI_FEATURE_IOVECTOR)

    int i;

#endif

    int ret;

    uint64_t lba;

    uint32_t num_sectors;
@@ -385,20 +409,25 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, 
        break;

    }



    if (iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,

    ret = iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task,

                                   iscsi_aio_read16_cb,

                                   NULL,

                                 acb) != 0) {

                                   acb);

    if (ret != 0) {

        scsi_free_scsi_task(acb->task);

        qemu_aio_release(acb);

        return NULL;

    }



#if defined(LIBISCSI_FEATURE_IOVECTOR)

    scsi_task_set_iov_in(acb->task, (struct scsi_iovec*) acb->qiov->iov, acb->qiov->niov);

#else

    for (i = 0; i < acb->qiov->niov; i++) {

        scsi_task_add_data_in_buffer(acb->task,

                acb->qiov->iov[i].iov_len,

                acb->qiov->iov[i].iov_base);

    }

#endif



    iscsi_set_events(iscsilun);
@@ -440,6 +469,7 @@ iscsi_aio_flush(BlockDriverState *bs, 
    acb->canceled   = 0;

    acb->bh         = NULL;

    acb->status     = -EINPROGRESS;

    acb->buf        = NULL;



    acb->task = iscsi_synchronizecache10_task(iscsi, iscsilun->lun,

                                         0, 0, 0, 0,
@@ -493,6 +523,7 @@ iscsi_aio_discard(BlockDriverState *bs, 
    acb->canceled   = 0;

    acb->bh         = NULL;

    acb->status     = -EINPROGRESS;

    acb->buf        = NULL;



    list[0].lba = sector_qemu2lun(sector_num, iscsilun);

    list[0].num = nb_sectors * BDRV_SECTOR_SIZE / iscsilun->block_size;