{"id":807905,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807905/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170830210542.2153-9-eblake@redhat.com>","date":"2017-08-30T21:05:32","name":"[v6,08/18] dirty-bitmap: Set iterator start by offset, not sector","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5fd10d169fca29068b4dee4e464dde41ad093746","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830210542.2153-9-eblake@redhat.com/mbox/","series":[{"id":700,"url":"http://patchwork.ozlabs.org/api/1.0/series/700/?format=json","date":"2017-08-30T21:05:25","name":"make dirty-bitmap byte-based","version":6,"mbox":"http://patchwork.ozlabs.org/series/700/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807905/checks/","tags":{},"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=eblake@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 3xjJGs0zBhz9sP5\n\tfor ;\n\tThu, 31 Aug 2017 07:16:53 +1000 (AEST)","from localhost ([::1]:52747 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnALz-0005Cm-4e\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:16:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37011)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABg-0003s4-QA\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABf-0007ZU-CH\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:12 -0400","from mx1.redhat.com ([209.132.183.28]:39438)\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 1dnABW-0007Sj-Of; Wed, 30 Aug 2017 17:06:02 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 BB797C04B938;\n\tWed, 30 Aug 2017 21:06:01 +0000 (UTC)","from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 72E4477557;\n\tWed, 30 Aug 2017 21:06:00 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com BB797C04B938","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:32 -0500","Message-Id":"<20170830210542.2153-9-eblake@redhat.com>","In-Reply-To":"<20170830210542.2153-1-eblake@redhat.com>","References":"<20170830210542.2153-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 30 Aug 2017 21:06:01 +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 v6 08/18] dirty-bitmap: Set iterator start by\n\toffset, not sector","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":"kwolf@redhat.com, vsementsov@virtuozzo.com, Fam Zheng , \n\tqemu-block@nongnu.org, Jeff Cody ,\n\tMax Reitz , jsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"All callers to bdrv_dirty_iter_new() passed 0 for their initial\nstarting point, drop that parameter.\n\nMost callers to bdrv_set_dirty_iter() were scaling a byte offset to\na sector number; the exception qcow2-bitmap will be converted later\nto use byte rather than sector iteration. Move the scaling to occur\ninternally to dirty bitmap code instead, so that callers now pass\nin bytes.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv5: no change\nv4: rebase to persistent bitmaps\nv3: no change\nv2: no change\n---\n include/block/dirty-bitmap.h | 5 ++---\n block/backup.c | 5 ++---\n block/dirty-bitmap.c | 9 ++++-----\n block/mirror.c | 4 ++--\n block/qcow2-bitmap.c | 4 ++--\n 5 files changed, 12 insertions(+), 15 deletions(-)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex f4ccd3f33f..ece28e1edc 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -44,8 +44,7 @@ void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors);\n BdrvDirtyBitmapIter *bdrv_dirty_meta_iter_new(BdrvDirtyBitmap *bitmap);\n-BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap,\n- uint64_t first_sector);\n+BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap);\n void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter);\n\n uint64_t bdrv_dirty_bitmap_serialization_size(const BdrvDirtyBitmap *bitmap,\n@@ -80,7 +79,7 @@ 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-void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *hbi, int64_t sector_num);\n+void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *hbi, int64_t offset);\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap);\n int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap);\n void bdrv_dirty_bitmap_truncate(BlockDriverState *bs);\ndiff --git a/block/backup.c b/block/backup.c\nindex 504a089150..1a6ec7d079 100644\n--- a/block/backup.c\n+++ b/block/backup.c\n@@ -372,7 +372,7 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job)\n\n granularity = bdrv_dirty_bitmap_granularity(job->sync_bitmap);\n clusters_per_iter = MAX((granularity / job->cluster_size), 1);\n- dbi = bdrv_dirty_iter_new(job->sync_bitmap, 0);\n+ dbi = bdrv_dirty_iter_new(job->sync_bitmap);\n\n /* Find the next dirty sector(s) */\n while ((offset = bdrv_dirty_iter_next(dbi) * BDRV_SECTOR_SIZE) >= 0) {\n@@ -403,8 +403,7 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job)\n /* If the bitmap granularity is smaller than the backup granularity,\n * we need to advance the iterator pointer to the next cluster. */\n if (granularity < job->cluster_size) {\n- bdrv_set_dirty_iter(dbi,\n- cluster * job->cluster_size / BDRV_SECTOR_SIZE);\n+ bdrv_set_dirty_iter(dbi, cluster * job->cluster_size);\n }\n\n last_cluster = cluster - 1;\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 034effc8cd..c091f0c7ba 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -475,11 +475,10 @@ uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap)\n return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap);\n }\n\n-BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap,\n- uint64_t first_sector)\n+BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap)\n {\n BdrvDirtyBitmapIter *iter = g_new(BdrvDirtyBitmapIter, 1);\n- hbitmap_iter_init(&iter->hbi, bitmap->bitmap, first_sector);\n+ hbitmap_iter_init(&iter->hbi, bitmap->bitmap, 0);\n iter->bitmap = bitmap;\n bitmap->active_iterators++;\n return iter;\n@@ -647,9 +646,9 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector,\n /**\n * Advance a BdrvDirtyBitmapIter to an arbitrary offset.\n */\n-void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *iter, int64_t sector_num)\n+void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *iter, int64_t offset)\n {\n- hbitmap_iter_init(&iter->hbi, iter->hbi.hb, sector_num);\n+ hbitmap_iter_init(&iter->hbi, iter->hbi.hb, offset >> BDRV_SECTOR_BITS);\n }\n\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap)\ndiff --git a/block/mirror.c b/block/mirror.c\nindex 429751b9fe..51824750ac 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -373,7 +373,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n next_dirty = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;\n if (next_dirty > next_offset || next_dirty < 0) {\n /* The bitmap iterator's cache is stale, refresh it */\n- bdrv_set_dirty_iter(s->dbi, next_offset >> BDRV_SECTOR_BITS);\n+ bdrv_set_dirty_iter(s->dbi, next_offset);\n next_dirty = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;\n }\n assert(next_dirty == next_offset);\n@@ -796,7 +796,7 @@ static void coroutine_fn mirror_run(void *opaque)\n }\n\n assert(!s->dbi);\n- s->dbi = bdrv_dirty_iter_new(s->dirty_bitmap, 0);\n+ s->dbi = bdrv_dirty_iter_new(s->dirty_bitmap);\n for (;;) {\n uint64_t delay_ns = 0;\n int64_t cnt, delta;\ndiff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex 4475273d8c..44329fc74f 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -1103,7 +1103,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n return NULL;\n }\n\n- dbi = bdrv_dirty_iter_new(bitmap, 0);\n+ dbi = bdrv_dirty_iter_new(bitmap);\n buf = g_malloc(s->cluster_size);\n limit = bytes_covered_by_bitmap_cluster(s, bitmap);\n sbc = limit >> BDRV_SECTOR_BITS;\n@@ -1153,7 +1153,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n break;\n }\n\n- bdrv_set_dirty_iter(dbi, end);\n+ bdrv_set_dirty_iter(dbi, end * BDRV_SECTOR_SIZE);\n }\n\n *bitmap_table_size = tb_size;\n","prefixes":["v6","08/18"]}