[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 12/20] iscsi: add bdrv_co_write_zeroes
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv3 12/20] iscsi: add bdrv_co_write_zeroes |
Date: |
Tue, 24 Sep 2013 15:35:06 +0200 |
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
---
block/iscsi.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/block/iscsi.c b/block/iscsi.c
index f6cd322..8f52ef8 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -56,6 +56,7 @@ typedef struct IscsiLun {
uint8_t lbprz;
struct scsi_inquiry_logical_block_provisioning lbp;
struct scsi_inquiry_block_limits bl;
+ unsigned char *zeroblock;
} IscsiLun;
typedef struct IscsiTask {
@@ -959,6 +960,62 @@ retry:
return 0;
}
+
+static int
+coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num,
+ int nb_sectors, BdrvRequestFlags flags)
+{
+ IscsiLun *iscsilun = bs->opaque;
+ struct IscsiTask iTask;
+ uint64_t lba;
+ uint32_t nb_blocks;
+
+ if (!is_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {
+ return -EINVAL;
+ }
+
+ if (!iscsilun->lbp.lbpws) {
+ /* WRITE SAME is not supported by the target */
+ return -ENOTSUP;
+ }
+
+ lba = sector_qemu2lun(sector_num, iscsilun);
+ nb_blocks = sector_qemu2lun(nb_sectors, iscsilun);
+
+ if (iscsilun->zeroblock == NULL) {
+ iscsilun->zeroblock = g_malloc0(iscsilun->block_size);
+ }
+
+ iscsi_co_init_iscsitask(iscsilun, &iTask);
+retry:
+ if (iscsi_writesame16_task(iscsilun->iscsi, iscsilun->lun, lba,
+ iscsilun->zeroblock, iscsilun->block_size,
+ nb_blocks, 0, !!(flags & BDRV_REQ_MAY_UNMAP),
+ 0, 0, iscsi_co_generic_cb, &iTask) == NULL) {
+ return -EIO;
+ }
+
+ while (!iTask.complete) {
+ iscsi_set_events(iscsilun);
+ qemu_coroutine_yield();
+ }
+
+ if (iTask.task != NULL) {
+ scsi_free_scsi_task(iTask.task);
+ iTask.task = NULL;
+ }
+
+ if (iTask.do_retry) {
+ goto retry;
+ }
+
+ if (iTask.status != SCSI_STATUS_GOOD) {
+ return -EIO;
+ }
+
+ return 0;
+}
+
static int parse_chap(struct iscsi_context *iscsi, const char *target)
{
QemuOptsList *list;
@@ -1421,6 +1478,7 @@ static void iscsi_close(BlockDriverState *bs)
}
qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), NULL, NULL, NULL);
iscsi_destroy_context(iscsi);
+ g_free(iscsilun->zeroblock);
memset(iscsilun, 0, sizeof(IscsiLun));
}
@@ -1541,6 +1599,7 @@ static BlockDriver bdrv_iscsi = {
.bdrv_co_get_block_status = iscsi_co_get_block_status,
#endif
.bdrv_co_discard = iscsi_co_discard,
+ .bdrv_co_write_zeroes = iscsi_co_write_zeroes,
.bdrv_aio_readv = iscsi_aio_readv,
.bdrv_aio_writev = iscsi_aio_writev,
--
1.7.9.5
- [Qemu-devel] [PATCHv3 04/20] block: introduce bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes, (continued)
- [Qemu-devel] [PATCHv3 04/20] block: introduce bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 01/20] block: make BdrvRequestFlags public, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 02/20] block: add flags to bdrv_*_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 03/20] block: introduce BDRV_REQ_MAY_UNMAP request flag, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 05/20] block/raw: add bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 06/20] block: add BlockLimits structure to BlockDriverState, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 07/20] block: honour BlockLimits in bdrv_co_do_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 08/20] block: honour BlockLimits in bdrv_co_discard, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 11/20] iscsi: add bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 13/20] block: introduce bdrv_zeroize, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 12/20] iscsi: add bdrv_co_write_zeroes,
Peter Lieven <=
- [Qemu-devel] [PATCHv3 10/20] iscsi: set limits in BlockDriverState, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 14/20] block/get_block_status: set *pnum = 0 on error, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 09/20] iscsi: simplify iscsi_co_discard, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 16/20] block/get_block_status: avoid redundant callouts on raw devices, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 18/20] qemu-img: add support for fully allocated images, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 20/20] block/raw: copy BlockLimits on raw_open, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 15/20] block/get_block_status: avoid segfault if there is no backing_hd, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 17/20] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 19/20] qemu-img: conditionally zero out target on convert, Peter Lieven, 2013/09/24