{"id":807907,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807907/?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-13-eblake@redhat.com>","date":"2017-08-30T21:05:36","name":"[v6,12/18] dirty-bitmap: Change bdrv_[re]set_dirty_bitmap() to use bytes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5634778c806009252242f335aa94d03d19ff42a3","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-13-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/807907/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xjJKn4BGKz9sNw\n\tfor ;\n\tThu, 31 Aug 2017 07:19:25 +1000 (AEST)","from localhost ([::1]:52761 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAOR-0007DR-Jf\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:19:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37088)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABt-00041P-12\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:26 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABr-0007fu-HK\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:25 -0400","from mx1.redhat.com ([209.132.183.28]:59922)\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 1dnABn-0007cE-4f; Wed, 30 Aug 2017 17:06:19 -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 24DC97EA93;\n\tWed, 30 Aug 2017 21:06:18 +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 7818477557;\n\tWed, 30 Aug 2017 21:06:14 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 24DC97EA93","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:36 -0500","Message-Id":"<20170830210542.2153-13-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.28]);\n\tWed, 30 Aug 2017 21:06:18 +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 12/18] dirty-bitmap: Change\n\tbdrv_[re]set_dirty_bitmap() to use 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":"Some of the callers were already scaling bytes to sectors; others\ncan be easily converted to pass byte offsets, all in our shift\ntowards a consistent byte interface everywhere. Making the change\nwill also make it easier to write the hold-out callers to use byte\nrather than sectors for their iterations; it also makes it easier\nfor a future dirty-bitmap patch to offload scaling over to the\ninternal hbitmap. Although all callers happen to pass\nsector-aligned values, make the internal scaling robust to any\nsub-sector requests.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv5: only context change\nv4: only context change, due to rebasing to persistent bitmaps\nv3: rebase to addition of _locked interfaces; complex enough that I\ndropped R-b\nv2: no change\n---\n include/block/dirty-bitmap.h | 8 ++++----\n block/dirty-bitmap.c | 22 ++++++++++++++--------\n block/mirror.c | 16 ++++++++--------\n migration/block.c | 7 +++++--\n 4 files changed, 31 insertions(+), 22 deletions(-)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex 1dddcd320b..0341a605d7 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -40,9 +40,9 @@ const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap);\n int64_t bdrv_dirty_bitmap_size(const BdrvDirtyBitmap *bitmap);\n DirtyBitmapStatus bdrv_dirty_bitmap_status(BdrvDirtyBitmap *bitmap);\n void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors);\n+ int64_t offset, int64_t bytes);\n void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors);\n+ int64_t offset, int64_t bytes);\n BdrvDirtyBitmapIter *bdrv_dirty_meta_iter_new(BdrvDirtyBitmap *bitmap);\n BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap);\n void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter);\n@@ -75,9 +75,9 @@ void bdrv_dirty_bitmap_unlock(BdrvDirtyBitmap *bitmap);\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+ int64_t offset, int64_t bytes);\n void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors);\n+ int64_t offset, int64_t bytes);\n int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter);\n void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *hbi, int64_t offset);\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap);\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 8b3c0221c6..9821225523 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -510,35 +510,41 @@ int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)\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+ int64_t offset, int64_t bytes)\n {\n+ int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n+\n assert(bdrv_dirty_bitmap_enabled(bitmap));\n assert(!bdrv_dirty_bitmap_readonly(bitmap));\n- hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors);\n+ hbitmap_set(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n+ end_sector - (offset >> BDRV_SECTOR_BITS));\n }\n\n void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors)\n+ int64_t offset, int64_t bytes)\n {\n bdrv_dirty_bitmap_lock(bitmap);\n- bdrv_set_dirty_bitmap_locked(bitmap, cur_sector, nr_sectors);\n+ bdrv_set_dirty_bitmap_locked(bitmap, offset, bytes);\n bdrv_dirty_bitmap_unlock(bitmap);\n }\n\n /* Called within bdrv_dirty_bitmap_lock..unlock */\n void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors)\n+ int64_t offset, int64_t bytes)\n {\n+ int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n+\n assert(bdrv_dirty_bitmap_enabled(bitmap));\n assert(!bdrv_dirty_bitmap_readonly(bitmap));\n- hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors);\n+ hbitmap_reset(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n+ end_sector - (offset >> BDRV_SECTOR_BITS));\n }\n\n void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n- int64_t cur_sector, int64_t nr_sectors)\n+ int64_t offset, int64_t bytes)\n {\n bdrv_dirty_bitmap_lock(bitmap);\n- bdrv_reset_dirty_bitmap_locked(bitmap, cur_sector, nr_sectors);\n+ bdrv_reset_dirty_bitmap_locked(bitmap, offset, bytes);\n bdrv_dirty_bitmap_unlock(bitmap);\n }\n\ndiff --git a/block/mirror.c b/block/mirror.c\nindex 42888ebd04..18172a56a3 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -141,8 +141,7 @@ static void mirror_write_complete(void *opaque, int ret)\n if (ret < 0) {\n BlockErrorAction action;\n\n- bdrv_set_dirty_bitmap(s->dirty_bitmap, op->offset >> BDRV_SECTOR_BITS,\n- op->bytes >> BDRV_SECTOR_BITS);\n+ bdrv_set_dirty_bitmap(s->dirty_bitmap, op->offset, op->bytes);\n action = mirror_error_action(s, false, -ret);\n if (action == BLOCK_ERROR_ACTION_REPORT && s->ret >= 0) {\n s->ret = ret;\n@@ -161,8 +160,7 @@ static void mirror_read_complete(void *opaque, int ret)\n if (ret < 0) {\n BlockErrorAction action;\n\n- bdrv_set_dirty_bitmap(s->dirty_bitmap, op->offset >> BDRV_SECTOR_BITS,\n- op->bytes >> BDRV_SECTOR_BITS);\n+ bdrv_set_dirty_bitmap(s->dirty_bitmap, op->offset, op->bytes);\n action = mirror_error_action(s, true, -ret);\n if (action == BLOCK_ERROR_ACTION_REPORT && s->ret >= 0) {\n s->ret = ret;\n@@ -383,8 +381,8 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n * calling bdrv_get_block_status_above could yield - if some blocks are\n * marked dirty in this window, we need to know.\n */\n- bdrv_reset_dirty_bitmap_locked(s->dirty_bitmap, offset >> BDRV_SECTOR_BITS,\n- nb_chunks * sectors_per_chunk);\n+ bdrv_reset_dirty_bitmap_locked(s->dirty_bitmap, offset,\n+ nb_chunks * s->granularity);\n bdrv_dirty_bitmap_unlock(s->dirty_bitmap);\n\n bitmap_set(s->in_flight_bitmap, offset / s->granularity, nb_chunks);\n@@ -626,7 +624,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n\n if (base == NULL && !bdrv_has_zero_init(target_bs)) {\n if (!bdrv_can_write_zeroes_with_unmap(target_bs)) {\n- bdrv_set_dirty_bitmap(s->dirty_bitmap, 0, end);\n+ bdrv_set_dirty_bitmap(s->dirty_bitmap, 0, s->bdev_length);\n return 0;\n }\n\n@@ -682,7 +680,9 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n n = count >> BDRV_SECTOR_BITS;\n assert(n > 0);\n if (ret == 1) {\n- bdrv_set_dirty_bitmap(s->dirty_bitmap, sector_num, n);\n+ bdrv_set_dirty_bitmap(s->dirty_bitmap,\n+ sector_num * BDRV_SECTOR_SIZE,\n+ n * BDRV_SECTOR_SIZE);\n }\n sector_num += n;\n }\ndiff --git a/migration/block.c b/migration/block.c\nindex b618869661..725f1974c3 100644\n--- a/migration/block.c\n+++ b/migration/block.c\n@@ -329,7 +329,8 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)\n blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov,\n 0, blk_mig_read_cb, blk);\n\n- bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector, nr_sectors);\n+ bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector * BDRV_SECTOR_SIZE,\n+ nr_sectors * BDRV_SECTOR_SIZE);\n aio_context_release(blk_get_aio_context(bmds->blk));\n qemu_mutex_unlock_iothread();\n\n@@ -537,7 +538,9 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,\n } else {\n nr_sectors = BDRV_SECTORS_PER_DIRTY_CHUNK;\n }\n- bdrv_reset_dirty_bitmap_locked(bmds->dirty_bitmap, sector, nr_sectors);\n+ bdrv_reset_dirty_bitmap_locked(bmds->dirty_bitmap,\n+ sector * BDRV_SECTOR_SIZE,\n+ nr_sectors * BDRV_SECTOR_SIZE);\n bdrv_dirty_bitmap_unlock(bmds->dirty_bitmap);\n\n blk = g_new(BlkMigBlock, 1);\n","prefixes":["v6","12/18"]}