From patchwork Mon Oct 9 12:59:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 9992985 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 B10AB60230 for ; Mon, 9 Oct 2017 13:03:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1B6928543 for ; Mon, 9 Oct 2017 13:03:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 968FB287CA; Mon, 9 Oct 2017 13:03:30 +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 EEA7028543 for ; Mon, 9 Oct 2017 13:03:29 +0000 (UTC) Received: from localhost ([::1]:57782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1XiS-0004bM-R3 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Oct 2017 09:03:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1XdQ-0001JW-5T for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:58:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1XdM-0002AM-UO for qemu-devel@nongnu.org; Mon, 09 Oct 2017 08:58:16 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:33686) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1XdM-00029t-LE; Mon, 09 Oct 2017 08:58:12 -0400 Received: by mail-pf0-x244.google.com with SMTP id m28so27450245pfi.0; Mon, 09 Oct 2017 05:58:12 -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=iguFLwDlrza/4tJYngdmzGLEOpBl+xtRjuB8Ti2e7Rg=; b=Rllbj0t7rHxTUchvOFsFuaYI0u72egc6vNLqFKvlJJgGFQOOdCemi7uzhfAaJvWe9R lH60Nr11pncAWo1GGvE72iJa/FLc3Tndswxa6pZb+Nzot7vnvW/iP4AxaEuKFX+8G/57 cCl741HaccNrZLmYaNuzphN9FnK/TmA6rUFfvvyGycAx10ILl/b7T/JngRKHYk7Qw1Me PLIC0YOQR5uf4/TBoj+q2Hh42fIyiP1leYBIJcMrZKon7FKepL25pDGQrfp5r5ZbqOjT Dfu0ZiYQb4AMVlTPVRXutvdOp+o/4c4ZqOVc1Tweo67OBJmes7RW7Ip3KYzqk/hgIWyd /zFg== 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=iguFLwDlrza/4tJYngdmzGLEOpBl+xtRjuB8Ti2e7Rg=; b=FMuTF6ANVQdo5kGLKfJP4y1o1wiZWMQj9JHCywGICBOgIgzCcYJw7YOm6Zr+BrCMpc +G30oqtxHLIAXeN9Lq0sUofUV/oN2R/55gKtZBqVfbOTeuw3NFmFpziXmnR4erjSa5Pd wAPuUx9a6lxvjQmn2XUVGYxfixMjTZsLUNs7Nj6bu0a7WIDN3DWGmoukNpGuh/cQIcS1 WMRPzZujBzAaFWzjPn1A2dmoZpWQ9wT/0yTts/tEDfyExHWzpt4vQhlDYNstYfU1m/5A 4gajvBSYZ4gOBoWJ4DGbpkXBwN5AyzY7NO6qVSyQMWa+ki0BplMGpLHL8r+A+glaGn/u r4zg== X-Gm-Message-State: AMCzsaVsl7yXegBw/jFsNMzOgIJIOF5MBjbt3RhAs1wdClgX1DvW3Q6r viR+J5+nLmf4HkHn8jQgxrE= X-Google-Smtp-Source: AOwi7QAGKWgLp4Bsj59rkAXVzWcnYEtDX/JuF5V3CWwkhbA/RgwsDILzFGv/z0Hn2Gza+y4XNnnN5g== X-Received: by 10.159.245.147 with SMTP id a19mr8848037pls.256.1507553891555; Mon, 09 Oct 2017 05:58:11 -0700 (PDT) Received: from localhost.localdomain ([27.251.197.195]) by smtp.gmail.com with ESMTPSA id d190sm14781283pgc.11.2017.10.09.05.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Oct 2017 05:58:11 -0700 (PDT) From: Ashijeet Acharya To: famz@redhat.com Date: Mon, 9 Oct 2017 18:29:39 +0530 Message-Id: <20171009125940.24220-8-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::244 Subject: [Qemu-devel] [PATCH v9 7/8] vmdk: Update metadata for multiple clusters 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 Include a next pointer in VmdkMetaData struct to point to the previous allocated L2 table. Modify vmdk_L2update to start updating metadata for allocation of multiple clusters at once. Signed-off-by: Ashijeet Acharya Reviewed-by: Fam Zheng --- block/vmdk.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 101 insertions(+), 27 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index d5dfd21abe..cbeffb1552 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -137,6 +137,8 @@ typedef struct VmdkMetaData { int valid; uint32_t *l2_cache_entry; uint32_t nb_clusters; + uint32_t offset; + struct VmdkMetaData *next; } VmdkMetaData; typedef struct VmdkGrainMarker { @@ -1133,34 +1135,87 @@ exit: return ret; } -static int vmdk_L2update(VmdkExtent *extent, VmdkMetaData *m_data, - uint32_t offset) +static int vmdk_alloc_cluster_link_l2(VmdkExtent *extent, + VmdkMetaData *m_data, bool zeroed) { - offset = cpu_to_le32(offset); + int i; + uint32_t offset, temp_offset; + int *l2_table_array; + int l2_array_size; + + if (zeroed) { + temp_offset = VMDK_GTE_ZEROED; + } else { + temp_offset = m_data->offset; + } + + l2_array_size = sizeof(uint32_t) * m_data->nb_clusters; + l2_table_array = qemu_try_blockalign(extent->file->bs, + QEMU_ALIGN_UP(l2_array_size, + BDRV_SECTOR_SIZE)); + if (l2_table_array == NULL) { + return VMDK_ERROR; + } + memset(l2_table_array, 0, QEMU_ALIGN_UP(l2_array_size, BDRV_SECTOR_SIZE)); /* update L2 table */ + offset = temp_offset; + for (i = 0; i < m_data->nb_clusters; i++) { + l2_table_array[i] = cpu_to_le32(offset); + if (!zeroed) { + offset += extent->cluster_sectors; + } + } if (bdrv_pwrite_sync(extent->file, - ((int64_t)m_data->l2_offset * 512) - + (m_data->l2_index * sizeof(offset)), - &offset, sizeof(offset)) < 0) { + ((int64_t)m_data->l2_offset * 512) + + ((m_data->l2_index) * sizeof(offset)), + l2_table_array, l2_array_size) < 0) { return VMDK_ERROR; } /* update backup L2 table */ if (extent->l1_backup_table_offset != 0) { m_data->l2_offset = extent->l1_backup_table[m_data->l1_index]; if (bdrv_pwrite_sync(extent->file, - ((int64_t)m_data->l2_offset * 512) - + (m_data->l2_index * sizeof(offset)), - &offset, sizeof(offset)) < 0) { + ((int64_t)m_data->l2_offset * 512) + + ((m_data->l2_index) * sizeof(offset)), + l2_table_array, l2_array_size) < 0) { return VMDK_ERROR; } } + + offset = temp_offset; if (m_data->l2_cache_entry) { - *m_data->l2_cache_entry = offset; + for (i = 0; i < m_data->nb_clusters; i++) { + *m_data->l2_cache_entry = cpu_to_le32(offset); + m_data->l2_cache_entry++; + + if (!zeroed) { + offset += extent->cluster_sectors; + } + } } + qemu_vfree(l2_table_array); return VMDK_OK; } +static int vmdk_L2update(VmdkExtent *extent, VmdkMetaData *m_data, + bool zeroed) +{ + int ret; + + while (m_data->next != NULL) { + + ret = vmdk_alloc_cluster_link_l2(extent, m_data, zeroed); + if (ret < 0) { + return ret; + } + + m_data = m_data->next; + } + + return VMDK_OK; +} + /* * vmdk_l2load * @@ -1277,9 +1332,10 @@ static int get_cluster_table(VmdkExtent *extent, uint64_t offset, * * VMDK_ERROR: in error cases */ + static int vmdk_handle_alloc(BlockDriverState *bs, VmdkExtent *extent, uint64_t offset, uint64_t *cluster_offset, - int64_t *bytes, VmdkMetaData *m_data, + int64_t *bytes, VmdkMetaData **m_data, bool allocate, uint32_t *alloc_clusters_counter) { int l1_index, l2_offset, l2_index; @@ -1288,6 +1344,7 @@ static int vmdk_handle_alloc(BlockDriverState *bs, VmdkExtent *extent, uint32_t nb_clusters; bool zeroed = false; uint64_t skip_start_bytes, skip_end_bytes; + VmdkMetaData *old_m_data; int ret; ret = get_cluster_table(extent, offset, &l1_index, &l2_offset, @@ -1348,13 +1405,21 @@ static int vmdk_handle_alloc(BlockDriverState *bs, VmdkExtent *extent, if (ret < 0) { 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]; - m_data->nb_clusters = nb_clusters; + + if (m_data != NULL) { + old_m_data = *m_data; + *m_data = g_malloc0(sizeof(**m_data)); + + **m_data = (VmdkMetaData) { + .valid = 1, + .l1_index = l1_index, + .l2_index = l2_index, + .l2_offset = l2_offset, + .l2_cache_entry = &l2_table[l2_index], + .nb_clusters = nb_clusters, + .offset = cluster_sector, + .next = old_m_data, + }; } } *cluster_offset = cluster_sector << BDRV_SECTOR_BITS; @@ -1383,7 +1448,7 @@ static int vmdk_handle_alloc(BlockDriverState *bs, VmdkExtent *extent, */ static int vmdk_alloc_clusters(BlockDriverState *bs, VmdkExtent *extent, - VmdkMetaData *m_data, uint64_t offset, + VmdkMetaData **m_data, uint64_t offset, bool allocate, uint64_t *cluster_offset, int64_t bytes, uint32_t *alloc_clusters_counter) @@ -1403,8 +1468,8 @@ static int vmdk_alloc_clusters(BlockDriverState *bs, new_cluster_offset = 0; *cluster_offset = 0; n_bytes = 0; - if (m_data) { - m_data->valid = 0; + if (*m_data) { + (*m_data)->valid = 0; } /* due to L2 table margins all bytes may not get allocated at once */ @@ -1818,10 +1883,12 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, int64_t offset_in_cluster, n_bytes; uint64_t cluster_offset; uint64_t bytes_done = 0; - VmdkMetaData m_data; uint64_t extent_end; + VmdkMetaData *m_data; uint32_t alloc_clusters_counter = 0; + m_data = g_new0(VmdkMetaData, 1); + if (DIV_ROUND_UP(offset, BDRV_SECTOR_SIZE) > bs->total_sectors) { error_report("Wrong offset: offset=0x%" PRIx64 " total_sectors=0x%" PRIx64, @@ -1830,6 +1897,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, } while (bytes > 0) { + m_data->next = NULL; extent = find_extent(s, offset >> BDRV_SECTOR_BITS, extent); if (!extent) { return -EIO; @@ -1875,7 +1943,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, alloc_clusters_counter; if (!zero_dry_run) { /* update L2 tables */ - if (vmdk_L2update(extent, &m_data, VMDK_GTE_ZEROED) + if (vmdk_L2update(extent, m_data, zeroed) != VMDK_OK) { return -EIO; } @@ -1889,11 +1957,9 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, if (ret) { return ret; } - if (m_data.valid) { + if (m_data->valid) { /* update L2 tables */ - if (vmdk_L2update(extent, &m_data, - cluster_offset >> BDRV_SECTOR_BITS) - != VMDK_OK) { + if (vmdk_L2update(extent, m_data, zeroed) != VMDK_OK) { return -EIO; } } @@ -1902,6 +1968,13 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, offset += n_bytes; bytes_done += n_bytes; + while (m_data->next != NULL) { + VmdkMetaData *next; + next = m_data->next; + g_free(m_data); + m_data = next; + } + /* update CID on the first write every time the virtual disk is * opened */ if (!s->cid_updated) { @@ -1912,6 +1985,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset, s->cid_updated = true; } } + g_free(m_data); return 0; }