iscsi: Use block size as minimum zero/discard alignment
If hardware does not advertise a minimum zero/discard alignment, we still want to guarantee that the block layer will align requests to our blocks, rather than the arbitrary 512-byte BDRV sector size. Signed-off-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
ebb718a5c7
commit
8b18474451
|
@ -1711,6 +1711,8 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp)
|
||||||
}
|
}
|
||||||
bs->bl.discard_alignment =
|
bs->bl.discard_alignment =
|
||||||
sector_limits_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun);
|
sector_limits_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun);
|
||||||
|
} else {
|
||||||
|
bs->bl.discard_alignment = iscsilun->block_size >> BDRV_SECTOR_BITS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (iscsilun->bl.max_ws_len < 0xffffffff) {
|
if (iscsilun->bl.max_ws_len < 0xffffffff) {
|
||||||
|
@ -1720,6 +1722,9 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp)
|
||||||
if (iscsilun->lbp.lbpws) {
|
if (iscsilun->lbp.lbpws) {
|
||||||
bs->bl.write_zeroes_alignment =
|
bs->bl.write_zeroes_alignment =
|
||||||
sector_limits_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun);
|
sector_limits_lun2qemu(iscsilun->bl.opt_unmap_gran, iscsilun);
|
||||||
|
} else {
|
||||||
|
bs->bl.write_zeroes_alignment =
|
||||||
|
iscsilun->block_size >> BDRV_SECTOR_BITS;
|
||||||
}
|
}
|
||||||
bs->bl.opt_transfer_length =
|
bs->bl.opt_transfer_length =
|
||||||
sector_limits_lun2qemu(iscsilun->bl.opt_xfer_len, iscsilun);
|
sector_limits_lun2qemu(iscsilun->bl.opt_xfer_len, iscsilun);
|
||||||
|
|
Loading…
Reference in New Issue