{"id":815113,"url":"http://patchwork.ozlabs.org/api/1.2/patches/815113/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-20-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20170918185819.5984-20-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-18T18:58:18","name":"[v8,19/20] dirty-bitmap: Switch bdrv_set_dirty() to bytes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a1737eef1f0649d0ca7f1273bcddfe827f4542b8","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.2/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-20-eblake@redhat.com/mbox/","series":[{"id":3711,"url":"http://patchwork.ozlabs.org/api/1.2/series/3711/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3711","date":"2017-09-18T18:58:00","name":"make dirty-bitmap byte-based","version":8,"mbox":"http://patchwork.ozlabs.org/series/3711/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815113/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815113/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xwwh20w3Nz9t2V\n\tfor ;\n\tTue, 19 Sep 2017 05:15:30 +1000 (AEST)","from localhost ([::1]:38453 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1du1Vw-0000f4-3n\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 15:15:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44703)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1du1GR-0002pl-UP\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1du1GQ-0006rq-Rd\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:28 -0400","from mx1.redhat.com ([209.132.183.28]:52036)\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 1du1GO-0006po-4j; Mon, 18 Sep 2017 14:59:24 -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 199CD2CE91E;\n\tMon, 18 Sep 2017 18:59:23 +0000 (UTC)","from red.redhat.com (ovpn-124-97.rdu2.redhat.com [10.10.124.97])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0017E5C1A3;\n\tMon, 18 Sep 2017 18:59:13 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 199CD2CE91E","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 13:58:18 -0500","Message-Id":"<20170918185819.5984-20-eblake@redhat.com>","In-Reply-To":"<20170918185819.5984-1-eblake@redhat.com>","References":"<20170918185819.5984-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.29]);\n\tMon, 18 Sep 2017 18:59:23 +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 v8 19/20] dirty-bitmap: Switch bdrv_set_dirty()\n\tto 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, Max Reitz ,\n\tStefan Hajnoczi , jsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Both callers already had bytes available, but were scaling to\nsectors. Move the scaling to internal code. In the case of\nbdrv_aligned_pwritev(), we are now passing the exact offset\nrather than a rounded sector-aligned value, but that's okay\nas long as dirty bitmap widens start/bytes to granularity\nboundaries.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv4: only context changes\nv3: rebase to lock context changes, R-b kept\nv2: no change\n---\n include/block/block_int.h | 2 +-\n block/io.c | 6 ++----\n block/dirty-bitmap.c | 7 ++++---\n 3 files changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/include/block/block_int.h b/include/block/block_int.h\nindex ba4c383393..55c5d573d4 100644\n--- a/include/block/block_int.h\n+++ b/include/block/block_int.h\n@@ -1021,7 +1021,7 @@ void blk_dev_eject_request(BlockBackend *blk, bool force);\n bool blk_dev_is_tray_open(BlockBackend *blk);\n bool blk_dev_is_medium_locked(BlockBackend *blk);\n\n-void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int64_t nr_sect);\n+void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes);\n bool bdrv_requests_pending(BlockDriverState *bs);\n\n void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out);\ndiff --git a/block/io.c b/block/io.c\nindex 4378ae4c7d..8a0cd8835a 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1334,7 +1334,6 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,\n bool waited;\n int ret;\n\n- int64_t start_sector = offset >> BDRV_SECTOR_BITS;\n int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n uint64_t bytes_remaining = bytes;\n int max_transfer;\n@@ -1409,7 +1408,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,\n bdrv_debug_event(bs, BLKDBG_PWRITEV_DONE);\n\n atomic_inc(&bs->write_gen);\n- bdrv_set_dirty(bs, start_sector, end_sector - start_sector);\n+ bdrv_set_dirty(bs, offset, bytes);\n\n stat64_max(&bs->wr_highest_offset, offset + bytes);\n\n@@ -2438,8 +2437,7 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset,\n ret = 0;\n out:\n atomic_inc(&bs->write_gen);\n- bdrv_set_dirty(bs, req.offset >> BDRV_SECTOR_BITS,\n- req.bytes >> BDRV_SECTOR_BITS);\n+ bdrv_set_dirty(bs, req.offset, req.bytes);\n tracked_request_end(&req);\n bdrv_dec_in_flight(bs);\n return ret;\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 117837b3cc..58a3f330a9 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -628,10 +628,10 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap)\n hbitmap_deserialize_finish(bitmap->bitmap);\n }\n\n-void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector,\n- int64_t nr_sectors)\n+void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes)\n {\n BdrvDirtyBitmap *bitmap;\n+ int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n\n if (QLIST_EMPTY(&bs->dirty_bitmaps)) {\n return;\n@@ -643,7 +643,8 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector,\n continue;\n }\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 bdrv_dirty_bitmaps_unlock(bs);\n }\n","prefixes":["v8","19/20"]}