{"id":807904,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807904/?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-12-eblake@redhat.com>","date":"2017-08-30T21:05:35","name":"[v6,11/18] dirty-bitmap: Change bdrv_get_dirty_locked() to take bytes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c38eb2f90a8fc14041896a0682ad8a2058b3e9b0","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-12-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/807904/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 3xjJGB6Zb3z9sNw\n\tfor ;\n\tThu, 31 Aug 2017 07:16:18 +1000 (AEST)","from localhost ([::1]:52745 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnALQ-0004FH-V0\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:16:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37063)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABp-0003zg-56\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:23 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABl-0007c5-WD\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:21 -0400","from mx1.redhat.com ([209.132.183.28]:40042)\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 1dnABj-0007ab-6h; Wed, 30 Aug 2017 17:06:15 -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 3B39EC047B67;\n\tWed, 30 Aug 2017 21:06:14 +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 E7C6577557;\n\tWed, 30 Aug 2017 21:06:07 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3B39EC047B67","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:35 -0500","Message-Id":"<20170830210542.2153-12-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:14 +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 11/18] dirty-bitmap: Change\n\tbdrv_get_dirty_locked() to take bytes","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, Juan Quintela ,\n\tJeff Cody ,\n\t\"Dr. David Alan Gilbert\" ,\n\tMax Reitz ,\n\tStefan Hajnoczi , jsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Half the callers were already scaling bytes to sectors; the other\nhalf can eventually be simplified to use byte iteration. Both\ncallers were already using the result as a bool, so make that\nexplicit. Making the change also makes it easier for a future\ndirty-bitmap patch to offload scaling over to the internal hbitmap.\n\nRemember, asking whether a byte is dirty is effectively asking\nwhether the entire granularity containing the byte is dirty, since\nwe only track dirtiness by granularity.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \nReviewed-by: Juan Quintela \n\n---\nv4: only context change\nv3: rebase to _locked rename was straightforward enough that R-b kept\nv2: tweak commit message, no code change\n---\n include/block/dirty-bitmap.h | 4 ++--\n block/dirty-bitmap.c | 8 ++++----\n block/mirror.c | 3 +--\n migration/block.c | 3 ++-\n 4 files changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex ece28e1edc..1dddcd320b 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -72,8 +72,8 @@ void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,\n /* Functions that require manual locking. */\n void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);\n void bdrv_dirty_bitmap_unlock(BdrvDirtyBitmap *bitmap);\n-int bdrv_get_dirty_locked(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,\n- int64_t sector);\n+bool bdrv_get_dirty_locked(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,\n+ int64_t offset);\n void bdrv_set_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors);\n void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex f983d99def..8b3c0221c6 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -440,13 +440,13 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs)\n }\n\n /* Called within bdrv_dirty_bitmap_lock..unlock */\n-int bdrv_get_dirty_locked(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,\n- int64_t sector)\n+bool bdrv_get_dirty_locked(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,\n+ int64_t offset)\n {\n if (bitmap) {\n- return hbitmap_get(bitmap->bitmap, sector);\n+ return hbitmap_get(bitmap->bitmap, offset >> BDRV_SECTOR_BITS);\n } else {\n- return 0;\n+ return false;\n }\n }\n\ndiff --git a/block/mirror.c b/block/mirror.c\nindex cc47e21814..42888ebd04 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -362,8 +362,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n int64_t next_offset = offset + nb_chunks * s->granularity;\n int64_t next_chunk = next_offset / s->granularity;\n if (next_offset >= s->bdev_length ||\n- !bdrv_get_dirty_locked(source, s->dirty_bitmap,\n- next_offset >> BDRV_SECTOR_BITS)) {\n+ !bdrv_get_dirty_locked(source, s->dirty_bitmap, next_offset)) {\n break;\n }\n if (test_bit(next_chunk, s->in_flight_bitmap)) {\ndiff --git a/migration/block.c b/migration/block.c\nindex a3512945da..b618869661 100644\n--- a/migration/block.c\n+++ b/migration/block.c\n@@ -530,7 +530,8 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,\n blk_mig_unlock();\n }\n bdrv_dirty_bitmap_lock(bmds->dirty_bitmap);\n- if (bdrv_get_dirty_locked(bs, bmds->dirty_bitmap, sector)) {\n+ if (bdrv_get_dirty_locked(bs, bmds->dirty_bitmap,\n+ sector * BDRV_SECTOR_SIZE)) {\n if (total_sectors - sector < BDRV_SECTORS_PER_DIRTY_CHUNK) {\n nr_sectors = total_sectors - sector;\n } else {\n","prefixes":["v6","11/18"]}