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 ADDEA803BB for ; Tue, 10 Nov 2026 07:53:53 +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 6AA7qewG011996; Tue, 10 Nov 2026 10:52:40 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7qewG011996 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ej0lexjH" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AA7qaQg011983 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 10:52:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7qaQg011983 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-492e3189fc9so1321952f8f.1 for ; Mon, 09 Nov 2026 23:52:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErG5iughNZB31obpSgDpJ2sG2YjP9bJsA6RK0yYPC6hzDsaEABSFohS/NH3lRVk/IwlmqLaChg==@openvz.org X-Gm-Message-State: APuU4Z+TGBsMr78kZ9HU6Abho9V3ChQK8n019hnHXrJ66apmYcqZ93o6 vQwjlGv8LQ3HD+sYI7TJVNEL11p0XR7cPTs0P3jGVtF6j4HxuP+xFN3RvIWEzr+iiPxuIMTBLS/ KtoffdSNoth3VUD58xucLeQdg90PNXI1L6wGGdOn1lWWi0AvPhT5qow== X-Gm-Gg: AYBFou1A802fDN82UdG3q8JR0di8k//ixvCUDjZ6UsiRsvtrloBcXpv/3D7xtaEX7pH eAlhS5zLz+put8LsFLkn2DCZGXrt5aBiJX1dlqLNkwIeV8J6v8QbL0otoDEF/KWUto9Zsr6/1Ks vHdmytBjpqncP5Nn/Kw3ARVRKLrSY85YJsIf++NYkTuHGzWQFevVtV4W7D6issswFIyKPoldPm1 ZPHB/r1jCuCYOHpg1wdvnhztKrkxP9JwPhXa0mnR96ynm1tvofnvGzAxvN/o/yx5AQ7uovmauAW o6ZQ4mkNwnlRO+rwtya80+K7QPyoQyVPPxExhtneXhpNA15iLzLmJ9k4twD8aEevWJl+2J8BTHC boEBrTz6lnblQEA6smyaUQ6kQKAVz X-Received: by 2002:a05:6000:40c9:b0:498:be72:636e with SMTP id ffacd0b85a97d-498be726401mr1398965f8f.21.1794297156323; Mon, 09 Nov 2026 23:52:36 -0800 (PST) X-Received: by 2002:a05:6000:40c9:b0:498:be72:636e with SMTP id ffacd0b85a97d-498be726401mr1398922f8f.21.1794297155808; Mon, 09 Nov 2026 23:52:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794297155; cv=none; d=google.com; s=arc-20260327; b=Xq5gdUvXSxAq7QpGXMrjsuTkB4mJ2ahSZfztnD6aoXz4C+enZg61RvhGHgqLjkbp5S hLYn8ANqG2CNFTTU3r6Z02x2kxZD1zyBxtv/oeU3yrSn4vXrN0xXg0+cZTFkZtTsNmph fT5ltVUpwnxTwH9q+xNcElv2H0pKGu1c6Da8xVPftV9GwISJfY+tkxEVj8VJ26sIMxA/ rTfPYMPdHUbQJyNFsr/t3W06PXkVJsq98LrQ3rVekpFE1gaUIoZon85/74PDFp6oSgH7 cXqKek8XKZRah+4hqOOcCymv+TyR/qzNyA9LZppCWhVGMdx5e5V4rE8JdZXCXMLFRjLq xFTA== 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=WKW9Hpj9MBaFLuJEn1ABU+Q1GmEesPQOrI1mfHPDgFM=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=bFDwoUfNxLjtcFOTfNn2LGCORxX1/s47RsLCxanb92tMhhjjTcti9IameMSHXbhOdM AI8WtOiIhV/blJH7kx0r4EqS1Ok8Dx5olvZcPw8mbNGGBHNhQfe08LvYLcJTB+nqnv71 4il4naNh8NWCoM9rXYE9PPdtpiqIDZn5eEcSCoF8TUMovQKEZs+RvtJ4OrESOI3rENMJ jRYDI3Uhu6Tm/c6Vd6wzXeaLKtuEyjvTGr6d8N7FRWwZW9q3l6IukB9UnC1aDU1XA2bV dmjJS5+CrdgBdXxCdF2loV28E6cfqqVusnSjreiDnc3KXMeKjrYrs6o4a3DIlY2NihPQ +2OA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=ej0lexjH; 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-49837dc1cf5si3460107f8f.436.2026.11.09.23.52.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 23:52:35 -0800 (PST) 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=ej0lexjH; 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=WKW9Hpj9MBaFLuJEn1ABU+Q1GmEesPQOrI1mfHPDgFM=; b=ej0lexjHHzZm DKmuzVNuygDq/g7zhLNwteatiWBmDbiLiOJysF4JR0GXibZUB8CFJBonXLTPG4v+ZQjSJYtdmjr6X 1Gk6KfpUEJcJVOwfbvsgMEFSG4vyMbQncqJt5DYtQwMdmSp0X9j00B+XimtBtsgcBquS4XPwMIqFj UvyLzLKgA4BSvTLaK8foFgkLuWoUHsE67y6CLCjhagb0uAub1yY/B6FYoul7a/YTDevl8IRqAi/Do lIVlFgnhxhXDxjeLRS/wpvn/FsDF4FDO+Qkbct2QiKEODt4rGL/ChhXkYIXwcZQo518HripF3iyn5 5XO5aEJRxK8YbFzNZhz1Nw==; 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 1xQgZo-008dOX-2Y; Tue, 10 Nov 2026 08:51:36 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 10 Nov 2026 08:51:38 +0100 Message-ID: <20261110075140.1475607-11-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> References: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v12 10/12] dm-qcow2: retry R1/R2 writeback that failed with ENOSPC 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 MD_DIRTY is dropped when an R1/R2 page writeback is submitted, and a failed writeback sets MD_WRITEBACK_ERROR. Nothing writes the page again unless its refcounts change. On suspend the md writeback flush finds the error and sets md_writeback_error, so resume is refused until the image is checked and the target reloaded, even if the failure was a transient ENOSPC of the underlying fs and the space has been freed since. Redirty the page on -ENOSPC, so the slow writeback timer retries it, as data writes delayed on ENOSPC are retried. Flushing deferred md activity on suspend, merge and target destruction fires the timer on each of its two passes, so a page that failed before the flush gets up to two attempts during it. A failure in the last pass does not redirty the page, so no timer is left armed after the flush, before the image is freed, and md_writeback_error is set as before. complete_metadata_writeback() turned every failed write into -EIO. Pass the errno of the write through and keep -EIO for a short write. A data request depending on a failed L1/L2 write then ends with BLK_STS_NOSPC and is delayed and resubmitted like any other write failing with ENOSPC, as already happens when fsync fails with it. Since failed L1/L2 writebacks leak their clusters, a request whose L2 write keeps failing with ENOSPC leaks one data cluster on every resubmission, until the space is back. 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 | 6 ++++-- drivers/md/dm-qcow2-target.c | 4 +++- drivers/md/dm-qcow2.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 8dfdbedac10d..2aaf11ee3b64 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -1357,6 +1357,8 @@ static void clear_writeback_status(struct qcow2 *qcow2, struct md_page *md, * so here we care about R1R2 only. */ md->status |= MD_WRITEBACK_ERROR; + if (ret == -ENOSPC && !READ_ONCE(qcow2->md_wb_no_retry)) + qcow2_md_make_dirty(qcow2, md, true); } if (md->wbd) { if (likely(ret == 0)) @@ -3869,9 +3871,9 @@ static int complete_metadata_writeback(struct qcow2 *qcow2) md = qio->ext->md; qvec = qio->data; ret = qio->ret; - if (unlikely(ret != PAGE_SIZE)) + if (unlikely(ret >= 0 && ret != PAGE_SIZE)) ret = -EIO; - else + else if (ret == PAGE_SIZE) ret = fsync_ret; do_md_page_write_complete(ret, qcow2, md); diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 99fb68a5535e..3c1df4c225b4 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -173,7 +173,9 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2 struct md_page *md; int i; + /* Do not redirty R1/R2 failed with ENOSPC on the last pass */ for (i = 0; i < 2; i++) { + WRITE_ONCE(qcow2->md_wb_no_retry, i == 1); if (timer_delete_sync_try(&qcow2->slow_wb_timer) != -1) qcow2_slow_wb_timer_fn(&qcow2->slow_wb_timer); /* Start md writeback */ @@ -181,12 +183,12 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2 /* Wait AIO of md wb */ qcow2_inflight_ref_switch(tgt); } + WRITE_ONCE(qcow2->md_wb_no_retry, false); spin_lock_irq(&qcow2->md_pages_lock); for (node = rb_first(&qcow2->md_pages); node; node = rb_next(node)) { md = rb_entry(node, struct md_page, node); - /* FIXME: call md_make_dirty() and try once again? */ if (md->status & MD_WRITEBACK_ERROR) { QC_ERR(tgt->ti, "Failed to write dirty pages"); tgt->md_writeback_error = true; diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 2a6203c86e3a..ebab22d505e8 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -281,6 +281,7 @@ struct qcow2 { struct list_head wb_batch_list; struct list_head slow_wb_batch_list; struct timer_list slow_wb_timer; + bool md_wb_no_retry; struct work_struct worker; struct work_struct fsync_worker; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel