From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAZbu-00039X-Qy for qemu-devel@nongnu.org; Wed, 08 Jun 2016 05:17:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAZbs-0001EU-TV for qemu-devel@nongnu.org; Wed, 08 Jun 2016 05:17:13 -0400 From: Kevin Wolf Date: Wed, 8 Jun 2016 11:16:32 +0200 Message-Id: <1465377417-5012-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1465377417-5012-1-git-send-email-kwolf@redhat.com> References: <1465377417-5012-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 06/31] iscsi: Use block size as minimum zero/discard alignment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Eric Blake 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 Signed-off-by: Kevin Wolf --- block/iscsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index e7d5f7b..94f9974 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1711,6 +1711,8 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp) } bs->bl.discard_alignment = 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) { @@ -1720,6 +1722,9 @@ static void iscsi_refresh_limits(BlockDriverState *bs, Error **errp) if (iscsilun->lbp.lbpws) { bs->bl.write_zeroes_alignment = 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 = sector_limits_lun2qemu(iscsilun->bl.opt_xfer_len, iscsilun); -- 1.8.3.1