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 3125E81377 for ; Mon, 9 Nov 2026 14:03:41 +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 6A9E2RaO032597; Mon, 9 Nov 2026 17:02:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9E2RaO032597 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="t6URryew" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A9E1mIq032518 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 9 Nov 2026 17:01:49 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9E1mIq032518 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a027f2e364so8048815e9.3 for ; Mon, 09 Nov 2026 06:01:48 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErEIHVzTtskjPC8B8mIaWyuMeXcwbd2D11xoM/HN1dUILZKjDLHZnKc2raDOW98M3qMtzGHy/A==@openvz.org X-Gm-Message-State: APuU4Z8dcbfknqgUiMhL5Bt7OaNgrqSMVyjax4eweljD+HPZ0AnsIOuT 8+HMReBEN3XZexbGCFCzJwSunATWLrpGKRXkEvy6dNEe1czRKEUsAQmdMJaDxhvn3Ju2GZtRAi5 DrAtvSWhQkIdV7/XwwXFlmwszBCSiVACuSH9Ss6zvsTSQc67DXarrQA== X-Gm-Gg: AYBFou1EoHOZ2FjJef8DIKbhW5n+GsULvsLDvlAyY+sOb2YDYHOPsUN4ANFH1gcWC8b By0e4eilAYllSwQKllX/T0GYypuB3zok+3V9m5XUojF3EqpTSqcIZ6mgGCjYmMxrAMOn3l9xUty twwNFnw1nHkW7rm++93p2hXOzSZD8p8C1vZ9gafFyETk4aHdvsNcMLB9VTMF25S8cJn6FolMxZk MLrk3CksdZ4YP5rGYuwqrx2nfoXALYmrPMh6BLzbLhybBOVT43ypjhFpt3BA0+cS6NUOEaokm9T yoqTkFReOUffyMO2n3c2xLMJ5cXI6rZkZywlCGGsLjxjY6ur3y20tzL8eZKmsgEFY1b6ktNuCTd /mQoqe9AqzmPLnADgIkIR3TUIm0U= X-Received: by 2002:a05:600c:1c0d:b0:4a1:fc98:1cb1 with SMTP id 5b1f17b1804b1-4b94d76e13amr84565145e9.2.1794232908257; Mon, 09 Nov 2026 06:01:48 -0800 (PST) X-Received: by 2002:a05:600c:1c0d:b0:4a1:fc98:1cb1 with SMTP id 5b1f17b1804b1-4b94d76e13amr84564305e9.2.1794232907530; Mon, 09 Nov 2026 06:01:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794232907; cv=none; d=google.com; s=arc-20260327; b=Fue8BHCH3w7ZfoFb5u7QxzT6asjWNU3N3R1bqqlswXxdNt/s4eBgKrb5rGuBfurbqr yA5UZe0HEp2lYh/CMR8jmIzFM/AvcKZ4bvS4hOahqc4N91xaZBKiT5KfBs2L1ZQTkywJ +mtDmL9Currf0aJQu/Ubts5HikgANZKWWfllgphqSC7qrHXSAHkHVTY3ieMsxxsv9pmM yautEPARJu5n8RYmfWERCx4bUnikzg39VWHSFo3WiIbPdYShSxq/EKyRn95/Rgt5XdfU oA2YDl7Y2+UFbCAA4Ij8nEjtZchdXv9JkquQYyb0mW0adNWjB5mwUGfLKCTUI4g/LN4a dRbg== 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=y/CN9LpltkDuGE+x/viwfgp0VXPqe/QkZW/cHuGU4Lc=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=XEeKz5NXEi0DgXmjLc/Mz71JvvRTCG5HjO2u71Or4nwl6i10KES2ZIXhDSWnKvzbg5 ZVtYxwiqevl1InQFetW0joU0dkEBr5We9mZfLjx7dU11T8gUa35ifWn6goqZ5rqVf9J4 aBHRrzA66W4VDMW/jLqh3/urp/jCNT/Aprky3ox8G9VcSJAh2Qb7+6c2OaI4rk55ucUd p3Lg1PedpEPsZAWn0qpOU4TeqHkKpAT9wBhz743htdVN4Z+/Xx44dbFaaRL7i7c9aBes vuHXNIbTY6xZIGKziha+SCq8LTdNkYh7HUCIwIDQlhuLxKbh6sYIKf5N9eXgYjInXPUZ o8Hw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=t6URryew; 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 5b1f17b1804b1-4b80220356bsi157585725e9.20.2026.11.09.06.01.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 06:01:47 -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=t6URryew; 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=y/CN9LpltkDuGE+x/viwfgp0VXPqe/QkZW/cHuGU4Lc=; b=t6URryewl9kj mmnKvdGVIQOWiF4FCdNKjERLL/XjUVXDky21+gcBGhoFDw+vGwt9MP+BM0zeO/Jk1++AUZWDwFaqp LLEyILdVGOKh4Qv0R9UJsDRhCLruRyiqC7Q2KayZYVxAOuZbNSHnXA1L+LwHKGta09cUq+uLwlrGp ep98xXMKwxHx9n8aKogenABfSOxBno8DqFKaRFBP1Iwl0AVrDnlDJngQykeFj7mOv0GV9by01zhn7 wcsUO8oxDvWQLSNT+51MrLyeEzQ0cNsAtF8RWWC27FtXRObrxLq7W5qxcD8TDIOZLu2c9VapBh7L6 XyCSpY7gch7378jNmfyCnw==; 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 1xQPsM-005vFF-2f; Mon, 09 Nov 2026 15:01:38 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 9 Nov 2026 15:01:42 +0100 Message-ID: <20261109140143.1408038-10-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109140143.1408038-1-alexander.ivanov@virtuozzo.com> References: <20261109140143.1408038-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v11 09/10] 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 A failed R1/R2 writeback sets MD_WRITEBACK_ERROR and drops MD_DIRTY. 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, which gives the page one more try. A page that still fails then is not redirtied, 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. 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 4ab8051f08c4..3bcaceab1a1d 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)) @@ -3867,9 +3869,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..e28c47d4e728 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; + /* Retry R1/R2 writeback failed with ENOSPC once, then give up */ 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