{"id":813563,"url":"http://patchwork.ozlabs.org/api/patches/813563/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-13-mreitz@redhat.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":"<20170913181910.29688-13-mreitz@redhat.com>","list_archive_url":null,"date":"2017-09-13T18:19:04","name":"[12/18] block/dirty-bitmap: Add bdrv_dirty_iter_next_area","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6bf7dd01eeaca6eb1b93b70be171d3a9fe355512","submitter":{"id":36836,"url":"http://patchwork.ozlabs.org/api/people/36836/?format=json","name":"Max Reitz","email":"mreitz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-13-mreitz@redhat.com/mbox/","series":[{"id":2960,"url":"http://patchwork.ozlabs.org/api/series/2960/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2960","date":"2017-09-13T18:18:52","name":"block/mirror: Add active-sync mirroring","version":1,"mbox":"http://patchwork.ozlabs.org/series/2960/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813563/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813563/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\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mreitz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsqrR0WBpz9s3T\n\tfor ;\n\tThu, 14 Sep 2017 04:27:03 +1000 (AEST)","from localhost ([::1]:44025 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsCNJ-0004sS-1r\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 14:27:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37474)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsCHs-0000eH-IV\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:21:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsCHr-000627-Ff\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:21:24 -0400","from mx1.redhat.com ([209.132.183.28]:52594)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsCHh-0005uu-K7; Wed, 13 Sep 2017 14:21:13 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id B7456C04B941;\n\tWed, 13 Sep 2017 18:21:12 +0000 (UTC)","from localhost (ovpn-204-23.brq.redhat.com [10.40.204.23])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 34E1A5EDE2;\n\tWed, 13 Sep 2017 18:21:05 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B7456C04B941","From":"Max Reitz ","To":"qemu-block@nongnu.org","Date":"Wed, 13 Sep 2017 20:19:04 +0200","Message-Id":"<20170913181910.29688-13-mreitz@redhat.com>","In-Reply-To":"<20170913181910.29688-1-mreitz@redhat.com>","References":"<20170913181910.29688-1-mreitz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 13 Sep 2017 18:21:12 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 12/18] block/dirty-bitmap: Add\n\tbdrv_dirty_iter_next_area","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , Fam Zheng ,\n\tqemu-devel@nongnu.org, Max Reitz ,\n\tStefan Hajnoczi , John Snow ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This new function allows to look for a consecutively dirty area in a\ndirty bitmap.\n\nSigned-off-by: Max Reitz \n---\n include/block/dirty-bitmap.h | 2 ++\n block/dirty-bitmap.c | 52 ++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 54 insertions(+)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex a79a58d2c3..7654748700 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -90,6 +90,8 @@ void bdrv_set_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors);\n int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter);\n+bool bdrv_dirty_iter_next_area(BdrvDirtyBitmapIter *iter, uint64_t max_offset,\n+ uint64_t *offset, int *bytes);\n void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *hbi, int64_t sector_num);\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap);\n int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap);\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex aee57cf8c8..81b2f78016 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -550,6 +550,58 @@ int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)\n return hbitmap_iter_next(&iter->hbi, true);\n }\n \n+/**\n+ * Return the next consecutively dirty area in the dirty bitmap\n+ * belonging to the given iterator @iter.\n+ *\n+ * @max_offset: Maximum value that may be returned for\n+ * *offset + *bytes\n+ * @offset: Will contain the start offset of the next dirty area\n+ * @bytes: Will contain the length of the next dirty area\n+ *\n+ * Returns: True if a dirty area could be found before max_offset\n+ * (which means that *offset and *bytes then contain valid\n+ * values), false otherwise.\n+ */\n+bool bdrv_dirty_iter_next_area(BdrvDirtyBitmapIter *iter, uint64_t max_offset,\n+ uint64_t *offset, int *bytes)\n+{\n+ uint32_t granularity = bdrv_dirty_bitmap_granularity(iter->bitmap);\n+ uint64_t gran_max_offset;\n+ int sector_gran = granularity >> BDRV_SECTOR_BITS;\n+ int64_t ret;\n+ int size;\n+\n+ if (DIV_ROUND_UP(max_offset, BDRV_SECTOR_SIZE) == iter->bitmap->size) {\n+ /* If max_offset points to the image end, round it up by the\n+ * bitmap granularity */\n+ gran_max_offset = ROUND_UP(max_offset, granularity);\n+ } else {\n+ gran_max_offset = max_offset;\n+ }\n+\n+ ret = hbitmap_iter_next(&iter->hbi, false);\n+ if (ret < 0 || (ret << BDRV_SECTOR_BITS) + granularity > gran_max_offset) {\n+ return false;\n+ }\n+\n+ *offset = ret << BDRV_SECTOR_BITS;\n+ size = 0;\n+\n+ assert(granularity <= INT_MAX);\n+\n+ do {\n+ /* Advance iterator */\n+ ret = hbitmap_iter_next(&iter->hbi, true);\n+ size += granularity;\n+ } while ((ret << BDRV_SECTOR_BITS) + granularity <= gran_max_offset &&\n+ hbitmap_iter_next(&iter->hbi, false) == ret + sector_gran &&\n+ size <= INT_MAX - granularity);\n+\n+ *bytes = MIN(size, max_offset - *offset);\n+ return true;\n+}\n+\n /* Called within bdrv_dirty_bitmap_lock..unlock */\n void bdrv_set_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors)\n","prefixes":["12/18"]}