From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkwfb-00045o-U7 for qemu-devel@nongnu.org; Mon, 25 Nov 2013 08:57:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VkwfV-0006dz-Nq for qemu-devel@nongnu.org; Mon, 25 Nov 2013 08:57:47 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:51436 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkwfV-0006dR-Di for qemu-devel@nongnu.org; Mon, 25 Nov 2013 08:57:41 -0500 From: Peter Lieven Date: Mon, 25 Nov 2013 14:57:18 +0100 Message-Id: <1385387840-17307-5-git-send-email-pl@kamp.de> In-Reply-To: <1385387840-17307-1-git-send-email-pl@kamp.de> References: <1385387840-17307-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 1.8 4/6] block/iscsi: set bdi->cluster_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Peter Lieven , stefanha@redhat.com this patch aims to set bdi->cluster_size to the internal page size of the iscsi target so that enabled callers can align requests properly. Signed-off-by: Peter Lieven --- block/iscsi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 93fee6d..75d6b87 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1580,6 +1580,13 @@ static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) IscsiLun *iscsilun = bs->opaque; bdi->unallocated_blocks_are_zero = !!iscsilun->lbprz; bdi->can_write_zeroes_with_unmap = iscsilun->lbprz && iscsilun->lbp.lbpws; + /* Guess the internal cluster (page) size of the iscsi target by the means + * of opt_unmap_gran. Transfer the unmap granularity only if it has a + * reasonable size for bdi->cluster_size */ + if (iscsilun->bl.opt_unmap_gran * iscsilun->block_size >= 64 * 1024 && + iscsilun->bl.opt_unmap_gran * iscsilun->block_size <= 16 * 1024 * 1024) { + bdi->cluster_size = iscsilun->bl.opt_unmap_gran * iscsilun->block_size; + } return 0; } -- 1.7.9.5