From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
To: andrey.zhadchenko@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH hci-8.1 v12 09/12] dm-qcow2: leak clusters allocated for a failed L1/L2 writeback
Date: Tue, 10 Nov 2026 08:51:37 +0100 [thread overview]
Message-ID: <20261110075140.1475607-10-alexander.ivanov@virtuozzo.com> (raw)
In-Reply-To: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com>
A failed L1/L2 writeback reverts the page in memory and frees each
cluster allocated for it: revert_l_entries_update() drops the refcount
of a newly allocated cluster, and a COW qio waiting on the page frees
its cluster through FREE_ALLOCATED_CLU when it ends with the error. The
write may still have partially reached the disk, so L1/L2 on disk may
point to such a cluster. Until the page is rewritten, the allocator may
give the cluster to another offset, and two guest offsets then share
it. If the page is not rewritten before suspend, the image is left with
a reference to a free cluster.
Keep the refcount of these clusters instead. If L1/L2 on disk points to
such a cluster, the image stays consistent; otherwise the cluster is
leaked. A request ends with the error once its L1 or L2 write fails, so
each failed write leaks one cluster per request: the L2 table for an L1
write, the data cluster for an L2 write. Check frees them, so the image
needs no check and resume needs no refusal.
https://virtuozzo.atlassian.net/browse/VSTOR-148171
Feature: dm-qcow2: block device over QCOW2 files driver
Fixes: 222b6f1291c1c ("dm-qcow2: Introduce driver to create block devices over QCOW2 files")
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
drivers/md/dm-qcow2-map.c | 53 ++++++++----------------------------
drivers/md/dm-qcow2-target.c | 4 ---
2 files changed, 11 insertions(+), 46 deletions(-)
diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c
index 7f61ff67646c..8dfdbedac10d 100644
--- a/drivers/md/dm-qcow2-map.c
+++ b/drivers/md/dm-qcow2-map.c
@@ -1331,50 +1331,15 @@ static void do_md_page_read_complete(int ret, struct qcow2 *qcow2,
/* Be careful with dirty_or_writeback()/etc! Check races. */
static void revert_l_entries_update(struct qcow2 *qcow2, struct wb_desc *wbd)
{
- struct qcow2_map_item r1, r2;
- struct page *pe_page;
- bool skip_odd;
- u64 pos, old;
- bool cleared;
- int i, ret;
-
- skip_odd = qcow2->ext_l2 && wbd->lx_level == L2_LEVEL;
+ struct page *pe_page = wbd->pe_page;
+ u64 old;
+ int i;
lockdep_assert_held(&qcow2->md_pages_lock);
for_each_set_bit(i, wbd->changed_indexes, LX_INDEXES_PER_PAGE) {
- pos = get_u64_from_be_page(wbd->md->page, i);
-
- cleared = !(pos & ~(u64)L2_READS_ALL_ZEROES);
-
/* Here we restore prealloced and compressed clu mappings */
- pe_page = wbd->pe_page;
- if (pe_page) { /* Only L2 has this. */
- old = get_u64_from_be_page(pe_page, i);
- if (old != 0) {
- set_u64_to_be_page(wbd->md->page, i, old);
- continue; /* Avoid mark_cluster_unused() */
- }
- }
-
- set_u64_to_be_page(wbd->md->page, i, 0);
- if (skip_odd && (i & 1))
- continue; /* pos contains ext_l2 part of L2 entry */
- if (cleared)
- continue; /* no cluster was allocated */
-
- spin_unlock(&qcow2->md_pages_lock);
- pos &= ~LX_REFCOUNT_EXACTLY_ONE;
-
- /*
- * R1/R2 should be cached, since we was able
- * to submit cluster allocation.
- */
- ret = qcow2_handle_r1r2_maps(qcow2, pos, NULL, &r1, &r2, false);
- if (WARN_ON_ONCE(ret <= 0))
- continue;
-
- mark_cluster_unused(qcow2, r2.md, r2.index_in_page, pos);
- spin_lock(&qcow2->md_pages_lock);
+ old = pe_page ? get_u64_from_be_page(pe_page, i) : 0;
+ set_u64_to_be_page(wbd->md->page, i, old);
}
}
@@ -1408,6 +1373,7 @@ static void complete_wbd(struct qcow2 *qcow2, struct wb_desc *wbd)
LIST_HEAD(wait_list);
LIST_HEAD(end_list);
unsigned long flags;
+ struct qio *qio;
spin_lock_irqsave(&qcow2->md_pages_lock, flags);
revert_l_entries_update(qcow2, wbd);
@@ -1415,6 +1381,10 @@ static void complete_wbd(struct qcow2 *qcow2, struct wb_desc *wbd)
&wait_list, &end_list);
spin_unlock_irqrestore(&qcow2->md_pages_lock, flags);
+ list_for_each_entry(qio, &end_list, link) {
+ if (qio->ext)
+ qio->ext->cleanup_mask &= ~FREE_ALLOCATED_CLU;
+ }
qcow2_dispatch_qios(qcow2, NULL, &wait_list);
end_qios(&end_list, errno_to_blk_status(wbd->ret));
}
@@ -1445,8 +1415,7 @@ static void do_md_page_write_complete(int ret, struct qcow2 *qcow2,
/*
* We can finish wb only in case of success.
* Otherwise this is done in finalize_wbd()
- * after data qios stopped use wbd clusters
- * and clusters allocations reverted.
+ * after data qios stopped use wbd clusters.
*/
if (likely(ret == 0)) {
clear_writeback_status(qcow2, md, ret,
diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c
index 6824d95193ae..99fb68a5535e 100644
--- a/drivers/md/dm-qcow2-target.c
+++ b/drivers/md/dm-qcow2-target.c
@@ -173,10 +173,6 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2
struct md_page *md;
int i;
- /*
- * We need second iteration, since revert_l_entries_update()
- * may start timer again after failed wb.
- */
for (i = 0; i < 2; i++) {
if (timer_delete_sync_try(&qcow2->slow_wb_timer) != -1)
qcow2_slow_wb_timer_fn(&qcow2->slow_wb_timer);
--
2.53.0
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
next prev parent reply other threads:[~2026-11-10 7:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 7:51 [Devel] [PATCH hci-8.1 v12 00/12] dm-qcow2: truncate unused tail of image on suspend Alexander Ivanov
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 01/12] dm-qcow2: add qcow2_md_page_read_sync() helper Alexander Ivanov
2026-11-10 7:55 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 02/12] dm-qcow2: drop duplicate prefix from QC_ERR/QC_INFO messages Alexander Ivanov
2026-11-10 7:55 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 03/12] dm-qcow2: extend the file for a new refblock in allocate_cluster() Alexander Ivanov
2026-11-10 7:56 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 04/12] dm-qcow2: complete wbd before ending the data qio Alexander Ivanov
2026-11-10 7:58 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 05/12] dm-qcow2: flush lower md before clearing dirty bit on merge failure Alexander Ivanov
2026-11-10 7:58 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 06/12] dm-qcow2: keep the dirty bit of an image that needs check Alexander Ivanov
2026-11-10 7:59 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 07/12] dm-qcow2: flag the image for check if reftable relocation fails late Alexander Ivanov
2026-11-10 8:00 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 08/12] dm-qcow2: fail the L2 table allocation request on L1 writeback error Alexander Ivanov
2026-11-10 8:01 ` no-reply
2026-11-10 7:51 ` Alexander Ivanov [this message]
2026-11-10 8:04 ` [Devel] [PATCH hci-8.1 v12 09/12] dm-qcow2: leak clusters allocated for a failed L1/L2 writeback no-reply
2026-11-10 8:25 ` Alexander Ivanov
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 10/12] dm-qcow2: retry R1/R2 writeback that failed with ENOSPC Alexander Ivanov
2026-11-10 8:06 ` no-reply
2026-11-10 8:31 ` Alexander Ivanov
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 11/12] dm-qcow2: truncate unused tail of image on suspend Alexander Ivanov
2026-11-10 8:07 ` no-reply
2026-11-10 7:51 ` [Devel] [PATCH hci-8.1 v12 12/12] dm-qcow2: fix WARN in qrq_endio() on flush failing with ENOSPC Alexander Ivanov
2026-11-10 8:07 ` no-reply
2026-11-10 8:35 ` Alexander Ivanov
2026-11-10 11:42 ` [Devel] [PATCH hci-8.1 v12 00/12] dm-qcow2: truncate unused tail of image on suspend Konstantin Khorenko
2026-11-10 11:43 ` Konstantin Khorenko
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=20261110075140.1475607-10-alexander.ivanov@virtuozzo.com \
--to=alexander.ivanov@virtuozzo.com \
--cc=andrey.zhadchenko@virtuozzo.com \
--cc=devel@openvz.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.