From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 07F97808A3 for ; Sat, 10 Oct 2026 12:48:18 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69ACl4X4021952; Sat, 10 Oct 2026 15:47:05 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69ACl4X4021952 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="LrCozOl/" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69ACkocq021925 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Sat, 10 Oct 2026 15:46:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69ACkocq021925 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-487038bc9b8so473413f8f.2 for ; Sat, 10 Oct 2026 05:46:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByXBeg4HFbkW8SRw1rl94wnh9nlVDjIdIT4AichYaXLnxvkREN63U+FbP6bvD1Wa0jAan0iYQ==@openvz.org X-Gm-Message-State: AFq9FYIJtfARmcbwCwiDiZmuiedCE80NWKxOdoIMmPSPlX1tx8kZrzNQ MS2W1RE3+PR6h0yurkcGK43MAD47JBvDG+7Gtb2/iBtwsuZZn+Mx6SxlxuYeD8fd2Iroxe87IPo IffcVS90HZfVz6rlexMddy1bxE0oitNu8jS423GIwMWSNBP+VEeCI9w== X-Gm-Gg: AYBFou3rVD3SCPDDPsGhOJzIygzIEwnKS9Vt2pxLL7PmU6ElGNYqcXh7myYV1Bm4DOD DxiFqKIFRA92hNWvjQW2qoySW0vNNbLG7Auh6JJn4fxpl44BELedMP0/CYBP/pYqx+03KYGkfc7 0kEUY8jIX19F5fbYJX6k1+dyChsUxoIdKfIwhAfpCEmwRMBXlGFIlvfvAWEhEu5jRdY/kV/YEMO NDruDZCfppeOB8lz1EZJQQ6cDangUPlAaZJFEhiz+g4v8Da4+fStCjcWbRPQKw5K1mBTUAEVmap 90rQnxm/G6GUGzmJ0k2wvklUNi4EOxALFRMYAc35iqXCUthbMoffgllYAqXVTD3kNjCWRe1MBKL wMGCAV7Jm64VqLnhIwBnqQq4PzHCa X-Received: by 2002:a5d:5f87:0:b0:48b:11b6:3cc9 with SMTP id ffacd0b85a97d-48dbaadde12mr9970305f8f.20.1791636410208; Sat, 10 Oct 2026 05:46:50 -0700 (PDT) X-Received: by 2002:a5d:5f87:0:b0:48b:11b6:3cc9 with SMTP id ffacd0b85a97d-48dbaadde12mr9970277f8f.20.1791636409571; Sat, 10 Oct 2026 05:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791636409; cv=none; d=google.com; s=arc-20260327; b=oWGB2bzWjN1+GFAUSi7hx0SrSlkHd1Bqa/30hfJpxaYK7kImNnBNf0aP05lqMvqVe/ wujwtvrjhodjzzhsGBSpGU0plX9QZ3uCVHsUMuZgd1NkHsI7lT9sXj2WBU7RnI6ll74C d+LDyqGVNZksdfLoxBW+J9m7jI7h4I+D2CZ69I7r7n7vQoLKzVTFI34D8z3C+rTima+M Sw43BgSvjOKmgR+VN1jGj2PnZv3iu8rsYBOWI3Inw9vurSKkjq7GNZTiy5cWXAKMmK5P u8CeJackQ5WEmyCyjJJ10DI2NBf+FuOrMmweBQHxVGh24YH9MQeLLeBk9zGP2tBPR1jl 3ozA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=PJWrZ7MFQepduRJahGwNfrORoEygFr6I4P+/VrARCtI=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=EV92e8qzXcwY2Ye9lCBl5+2QIHP9fI1WH0gxFbQvnZ1nnIyMbN9/Fs1FxgIdbMNQgE 0uDId/CFiMoRo06ARbsJH9elHrGdgPdAT3UPFRho8zyzHfqucOUyvN//bipe27SB+ml1 iboB8fgPNsRedu9/UUwqRWlFVIdZoe77JqTR1ondbdmmTO8u4iSKXwdLA0eYNPw/PS1O LDtvZFNe6n0tYqDwjR5xmbch0ZSRyUg2MEWdRnQsdYsa32pGqcUOy9B5h0RoFhQfxaf+ 1rMg0Hh6pW/vWn5dpb01GMDH7YJoou4FciocUSgnbyJCm9lMAYh1hDHXgEpKTLhQbCUK WKOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="LrCozOl/"; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48dc201343dsi5338994f8f.388.2026.10.10.05.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2026 05:46:49 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="LrCozOl/"; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=PJWrZ7MFQepduRJahGwNfrORoEygFr6I4P+/VrARCtI=; b=LrCozOl/w+T/ zFycckOjlrgOrRHnKnPN/BotDIHywS+8D8frDIvzb0yHJAShMAjlD6Y5uwhddFPCywpV0Fpi4VuiE VxMsqgqLKiNmMSAcb3lpVVheWOLXK/aydt+BiPRUWaDKROuGkMYVYZzV/2gGVkt0CrQrmpgcBT+Vc F3kl9rFKjrmtkyT4mpBb7oDt+1SZvUFQ8pCGiCgtzoDYMfX5CqdLXZfpuTmwj2p3vW/JWtMB3EzF2 pZtfBRDEpmD1Bk7VPiYHh8p9c7lRZZRZ0lzI4keZ3rjdG+esQ59C7AkwBI6q6dk4QT4lSNbO4E0ag Olm3Hk9ZTGrH+/x3py4LBg==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xFWQ6-00G6FQ-0s; Sat, 10 Oct 2026 14:46:43 +0200 From: Alexander Ivanov To: den@openvz.org Date: Sat, 10 Oct 2026 14:46:42 +0200 Message-ID: <20261010124642.927044-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261010124642.927044-1-alexander.ivanov@virtuozzo.com> References: <20261010124642.927044-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v5 3/3] dm-qcow2: truncate unused tail of image on suspend X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org On postsuspend we truncate the image file only down to file_preallocated_area_start, i.e. we drop preallocations only. Clusters at the end of the file freed by discard (refcount dropped to zero) are never given back, so the file size never shrinks. Add qcow2_calc_used_end(), which scans refcount blocks backward from file_preallocated_area_start and returns the end of the last cluster with non-zero refcount. Refcount ranges with no allocated refblock are skipped at once. Metadata pages are taken from md cache or read synchronously. This is called on suspended device after md writeback, so R1 and R2 can't change under us. Truncate the file to the used end. Skip the scan if md writeback failed, as refcounts on disk are stale then, and fall back to the old behaviour on scan error. Close and reload to RO go through postsuspend too: on remove, __dm_destroy() suspends the live table if it isn't suspended yet, and on table swap do_resume() suspends the old (RW) table before dm_swap_table(). So the tail is given back in these cases as well. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov Reviewed-by: Denis V. Lunev --- drivers/md/dm-qcow2-map.c | 56 ++++++++++++++++++++++++++++++++++++ drivers/md/dm-qcow2-target.c | 12 +++++++- drivers/md/dm-qcow2.h | 1 + 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 78ee7cf5e881..65ee6ae144bf 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -2208,6 +2208,62 @@ int qcow2_truncate_safe(struct file *file, loff_t new_len) return do_ftruncate(file, new_len, 0); } +/* + * Returns the end of the last cluster, which is used according + * to refcount table, clamped to file_preallocated_area_start since + * the last cluster may be partial. Clusters freed by discard may + * leave the tail of file unused. Everything at or above + * file_preallocated_area_start is unused by construction, so the scan + * starts below it. This must be called on suspended device after md + * writeback, so nobody changes R1 and R2. + */ +loff_t qcow2_calc_used_end(struct qcow2 *qcow2) +{ + u32 clu_size = qcow2->clu_size; + struct qcow2_map_item r1, r2; + struct md_page *r1_md = NULL; + loff_t pos; + s32 i; + int ret; + + pos = round_down(qcow2->file_preallocated_area_start - 1, clu_size); + while (pos >= 0) { + if (calc_refcounters_map(qcow2, pos, &r1, &r2) < 0) + return -EIO; + + if (!r1_md || r1_md->id != r1.page_id) { + ret = qcow2_md_page_read_sync(qcow2, r1.page_id, &r1_md); + if (ret) + return ret; + } + r1.md = r1_md; + + ret = calc_r2_page_id(qcow2, &r1, &r2); + if (ret == -ENOENT) { + /* No R2 cluster, so all clusters it covers are unused */ + pos = (loff_t)r1.index * qcow2->refblock_entries * clu_size; + pos -= clu_size; + continue; + } + + if (ret < 0) + return ret; + + ret = qcow2_md_page_read_sync(qcow2, r2.page_id, &r2.md); + if (ret) + return ret; + + for (i = r2.index_in_page; i >= 0; i--, pos -= clu_size) { + /* Last cluster is partial if size isn't cluster-aligned */ + if (get_r2_entry(qcow2, r2.md, i)) + return min_t(loff_t, pos + clu_size, + qcow2->file_preallocated_area_start); + } + } + + return -EIO; +} + static int truncate_prealloc_safe(struct qcow2 *qcow2, loff_t len, const char *func) { loff_t prealloc_len, max_prealloc_len = qcow2->reftable_max_file_size; diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index bb11b8a74598..8555494a0c1c 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -1047,11 +1047,21 @@ static void qcow2_truncate_preallocations(struct dm_target *ti) { struct qcow2_target *tgt = to_qcow2_target(ti); struct qcow2 *qcow2 = top_qcow2_protected(ti); - loff_t end = qcow2->file_preallocated_area_start; + loff_t used_end, end = qcow2->file_preallocated_area_start; int ret; if (!(dm_table_get_mode(ti->table) & FMODE_WRITE)) return; + + /* Refcounts on disk are stale after failed md writeback */ + if (!tgt->md_writeback_error) { + used_end = qcow2_calc_used_end(qcow2); + if (used_end < 0) + QC_ERR(ti, "Can't find used end: %pe", ERR_PTR(used_end)); + else + end = used_end; + } + if (end == qcow2->file_size) return; diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 69d3ae6fca8a..73d3cf175bbf 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -411,6 +411,7 @@ void qcow2_ref_dec(struct qcow2_target *tgt, u8 ref_index); int qcow2_inflight_ref_switch(struct qcow2_target *tgt); void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2); int qcow2_truncate_safe(struct file *file, loff_t new_len); +loff_t qcow2_calc_used_end(struct qcow2 *qcow2); void qcow2_merge_backward_work(struct work_struct *work); void qcow2_merge_backward_cancel(struct qcow2_target *tgt); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel