From patchwork Mon Oct 9 12:59:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9993007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BE3660230 for ; Mon, 9 Oct 2017 13:05:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D7DE287D1 for ; Mon, 9 Oct 2017 13:05:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4259F287D6; Mon, 9 Oct 2017 13:05:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2287E287D1 for ; Mon, 9 Oct 2017 13:05:50 +0000 (UTC) Received: from localhost ([::1]:57789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1Xkj-0006F9-Cd for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Oct 2017 09:05:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1XdT-0001N2-O0 for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1XdS-0002Dx-KT for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:58:19 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:38503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1XdS-0002Da-Bf; Mon, 09 Oct 2017 08:58:18 -0400 Received: by mail-pf0-x243.google.com with SMTP id a7so27581945pfj.5; Mon, 09 Oct 2017 05:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JV70LmVWv57R6jWJ5/+1X3dmJLF1JVav5+wRwguopgI=; b=tiZbw9gNlUTH4/I9lgujpFznxv7HSd08+ps/fEeePrJ4MN8BABJN1T5gj+YdyrXhZH UapmGqGKT7RttexOiqW92R2a8AD82sqiKsvLZxBIgYhj2NL8Zc1BSBwaOj9fVWAkERo7 xeUKLOkHrIvTPqJGe82d2fnAga6jZf5Yq1LYBzzu61yngYA2eDG1pks+ltyeS9EphVUD wjRk2a7zqp/YckrhRh5v9L8N81haArqqF6HI01jexZrCEIpbiIrseL49oUhA40+lBXNV YV9R/VdcZZ58RZPxqBxV4dr4IQ0dNadfbQORS2ADGTq1eY9l81tVsxkIxjZpNtWApnXt XMzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JV70LmVWv57R6jWJ5/+1X3dmJLF1JVav5+wRwguopgI=; b=UtrChntkO3kvylQN/DXvZkISe8c6BY9VpKQkJHYNOwimfRBZo3e64qaUGxE7xo008I vg44X0GrK9HsIyTCjgUc/NZrIp1SyjxL4eb0yUZyt9kj+jle4W3mSMOdzQy4DPzfvJa+ 2fXfKQV/x6GguOliBvHMG76/N1mDJna2Q6i/fWepKtz9xvAC7DCO1DlYxds1mBsOJCoW Euxom1QjuFOqFMoD5hb4iu4oWr5YCB6A/8/42vo+xQyzMxQyqMaLhTrT1bqGJ19ByQ0F ac0zqV7XtxfVE+NN/Z4vuHx9J8qsyF7DgtXRy7dmAVZCtCq+6OpLdgId+65s3V53GaXt 4GSA== X-Gm-Message-State: AMCzsaUxb3hiweAUIuBEmeq1afREZ5wITHZpM0mxfClng1GRWOgyZfVD fErp9bSI1e4qAHWPmvYOrUA= X-Google-Smtp-Source: AOwi7QDaYVqFPIq2nqixZqUkZGOLEfVSDXCneXFB9MGSUTBZZhe4ymdB47b+HobBc2y1oJDVOccHZw== X-Received: by 10.159.253.148 with SMTP id q20mr8977951pls.308.1507553897352; Mon, 09 Oct 2017 05:58:17 -0700 (PDT) Received: from localhost.localdomain ([27.251.197.195]) by smtp.gmail.com with ESMTPSA id d190sm14781283pgc.11.2017.10.09.05.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 05:58:16 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 9 Oct 2017 18:29:40 +0530 Message-Id: <20171009125940.24220-9-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171009125940.24220-1-ashijeetacharya@gmail.com> References: <20171009125940.24220-1-ashijeetacharya@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v9 8/8] vmdk: Make vmdk_get_cluster_offset() return cluster offset only X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, stefanha@gmail.com, qemu-devel@nongnu.org, mreitz@redhat.com, Ashijeet Acharya , jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP vmdk_alloc_clusters() introduced earlier now handles the task of allocating clusters and performing COW when needed. Thus we can change vmdk_get_cluster_offset() to stick to the sole purpose of returning cluster offset using sector number. Update the changes at all call sites. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 56 ++++++++++++-------------------------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index cbeffb1552..497e30f6df 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1511,25 +1511,16 @@ static int vmdk_alloc_clusters(BlockDriverState *bs, * For flat extents, the start offset as parsed from the description file is * returned. * - * For sparse extents, look up in L1, L2 table. If allocate is true, return an - * offset for a new cluster and update L2 cache. If there is a backing file, - * COW is done before returning; otherwise, zeroes are written to the allocated - * cluster. Both COW and zero writing skips the sector range - * [@skip_start_sector, @skip_end_sector) passed in by caller, because caller - * has new data to write there. + * For sparse extents, look up the L1, L2 table. * * Returns: VMDK_OK if cluster exists and mapped in the image. - * VMDK_UNALLOC if cluster is not mapped and @allocate is false. - * VMDK_ERROR if failed. + * VMDK_UNALLOC if cluster is not mapped. + * VMDK_ERROR if failed */ static int vmdk_get_cluster_offset(BlockDriverState *bs, VmdkExtent *extent, - VmdkMetaData *m_data, uint64_t offset, - bool allocate, - uint64_t *cluster_offset, - uint64_t skip_start_bytes, - uint64_t skip_end_bytes) + uint64_t *cluster_offset) { int l1_index, l2_offset, l2_index; uint32_t *l2_table; @@ -1554,31 +1545,9 @@ static int vmdk_get_cluster_offset(BlockDriverState *bs, } if (!cluster_sector || zeroed) { - if (!allocate) { - return zeroed ? VMDK_ZEROED : VMDK_UNALLOC; - } - - cluster_sector = extent->next_cluster_sector; - extent->next_cluster_sector += extent->cluster_sectors; - - /* First of all we write grain itself, to avoid race condition - * that may to corrupt the image. - * This problem may occur because of insufficient space on host disk - * or inappropriate VM shutdown. - */ - ret = vmdk_perform_cow(bs, extent, cluster_sector * BDRV_SECTOR_SIZE, - offset, skip_start_bytes, skip_end_bytes); - if (ret) { - return ret; - } - if (m_data) { - m_data->valid = 1; - m_data->l1_index = l1_index; - m_data->l2_index = l2_index; - m_data->l2_offset = l2_offset; - m_data->l2_cache_entry = &l2_table[l2_index]; - } + return zeroed ? VMDK_ZEROED : VMDK_UNALLOC; } + *cluster_offset = cluster_sector << BDRV_SECTOR_BITS; return VMDK_OK; } @@ -1621,9 +1590,7 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, return 0; } qemu_co_mutex_lock(&s->lock); - ret = vmdk_get_cluster_offset(bs, extent, NULL, - sector_num * 512, false, &offset, - 0, 0); + ret = vmdk_get_cluster_offset(bs, extent, sector_num * 512, &offset); qemu_co_mutex_unlock(&s->lock); index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); @@ -1814,13 +1781,14 @@ vmdk_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes, ret = -EIO; goto fail; } - ret = vmdk_get_cluster_offset(bs, extent, NULL, - offset, false, &cluster_offset, 0, 0); + offset_in_cluster = vmdk_find_offset_in_cluster(extent, offset); n_bytes = MIN(bytes, extent->cluster_sectors * BDRV_SECTOR_SIZE - offset_in_cluster); + ret = vmdk_get_cluster_offset(bs, extent, offset, &cluster_offset); + if (ret != VMDK_OK) { /* if not allocated, try to read from parent image, if exist */ if (bs->backing && ret != VMDK_ZEROED) { @@ -2565,9 +2533,9 @@ static int vmdk_check(BlockDriverState *bs, BdrvCheckResult *result, ret = -EINVAL; break; } - ret = vmdk_get_cluster_offset(bs, extent, NULL, + ret = vmdk_get_cluster_offset(bs, extent, sector_num << BDRV_SECTOR_BITS, - false, &cluster_offset, 0, 0); + &cluster_offset); if (ret == VMDK_ERROR) { fprintf(stderr, "ERROR: could not get cluster_offset for sector %"