[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 03/11] iscsi: add bdrv_co_is_allocated
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv2 03/11] iscsi: add bdrv_co_is_allocated |
Date: |
Thu, 27 Jun 2013 15:11:27 +0200 |
this patch adds a coroutine for .bdrv_co_is_allocated as well as
a generic framework that can be used to build coroutines in block/iscsi.
Signed-off-by: Peter Lieven <address@hidden>
---
block/iscsi.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/block/iscsi.c b/block/iscsi.c
index 2e2455d..d31ee95 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -58,6 +58,15 @@ typedef struct IscsiLun {
uint32_t max_unmap_bdc;
} IscsiLun;
+typedef struct IscsiTask {
+ int status;
+ int complete;
+ int retries;
+ int do_retry;
+ struct scsi_task *task;
+ Coroutine *co;
+} IscsiTask;
+
typedef struct IscsiAIOCB {
BlockDriverAIOCB common;
QEMUIOVector *qiov;
@@ -113,6 +122,45 @@ iscsi_schedule_bh(IscsiAIOCB *acb)
qemu_bh_schedule(acb->bh);
}
+static void
+iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
+ void *command_data, void *opaque)
+{
+ struct IscsiTask *iTask = opaque;
+ struct scsi_task *task = command_data;
+
+ iTask->complete = 1;
+ iTask->status = status;
+ iTask->do_retry = 0;
+ iTask->task = task;
+
+ if (iTask->retries-- > 0 && status == SCSI_STATUS_CHECK_CONDITION
+ && task->sense.key == SCSI_SENSE_UNIT_ATTENTION) {
+ iTask->do_retry = 1;
+ goto out;
+ }
+
+ if (status != SCSI_STATUS_GOOD) {
+ error_report("iSCSI: Failure. %s", iscsi_get_error(iscsi));
+ goto out;
+ }
+
+out:
+ if (iTask->status != SCSI_STATUS_GOOD) {
+ scsi_free_scsi_task(iTask->task);
+ iTask->task = NULL;
+ }
+ if (iTask->co) {
+ qemu_coroutine_enter(iTask->co, NULL);
+ }
+}
+
+static void iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask
*iTask)
+{
+ memset(iTask, 0x00, sizeof(struct IscsiTask));
+ iTask->co = qemu_coroutine_self();
+ iTask->retries = ISCSI_CMD_RETRIES;
+}
static void
iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void
*command_data,
@@ -807,6 +855,79 @@ iscsi_getlength(BlockDriverState *bs)
return len;
}
+static int coroutine_fn iscsi_co_is_allocated(BlockDriverState *bs,
+ int64_t sector_num,
+ int nb_sectors, int *pnum)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct scsi_get_lba_status *lbas = NULL;
+ struct scsi_lba_status_descriptor *lbasd = NULL;
+ struct IscsiTask iTask;
+ int ret;
+
+ /* LUN does not support logical block provisioning */
+ if (iscsilun->lbpme == 0) {
+ *pnum = nb_sectors;
+ return 1;
+ }
+
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+
+retry:
+ if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,
+ sector_qemu2lun(sector_num, iscsilun),
+ 8 + 16, iscsi_co_generic_cb,
+ &iTask) == NULL) {
+ goto fail;
+ }
+
+ while (!iTask.complete) {
+ iscsi_set_events(iscsilun);
+ qemu_coroutine_yield();
+ }
+
+ if (iTask.do_retry) {
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ /* in case the get_lba_status_callout fails (i.e.
+ * because the device is busy or the cmd is not
+ * supported) we pretend all blocks are allocated
+ * for backwards compatiblity */
+ *pnum = nb_sectors;
+ return 1;
+ }
+
+ lbas = scsi_datain_unmarshall(iTask.task);
+ if (lbas == NULL) {
+ goto fail;
+ }
+
+ lbasd = &lbas->descriptors[0];
+
+ if (sector_qemu2lun(sector_num, iscsilun) != lbasd->lba) {
+ goto fail;
+ }
+
+ *pnum = lbasd->num_blocks * (iscsilun->block_size / BDRV_SECTOR_SIZE);
+ if (*pnum > nb_sectors) {
+ *pnum = nb_sectors;
+ }
+
+ ret = lbasd->provisioning == SCSI_PROVISIONING_TYPE_MAPPED ? 1 : 0;
+
+ scsi_free_scsi_task(iTask.task);
+ return ret;
+
+fail:
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ }
+ *pnum = 0;
+ return 0;
+}
+
static int parse_chap(struct iscsi_context *iscsi, const char *target)
{
QemuOptsList *list;
@@ -1347,6 +1468,8 @@ static BlockDriver bdrv_iscsi = {
.bdrv_getlength = iscsi_getlength,
.bdrv_truncate = iscsi_truncate,
+ .bdrv_co_is_allocated = iscsi_co_is_allocated,
+
.bdrv_aio_readv = iscsi_aio_readv,
.bdrv_aio_writev = iscsi_aio_writev,
.bdrv_aio_flush = iscsi_aio_flush,
--
1.7.9.5
- [Qemu-devel] [PATCHv2 00/11] iscsi/qemu-img/block-migration enhancements, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 03/11] iscsi: add bdrv_co_is_allocated,
Peter Lieven <=
- [Qemu-devel] [PATCHv2 02/11] iscsi: read unmap info from block limits vpd page, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 05/11] block: add bdrv_write_zeroes(), Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 01/11] iscsi: add logical block provisioning information to iscsilun, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 06/11] block/raw: add bdrv_co_write_zeroes, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 09/11] iscsi: factor out sector conversions, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 07/11] iscsi: let bdrv_create conditionally zero out the device, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 10/11] iscsi: ignore aio_discard if unsupported, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 04/11] iscsi: add bdrv_co_write_zeroes, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 11/11] iscsi: assert that sectors are aligned to LUN blocksize, Peter Lieven, 2013/06/27
- [Qemu-devel] [PATCHv2 08/11] block-migration: efficiently encode zero blocks, Peter Lieven, 2013/06/27