[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/19] block/iscsi: check WRITE SAME support diff
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 12/19] block/iscsi: check WRITE SAME support differently depending on MAY_UNMAP |
Date: |
Fri, 22 Nov 2013 13:39:54 +0100 |
The current check is right for MAY_UNMAP=1. For MAY_UNMAP=0, just
try and fall back to regular writes as soon as a WRITE SAME command
fails.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/iscsi.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 20f4f55..93fee6d 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -55,6 +55,7 @@ typedef struct IscsiLun {
QEMUTimer *nop_timer;
uint8_t lbpme;
uint8_t lbprz;
+ uint8_t has_write_same;
struct scsi_inquiry_logical_block_provisioning lbp;
struct scsi_inquiry_block_limits bl;
unsigned char *zeroblock;
@@ -976,8 +977,13 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs,
int64_t sector_num,
return -EINVAL;
}
- if (!iscsilun->lbp.lbpws) {
- /* WRITE SAME is not supported by the target */
+ if (!(flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->has_write_same) {
+ /* WRITE SAME without UNMAP is not supported by the target */
+ return -ENOTSUP;
+ }
+
+ if ((flags & BDRV_REQ_MAY_UNMAP) && !iscsilun->lbp.lbpws) {
+ /* WRITE SAME with UNMAP is not supported by the target */
return -ENOTSUP;
}
@@ -1012,6 +1018,14 @@ retry:
}
if (iTask.status != SCSI_STATUS_GOOD) {
+ if (iTask.status == SCSI_STATUS_CHECK_CONDITION &&
+ iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST &&
+ iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+ /* WRITE SAME is not supported by the target */
+ iscsilun->has_write_same = false;
+ return -ENOTSUP;
+ }
+
return -EIO;
}
@@ -1375,6 +1389,7 @@ static int iscsi_open(BlockDriverState *bs, QDict
*options, int flags,
}
iscsilun->type = inq->periperal_device_type;
+ iscsilun->has_write_same = true;
if ((ret = iscsi_readcapacity_sync(iscsilun)) != 0) {
goto out;
--
1.8.4.2
- [Qemu-devel] [PATCH v3 07/19] vpc, vhdx: add get_info, (continued)
- [Qemu-devel] [PATCH v3 07/19] vpc, vhdx: add get_info, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 09/19] block drivers: expose requirement for write same alignment from formats, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 08/19] block drivers: add discard/write_zeroes properties to bdrv_get_info implementation, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 10/19] block/iscsi: remove .bdrv_has_zero_init, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 06/19] block: make bdrv_co_do_write_zeroes stricter in producing aligned requests, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 11/19] block/iscsi: updated copyright, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 12/19] block/iscsi: check WRITE SAME support differently depending on MAY_UNMAP,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 13/19] raw-posix: implement write_zeroes with MAY_UNMAP for files, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 14/19] raw-posix: implement write_zeroes with MAY_UNMAP for block devices, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 15/19] raw-posix: add support for write_zeroes on XFS and block devices, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 16/19] qemu-iotests: 033 is fast, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 17/19] scsi-disk: catch write protection errors in UNMAP, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 18/19] scsi-disk: reject ANCHOR=1 for UNMAP and WRITE SAME commands, Paolo Bonzini, 2013/11/22
- [Qemu-devel] [PATCH v3 19/19] scsi-disk: correctly implement WRITE SAME, Paolo Bonzini, 2013/11/22