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 3F8EF80024 for ; Fri, 28 Aug 2026 17:05:09 +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 67SH3ufv011542; Fri, 28 Aug 2026 20:03:57 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67SH3ufv011542 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RAqcQGLa" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67SH3ovu011507 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 28 Aug 2026 20:03:51 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67SH3ovu011507 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4955e865174so5527225e9.3 for ; Fri, 28 Aug 2026 10:03:51 -0700 (PDT) X-Gm-Message-State: AFuF++nUGttXabh2EUZZ/sDVNuWq8tmcmARTHBYZ80tbdi/3on2qfiu6 o2FlMeO7J53S8l6WWy94uj1BPC0+gvnqX0eBtHOV0RIA/nJLKDzwqN9sgsYCddR3M5ySxr6Ri+f a//7dYqdljdcuIYKvGA0v8kPgkTfWIAkKbV/Igtp6Gs5g8pejelCUxg== X-Gm-Gg: AR+sD13FmoDKlbZg+ShkX13TED0S0qTVzifI5PVMJnm367jyXxHnrEvnQgjrxvBIly+ uCI9jkC3ut1hxVAaaCryDaQ5qW3KX0gFezlvzqu3+8ok4jwd/UW0Rl1jhdiOL5+SxUXB6u5s2h4 nbKPyTXoxu3A3U8ijRI9iQeTcX7CwbG8WL/0GKVyhWcWp4y0HAxIKYzLp2R1HBKw7XUdAGBtjIQ 4hc3tzD/ymCXt8POMDhx3i5P6T+xLbz1owXAoy/QZyisntIbyhBvFm4pDNCJuLBm2KwjSb8XRQp IdOQCokqHbp9TE3OIdwbeAD9TW/bb4bVis4xgWhTlgKczzAAwkYK7VONwZUCLovAvmVwpCLoEZ5 bO195DR2cBYDBoqZc X-Received: by 2002:a05:600c:4443:b0:499:d63b:a6da with SMTP id 5b1f17b1804b1-49b91c17149mr106617875e9.2.1787936630662; Fri, 28 Aug 2026 10:03:50 -0700 (PDT) X-Received: by 2002:a05:600c:4443:b0:499:d63b:a6da with SMTP id 5b1f17b1804b1-49b91c17149mr106616945e9.2.1787936630214; Fri, 28 Aug 2026 10:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787936630; cv=none; d=google.com; s=arc-20260327; b=U1Q7V9b72xEylAJombRJSbrnkGa8V22C2uUpAc0g5Qc4yA1f8ZAR9E+wM4hYPi1quR kaxzdvxkIx/ioNFNiXr7GciIcSkwtKjMUKClj5PQC7RLd0p/OnF/A0qIwidTcnWJkOzF B9Ut2qNwhxfbipt20s6sFNxXawYvRFHdBGO1ZgUXoPU6B1HGbg63qyT3z1bW+rzb73rp Vrk0K0YHQSf/Yn+u1d7pdPTyBZjAuqXu8eZv1hHyMpINcNSHDvH3rTBrvdL8Yv1lzkWS rA9YacKRhE22JQMajI6C72piNMix3vxDxsx6NsmoJPlTyy/2DQ2kAuu7ET/xYkBsxmjC yByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=subject:in-reply-to:cc:to:from:message-id:date:dkim-signature; bh=9R2c9ackT+C8UlMXRMlHaMJI8o1nggSWET6os1LVXSM=; fh=Vum9jOrhj7HN5ByxRUgrKjNRrylYGqSqAPC0VlAu4Lc=; b=Xcv5we2v8Z/36Wg18xCRP3Qi0plFwbuow3NiDwTmzfVFU0t9TFRVZZRy+4qsIc4Tyx j/bdep3ZB8ul01O9GQS8Q5NhFQxvm6LhPq2SxhJUEerz996CyNwM6Co/JN35m4D5+YfQ piYbCEwAiZPTDRfZEhMHKl2xuDTtJ1MJmDVE0RVuftYDcW+i1F33LjPOefFbPSwrq4O8 8+WyDdfPu0TyT6et0PdEsrWeSiEPAQQP3mT5Rjt+CP9DKNxiK1hZ2+ZKNcUzzgaa91+K j9qlkO5nH54Rb0rCqcptOOArF9FjReCUxS7wdwKbLjoGnlZcGIfpzIWoxRNm9w22Oujo dmTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=RAqcQGLa; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@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-482fbb55ed7si3754537f8f.494.2026.08.28.10.03.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2026 10:03:50 -0700 (PDT) Received-SPF: pass (google.com: domain of khorenko@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=RAqcQGLa; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@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=Subject:From:Message-Id:Date:Content-Type: MIME-Version; bh=9R2c9ackT+C8UlMXRMlHaMJI8o1nggSWET6os1LVXSM=; b=RAqcQGLa/w8F t9n6bRQBdO75Mvit4vsW3U7s2Q2ykins/tbzNXPUiGYgNp/2wBf3eq7Y9MbGO2Q16QBKvB9MnvRtr exZ0vSmltWPjFONTk+rceX6TNPPFz/L35ioXuve4MF+RqE5zacneOQuMTUtwokiVjb6M2wGHqp1I7 rrsZ9ZYYc6DzRF+zTSDpFPrO8Z8HqEMTEqz2vlppDz9V29Ck8A/hs8y+ComBtS85r7SZz8c//5qIC BPX5izPgUeqkvHSf6Bseu0PUIlJnyVKeKZJ/k2e2qU3CsctydQe8URtE60cltB8Jm+tvP7tx7eOCT LjxfqY+VTybYYshGQVY4aA==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=f0.sw.ru) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wzzxH-008dtn-38; Fri, 28 Aug 2026 19:03:45 +0200 Received: from f0.sw.ru (localhost [127.0.0.1]) by f0.sw.ru (8.18.1/8.18.1/Debian-2) with ESMTP id 67SH3mLE1063964; Fri, 28 Aug 2026 19:03:48 +0200 Received: (from kostja@localhost) by f0.sw.ru (8.18.1/8.18.1/Submit) id 67SH3m8d1063963; Fri, 28 Aug 2026 19:03:48 +0200 Date: Fri, 28 Aug 2026 19:03:48 +0200 Message-Id: <202608281703.67SH3m8d1063963@f0.sw.ru> X-Authentication-Warning: f0.sw.ru: kostja set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko To: Andrey Zhadchenko In-Reply-to: <20260827160619.303398-11-andrey.zhadchenko@virtuozzo.com> X-OZ-Fwd: true Cc: OpenVZ devel Subject: Re: [Devel] [PATCH RHEL10 COMMIT] drivers/md/dm-qcow2: do discards during backward merge only for writable image 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: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git@bitbucket.org:openvz/vzkernel.git after rh10-6.12.0-211.39.1.16.11.vz10 ------> commit 215cf7364e9f1ca179add5cc4b1a1e3a5b6b39cd Author: Andrey Zhadchenko Date: Thu Aug 27 19:06:18 2026 +0300 drivers/md/dm-qcow2: do discards during backward merge only for writable image Backward merge discards every merged cluster from the image we merge from: the L2 entry is zeroed and refcounts are decremented, which dirties the image metadata. This requires the image file to be opened for write, while merge-in-the-middle images usually opened read-only. Skip the discard step when the merged image is read-only: - complete the merge qio right after its data is written to the lower delta, without the L1/L2 entry update; - process READs on such image in the regular way. Previously reads would cause out-of-order merge for present cluster and then requeue. Without discard it will loop. - do not break COW at L1. Note that due to how merge machinery works, we can't merge without unuse and internal snaphots (to be addressed in the next patches). - do not clear the dirty bit on merge completion: the image was never modified. Just in case add warning and end qio if we somehow encounter non-service write qio for read-only images during the merge. https://virtuozzo.atlassian.net/browse/VSTOR-138288 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Andrey Zhadchenko Reviewed-by: Pavel Tikhomirov Reviewed-by: Vasileios Almpanis Reviewed-by: Konstantin Khorenko --- drivers/md/dm-qcow2-cmd.c | 21 +++++++++++++-------- drivers/md/dm-qcow2-map.c | 27 ++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-qcow2-cmd.c b/drivers/md/dm-qcow2-cmd.c index e1a94bc4a140c..2865940cff303 100644 --- a/drivers/md/dm-qcow2-cmd.c +++ b/drivers/md/dm-qcow2-cmd.c @@ -264,7 +264,7 @@ static int qcow2_merge_backward_start(struct qcow2_target *tgt, int efd, u32 dep lower = qcow2->lower; if (!lower) return -ENOENT; - if (!(lower->file->f_mode & FMODE_WRITE)) + if (!qcow2_file_is_writable(lower)) return -EACCES; if (qcow2->clu_size != lower->clu_size) return -EOPNOTSUPP; @@ -315,11 +315,14 @@ void qcow2_merge_backward_work(struct work_struct *work) * there would be problems with unusing them: * we'd have to freeze IO going to all data clusters * under every L1 entry related to several snapshots. + * Readonly images skip this stage. */ - ret = qcow2_break_l1cow(tgt, qcow2); - if (ret) { - QC_ERR(tgt->ti, "Can't break L1 COW"); - goto out_err; + if (qcow2_file_is_writable(qcow2)) { + ret = qcow2_break_l1cow(tgt, qcow2); + if (ret) { + QC_ERR(tgt->ti, "Can't break L1 COW"); + goto out_err; + } } backward_merge_update_stage(tgt, BACKWARD_MERGE_STAGE_SET_DIRTY); @@ -393,9 +396,11 @@ static int qcow2_merge_backward_complete(struct qcow2_target *tgt) qcow2_flush_deferred_activity(tgt, qcow2); /* Delayed md pages */ qcow2->lower = NULL; - ret = qcow2_set_image_file_features(qcow2, false); - if (ret < 0) - QC_ERR(tgt->ti, "Can't unuse merged img (%d)", ret); + if (qcow2_file_is_writable(qcow2)) { + ret = qcow2_set_image_file_features(qcow2, false); + if (ret < 0) + QC_ERR(tgt->ti, "Can't unuse merged img (%d)", ret); + } qcow2_destroy(qcow2); tgt->backward_merge.state = BACKWARD_MERGE_STOPPED; diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index c5a79a51942ae..53cb11242bf0d 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -2701,6 +2701,12 @@ static void backward_merge_write_complete(struct qcow2_target *tgt, struct qio * return; } + /* Skip discard for read-only source images */ + if (!qcow2_file_is_writable(qcow2)) { + qio_endio(qio); + return; + } + WARN_ON_ONCE(qio->flags & QIO_IS_DISCARD_FL); qio->flags |= QIO_IS_DISCARD_FL; @@ -2744,6 +2750,17 @@ static int prepare_backward_merge(struct qcow2 *qcow2, struct qio **qio, struct qio *aux_qio; int ret; + /* Readonly image mappings remain stable, so reads just go through */ + if (!qcow2_file_is_writable(qcow2)) { + if (!op_is_write((*qio)->bi_op)) + return 1; + if (WARN_ON_ONCE(!fake_merge_qio(*qio))) { + (*qio)->bi_status = BLK_STS_IOERR; + qio_endio(*qio); + return 0; + } + } + if (!map->data_clu_alloced) { /* Strange COW at L1, except the merge from RO image */ WARN_ON_ONCE(map->clu_is_cow && qio_may_modify_image(qcow2, *qio)); @@ -3654,7 +3671,15 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) if (!handle_metadata(qcow2, &qio, &map)) return; - if (unlikely(qcow2->backward_merge_in_process)) { + /* + * Merge machinery makes out of order merges for present + * clusters when it sees the reads. But if the merge does + * not discard the cluser mapping, it will spin endlessly. + * So process only actual merge qios or reads from writable + * images. + */ + if (unlikely(qcow2->backward_merge_in_process) && + (fake_merge_qio(qio) || qcow2_file_is_writable(qcow2))) { submit_top_delta_read(&map, qio); return; } _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel