From patchwork Tue Nov 26 08:56:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 294260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 954222C00A0 for ; Tue, 26 Nov 2013 19:57:33 +1100 (EST) Received: from localhost ([::1]:57235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlESZ-0006fo-23 for incoming@patchwork.ozlabs.org; Tue, 26 Nov 2013 03:57:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlERv-0006WC-SZ for qemu-devel@nongnu.org; Tue, 26 Nov 2013 03:56:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlERq-0008B0-66 for qemu-devel@nongnu.org; Tue, 26 Nov 2013 03:56:51 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:59727 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlERp-0008Au-RE for qemu-devel@nongnu.org; Tue, 26 Nov 2013 03:56:46 -0500 Received: (qmail 14180 invoked by uid 89); 26 Nov 2013 08:56:44 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/18162. hbedv: 8.2.12.150/7.11.115.128. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/4.0):. Processed in 10.112788 secs); 26 Nov 2013 08:56:44 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 26 Nov 2013 08:56:34 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 3C9E7206AA; Tue, 26 Nov 2013 09:56:04 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 18A845FBB7; Tue, 26 Nov 2013 09:56:29 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 26 Nov 2013 09:56:17 +0100 Message-Id: <1385456183-24840-4-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385456183-24840-1-git-send-email-pl@kamp.de> References: <1385456183-24840-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, pbonzini@redhat.com, Peter Lieven , stefanha@redhat.com Subject: [Qemu-devel] [PATCHv2 1.8 3/9] block/iscsi: set bdi->cluster_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Reviewed-by: Paolo Bonzini 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; }