[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv6 3/6] block/iscsi: set max_transfer_length
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv6 3/6] block/iscsi: set max_transfer_length |
Date: |
Mon, 27 Oct 2014 10:18:45 +0100 |
Copy the max_xfer_len from the BlockLimits VPD or use the
maximum value fitting in the CDB.
The helper function sector_limits_lun2qemu is introduced to convert
and cap the limits from the VPD to the maximum power of two fitting
in an integer; integer is the range for nb_sectors throughout
the block layer.
Signed-off-by: Peter Lieven <address@hidden>
---
block/iscsi.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 233f462..6b229b1 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1447,12 +1447,25 @@ static void iscsi_close(BlockDriverState *bs)
memset(iscsilun, 0, sizeof(IscsiLun));
}
-static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp)
+static int sector_limits_lun2qemu(int64_t sector, IscsiLun *iscsilun)
{
- IscsiLun *iscsilun = bs->opaque;
+ return MIN(sector_lun2qemu(sector, iscsilun), INT_MAX / 2 + 1);
+}
+static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp)
+{
/* We don't actually refresh here, but just return data queried in
* iscsi_open(): iscsi targets don't change their limits. */
+
+ IscsiLun *iscsilun = bs->opaque;
+ uint32_t max_xfer_len = iscsilun->use_16_for_rw ? 0xffffffff : 0xffff;
+
+ if (iscsilun->bl.max_xfer_len) {
+ max_xfer_len = MIN(max_xfer_len, iscsilun->bl.max_xfer_len);
+ }
+
+ bs->bl.max_transfer_length = sector_limits_lun2qemu(max_xfer_len,
iscsilun);
+
if (iscsilun->lbp.lbpu) {
if (iscsilun->bl.max_unmap < 0xffffffff) {
bs->bl.max_discard = sector_lun2qemu(iscsilun->bl.max_unmap,
--
1.7.9.5
- [Qemu-devel] [PATCHv6 0/6] introduce max_transfer_length, Peter Lieven, 2014/10/27
- [Qemu-devel] [PATCHv6 2/6] BlockLimits: introduce max_transfer_length, Peter Lieven, 2014/10/27
- [Qemu-devel] [PATCHv6 1/6] util: introduce MIN_NON_ZERO, Peter Lieven, 2014/10/27
- [Qemu-devel] [PATCHv6 4/6] block: avoid creating oversized writes in multiwrite_merge, Peter Lieven, 2014/10/27
- [Qemu-devel] [PATCHv6 3/6] block/iscsi: set max_transfer_length,
Peter Lieven <=
- [Qemu-devel] [PATCHv6 6/6] block/iscsi: check for oversized requests, Peter Lieven, 2014/10/27
- [Qemu-devel] [PATCHv6 5/6] block/iscsi: use sector_limits_lun2qemu throughout iscsi_refresh_limits, Peter Lieven, 2014/10/27
- Re: [Qemu-devel] [PATCHv6 0/6] introduce max_transfer_length, Stefan Hajnoczi, 2014/10/28