From patchwork Sat Sep 10 08:59:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 114153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1048B71BE for ; Sat, 10 Sep 2011 18:58:50 +1000 (EST) Received: from localhost ([::1]:46518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R2JOf-0003vz-He for incoming@patchwork.ozlabs.org; Sat, 10 Sep 2011 04:58:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R2JOa-0003vt-OC for qemu-devel@nongnu.org; Sat, 10 Sep 2011 04:58:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R2JOZ-0003FY-FJ for qemu-devel@nongnu.org; Sat, 10 Sep 2011 04:58:40 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:52064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R2JOZ-0003FF-92 for qemu-devel@nongnu.org; Sat, 10 Sep 2011 04:58:39 -0400 Received: by fxh13 with SMTP id 13so224192fxh.4 for ; Sat, 10 Sep 2011 01:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=pTGnxtgsuCfdK6kGTmOCQsy1HaE/NU2rbWWts0NRPhw=; b=Jq5BWC52+5P5YTYao23iqNt1IKkIgAIn3L4NoO46gPk7TEKrzNPYbDceq0L8ltvLow wazTYIzlu0sx0W0GaDksZO2Tnbnr6dVwMg7r9zCQpMopbu2Uq1BD+YFsLJWJ5CdJ3X37 ba+MjPFXWg4i7QGhufVIZlJjsrtFoxLfQV4dM= Received: by 10.223.47.156 with SMTP id n28mr934555faf.7.1315645118037; Sat, 10 Sep 2011 01:58:38 -0700 (PDT) Received: from obol602.localdomain (net-2-37-111-0.cust.dsl.vodafone.it [2.37.111.0]) by mx.google.com with ESMTPS id l21sm4137701fac.8.2011.09.10.01.58.36 (version=SSLv3 cipher=OTHER); Sat, 10 Sep 2011 01:58:37 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Sat, 10 Sep 2011 10:59:16 +0200 Message-Id: <1315645156-8787-1-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH] qcow2: align cluster_data to block to improve performance using O_DIRECT 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 Signed-off-by: Frediano Ziglio --- block/qcow2.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 8aed310..510ff68 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -237,7 +237,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) s->cluster_cache = g_malloc(s->cluster_size); /* one more sector for decompressed data alignment */ - s->cluster_data = g_malloc(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size + s->cluster_data = qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size + 512); s->cluster_cache_offset = -1; @@ -296,7 +296,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) qcow2_cache_destroy(bs, s->l2_table_cache); } g_free(s->cluster_cache); - g_free(s->cluster_data); + qemu_vfree(s->cluster_data); return ret; } @@ -456,7 +456,7 @@ static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, */ if (!cluster_data) { cluster_data = - g_malloc0(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); + qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); } assert(cur_nr_sectors <= @@ -496,7 +496,7 @@ fail: qemu_co_mutex_unlock(&s->lock); qemu_iovec_destroy(&hd_qiov); - g_free(cluster_data); + qemu_vfree(cluster_data); return ret; } @@ -566,7 +566,7 @@ static int qcow2_co_writev(BlockDriverState *bs, if (s->crypt_method) { if (!cluster_data) { - cluster_data = g_malloc0(QCOW_MAX_CRYPT_CLUSTERS * + cluster_data = qemu_blockalign(bs, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); } @@ -611,7 +611,7 @@ fail: qemu_co_mutex_unlock(&s->lock); qemu_iovec_destroy(&hd_qiov); - g_free(cluster_data); + qemu_vfree(cluster_data); return ret; } @@ -628,7 +628,7 @@ static void qcow2_close(BlockDriverState *bs) qcow2_cache_destroy(bs, s->refcount_block_cache); g_free(s->cluster_cache); - g_free(s->cluster_data); + qemu_vfree(s->cluster_data); qcow2_refcount_close(bs); }