Commit f18a7cbb authored by Peter Lieven's avatar Peter Lieven Committed by Paolo Bonzini
Browse files

iscsi: add logical block provisioning information to iscsilun 



Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 57ffcc4c

block/iscsi.c

+77 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ typedef struct IscsiLun { 
    uint64_t num_blocks;

    int events;

    QEMUTimer *nop_timer;

    uint8_t lbpme;

    uint8_t lbprz;

    struct scsi_inquiry_logical_block_provisioning lbp;

    struct scsi_inquiry_block_limits bl;

} IscsiLun;



typedef struct IscsiAIOCB {
@@ -999,6 +1003,8 @@ static int iscsi_readcapacity_sync(IscsiLun *iscsilun) 
                } else {

                    iscsilun->block_size = rc16->block_length;

                    iscsilun->num_blocks = rc16->returned_lba + 1;

                    iscsilun->lbpme = rc16->lbpme;

                    iscsilun->lbprz = rc16->lbprz;

                }

            }

            break;
@@ -1051,6 +1057,37 @@ static QemuOptsList runtime_opts = { 
    },

};



static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi,

                                          int lun, int evpd, int pc) {

        int full_size;

        struct scsi_task *task = NULL;

        task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, 64);

        if (task == NULL || task->status != SCSI_STATUS_GOOD) {

            goto fail;

        }

        full_size = scsi_datain_getfullsize(task);

        if (full_size > task->datain.size) {

            scsi_free_scsi_task(task);



            /* we need more data for the full list */

            task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, full_size);

            if (task == NULL || task->status != SCSI_STATUS_GOOD) {

                goto fail;

            }

        }



        return task;



fail:

        error_report("iSCSI: Inquiry command failed : %s",

                     iscsi_get_error(iscsi));

        if (task) {

            scsi_free_scsi_task(task);

            return NULL;

        }

        return NULL;

}



/*

 * We support iscsi url's on the form

 * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
@@ -1180,6 +1217,46 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) 
        bs->sg = 1;

    }



    if (iscsilun->lbpme) {

        struct scsi_inquiry_logical_block_provisioning *inq_lbp;

        task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

                                SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING);

        if (task == NULL) {

            ret = -EINVAL;

            goto out;

        }

        inq_lbp = scsi_datain_unmarshall(task);

        if (inq_lbp == NULL) {

            error_report("iSCSI: failed to unmarshall inquiry datain blob");

            ret = -EINVAL;

            goto out;

        }

        memcpy(&iscsilun->lbp, inq_lbp,

               sizeof(struct scsi_inquiry_logical_block_provisioning));

        scsi_free_scsi_task(task);

        task = NULL;

    }



    if (iscsilun->lbp.lbpu || iscsilun->lbp.lbpws) {

        struct scsi_inquiry_block_limits *inq_bl;

        task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1,

                                SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS);

        if (task == NULL) {

            ret = -EINVAL;

            goto out;

        }

        inq_bl = scsi_datain_unmarshall(task);

        if (inq_bl == NULL) {

            error_report("iSCSI: failed to unmarshall inquiry datain blob");

            ret = -EINVAL;

            goto out;

        }

        memcpy(&iscsilun->bl, inq_bl,

               sizeof(struct scsi_inquiry_block_limits));

        scsi_free_scsi_task(task);

        task = NULL;

    }



#if defined(LIBISCSI_FEATURE_NOP_COUNTER)

    /* Set up a timer for sending out iSCSI NOPs */

    iscsilun->nop_timer = timer_new_ms(QEMU_CLOCK_REALTIME, iscsi_nop_timed_event, iscsilun);