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 2B652803BB for ; Mon, 16 Nov 2026 15:43:04 +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 6AGFfmkU027419; Mon, 16 Nov 2026 18:41:49 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGFfmkU027419 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="vZL/9p/Y" 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 6AGFfQC4027346 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 18:41:26 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGFfQC4027346 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-49034831bb3so2395573f8f.1 for ; Mon, 16 Nov 2026 07:41:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErGUSQjVaJD95M0+sBEYqBIOh9/DWOr6+i7/S5ZHfgaO3ROz1s7/hQjl+ej3qve/nH+DhvH8aQ==@openvz.org X-Gm-Message-State: APuU4Z/PUk7PXiJbGAjkY4Elqd26rEWRrOTkPOg8lwqI+ZxG8xkHvq9/ eZAlxwMPQsZyUNCTyvvXGjZWLoZMyiBP/VHpfCFZvMk1tDXKc5FLGMr1sAW3CDLBHYnLi/oWcGU OhauTnD/0baq5+D3u6DAZLSsGlffFJb1ypKCRFhIRETvqgKEEMml9nw== X-Gm-Gg: AZFdTZfCWQBwQhbLwh9V3NJ/iE4EvBCVRSI0GcdbqOOz/t8yZr6smDGmSUIZ5XAb5YT vKdsNOayqi/1im4tCMMNCMSRsbIDZV/YAi4eGMEUANKD7NjCVybpc6lOJto9aXXmv5Vs3i48axn 3BS/k0wj/bpd2LZ0rknAYZ/3Ip6vczrNP7oY56xySZegWYcs+BRrS7BaE/8eHqANK1SaPfk7EGI wYQ+K2Q2ZUUmne3m6MkvF58pukr6w+WyQAtuZHhqpxvvSzj33p6wsb05kRAsiQYqbUtax1cg/k7 k47vxm4hylqZxKjYIRo9vEbvcDqhKcl3LsdMv2uo8j8i/k9PNelHPnzXPRcxUhYYJhs8XNF2JP9 0MNiQ1E0fo8cXDkl2Ttre87PO/xs= X-Received: by 2002:a05:6000:29d2:b0:498:38b3:55a1 with SMTP id ffacd0b85a97d-49c71e3e27amr14401428f8f.15.1794843686415; Mon, 16 Nov 2026 07:41:26 -0800 (PST) X-Received: by 2002:a05:6000:29d2:b0:498:38b3:55a1 with SMTP id ffacd0b85a97d-49c71e3e27amr14401381f8f.15.1794843685826; Mon, 16 Nov 2026 07:41:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794843685; cv=none; d=google.com; s=arc-20260327; b=K/8klS2u8MJaz/oDAaa5YTABDPti5V5/HGLrtM6wKUhPn0XLAYV2wGG+CKotj2cfnH XZxf9Jd//j1SfheA/lNSeVUTPBYuN+lvMGD/9J4IoseDOQ8XTcQkug1qcuqKFnS25dpL qwCBU9NBZ2dxA3qLAilVP2r/Rdh6lcOfi18X7Gdz87gNDxN63ce5BEKu3qSfWBdIoXID sL6RxLUy1WTk8YPHxGlUHiONTXxeYUkZwlFfIJkG3/AqhegqcGMkpATxXg0nBtXZmTej bnfRKMj17P23J4/qP0YLRip7anu7Yd6lsCr6jEclQfardvqNZ896e2qlXmpyUDkvwHxe 7W6g== 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=7wCkMyzsaXS9KtIMaUSuJnHA1FB9M2ifivKhRo91Dh8=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=Puxgk/WAkQi95YuXS4o0YiabpJsQo5S8Ip33Rych2sf/UorcmBYwfrJybYmA0YB4ON XnBQGSBgQyiDOIFjeYpok+Az7Rch2H/bkXOdUiRU7PvbFjCoubzivlJCtsK9PL3/wLCP 6pYBrRxEUjXFspr9p7c41+sndbp9x2dgTjwWFP07PejbTwhv2pXOQK5rufs6LkMFeVMq nUDPqnMMFVEgYn9TOlnMOnlUZANMAbq/Bx9A75XGEIn32yIXYERVUvSxMA13yZD1Fo7S EdRrgWBKh+SpWLJCExmmOCc8MIt8avHW3nyTEHHqEQg/n1oZ+HkLDeUNhKwnmaVzPGWn V1IQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="vZL/9p/Y"; 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-49c6454b591si21371766f8f.330.2026.11.16.07.41.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 07:41:25 -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="vZL/9p/Y"; 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=7wCkMyzsaXS9KtIMaUSuJnHA1FB9M2ifivKhRo91Dh8=; b=vZL/9p/YNOZT O7ne5ApQgWawDGN0JCsmLheQKQNnTsDYPLc+iUZwy3CWWrrRfheFLYlTL/Dqw/WGoluXkE/sVMQV2 piDOi955OKwlwB9ZsJYYJO0NvFv3ojyqsIAalKwlKl9TTiGbl/c7Wge4A8pO6x45UT2isCB5JJc8W d1ssBfgmMJs3vijZQrp1PuzF/z92OR/W/8r3+EVxPkBtzPECIOZYNaPS0sfo+Spftzmj3ljgH24LP dsUkskCglV14WlGtW9+lsQxfJt4dEI8A7VlJwQ5oUdv/q4+VeW6iXxq38o0Smk9s2wj0mJDfXwYQW imKi1VUHJULSUFkHvJI2QQ==; 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 1xSylS-005tLh-1C; Mon, 16 Nov 2026 16:41:17 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 16 Nov 2026 16:41:16 +0100 Message-ID: <20261116154119.2979718-7-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261116154119.2979718-1-alexander.ivanov@virtuozzo.com> References: <20261116154119.2979718-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 6/9] drivers/md/dm-qcow2: add the resubmit and fail_held messages 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 Held requests are retried every 20 seconds. QEMU pauses the VM on the IO_ERROR uevent, and the requests should be retried as soon as the VM is resumed, and dropped if the VM is destroyed: vhost-blk waits for all in-flight requests on release, so a request held while the error persists leaves QEMU in D state. QEMU has no CAP_SYS_ADMIN, so libvirt sends the messages: resubmit - resubmit the held requests now fail_held - fail the held requests and stop holding new ones until resubmit or resume fail_held has to be sticky: requests in flight when it arrives, a timer resubmission included, fail later and would otherwise be held again with the timer rearmed. 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-cmd.c | 21 +++++++++++++++++++++ drivers/md/dm-qcow2-map.c | 35 ++++++++++++++++++++++++++++++++++- drivers/md/dm-qcow2-target.c | 16 +++++++--------- drivers/md/dm-qcow2.h | 4 ++++ 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/drivers/md/dm-qcow2-cmd.c b/drivers/md/dm-qcow2-cmd.c index 7af3ac154127..ea9c69b454ea 100644 --- a/drivers/md/dm-qcow2-cmd.c +++ b/drivers/md/dm-qcow2-cmd.c @@ -643,6 +643,27 @@ int qcow2_message(struct dm_target *ti, unsigned int argc, char **argv, } ret = qcow2_get_event(tgt, result, maxlen); goto out; + } else if (!strcmp(argv[0], "resubmit")) { + if (argc != 1) { + ret = -EINVAL; + goto out; + } + spin_lock_irq(&tgt->event_lock); + tgt->fail_held = false; + spin_unlock_irq(&tgt->event_lock); + timer_delete(&tgt->held_timer); + qcow2_resubmit_held_qios(tgt); + ret = 0; + goto out; + } else if (!strcmp(argv[0], "fail_held")) { + if (argc != 1) { + ret = -EINVAL; + goto out; + } + timer_delete(&tgt->held_timer); + qcow2_fail_held_qios(tgt); + ret = 0; + goto out; } else if (!strcmp(argv[0], "merge_backward")) { if (argc < 2) { ret = -EINVAL; diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 2a663eb652f4..b2962c77cc15 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -4577,12 +4577,13 @@ static bool qcow2_try_hold_error(struct qcow2_target *tgt, struct qcow2_rq *qrq, return false; spin_lock_irqsave(&tgt->event_lock, flags); - if (unlikely(tgt->wants_suspend)) { + if (unlikely(tgt->wants_suspend || tgt->fail_held)) { held = false; goto unlock; } init_qrq_and_embedded_qio(tgt, qrq->rq, qrq, qio); + qrq->held_status = bi_status; pr_err_once(QCOW2_FMT("underlying disk is almost full"), qcow2_device_name(tgt->ti)); @@ -4689,6 +4690,38 @@ void qcow2_submit_embedded_qios(struct qcow2_target *tgt, struct list_head *list qcow2_submit_embedded_qio(tgt, qio); } +void qcow2_resubmit_held_qios(struct qcow2_target *tgt) +{ + unsigned long flags; + LIST_HEAD(list); + + spin_lock_irqsave(&tgt->event_lock, flags); + list_splice_init(&tgt->held_qios, &list); + spin_unlock_irqrestore(&tgt->event_lock, flags); + + qcow2_submit_embedded_qios(tgt, &list); +} + +void qcow2_fail_held_qios(struct qcow2_target *tgt) +{ + struct qcow2_rq *qrq; + struct request *rq; + struct qio *qio; + LIST_HEAD(list); + + spin_lock_irq(&tgt->event_lock); + tgt->fail_held = true; + list_splice_init(&tgt->held_qios, &list); + spin_unlock_irq(&tgt->event_lock); + + while ((qio = qio_list_pop(&list)) != NULL) { + qrq = qio->endio_cb_data; + rq = qrq->rq; + dm_complete_request(rq, qrq->held_status); + mempool_free(qrq, tgt->qrq_pool); + } +} + int qcow2_clone_and_map(struct dm_target *ti, struct request *rq, union map_info *info, struct request **clone) { diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 2a57f66fe25d..590c2e6a4bec 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -484,14 +484,8 @@ static void inflight_ref_exit1(struct percpu_ref *ref) static void qcow2_held_timer(struct timer_list *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->held_qios, &list); - spin_unlock_irqrestore(&tgt->event_lock, flags); - - qcow2_submit_embedded_qios(tgt, &list); + qcow2_resubmit_held_qios(tgt); } static void qcow2_send_io_error_uevent(struct qcow2_target *tgt, @@ -1247,8 +1241,12 @@ static int qcow2_preresume(struct dm_target *ti) if (ret) QC_ERR(ti, "Can't set features"); } - if (!ret) - qcow2_set_wants_suspend(ti, false); + if (!ret) { + spin_lock_irq(&tgt->event_lock); + tgt->fail_held = false; + tgt->wants_suspend = false; + spin_unlock_irq(&tgt->event_lock); + } return ret; } diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 03233090da23..df20826c6060 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -206,6 +206,7 @@ struct qcow2_target { bool service_operations_allowed; bool wants_suspend; + bool fail_held; bool md_writeback_error; bool truncate_error; bool event_io_error; @@ -345,6 +346,7 @@ struct qio_ext { struct qcow2_rq { struct request *rq; struct bio_vec *bvec; + blk_status_t held_status; }; struct qio; @@ -426,6 +428,8 @@ void qcow2_init_qio(struct qio *qio, unsigned int bi_op, struct qcow2 *qcow2); void qcow2_dispatch_qios(struct qcow2 *qcow2, struct qio *qio, struct list_head *qio_list); void qcow2_submit_embedded_qios(struct qcow2_target *tgt, struct list_head *list); +void qcow2_resubmit_held_qios(struct qcow2_target *tgt); +void qcow2_fail_held_qios(struct qcow2_target *tgt); struct qcow2 *qcow2_ref_inc(struct qcow2_target *tgt, u8 *ref_index); void qcow2_ref_dec(struct qcow2_target *tgt, u8 ref_index); int qcow2_inflight_ref_switch(struct qcow2_target *tgt); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel