haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/dirty-bitmap: add _next_dirty API 

We have bdrv_dirty_bitmap_next_zero, let's add corresponding
bdrv_dirty_bitmap_next_dirty, which is more comfortable to use than
bitmap iterators in some cases.

For test modify test_hbitmap_next_zero_check_range to check both
next_zero and next_dirty and add some new checks.

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-7-vsementsov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
stable-5.0
Vladimir Sementsov-Ogievskiy 2020-02-05 14:20:37 +03:00 committed by John Snow
parent 642700fda0
commit 9399c54b75
5 changed files with 126 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/dirty-bitmap.c
View File

@ -860,6 +860,12 @@ char *bdrv_dirty_bitmap_sha256(const BdrvDirtyBitmap *bitmap, Error **errp)
return hbitmap_sha256(bitmap->bitmap, errp);
}
int64_t bdrv_dirty_bitmap_next_dirty(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bytes)
{
return hbitmap_next_dirty(bitmap->bitmap, offset, bytes);
}
int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bytes)
{

2
include/block/dirty-bitmap.h
View File

@ -105,6 +105,8 @@ for (bitmap = bdrv_dirty_bitmap_first(bs); bitmap; \
bitmap = bdrv_dirty_bitmap_next(bitmap))
char *bdrv_dirty_bitmap_sha256(const BdrvDirtyBitmap *bitmap, Error **errp);
int64_t bdrv_dirty_bitmap_next_dirty(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bytes);
int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, int64_t offset,
int64_t bytes);
bool bdrv_dirty_bitmap_next_dirty_area(BdrvDirtyBitmap *bitmap,

13
include/qemu/hbitmap.h
View File

@ -297,6 +297,19 @@ void hbitmap_free(HBitmap *hb);
*/
void hbitmap_iter_init(HBitmapIter *hbi, const HBitmap *hb, uint64_t first);
/*
* hbitmap_next_dirty:
*
* Find next dirty bit within selected range. If not found, return -1.
*
* @hb: The HBitmap to operate on
* @start: The bit to start from.
* @count: Number of bits to proceed. If @start+@count > bitmap size, the whole
* bitmap is looked through. You can use INT64_MAX as @count to search up to
* the bitmap end.
*/
int64_t hbitmap_next_dirty(const HBitmap *hb, int64_t start, int64_t count);
/* hbitmap_next_zero:
*
* Find next not dirty bit within selected range. If not found, return -1.

130
tests/test-hbitmap.c
View File

@ -816,92 +816,108 @@ static void test_hbitmap_iter_and_reset(TestHBitmapData *data,
hbitmap_iter_next(&hbi);
}
static void test_hbitmap_next_zero_check_range(TestHBitmapData *data,
int64_t start,
int64_t count)
static void test_hbitmap_next_x_check_range(TestHBitmapData *data,
int64_t start,
int64_t count)
{
int64_t ret1 = hbitmap_next_zero(data->hb, start, count);
int64_t ret2 = start;
int64_t next_zero = hbitmap_next_zero(data->hb, start, count);
int64_t next_dirty = hbitmap_next_dirty(data->hb, start, count);
int64_t next;
int64_t end = start >= data->size || data->size - start < count ?
data->size : start + count;
bool first_bit = hbitmap_get(data->hb, start);
for ( ; ret2 < end && hbitmap_get(data->hb, ret2); ret2++) {
for (next = start;
next < end && hbitmap_get(data->hb, next) == first_bit;
next++)
{
;
}
if (ret2 == end) {
ret2 = -1;
if (next == end) {
next = -1;
}
g_assert_cmpint(ret1, ==, ret2);
g_assert_cmpint(next_dirty, ==, first_bit ? start : next);
g_assert_cmpint(next_zero, ==, first_bit ? next : start);
}
static void test_hbitmap_next_zero_check(TestHBitmapData *data, int64_t start)
static void test_hbitmap_next_x_check(TestHBitmapData *data, int64_t start)
{
test_hbitmap_next_zero_check_range(data, start, INT64_MAX);
test_hbitmap_next_x_check_range(data, start, INT64_MAX);
}
static void test_hbitmap_next_zero_do(TestHBitmapData *data, int granularity)
static void test_hbitmap_next_x_do(TestHBitmapData *data, int granularity)
{
hbitmap_test_init(data, L3, granularity);
test_hbitmap_next_zero_check(data, 0);
test_hbitmap_next_zero_check(data, L3 - 1);
test_hbitmap_next_zero_check_range(data, 0, 1);
test_hbitmap_next_zero_check_range(data, L3 - 1, 1);
test_hbitmap_next_x_check(data, 0);
test_hbitmap_next_x_check(data, L3 - 1);
test_hbitmap_next_x_check_range(data, 0, 1);
test_hbitmap_next_x_check_range(data, L3 - 1, 1);
hbitmap_set(data->hb, L2, 1);
test_hbitmap_next_zero_check(data, 0);
test_hbitmap_next_zero_check(data, L2 - 1);
test_hbitmap_next_zero_check(data, L2);
test_hbitmap_next_zero_check(data, L2 + 1);
test_hbitmap_next_zero_check_range(data, 0, 1);
test_hbitmap_next_zero_check_range(data, 0, L2);
test_hbitmap_next_zero_check_range(data, L2 - 1, 1);
test_hbitmap_next_zero_check_range(data, L2 - 1, 2);
test_hbitmap_next_zero_check_range(data, L2, 1);
test_hbitmap_next_zero_check_range(data, L2 + 1, 1);
test_hbitmap_next_x_check(data, 0);
test_hbitmap_next_x_check(data, L2 - 1);
test_hbitmap_next_x_check(data, L2);
test_hbitmap_next_x_check(data, L2 + 1);
test_hbitmap_next_x_check_range(data, 0, 1);
test_hbitmap_next_x_check_range(data, 0, L2);
test_hbitmap_next_x_check_range(data, L2 - 1, 1);
test_hbitmap_next_x_check_range(data, L2 - 1, 2);
test_hbitmap_next_x_check_range(data, L2, 1);
test_hbitmap_next_x_check_range(data, L2 + 1, 1);
hbitmap_set(data->hb, L2 + 5, L1);
test_hbitmap_next_zero_check(data, 0);
test_hbitmap_next_zero_check(data, L2 + 1);
test_hbitmap_next_zero_check(data, L2 + 2);
test_hbitmap_next_zero_check(data, L2 + 5);
test_hbitmap_next_zero_check(data, L2 + L1 - 1);
test_hbitmap_next_zero_check(data, L2 + L1);
test_hbitmap_next_zero_check_range(data, L2, 6);
test_hbitmap_next_zero_check_range(data, L2 + 1, 3);
test_hbitmap_next_zero_check_range(data, L2 + 4, L1);
test_hbitmap_next_zero_check_range(data, L2 + 5, L1);
test_hbitmap_next_x_check(data, 0);
test_hbitmap_next_x_check(data, L2 - L1);
test_hbitmap_next_x_check(data, L2 + 1);
test_hbitmap_next_x_check(data, L2 + 2);
test_hbitmap_next_x_check(data, L2 + 5);
test_hbitmap_next_x_check(data, L2 + L1 - 1);
test_hbitmap_next_x_check(data, L2 + L1);
test_hbitmap_next_x_check(data, L2 + L1 + 1);
test_hbitmap_next_x_check_range(data, L2 - 2, L1);
test_hbitmap_next_x_check_range(data, L2, 4);
test_hbitmap_next_x_check_range(data, L2, 6);
test_hbitmap_next_x_check_range(data, L2 + 1, 3);
test_hbitmap_next_x_check_range(data, L2 + 4, L1);
test_hbitmap_next_x_check_range(data, L2 + 5, L1);
test_hbitmap_next_x_check_range(data, L2 + 5 + L1 - 1, 1);
test_hbitmap_next_x_check_range(data, L2 + 5 + L1, 1);
test_hbitmap_next_x_check_range(data, L2 + 5 + L1 + 1, 1);
hbitmap_set(data->hb, L2 * 2, L3 - L2 * 2);
test_hbitmap_next_zero_check(data, L2 * 2 - L1);
test_hbitmap_next_zero_check(data, L2 * 2 - 2);
test_hbitmap_next_zero_check(data, L2 * 2 - 1);
test_hbitmap_next_zero_check(data, L2 * 2);
test_hbitmap_next_zero_check(data, L3 - 1);
test_hbitmap_next_zero_check_range(data, L2 * 2 - L1, L1 + 1);
test_hbitmap_next_zero_check_range(data, L2 * 2, L2);
test_hbitmap_next_x_check(data, L2 * 2 - L1);
test_hbitmap_next_x_check(data, L2 * 2 - 2);
test_hbitmap_next_x_check(data, L2 * 2 - 1);
test_hbitmap_next_x_check(data, L2 * 2);
test_hbitmap_next_x_check(data, L2 * 2 + 1);
test_hbitmap_next_x_check(data, L2 * 2 + L1);
test_hbitmap_next_x_check(data, L3 - 1);
test_hbitmap_next_x_check_range(data, L2 * 2 - L1, L1 + 1);
test_hbitmap_next_x_check_range(data, L2 * 2, L2);
hbitmap_set(data->hb, 0, L3);
test_hbitmap_next_zero_check(data, 0);
test_hbitmap_next_x_check(data, 0);
}
static void test_hbitmap_next_zero_0(TestHBitmapData *data, const void *unused)
static void test_hbitmap_next_x_0(TestHBitmapData *data, const void *unused)
{
test_hbitmap_next_zero_do(data, 0);
test_hbitmap_next_x_do(data, 0);
}
static void test_hbitmap_next_zero_4(TestHBitmapData *data, const void *unused)
static void test_hbitmap_next_x_4(TestHBitmapData *data, const void *unused)
{
test_hbitmap_next_zero_do(data, 4);
test_hbitmap_next_x_do(data, 4);
}
static void test_hbitmap_next_zero_after_truncate(TestHBitmapData *data,
const void *unused)
static void test_hbitmap_next_x_after_truncate(TestHBitmapData *data,
const void *unused)
{
hbitmap_test_init(data, L1, 0);
hbitmap_test_truncate_impl(data, L1 * 2);
hbitmap_set(data->hb, 0, L1);
test_hbitmap_next_zero_check(data, 0);
test_hbitmap_next_x_check(data, 0);
}
static void test_hbitmap_next_dirty_area_check(TestHBitmapData *data,
@ -1068,12 +1084,12 @@ int main(int argc, char **argv)
hbitmap_test_add("/hbitmap/iter/iter_and_reset",
test_hbitmap_iter_and_reset);
hbitmap_test_add("/hbitmap/next_zero/next_zero_0",
test_hbitmap_next_zero_0);
hbitmap_test_add("/hbitmap/next_zero/next_zero_4",
test_hbitmap_next_zero_4);
hbitmap_test_add("/hbitmap/next_zero/next_zero_after_truncate",
test_hbitmap_next_zero_after_truncate);
hbitmap_test_add("/hbitmap/next_zero/next_x_0",
test_hbitmap_next_x_0);
hbitmap_test_add("/hbitmap/next_zero/next_x_4",
test_hbitmap_next_x_4);
hbitmap_test_add("/hbitmap/next_zero/next_x_after_truncate",
test_hbitmap_next_x_after_truncate);
hbitmap_test_add("/hbitmap/next_dirty_area/next_dirty_area_0",
test_hbitmap_next_dirty_area_0);

60
util/hbitmap.c
View File

@ -193,6 +193,30 @@ void hbitmap_iter_init(HBitmapIter *hbi, const HBitmap *hb, uint64_t first)
}
}
int64_t hbitmap_next_dirty(const HBitmap *hb, int64_t start, int64_t count)
{
HBitmapIter hbi;
int64_t first_dirty_off;
uint64_t end;
assert(start >= 0 && count >= 0);
if (start >= hb->orig_size || count == 0) {
return -1;
}
end = count > hb->orig_size - start ? hb->orig_size : start + count;
hbitmap_iter_init(&hbi, hb, start);
first_dirty_off = hbitmap_iter_next(&hbi);
if (first_dirty_off < 0 || first_dirty_off >= end) {
return -1;
}
return MAX(start, first_dirty_off);
}
int64_t hbitmap_next_zero(const HBitmap *hb, int64_t start, int64_t count)
{
size_t pos = (start >> hb->granularity) >> BITS_PER_LEVEL;
@ -248,40 +272,20 @@ int64_t hbitmap_next_zero(const HBitmap *hb, int64_t start, int64_t count)
bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t *start, int64_t *count)
{
HBitmapIter hbi;
int64_t firt_dirty_off, area_end;
uint32_t granularity = 1UL << hb->granularity;
uint64_t end;
int64_t area_start, area_end;
assert(*start >= 0 && *count >= 0);
if (*start >= hb->orig_size || *count == 0) {
area_start = hbitmap_next_dirty(hb, *start, *count);
if (area_start < 0) {
return false;
}
end = *count > hb->orig_size - *start ? hb->orig_size : *start + *count;
hbitmap_iter_init(&hbi, hb, *start);
firt_dirty_off = hbitmap_iter_next(&hbi);
if (firt_dirty_off < 0 || firt_dirty_off >= 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);
}
if (firt_dirty_off + granularity >= end) {
area_end = end;
} else {
area_end = hbitmap_next_zero(hb, firt_dirty_off + granularity,
end - firt_dirty_off - granularity);
if (area_end < 0) {
area_end = end;
}
}
if (firt_dirty_off > *start) {
*start = firt_dirty_off;
}
*count = area_end - *start;
*start = area_start;
*count = area_end - area_start;
return true;
}