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 B882A80E7E for ; Mon, 9 Nov 2026 12:00:49 +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 6A9Bxbfa031416; Mon, 9 Nov 2026 14:59:37 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9Bxbfa031416 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="GjuUmlYc" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A9Bx4iY031336 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 9 Nov 2026 14:59:04 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A9Bx4iY031336 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-48e011829easo542465f8f.3 for ; Mon, 09 Nov 2026 03:59:04 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErEKItsqY7A2MRNloZMCFiGox3YUBsKaqW9kwrJEB7iy3/byvonRI4mH0QzV1D//Ofd4MGzivw==@openvz.org X-Gm-Message-State: APuU4Z+buELynW2aQOFt1OkFdNOyyWGjQlDW/q84jcjDrYv+Jw7tEo2a sOnXFyBooW4iEmK/x3GpMFdNr31ouEvoTmADTvWELtl/JvGr4J2LZLAuv9Suyuzsph/i+QuGegu XorcVNDHecuUxaiErOghs0vLMgACLzpB0Q8FkUvcFkiwVKNC5TWzvkA== X-Gm-Gg: AYBFou2/pWD+WNB4wWtITecTp2eqTJbeQQIReKftK217naCkJNSd2pAP3WHZtKukBl1 Nwt0oNKRwQI2EOLHCmMIImdLRdE0uV55OawrXjDQIz3q1qq2lPC0Yhubsks8P/0h4XJdQlo27Hc V3Pn1riVhWOWfXeGlKMCyFo/v+CXd376GPL42vvaNnG8AZ9t3nZJQDHrlN3/ZipclbpE6k8pewH oysP9WL5JVLJzbkIVT8zx5W/odZSFei6cu60QKJRVh2p13ImFMZYkAmuZboRIzpuJzlyRhy0UTc HDPH+E7ar5q2SMWKE4TqcgZedqlyJvPXK/xJ2/pRPfa3wyt1aY9Td1+8yrChT2ufXq0n4jkeTqB cjfwMVEv/o/YnUuN3RRYHRvbxC502 X-Received: by 2002:a05:6000:29d2:b0:48e:25e1:5eb8 with SMTP id ffacd0b85a97d-497bba21c85mr552717f8f.3.1794225543993; Mon, 09 Nov 2026 03:59:03 -0800 (PST) X-Received: by 2002:a05:6000:29d2:b0:48e:25e1:5eb8 with SMTP id ffacd0b85a97d-497bba21c85mr552699f8f.3.1794225543412; Mon, 09 Nov 2026 03:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794225543; cv=none; d=google.com; s=arc-20260327; b=gmsw+GV9zo28+Be/VTd24tO6X3ZwmEUp46YC9ymCjakRHOwVADeiJtG3PHWJ3ipkDn S29xKzVjTBi5h5cuP/hgSgnpmujRsnx0CbvwOTnxmPG8AaZd20ZVElRZtt9mJenObHa8 4YpVQ/MDoku/lwuW+UuGIs7E3YtA4D6/X1nBOwnhPH2nJrqY4gyvDz9AMss5X+G2seAc LIkEXuBP4MHu5KkWbbCcBcnZ/5MYLM84K8OClNqtRvSbnZnh+F36RAzyePKuoGSnv2xO 9tHBMAUunAYZplWPJMZAQqNQyjOJIJ8IjkjA9EMseJ7S/aC04GrcLKwEyHWq6nuGeA4k S7BQ== 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=ML1aP5IzCZr8MWDOChtXsVyJjeQjkViENyG5U3bbF+Y=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=lPmscijik9TGIRT3eZwbBwhvET1PgIHy0RLDdTrvD5RPP3MehwXZ4yMDKcvqwSrJcO U76rLGb7MbdK9EZbWCQR5qaxTyzd90+CrB6rtiR0PwaeCgUvEK2SXTnV3FgvurnYU4g4 JVYT1LoiF3CE5ZHplxumkjeuTW1PiNSTthnByKVbQbQCzy44uUdKFki4YrzWo7cuxIYR Z/ZBot/ngdVEa74sEh8JDEVnaYuT5+osLHo3A++3RsW93ZaLQ2q2W5we28qQNqSIumiW ebfAdd09r86pFCjoJywvAvxTsKbMcqQOo+cjLyvvvfKtAPTwPPf+k6jUjz5+KiDDrP7p ++Kg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=GjuUmlYc; 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-49596cb8961si8605693f8f.138.2026.11.09.03.59.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 03:59:03 -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=GjuUmlYc; 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=ML1aP5IzCZr8MWDOChtXsVyJjeQjkViENyG5U3bbF+Y=; b=GjuUmlYcQKc9 rAaHSe6Yswxrr0YCjM0lci2QMAUSC7s/O2d5HaDNMRVRP2hDg6RwCUY6x524kGnz2NjuyrUvIOEN/ VQPZN6rmU9eGy5ZRYKXxDjpcMzBgDPL9t7qAyX0B+sxsvJ7xC+8s4eX2ObsgjCFW00/pcjSMteIFB PmZBJK05ai2ZtwH7cZfVL74CWsGqWJHSyDbvmgFZguqRUkT2qHDo0dgu8EIX9xbHjZz1qrrBv1pWg OcK1Ypb2VO4FJUxVnx0Yt2Z6Hz0pD3REostJ3V3vl8xmb6UqlxC7IoBUW4D0HJHjCyRBLcBZ3DqhE v9S4h7jm+nNIvFVZlHsGwg==; 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 1xQNxa-003a4R-2j; Mon, 09 Nov 2026 12:58:54 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 9 Nov 2026 12:58:55 +0100 Message-ID: <20261109115856.1362416-10-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109115856.1362416-1-alexander.ivanov@virtuozzo.com> References: <20261109115856.1362416-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v10 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. The suspend flush fires the timer, which gives the page one more try. A page that still fails then is not redirtied, as wants_suspend is set, so nothing is left pending on a suspended device 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 | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 4197f7704e18..27ae22495f37 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->tgt->wants_suspend)) + qcow2_md_make_dirty(qcow2, md, true); } if (md->wbd) { if (likely(ret == 0)) @@ -3864,9 +3866,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 6824d95193ae..1b7a75239291 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -190,7 +190,6 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2 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; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel