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 D60C18017D for ; Tue, 17 Nov 2026 10:11:57 +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 6AHAAlVu007812; Tue, 17 Nov 2026 13:10:48 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHAAlVu007812 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="kAAq7ZTE" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHAAUiY007749 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 13:10:31 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHAAUiY007749 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48fcb657f32so2778465f8f.2 for ; Tue, 17 Nov 2026 02:10:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErFA8bT1mt222EVc6rP9bniw/s+zbT4klV9LnQ497bO3SJ86a0TA8cqSKZTdCv9d+vGTQRoZjg==@openvz.org X-Gm-Message-State: APuU4Z+mX5heMYUhgczm/AYQDfNtMqkZeXnDhoPqxJ7Qc+fCqQbSpa02 Xy/c7zal2Y2OsxKrlzkL/1KR6QEsBuG324pr8kJTSS0FhDnWOlQ93+3ZodRmH7tqeQJ3jRE7W40 aZ5ax7epuiOkSuXPt4OmXvlnIQxumIBy3tlwZym74aubRKlUfAe5H5A== X-Gm-Gg: AZFdTZd4eDFy3xhA1zN2oEnYSWMAnxLgqF3YIf0ip2BRglVANr3f1Tm0v6+tXK2iGcX f3MK/FXPLplxLuRLbvuf56Emg2b0K7yBw+88UKIz1ZRAHm+Z8eG7cAfZSesdbG9AMhsDvycuqtX BjUeo3F3hFzwb0hbUEapZiKnR0bCbGk8y/T7dSekwsu4tmARdAz+IdH5qsKqWL7WR/hFRWee1fd wGjyyzo4T1tlyAl1W2f+XQ9ruTjH0GyPRkFNgSbDUdCkeZMosZTpmT8yxiQwZdAssiFLEcPGgBM C9A26lgtHJQag2AVZ2xMSE9wlzHH/YKXAiZ3Dzmdk78UWt9mIF0FLDpmRlDmpVVSkCVm2HVEh2l c7+NUcurpl6W1r/aK9i2ePrN9uefK X-Received: by 2002:a5d:6f07:0:b0:490:f98f:addc with SMTP id ffacd0b85a97d-49c71d48742mr27383587f8f.27.1794910230349; Tue, 17 Nov 2026 02:10:30 -0800 (PST) X-Received: by 2002:a5d:6f07:0:b0:490:f98f:addc with SMTP id ffacd0b85a97d-49c71d48742mr27383515f8f.27.1794910229755; Tue, 17 Nov 2026 02:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794910229; cv=none; d=google.com; s=arc-20260327; b=fE1xrD7SwKw7SksOjhXt3M82I6Bkge7RhORHQ6Mt0S3BxrWE5/yGZqp2B3wnNbGdNi CX3SEf4lMuJPXm8KyP3PZroaLX6s+nRgb6LOzWuVfA1xnQQyxmv5vK6ksa8T+UVSOprz z+WRQW++M6EY58VH3CHHUz2RqTFl1CRUMIdD7cTkdEDsmpXWDkuzRHgsI0FaKAZxqTRp EIp2OJbSCmvV4JEpRh6/Am1yHm7SR8uopMC3varf6IU25X4MUjGpOhnTIJLgJ1j6tyva mzV2H1qz4Xe8KEk7gZympI2e7zmyBhzZ5FCeTggt47LBnIdfT/F8teHixqJvh96iNlEV nb4w== 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=lXFKW1tAYPqnJUORJRdHrly3A20voSWR2KlITfJWek0=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=LKI3qcm6ZVYrAqOZbAVDt0hY5drXf7HYUEmwwjROXdcTZQap1pqypWfTnWab5KRll/ cVW9c0o8hAajn1UsCLvOwKdEHr2T7xwfbhyrMdpkIjdWzmc99Wo5BC6tjvza7QhWqyck TWIxTBJW2KqAwc3782Bn8yXDCBFCS/FChAQg50BiH74FwmyH7i8MZJNSI4ZEkRUzb3wg 847uxvGz7gx9R/QHtD+ShOU5WDRLd0woP44Uh7QLBp/1UJccCYdEdQImpDpHChP2s6Vp MU6EfGt3bkDq6jd7jqIAPJfpSPerSXP4zFTS9FLahk+9XO7WywitGS9B/W5s6S5+xoWW ARiA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=kAAq7ZTE; 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-4a41f239a27si3111355f8f.347.2026.11.17.02.10.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:10:29 -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=kAAq7ZTE; 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=lXFKW1tAYPqnJUORJRdHrly3A20voSWR2KlITfJWek0=; b=kAAq7ZTEhIjd 5YkJBpea84epZ/qpSnvGT0kivZhpUfQYd7epRNvpSZsA/PYPc03vf2InXD6W3auo8XohdXEsYJe8c VQZ6T7RhpAYfAKQEbt9NmFL9ce6WsKBxaXMfnEzRxwhqv6sbrDO16o+pq722HOmU6jThAqk7z29Wk 1LiJ2RUP8mF0z8MM+DwP4t/7lgR7SGGlb+NJiU7smCGAafotpPauRaHFDddUb21URQuEmFO2lF7lN cP3MupquRQJYX3zPO/n8D1TLVxGBKv0sx68RTFqZdb4biXK2cn6FNdlvBbXZ7CxSOOohcrJykNLpw IdmaUJ46GSGDyVN4PaMbXA==; 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 1xTG4j-009Isp-0W; Tue, 17 Nov 2026 11:10:19 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 17 Nov 2026 11:10:20 +0100 Message-ID: <20261117101026.3071579-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117101026.3071579-1-alexander.ivanov@virtuozzo.com> References: <20261117101026.3071579-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 3/9] drivers/md/dm-qcow2: rename the ENOSPC delay list to a held request list 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 Requests that fail with ENOSPC are parked on tgt->enospc_qios and resubmitted by a timer. The same mechanism is going to hold requests failed with other errors, depending on the disk error policy, so rename enospc_qios, enospc_timer and qcow2_try_delay_enospc() to held_qios, held_timer and qcow2_try_hold_error(), and let the latter decide whether a status is to be held. Drop the WARN_ON_ONCE() for a non-write ENOSPC. A read can get ENOSPC from the read_iter of an image on FUSE, and a WARN on an error of the lower file system takes the node down with panic_on_warn. Such a read is still held, as before. No other functional change. https://virtuozzo.atlassian.net/browse/VSTOR-152175 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov --- drivers/md/dm-qcow2-map.c | 31 ++++++++++++++++--------------- drivers/md/dm-qcow2-target.c | 16 ++++++++-------- drivers/md/dm-qcow2.h | 6 +++--- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 32373114580e..b987d459863d 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -4566,14 +4566,18 @@ void do_qcow2_fsync_work(struct work_struct *ws) current_restore_flags(pflags, PF_LOCAL_THROTTLE|PF_MEMALLOC_NOIO); } -static bool qcow2_try_delay_enospc(struct qcow2_target *tgt, struct qcow2_rq *qrq, struct qio *qio) +static bool qcow2_try_hold_error(struct qcow2_target *tgt, struct qcow2_rq *qrq, + struct qio *qio, blk_status_t bi_status) { - bool delayed = true; + bool held = true; unsigned long flags; + if (bi_status != BLK_STS_NOSPC) + return false; + spin_lock_irqsave(&tgt->event_lock, flags); if (unlikely(tgt->wants_suspend)) { - delayed = false; + held = false; goto unlock; } @@ -4582,15 +4586,15 @@ static bool qcow2_try_delay_enospc(struct qcow2_target *tgt, struct qcow2_rq *qr pr_err_once(QCOW2_FMT("underlying disk is almost full"), qcow2_device_name(tgt->ti)); tgt->event_enospc = true; - list_add_tail(&qio->link, &tgt->enospc_qios); + list_add_tail(&qio->link, &tgt->held_qios); unlock: spin_unlock_irqrestore(&tgt->event_lock, flags); - if (delayed) - mod_timer(&tgt->enospc_timer, jiffies + ENOSPC_TIMEOUT_JI); + if (held) + mod_timer(&tgt->held_timer, jiffies + HOLD_TIMEOUT_JI); schedule_work(&tgt->event_work); - return delayed; + return held; } static void qrq_endio(struct qcow2_target *tgt, struct qio *qio, @@ -4602,18 +4606,15 @@ static void qrq_endio(struct qcow2_target *tgt, struct qio *qio, if (qrq->bvec) kvfree(qrq->bvec); /* - * Here is exit point for rq, and here we handle ENOSPC. + * Here is exit point for rq, and here we handle errors. * Embedded qios will be reinitialized like they've just * came from upper dm level, and later resubmitted after * timeout. Note, that we do not handle merge here: merge - * callers receive -ENOSPC synchronous without intermediaries. + * callers receive errors synchronous without intermediaries. */ - if (unlikely(bi_status == BLK_STS_NOSPC)) { - WARN_ON_ONCE(!op_is_write(qio->bi_op) && - qio->bi_op != REQ_OP_FLUSH); - if (qcow2_try_delay_enospc(tgt, qrq, qio)) - return; - } + if (unlikely(bi_status != BLK_STS_OK) && + qcow2_try_hold_error(tgt, qrq, qio, bi_status)) + return; mempool_free(qrq, tgt->qrq_pool); dm_complete_request(rq, bi_status); diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index aa0bbb6b4a97..89b12c4f971b 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -254,7 +254,7 @@ static void qcow2_tgt_destroy(struct qcow2_target *tgt) destroy_workqueue(tgt->wq); } qcow2_merge_backward_cancel(tgt); - timer_shutdown_sync(&tgt->enospc_timer); + timer_shutdown_sync(&tgt->held_timer); cancel_work_sync(&tgt->event_work); mempool_destroy(tgt->qio_pool); @@ -480,14 +480,14 @@ static void inflight_ref_exit1(struct percpu_ref *ref) complete(&tgt->inflight_ref_comp); } -static void qcow2_enospc_timer(struct timer_list *timer) +static void qcow2_held_timer(struct timer_list *timer) { - struct qcow2_target *tgt = timer_container_of(tgt, timer, enospc_timer); + struct qcow2_target *tgt = timer_container_of(tgt, timer, held_timer); unsigned long flags; LIST_HEAD(list); spin_lock_irqsave(&tgt->event_lock, flags); - list_splice_init(&tgt->enospc_qios, &list); + list_splice_init(&tgt->held_qios, &list); spin_unlock_irqrestore(&tgt->event_lock, flags); qcow2_submit_embedded_qios(tgt, &list); @@ -542,8 +542,8 @@ static struct qcow2_target *alloc_qcow2_target(struct dm_target *ti) init_rwsem(&tgt->seek_rwsem); init_waitqueue_head(&tgt->service_wq); INIT_WORK(&tgt->event_work, qcow2_event_work); - INIT_LIST_HEAD(&tgt->enospc_qios); - timer_setup(&tgt->enospc_timer, qcow2_enospc_timer, 0); + INIT_LIST_HEAD(&tgt->held_qios); + timer_setup(&tgt->held_timer, qcow2_held_timer, 0); ti->private = tgt; tgt->ti = ti; @@ -1165,8 +1165,8 @@ static void qcow2_presuspend(struct dm_target *ti) qcow2_set_service_operations(ti, false); qcow2_set_wants_suspend(ti, true); - timer_delete_sync(&tgt->enospc_timer); - qcow2_enospc_timer(&tgt->enospc_timer); + timer_delete_sync(&tgt->held_timer); + qcow2_held_timer(&tgt->held_timer); } static void qcow2_presuspend_undo(struct dm_target *ti) { diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 3f1d5b5eef26..ea6bc6258cb0 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -19,7 +19,7 @@ #define MIN_QIOS 512 #define WB_TIMEOUT_JI (60 * HZ) -#define ENOSPC_TIMEOUT_JI (20 * HZ) +#define HOLD_TIMEOUT_JI (20 * HZ) #define PREALLOC_SIZE (128ULL * 1024 * 1024) struct QCowHeader { @@ -213,8 +213,8 @@ struct qcow2_target { atomic_t service_qios; struct wait_queue_head service_wq; - struct list_head enospc_qios; /* Delayed after ENOSPC */ - struct timer_list enospc_timer; + struct list_head held_qios; /* Failed, waiting for resubmission */ + struct timer_list held_timer; struct work_struct event_work; spinlock_t event_lock; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel