From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 00E5980C1B for ; Mon, 26 Oct 2026 14:43:56 +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 69QEgghG011687; Mon, 26 Oct 2026 17:42:43 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgghG011687 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="YknM0ntZ" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69QEgSRY011650 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 26 Oct 2026 17:42:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgSRY011650 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4a4af69e06fso11278235e9.2 for ; Mon, 26 Oct 2026 07:42:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwlHivTKdICiSRcyfuWKxoQ36JNJse+sY8CeMm8vlQAFLWqPQ5G/kRgYpBo9RKRAoNltC6Pnw==@openvz.org X-Gm-Message-State: AFq9FYIsu2I+KGY3+EKNxKvopWUGMbSgUiGe2h3Qf3dCBpGtORaOMYrl W8fEZuI17md+tR8Cx2VPPxgLVsWnIGPKfNIY3knHpq5EeZEjERIp1/Zl0LYPQwI5mlYKk7ETBQk diO28tJODp8XzGvNVmF6U3Ead8oLRQywdCrEtnID3vACG7uMX2sxyIA== X-Gm-Gg: AYBFou2hMQJu/33/aOXaA9VxYPtYYhy43bCCQjs21xq2/v1Sn++1idX4k1f06QM/w8b DjaeiOU3ynihI9Fw/Nvbwx2g+P8/k9tqzk2/L3nPZ8sZWuYvMBALqJQnu4sTacnHM1rWS0nDmQD Xeql5ctPRiDFJDwwkRlXTmn5S+AnYnuqpHSU7+7mUNFGa3CkZwaYKJ/aeqO08uQY5qWcX0lJu1p 96U+Tu8dPgo48FskoI7Yfy2R8+xXCWcWs4P3+Sj1LHNEgg+6GOIvuQoVX+KfrY4AazEHaJOHbQC We+2RdXvrUws0jtMcYy6yp7Xketv3YgKFysojTmhxERZlbpaSR9aDqWHX/+BIC8tbQGriA2NAgH mfIfPpRZCo0/bfunBC7nQzDlvQn8= X-Received: by 2002:a05:600c:8591:b0:4a5:26b8:4507 with SMTP id 5b1f17b1804b1-4a526b84dc3mr65391995e9.21.1793025748423; Mon, 26 Oct 2026 07:42:28 -0700 (PDT) X-Received: by 2002:a05:600c:8591:b0:4a5:26b8:4507 with SMTP id 5b1f17b1804b1-4a526b84dc3mr65391495e9.21.1793025747795; Mon, 26 Oct 2026 07:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793025747; cv=none; d=google.com; s=arc-20260327; b=YKkJoA6WjSywTnP1JBj0KHASoFpwgNW7w6qpVaJ0gzL7yks7R4yVQkA0kiiG8ZyHZT 4+vgW4NhVuMgUO6eAgpTpWQmWwHVM2BnC/c1hq80xRu50z/yjUrcyIkEfZVOfo7FlKwj lkLiE8/NhmnqBNfipQcDfxUX5GUX99SGnr7yXAV8Qk4IuipWLYso12ZPDo7s7tmjJ69o 2xtJUlTQUg42krJYmyBoNwRq0vnZJOn7DZrWpTfwraPgWgNHZbZmBz8Yv3cocpY/gTNp 0Pex+TBh6nQdgv/HvIPjTNVfnt8++DqL2w7E3B66Nkru72n3xyzt5SkHLqjMXvfRxGoh jv3g== 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=sK/TlinDaKnB1tPV7EIehMCCvv5ilZ2j/FwA3Pe/fI8=; fh=1MEQxOGYABaQPNQS1Ckioh0rrUOwgCYjd8t5csgx5as=; b=rtRTAjqUYdZyCOkIrxQp4pn1h0+mJuETyEo2E/rb6vJbUdeHm9JPGbfXkfcvrXR3+s M/T3sP2J3E0us8yMXhGqesgYwnRP9bkDnO7wnV84YDKpMsMhSkaK/bOO4XN7xQ11J1t1 6yG41hPNU6FXeIOSurwdcoWlb805KmMSnswcBY3NYCFh62ZGlpjVNZohbedY4evIRXsM DagRQ9bZiCKLsOCUmHQZPWUlXlOnriqM1yS9fCvi/SDW+DqZju+04OOFz4Aa3G5nllPl Mnm5iaZW28CuNdHDa3qZmHj+hmRAPzf7pOJZjQKJm8Ck0IEUBL3pRyyKsdHE2ZzxgEx3 G5cA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=YknM0ntZ; 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-48e3eb9cd28si14983712f8f.17.2026.10.26.07.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 07:42:27 -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=YknM0ntZ; 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=sK/TlinDaKnB1tPV7EIehMCCvv5ilZ2j/FwA3Pe/fI8=; b=YknM0ntZZ/1I NM2whlhJbRz8wm96QeHcP1l1fKEIi/4sI83ZkDoKW+QYOgdySHi9Y1/hs1hqVy0uhqYfuci69aaGL 1BqYZGz2uu031qOVisw8l+Iacc0n7CGNJSW2NvjCjCZKXDdhrrjRZBL+igPZ/sQxAecXh3eDgM53M gui2zKkkzIWj6E6ccOQSmtx8JYO8wXVJvS3eVgV92h57RNfEYy4DMfsxj4AEb+MhIXUUseY/xaF/1 o8ZJ9G1uw9OvVBMk8c8lvqlKDtQnLkEVhkgjQCPNQGzsONnGmqxxDdFwcDs8EDDX4coN1ZByPSMkm /FbkmWGyE6B2czkGv2Il/w==; 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 1xLLqN-004nT9-2y; Mon, 26 Oct 2026 15:42:18 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 26 Oct 2026 15:42:20 +0100 Message-ID: <20261026144223.2787145-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> References: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v8 3/6] dm-qcow2: extend the file for a new refblock in allocate_cluster() 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 place_r2() links a new refblock into R1, but moves neither file_size nor file_preallocated_area_start. The refblock stays at or above the watermark if truncate_prealloc_safe() in allocate_cluster() fails after place_r2(), or if a parallel mark_cluster_unused() lowers free_cluster_search_pos before the second pass of find_unused_cluster(). Truncation of preallocations on suspend then cuts the file under the refblock: R1 on disk points past EOF, and the next session gets -EIO on allocations in the range it covers. Make find_unused_cluster() report a position not covered by R2 instead of placing the refblock there itself. allocate_cluster() prepares that cluster the same way as a data cluster, with the punch, extend and watermark update moved into prepare_unused_cluster(), and calls place_r2() before searching again. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov --- drivers/md/dm-qcow2-map.c | 88 ++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 78ee7cf5e881..5952b5feb8bf 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -2085,21 +2085,12 @@ static int parse_metadata(struct qcow2 *qcow2, struct qio **qio, * and connects it to R1 table entry. */ static int place_r2(struct qcow2 *qcow2, struct qcow2_map_item *r1, - struct qcow2_map_item *r2, loff_t r2_pos, struct qio **qio) + struct qcow2_map_item *r2, loff_t r2_pos) { struct dm_target *ti = qcow2->tgt->ti; u64 page_id = r2_pos >> PAGE_SHIFT; int ret; - if (delay_if_writeback(qcow2, r1->md, r1->index_in_page, qio, true)) - return 0; - - ret = qcow2_punch_hole(qcow2->file, r2_pos, qcow2->clu_size); - if (ret) { - QC_ERR(ti, "punch hole: %d", ret); - return ret; - } - ret = qcow2_alloc_and_insert_md_page(qcow2, page_id, &r2->md); if (ret < 0) { QC_ERR(ti, "Can't alloc: ret=%d, page_id=%llu", ret, page_id); @@ -2115,7 +2106,7 @@ static int place_r2(struct qcow2 *qcow2, struct qcow2_map_item *r1, spin_unlock_irq(&qcow2->md_pages_lock); mark_cluster_used(qcow2, r2->md, r2->index_in_page); - return 1; + return 0; } static s32 find_unused_block_entry(struct qcow2 *qcow2, struct md_page *md, @@ -2137,11 +2128,13 @@ static s32 find_unused_block_entry(struct qcow2 *qcow2, struct md_page *md, static loff_t find_unused_cluster(struct qcow2 *qcow2, struct qio **qio, struct qcow2_map_item *r1, - struct qcow2_map_item *r2) + struct qcow2_map_item *r2, bool *needs_r2) { u32 clu_size = qcow2->clu_size; s32 index, ret; loff_t pos; + + *needs_r2 = false; again: pos = READ_ONCE(qcow2->free_cluster_search_pos); if (pos >= qcow2->reftable_max_file_size) @@ -2153,15 +2146,15 @@ static loff_t find_unused_cluster(struct qcow2 *qcow2, struct qio **qio, return ret; /* * Since pos is not covered by R2, the whole cluster - * must be unused. Use it to store R2 cluster. + * must be unused. The caller stores R2 cluster there. * Both indexes must be 0 here, because of we allocate * clusters from small to big. */ WARN_ON_ONCE(r2->index_in_page != 0 || r2->index != 0); - ret = place_r2(qcow2, r1, r2, pos, qio); - if (ret <= 0) - return ret; - goto again; + if (delay_if_writeback(qcow2, r1->md, r1->index_in_page, qio, true)) + return 0; + *needs_r2 = true; + return pos; } spin_lock_irq(&qcow2->md_pages_lock); @@ -2432,6 +2425,37 @@ static int relocate_refcount_table(struct qcow2 *qcow2, struct qio **qio) return -EIO; } +/* + * Zero the unused cluster at @pos and make the file size and + * file_preallocated_area_start cover it. + */ +static int prepare_unused_cluster(struct qcow2 *qcow2, loff_t pos) +{ + loff_t off, end = pos + qcow2->clu_size; + loff_t old_size = qcow2->file_size; + int ret; + + if (pos < qcow2->file_preallocated_area_start) { + /* Clu at @pos may contain dirty data */ + off = min_t(loff_t, old_size, end); + ret = qcow2_punch_hole(qcow2->file, pos, off - pos); + if (ret) { + QC_ERR(qcow2->tgt->ti, "punch hole: %d", ret); + return ret; + } + } + + if (end > old_size) { + ret = truncate_prealloc_safe(qcow2, end, __func__); + if (ret) + return ret; + } + + if (end > qcow2->file_preallocated_area_start) + qcow2->file_preallocated_area_start = end; + return 0; +} + /* * This function is aimed to be called only from main work. * In case of wish to use it from more places, it's needed @@ -2441,13 +2465,12 @@ static int relocate_refcount_table(struct qcow2 *qcow2, struct qio **qio) static loff_t allocate_cluster(struct qcow2 *qcow2, struct qio *qio, struct md_page **r2_md, u32 *r2_index_in_page) { - u32 clu_size = qcow2->clu_size; - struct file *file = qcow2->file; - loff_t pos, off, end, old_size; struct qcow2_map_item r1, r2; + bool needs_r2; + loff_t pos; int ret; again: - pos = find_unused_cluster(qcow2, &qio, &r1, &r2); + pos = find_unused_cluster(qcow2, &qio, &r1, &r2, &needs_r2); if (unlikely(pos == -ENOENT)) { ret = relocate_refcount_table(qcow2, &qio); if (ret <= 0) @@ -2457,28 +2480,17 @@ static loff_t allocate_cluster(struct qcow2 *qcow2, struct qio *qio, if (pos <= 0) return pos; - end = pos + clu_size; - old_size = qcow2->file_size; - - if (pos < qcow2->file_preallocated_area_start) { - /* Clu at @pos may contain dirty data */ - off = min_t(loff_t, old_size, end); - ret = qcow2_punch_hole(file, pos, off - pos); - if (ret) { - QC_ERR(qcow2->tgt->ti, "punch hole: %d", ret); - return ret; - } - } + ret = prepare_unused_cluster(qcow2, pos); + if (ret) + return ret; - if (end > old_size) { - ret = truncate_prealloc_safe(qcow2, end, __func__); + if (needs_r2) { + ret = place_r2(qcow2, &r1, &r2, pos); if (ret) return ret; + goto again; } - if (end > qcow2->file_preallocated_area_start) - qcow2->file_preallocated_area_start = end; - mark_cluster_used(qcow2, r2.md, r2.index_in_page); if (r2_md) *r2_md = r2.md; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel