From: "Denis V. Lunev" <den@openvz.org>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: stefanha@redhat.com, alexander.ivanov@virtuozzo.com,
mike.maslenkin@gmail.com, "Denis V. Lunev" <den@openvz.org>
Subject: [PATCH 08/22] parallels: create mark_used() helper which sets bit in used bitmap
Date: Mon, 18 Sep 2023 20:00:46 +0200 [thread overview]
Message-ID: <20230918180100.524843-10-den@openvz.org> (raw)
In-Reply-To: <20230918180100.524843-1-den@openvz.org>
This functionality is used twice already and next patch will add more
code with it.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index af3b4894d7..66c86d87e3 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -178,6 +178,21 @@ static void parallels_set_bat_entry(BDRVParallelsState *s,
bitmap_set(s->bat_dirty_bmap, bat_entry_off(index) / s->bat_dirty_block, 1);
}
+static int mark_used(BlockDriverState *bs,
+ unsigned long *bitmap, uint32_t bitmap_size, int64_t off)
+{
+ BDRVParallelsState *s = bs->opaque;
+ uint32_t cluster_index = host_cluster_index(s, off);
+ if (cluster_index >= bitmap_size) {
+ return -E2BIG;
+ }
+ if (test_bit(cluster_index, bitmap)) {
+ return -EBUSY;
+ }
+ bitmap_set(bitmap, cluster_index, 1);
+ return 0;
+}
+
static int64_t coroutine_fn GRAPH_RDLOCK
allocate_clusters(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, int *pnum)
@@ -621,7 +636,7 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
BDRVParallelsState *s = bs->opaque;
int64_t host_off, host_sector, guest_sector;
unsigned long *bitmap;
- uint32_t i, bitmap_size, cluster_index, bat_entry;
+ uint32_t i, bitmap_size, bat_entry;
int n, ret = 0;
uint64_t *buf = NULL;
bool fixed = false;
@@ -655,10 +670,9 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
continue;
}
- cluster_index = host_cluster_index(s, host_off);
- assert(cluster_index < bitmap_size);
- if (!test_bit(cluster_index, bitmap)) {
- bitmap_set(bitmap, cluster_index, 1);
+ ret = mark_used(bs, bitmap, bitmap_size, host_off);
+ assert(ret != -E2BIG);
+ if (ret == 0) {
continue;
}
@@ -713,11 +727,13 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
* consistent for the new allocated clusters too.
*
* Note, clusters allocated outside the current image are not
- * considered, and the bitmap size doesn't change.
+ * considered, and the bitmap size doesn't change. This specifically
+ * means that -E2BIG is OK.
*/
- cluster_index = host_cluster_index(s, host_off);
- if (cluster_index < bitmap_size) {
- bitmap_set(bitmap, cluster_index, 1);
+ ret = mark_used(bs, bitmap, bitmap_size, host_off);
+ if (ret == -EBUSY) {
+ res->check_errors++;
+ goto out_repair_bat;
}
fixed = true;
--
2.34.1
next prev parent reply other threads:[~2023-09-18 18:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 18:00 [PATCH v2 00/22] implement discard operation for Parallels images Denis V. Lunev
2023-09-18 18:00 ` [PATCH 01/22] parallels: fix formatting in bdrv_parallels initialization Denis V. Lunev
2023-09-18 18:00 ` [PATCH 02/22] parallels: mark driver as supporting CBT Denis V. Lunev
2023-09-18 18:00 ` [PATCH 03/22] parallels: fix memory leak in parallels_open() Denis V. Lunev
2023-09-19 9:28 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 3/3] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
2023-09-18 18:05 ` Denis V. Lunev
2023-09-18 18:00 ` [PATCH 04/22] parallels: invent parallels_opts_prealloc() helper to parse prealloc opts Denis V. Lunev
2023-09-19 9:34 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 05/22] parallels: return earler in fail_format branch in parallels_open() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 06/22] parallels: return earlier from parallels_open() function on error Denis V. Lunev
2023-09-18 18:00 ` [PATCH 07/22] parallels: refactor path when we need to re-check image in parallels_open Denis V. Lunev
2023-09-18 18:00 ` Denis V. Lunev [this message]
2023-09-18 18:00 ` [PATCH 09/22] tests: ensure that image validation will not cure the corruption Denis V. Lunev
2023-09-18 18:00 ` [PATCH 10/22] parallels: fix broken parallels_check_data_off() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 11/22] parallels: add test which will validate data_off fixes through repair Denis V. Lunev
2023-09-18 18:00 ` [PATCH 12/22] parallels: collect bitmap of used clusters at open Denis V. Lunev
2023-09-18 18:00 ` [PATCH 13/22] tests: fix broken deduplication check in parallels format test Denis V. Lunev
2023-09-18 18:00 ` [PATCH 14/22] tests: test self-cure of parallels image with duplicated clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 15/22] parallels: accept multiple clusters in mark_used() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 16/22] parallels: update used bitmap in allocate_cluster Denis V. Lunev
2023-09-18 18:00 ` [PATCH 17/22] parallels: naive implementation of allocate_clusters with used bitmap Denis V. Lunev
2023-09-18 18:00 ` [PATCH 18/22] parallels: improve readability of allocate_clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 19/22] parallels: naive implementation of parallels_co_pdiscard Denis V. Lunev
2023-09-19 9:42 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 20/22] tests: extend test 131 to cover availability of the discard operation Denis V. Lunev
2023-09-19 9:56 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 21/22] parallels: naive implementation of parallels_co_pwrite_zeroes Denis V. Lunev
2023-09-18 18:01 ` [PATCH 22/22] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230918180100.524843-10-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=mike.maslenkin@gmail.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).