util/hbitmap: update orig_size on truncate
PATCH 1/1 util/hbitmap: update orig_size on truncate
Without this, hbitmap_next_zero and hbitmap_next_dirty_area are broken after truncate. So, orig_size is broken since it's introduction in 76d570dc495c56bb.
---
Hi!
Here is one more hbitmap bug I noticed. It's my fault, I'm sorry :( Broken in 4.0, but if we are already going to fix in 4.1 some things around it, it's a small meaningful addition.
Users of broken API are incremental backup, sync mirror (but it may not be broken, if truncates not allowed during mirror, are they?), bitmap export through NBD.
util/hbitmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
util/hbitmap.c +5 -1
@@ -53,7 +53,9 @@*/ struct HBitmap { -/* Size of the bitmap, as requested in hbitmap_alloc. */ +/* +* Size of the bitmap, as requested in hbitmap_alloc or in hbitmap_truncate. +*/ uint64_t orig_size;/* Number of total bits in the bottom level. */
@@ -732,6 +734,8 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size)uint64_t num_elements = size;uint64_t old; + hb->orig_size = size; +/* Size comes in as logical elements, adjust for granularity. */ size = (size + (1ULL << hb->granularity) -1 ) >> hb->granularity;assert (size <= ((uint64_t )1 <<HBITMAP_LOG_MAX_SIZE ));
Signature · 1 line
2.18.0
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Without this,
hbitmap_next_zeroandhbitmap_next_dirty_areaare broken after truncate. So,orig_sizeis broken since it's introduction in76d570dc495c56bb.Fixes 76d570dc495c56bbSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Quoted 7 lines
---
Hi!
Here is one more hbitmap bug I noticed. It's my fault, I'm sorry :( Broken in 4.0, but if we are already going to fix in 4.1 some things around it, it's a small meaningful addition.
Hm. :-/
Quoted 2 lines
Users of broken API are incremental backup, sync mirror (but it may not be broken, if truncates not allowed during mirror, are they?),
It doesn’t appear that way (we don’t share BLK_PERM_RESIZE).
Quoted 1 line
bitmap export through NBD.
I suppose that counts as block-y enough for me to take it. Well, I’d still like a test case to see the impact... I’ll see whether I can come up with something.
Quoted 2 lines
util/hbitmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 20 lines · Max Reitz
Quoted 6 lines · Vladimir Sementsov-Ogievskiy
Without this,
hbitmap_next_zeroandhbitmap_next_dirty_areaare broken after truncate. So,orig_sizeis broken since it's introduction in76d570dc495c56bb.Fixes 76d570dc495c56bbSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Quoted 7 lines
---
Hi!
Here is one more hbitmap bug I noticed. It's my fault, I'm sorry :( Broken in 4.0, but if we are already going to fix in 4.1 some things around it, it's a small meaningful addition.
Hm. :-/
Quoted 2 lines
Users of broken API are incremental backup, sync mirror (but it may not be broken, if truncates not allowed during mirror, are they?),
Quoted 7 lines
It doesn’t appear that way (we don’t share
BLK_PERM_RESIZE).Quoted 1 line
bitmap export through NBD.
I suppose that counts as block-y enough for me to take it. Well, I’d still like a test case to see the impact... I’ll see whether I can come up with something.
And also a unit test...
Paolo
Max Reitz
AppliedQuoted 6 lines · Vladimir Sementsov-Ogievskiy
Without this,
hbitmap_next_zeroandhbitmap_next_dirty_areaare broken after truncate. So,orig_sizeis broken since it's introduction in76d570dc495c56bb.Fixes 76d570dc495c56bbSigned-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
A unit test as a follow-up would indeed be nice, but I’ll just take it now anyway.
Max