{"id":1307001,"url":"http://patchwork.ozlabs.org/api/patches/1307001/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/d61ad6351d7e06de6bc213b5e321daa2e22d7030.1591801197.git.berto@igalia.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2020-06-10T15:02:41","name":"[v8,03/34] qcow2: Add calculate_l2_meta()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a7c1cc9e15f1d30d965b2386f0f702b08b1781f2","submitter":{"id":65704,"url":"http://patchwork.ozlabs.org/api/people/65704/?format=json","name":"Alberto Garcia","email":"berto@igalia.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/d61ad6351d7e06de6bc213b5e321daa2e22d7030.1591801197.git.berto@igalia.com/mbox/","series":[{"id":182563,"url":"http://patchwork.ozlabs.org/api/series/182563/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=182563","date":"2020-06-10T15:02:49","name":"Add subcluster allocation to qcow2","version":8,"mbox":"http://patchwork.ozlabs.org/series/182563/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1307001/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1307001/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=)","ozlabs.org;\n dmarc=none (p=none dis=none) header.from=igalia.com","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256\n header.s=20170329 header.b=bwCj7HYy;\n\tdkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49hr0B3Jc7z9sRk\n\tfor ; Thu, 11 Jun 2020 01:05:46 +1000 (AEST)","from localhost ([::1]:49018 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1jj2IS-0002eR-5D\n\tfor incoming@patchwork.ozlabs.org; Wed, 10 Jun 2020 11:05:44 -0400","from eggs.gnu.org ([2001:470:142:3::10]:35952)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1jj2Ga-0002HI-Ag; Wed, 10 Jun 2020 11:03:48 -0400","from fanzine.igalia.com ([178.60.130.6]:58033)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1jj2GX-0006vv-LH; Wed, 10 Jun 2020 11:03:47 -0400","from [81.0.38.199] (helo=perseus.local)\n by fanzine.igalia.com with esmtpsa\n (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim)\n id 1jj2GQ-0007gf-Af; Wed, 10 Jun 2020 17:03:38 +0200","from berto by perseus.local with local (Exim 4.92)\n (envelope-from )\n id 1jj2GB-0007MY-Nu; Wed, 10 Jun 2020 17:03:23 +0200"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com;\n s=20170329;\n h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From;\n bh=zhUI+SdcRuNKlLxl0eH0JWm96meGNa39l1+qfmyCMtQ=;\n b=bwCj7HYyMSNjYYtS38gTtUlfP1yK7DTyPMzc9dq3eiNXjaOl4lCrsmZv46uF91o5baKa0rauDTNdEr73OO3IM8jQBZ8k6IQG4075Eu5wR9zh+Rg2H3J/nUg0fe3M58s/AYhQHBaLIuIbIx+TKsFwkJEy2ldWWIMC9itIiMfR/Y88THBK58BeY05CdhOeWfUql/cEbbQwwmIe+p8zfnG5lklv2EZpYtLcPmBR5f4bovfz8ua+sDmhbX2oQ5iWmxe4awHVZsG1sUBhCWAHF36JVxc6NWnK8r2Sn1A4V5IGOUESYZhc9s8YAEJVcVw2bHeXfpb14xusDnt3t1MkGSMfYA==;","From":"Alberto Garcia ","To":"qemu-devel@nongnu.org","Subject":"[PATCH v8 03/34] qcow2: Add calculate_l2_meta()","Date":"Wed, 10 Jun 2020 17:02:41 +0200","Message-Id":"\n ","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=178.60.130.6; envelope-from=berto@igalia.com;\n helo=fanzine.igalia.com","X-detected-operating-system":"by eggs.gnu.org: First seen = 2020/06/10 11:03:39","X-ACL-Warn":"Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy]","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=_AUTOLEARN","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"Kevin Wolf ,\n Vladimir Sementsov-Ogievskiy ,\n Alberto Garcia , qemu-block@nongnu.org,\n Derek Su , Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"handle_alloc() creates a QCowL2Meta structure in order to update the\nimage metadata and perform the necessary copy-on-write operations.\n\nThis patch moves that code to a separate function so it can be used\nfrom other places.\n\nSigned-off-by: Alberto Garcia \nReviewed-by: Max Reitz \n---\n block/qcow2-cluster.c | 77 +++++++++++++++++++++++++++++--------------\n 1 file changed, 53 insertions(+), 24 deletions(-)","diff":"diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c\nindex 9ab41cb728..61ad638bdc 100644\n--- a/block/qcow2-cluster.c\n+++ b/block/qcow2-cluster.c\n@@ -1037,6 +1037,56 @@ void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)\n }\n }\n \n+/*\n+ * For a given write request, create a new QCowL2Meta structure, add\n+ * it to @m and the BDRVQcow2State.cluster_allocs list.\n+ *\n+ * @host_cluster_offset points to the beginning of the first cluster.\n+ *\n+ * @guest_offset and @bytes indicate the offset and length of the\n+ * request.\n+ *\n+ * If @keep_old is true it means that the clusters were already\n+ * allocated and will be overwritten. If false then the clusters are\n+ * new and we have to decrease the reference count of the old ones.\n+ */\n+static void calculate_l2_meta(BlockDriverState *bs,\n+ uint64_t host_cluster_offset,\n+ uint64_t guest_offset, unsigned bytes,\n+ QCowL2Meta **m, bool keep_old)\n+{\n+ BDRVQcow2State *s = bs->opaque;\n+ unsigned cow_start_from = 0;\n+ unsigned cow_start_to = offset_into_cluster(s, guest_offset);\n+ unsigned cow_end_from = cow_start_to + bytes;\n+ unsigned cow_end_to = ROUND_UP(cow_end_from, s->cluster_size);\n+ unsigned nb_clusters = size_to_clusters(s, cow_end_from);\n+ QCowL2Meta *old_m = *m;\n+\n+ *m = g_malloc0(sizeof(**m));\n+ **m = (QCowL2Meta) {\n+ .next = old_m,\n+\n+ .alloc_offset = host_cluster_offset,\n+ .offset = start_of_cluster(s, guest_offset),\n+ .nb_clusters = nb_clusters,\n+\n+ .keep_old_clusters = keep_old,\n+\n+ .cow_start = {\n+ .offset = cow_start_from,\n+ .nb_bytes = cow_start_to - cow_start_from,\n+ },\n+ .cow_end = {\n+ .offset = cow_end_from,\n+ .nb_bytes = cow_end_to - cow_end_from,\n+ },\n+ };\n+\n+ qemu_co_queue_init(&(*m)->dependent_requests);\n+ QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);\n+}\n+\n /*\n * Returns the number of contiguous clusters that can be used for an allocating\n * write, but require COW to be performed (this includes yet unallocated space,\n@@ -1435,35 +1485,14 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,\n uint64_t requested_bytes = *bytes + offset_into_cluster(s, guest_offset);\n int avail_bytes = nb_clusters << s->cluster_bits;\n int nb_bytes = MIN(requested_bytes, avail_bytes);\n- QCowL2Meta *old_m = *m;\n-\n- *m = g_malloc0(sizeof(**m));\n-\n- **m = (QCowL2Meta) {\n- .next = old_m,\n-\n- .alloc_offset = alloc_cluster_offset,\n- .offset = start_of_cluster(s, guest_offset),\n- .nb_clusters = nb_clusters,\n-\n- .keep_old_clusters = keep_old_clusters,\n-\n- .cow_start = {\n- .offset = 0,\n- .nb_bytes = offset_into_cluster(s, guest_offset),\n- },\n- .cow_end = {\n- .offset = nb_bytes,\n- .nb_bytes = avail_bytes - nb_bytes,\n- },\n- };\n- qemu_co_queue_init(&(*m)->dependent_requests);\n- QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);\n \n *host_offset = alloc_cluster_offset + offset_into_cluster(s, guest_offset);\n *bytes = MIN(*bytes, nb_bytes - offset_into_cluster(s, guest_offset));\n assert(*bytes != 0);\n \n+ calculate_l2_meta(bs, alloc_cluster_offset, guest_offset, *bytes,\n+ m, keep_old_clusters);\n+\n return 1;\n \n fail:\n","prefixes":["v8","03/34"]}