From patchwork Fri Dec 7 17:08:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 204577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 229B02C0189 for ; Sat, 8 Dec 2012 04:09:25 +1100 (EST) Received: from localhost ([::1]:38610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1QR-0002lH-42 for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 12:09:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1Q5-0002gw-Fp for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th1Q0-0007Xs-GI for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:09:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1Q0-0007Xn-7P for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:08:56 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB7H8tdp028782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 7 Dec 2012 12:08:55 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-5-38.ams2.redhat.com [10.36.5.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qB7H8oGO022029; Fri, 7 Dec 2012 12:08:54 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2012 18:08:44 +0100 Message-Id: <1354900129-5745-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1354900129-5745-1-git-send-email-kwolf@redhat.com> References: <1354900129-5745-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 3/8] qcow2: Allocate l2meta dynamically 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 As soon as delayed COW is introduced, the l2meta struct is needed even after completion of the request, so it can't live on the stack. Signed-off-by: Kevin Wolf --- block/qcow2.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 0a08ec7..71f870d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -774,15 +774,11 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, QEMUIOVector hd_qiov; uint64_t bytes_done = 0; uint8_t *cluster_data = NULL; - QCowL2Meta l2meta = { - .nb_clusters = 0, - }; + QCowL2Meta *l2meta; trace_qcow2_writev_start_req(qemu_coroutine_self(), sector_num, remaining_sectors); - qemu_co_queue_init(&l2meta.dependent_requests); - qemu_iovec_init(&hd_qiov, qiov->niov); s->cluster_cache_offset = -1; /* disable compressed cache */ @@ -791,6 +787,9 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, while (remaining_sectors != 0) { + l2meta = g_malloc0(sizeof(*l2meta)); + qemu_co_queue_init(&l2meta->dependent_requests); + trace_qcow2_writev_start_part(qemu_coroutine_self()); index_in_cluster = sector_num & (s->cluster_sectors - 1); n_end = index_in_cluster + remaining_sectors; @@ -800,17 +799,17 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, } ret = qcow2_alloc_cluster_offset(bs, sector_num << 9, - index_in_cluster, n_end, &cur_nr_sectors, &l2meta); + index_in_cluster, n_end, &cur_nr_sectors, l2meta); if (ret < 0) { goto fail; } - if (l2meta.nb_clusters > 0 && + if (l2meta->nb_clusters > 0 && (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS)) { qcow2_mark_dirty(bs); } - cluster_offset = l2meta.cluster_offset; + cluster_offset = l2meta->cluster_offset; assert((cluster_offset & 511) == 0); qemu_iovec_reset(&hd_qiov); @@ -847,12 +846,14 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, goto fail; } - ret = qcow2_alloc_cluster_link_l2(bs, &l2meta); + ret = qcow2_alloc_cluster_link_l2(bs, l2meta); if (ret < 0) { goto fail; } - run_dependent_requests(s, &l2meta); + run_dependent_requests(s, l2meta); + g_free(l2meta); + l2meta = NULL; remaining_sectors -= cur_nr_sectors; sector_num += cur_nr_sectors; @@ -862,7 +863,10 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, ret = 0; fail: - run_dependent_requests(s, &l2meta); + if (l2meta != NULL) { + run_dependent_requests(s, l2meta); + g_free(l2meta); + } qemu_co_mutex_unlock(&s->lock);