Skip to content

Commit

Permalink
block/dirty-bitmap: improve _next_dirty_area API
Browse files Browse the repository at this point in the history 
Firstly, _next_dirty_area is for scenarios when we may contiguously
search for next dirty area inside some limited region, so it is more
comfortable to specify "end" which should not be recalculated on each
iteration.

Secondly, let's add a possibility to limit resulting area size, not
limiting searching area. This will be used in NBD code in further
commit. (Note that now bdrv_dirty_bitmap_next_dirty_area is unused)

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20200205112041.6003-8-vsementsov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
  • Loading branch information
@jnsnow
Vladimir Sementsov-Ogievskiy authored and jnsnow committed Mar 18, 2020
1 parent 9399c54 commit 299ea9f
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 46 deletions.
6 changes: 4 additions & 2 deletions block/dirty-bitmap.c
View file
Expand Up @@ -873,9 +873,11 @@ int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, int64_t offset,
}

bool bdrv_dirty_bitmap_next_dirty_area(BdrvDirtyBitmap *bitmap,
int64_t *offset, int64_t *bytes)
int64_t start, int64_t end, int64_t max_dirty_count,
int64_t *dirty_start, int64_t *dirty_count)
{
return hbitmap_next_dirty_area(bitmap->bitmap, offset, bytes);
return hbitmap_next_dirty_area(bitmap->bitmap, start, end, max_dirty_count,
dirty_start, dirty_count);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion include/block/dirty-bitmap.h
View file
Expand Up @@ -110,7 +110,8 @@ int64_t bdrv_dirty_bitmap_next_dirty(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bytes);
bool bdrv_dirty_bitmap_next_dirty_area(BdrvDirtyBitmap *bitmap,
int64_t *offset, int64_t *bytes);
int64_t start, int64_t end, int64_t max_dirty_count,
int64_t *dirty_start, int64_t *dirty_count);
BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,
Error **errp);

Expand Down
25 changes: 14 additions & 11 deletions include/qemu/hbitmap.h
View file
Expand Up @@ -324,18 +324,21 @@ int64_t hbitmap_next_zero(const HBitmap *hb, int64_t start, int64_t count);

/* hbitmap_next_dirty_area:
* @hb: The HBitmap to operate on
* @start: in-out parameter.
* in: the offset to start from
* out: (if area found) start of found area
* @count: in-out parameter.
* in: length of requested region
* out: length of found area
*
* If dirty area found within [@start, @start + @count), returns true and sets
* @offset and @bytes appropriately. Otherwise returns false and leaves @offset
* and @bytes unchanged.
* @start: the offset to start from
* @end: end of requested area
* @max_dirty_count: limit for out parameter dirty_count
* @dirty_start: on success: start of found area
* @dirty_count: on success: length of found area
*
* If dirty area found within [@start, @end), returns true and sets
* @dirty_start and @dirty_count appropriately. @dirty_count will not exceed
* @max_dirty_count.
* If dirty area was not found, returns false and leaves @dirty_start and
* @dirty_count unchanged.
*/
bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t *start, int64_t *count);
bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t start, int64_t end,
int64_t max_dirty_count,
int64_t *dirty_start, int64_t *dirty_count);

/**
* hbitmap_iter_next:
Expand Down
43 changes: 28 additions & 15 deletions tests/test-hbitmap.c
View file
Expand Up @@ -920,18 +920,19 @@ static void test_hbitmap_next_x_after_truncate(TestHBitmapData *data,
test_hbitmap_next_x_check(data, 0);
}

static void test_hbitmap_next_dirty_area_check(TestHBitmapData *data,
int64_t offset,
int64_t count)
static void test_hbitmap_next_dirty_area_check_limited(TestHBitmapData *data,
int64_t offset,
int64_t count,
int64_t max_dirty)
{
int64_t off1, off2;
int64_t len1 = 0, len2;
bool ret1, ret2;
int64_t end;

off1 = offset;
len1 = count;
ret1 = hbitmap_next_dirty_area(data->hb, &off1, &len1);
ret1 = hbitmap_next_dirty_area(data->hb,
offset, count == INT64_MAX ? INT64_MAX : offset + count, max_dirty,
&off1, &len1);

end = offset > data->size || data->size - offset < count ? data->size :
offset + count;
Expand All @@ -940,21 +941,25 @@ static void test_hbitmap_next_dirty_area_check(TestHBitmapData *data,
;
}

for (len2 = 1; off2 + len2 < end && hbitmap_get(data->hb, off2 + len2);
len2++) {
for (len2 = 1; (off2 + len2 < end && len2 < max_dirty &&
hbitmap_get(data->hb, off2 + len2)); len2++)
{
;
}

ret2 = off2 < end;
if (!ret2) {
/* leave unchanged */
off2 = offset;
len2 = count;
g_assert_cmpint(ret1, ==, ret2);

if (ret2) {
g_assert_cmpint(off1, ==, off2);
g_assert_cmpint(len1, ==, len2);
}
}

g_assert_cmpint(ret1, ==, ret2);
g_assert_cmpint(off1, ==, off2);
g_assert_cmpint(len1, ==, len2);
static void test_hbitmap_next_dirty_area_check(TestHBitmapData *data,
int64_t offset, int64_t count)
{
test_hbitmap_next_dirty_area_check_limited(data, offset, count, INT64_MAX);
}

static void test_hbitmap_next_dirty_area_do(TestHBitmapData *data,
Expand All @@ -964,6 +969,7 @@ static void test_hbitmap_next_dirty_area_do(TestHBitmapData *data,
test_hbitmap_next_dirty_area_check(data, 0, INT64_MAX);
test_hbitmap_next_dirty_area_check(data, 0, 1);
test_hbitmap_next_dirty_area_check(data, L3 - 1, 1);
test_hbitmap_next_dirty_area_check_limited(data, 0, INT64_MAX, 1);

hbitmap_set(data->hb, L2, 1);
test_hbitmap_next_dirty_area_check(data, 0, 1);
Expand All @@ -976,6 +982,8 @@ static void test_hbitmap_next_dirty_area_do(TestHBitmapData *data,
test_hbitmap_next_dirty_area_check(data, L2, INT64_MAX);
test_hbitmap_next_dirty_area_check(data, L2, 1);
test_hbitmap_next_dirty_area_check(data, L2 + 1, 1);
test_hbitmap_next_dirty_area_check_limited(data, 0, INT64_MAX, 1);
test_hbitmap_next_dirty_area_check_limited(data, L2 - 1, 2, 1);

hbitmap_set(data->hb, L2 + 5, L1);
test_hbitmap_next_dirty_area_check(data, 0, INT64_MAX);
Expand All @@ -988,6 +996,8 @@ static void test_hbitmap_next_dirty_area_do(TestHBitmapData *data,
test_hbitmap_next_dirty_area_check(data, L2 + L1, L1);
test_hbitmap_next_dirty_area_check(data, L2, 0);
test_hbitmap_next_dirty_area_check(data, L2 + 1, 0);
test_hbitmap_next_dirty_area_check_limited(data, L2 + 3, INT64_MAX, 3);
test_hbitmap_next_dirty_area_check_limited(data, L2 + 3, 7, 10);

hbitmap_set(data->hb, L2 * 2, L3 - L2 * 2);
test_hbitmap_next_dirty_area_check(data, 0, INT64_MAX);
Expand All @@ -997,6 +1007,9 @@ static void test_hbitmap_next_dirty_area_do(TestHBitmapData *data,
test_hbitmap_next_dirty_area_check(data, L2 + 5 + L1, 5);
test_hbitmap_next_dirty_area_check(data, L2 * 2 - L1, L1 + 1);
test_hbitmap_next_dirty_area_check(data, L2 * 2, L2);
test_hbitmap_next_dirty_area_check_limited(data, L2 * 2 + 1, INT64_MAX, 5);
test_hbitmap_next_dirty_area_check_limited(data, L2 * 2 + 1, 10, 5);
test_hbitmap_next_dirty_area_check_limited(data, L2 * 2 + 1, 2, 5);

hbitmap_set(data->hb, 0, L3);
test_hbitmap_next_dirty_area_check(data, 0, INT64_MAX);
Expand Down
44 changes: 27 additions & 17 deletions util/hbitmap.c
View file
Expand Up @@ -270,22 +270,33 @@ int64_t hbitmap_next_zero(const HBitmap *hb, int64_t start, int64_t count)
return res;
}

bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t *start, int64_t *count)
bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t start, int64_t end,
int64_t max_dirty_count,
int64_t *dirty_start, int64_t *dirty_count)
{
int64_t area_start, area_end;
int64_t next_zero;

area_start = hbitmap_next_dirty(hb, *start, *count);
if (area_start < 0) {
assert(start >= 0 && end >= 0 && max_dirty_count > 0);

end = MIN(end, hb->orig_size);
if (start >= end) {
return false;
}

area_end = hbitmap_next_zero(hb, area_start, *start + *count - area_start);
if (area_end < 0) {
area_end = MIN(hb->orig_size, *start + *count);
start = hbitmap_next_dirty(hb, start, end - start);
if (start < 0) {
return false;
}

*start = area_start;
*count = area_end - area_start;
end = start + MIN(end - start, max_dirty_count);

next_zero = hbitmap_next_zero(hb, start, end - start);
if (next_zero >= 0) {
end = next_zero;
}

*dirty_start = start;
*dirty_count = end - start;

return true;
}
Expand Down Expand Up @@ -841,16 +852,15 @@ bool hbitmap_can_merge(const HBitmap *a, const HBitmap *b)
*/
static void hbitmap_sparse_merge(HBitmap *dst, const HBitmap *src)
{
int64_t offset = 0;
int64_t count = src->orig_size;
int64_t offset;
int64_t count;

while (hbitmap_next_dirty_area(src, &offset, &count)) {
for (offset = 0;
hbitmap_next_dirty_area(src, offset, src->orig_size, INT64_MAX,
&offset, &count);
offset += count)
{
hbitmap_set(dst, offset, count);
offset += count;
if (offset >= src->orig_size) {
break;
}
count = src->orig_size - offset;
}
}

Expand Down

0 comments on commit 299ea9f

Please sign in to comment.