From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df6tv-0003JK-KJ for qemu-devel@nongnu.org; Tue, 08 Aug 2017 11:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1df6tu-0007Zp-MX for qemu-devel@nongnu.org; Tue, 08 Aug 2017 11:58:35 -0400 From: Markus Armbruster References: <1502117160-24655-1-git-send-email-armbru@redhat.com> <1502117160-24655-29-git-send-email-armbru@redhat.com> <993e9832-d7f0-9523-9143-5286d3b0ba33@redhat.com> Date: Tue, 08 Aug 2017 17:58:17 +0200 In-Reply-To: <993e9832-d7f0-9523-9143-5286d3b0ba33@redhat.com> (John Snow's message of "Mon, 7 Aug 2017 21:55:21 -0400") Message-ID: <8760dy6oh2.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [RFC PATCH 28/56] block: Widen dirty bitmap granularity to uint64_t for safety List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow Cc: qemu-devel@nongnu.org, kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, jcody@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com John Snow writes: > On 08/07/2017 10:45 AM, Markus Armbruster wrote: >> Block dirty bitmaps represent granularity in bytes as uint32_t. It >> must be a power of two and a multiple of BDRV_SECTOR_SIZE. >> >> The trouble with uint32_t is computations like this one in >> mirror_do_read(): >> >> uint64_t max_bytes; >> >> max_bytes = s->granularity * s->max_iov; >> >> The operands of * are uint32_t and int, so the product is computed in >> uint32_t (assuming 32 bit int), then zero-extended to uint64_t. >> >> Since granularity is generally combined with 64 bit file offsets, it's >> best to make it 64 bits, too. Less opportunity to screw up. >> >> Signed-off-by: Markus Armbruster > > [bweeooop] > >> --- a/block/dirty-bitmap.c >> +++ b/block/dirty-bitmap.c > > [buuuuweeeep] > >> @@ -506,16 +506,11 @@ uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs) >> return granularity; >> } >> >> -uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap) >> +uint64_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap) >> { >> return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap); >> } >> >> -uint32_t bdrv_dirty_bitmap_meta_granularity(BdrvDirtyBitmap *bitmap) >> -{ >> - return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->meta); >> -} > > Why? Unused? Not cool enough to mention? I didn't feel like fixing an unused function, so I dropped it. Can mention this in the commit message.