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 D51E78017D for ; Tue, 10 Nov 2026 11:52:22 +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 6AABp9N4014485; Tue, 10 Nov 2026 14:51:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AABp9N4014485 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="HSnFFZjU" 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 6AABoxae014439 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 14:50:59 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AABoxae014439 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-49323e268aeso1523993f8f.1 for ; Tue, 10 Nov 2026 03:50:59 -0800 (PST) X-Gm-Message-State: APuU4Z/0Z3hsFelWLRl5bwsMUts7hAGqbhcZLr9eTmheEdKLn58Vqipd O9V5VsFzQQihe4WUsIwUzna8dIK+DY4zoVZInmDtUdxdH8ODx/ZvXV2o18vUmXs7G6A3Fu4mkj/ NQxszWq4jVb3dZQ663izdPUXr+iAxp58APzQVfaV7/dBT/El5LijOkA== X-Gm-Gg: AYBFou3L6GGDNk19R0uJoPqCtqPQZgB5SQIk6AnMqenTEwulHmPWNg+dFLAcf/Yte48 QTJw+lud/lat2x/7bEfQ6iNl5+VIOomRWQV63qIpbGq73DTDmGpNbX8amYvhuJpPxX299gbYyJ5 Tv+RjgRGDv95SOU+CWfwF+154FvC88qo4sqvS7+JLZSxJGlZwPYf37fDom1VhGfzTEyDNSfaVMk pupNgoFafgslQiW/qnaJoeJPiluAFqh0HOxc6b2IgjmCsm4zS19nFrzqlwmyacdhiWfD3NgFzhm ceTE3dtVrROSjatyx5xMmc0Spn1ePRMAB1aobxxol8xe0jJrqEO2v5lY8DKNo2nOCTyspNO+6VX EiCwlsgZhdIMxv0oYueJ9YI7EnXhxkw== X-Received: by 2002:a05:6000:4a10:b0:493:72f7:1d5b with SMTP id ffacd0b85a97d-498309aeca3mr4514308f8f.29.1794311458994; Tue, 10 Nov 2026 03:50:58 -0800 (PST) X-Received: by 2002:a05:6000:4a10:b0:493:72f7:1d5b with SMTP id ffacd0b85a97d-498309aeca3mr4514276f8f.29.1794311458503; Tue, 10 Nov 2026 03:50:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794311458; cv=none; d=google.com; s=arc-20260327; b=kv/rS3HQsGGL1yRJyuT0sC7QsDDeUaiIKb5M6Prbuha+WL5fEfClD8pBLdjV+0IdL2 Y2R0gi1SA/lmUm/xhdmIdnh/y6smi6bARNgLWXsGIBgZMl9lB281S51ZCg2bYhgecNgF Pfk9S5BhjE63FLxZshc/XiPs4zy77oaYuyjB52D1O4zFDHwMagALUeaWuuR618a9SZBf Ljdk3k83XpBhiIdEo8t3VBhzjnAhMXB9sG3OqcSuz/bWDg/7sKemspujSJ3CpYBn2B2j biJF75ICNIMPFAdgznvQKjng1tWADEbDrwta8G+HpQR75/mFTkvpeuXa3ed9GA1ISV58 MI7Q== 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=Fu2eQYwPS5x15OhDCMGl7+CaZsme53lsEAXqiEQ66TE=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=JZjWhlSJvPlOnMgaHjpFkLC18r2OmHbmQ0mAKZ5qeCIYAT3uYkyI2onXGz9YVKGfk1 E2WTy2JsnevAhMmHL1x/qlx78SMVnJTtM5Epw1G2UffiG7otTNj4m0laLBEik2WeveyD Hnj6bw+VtwlRHP3c4coMyAtmlCvUJc1Txv/roFp9rM7Es0doljPgiGYB7ih0cf7JGiqa eBXg13hzjyFvmzR9U9hbKgVdokkTwDjYqf0YDAC4+yXPnW0kUUMMJaIk3FZN2LBfV+m0 Vbnwb33o0TJxKegX5ngqwLX2oGlyyIo5T7EgDzmJmyoxF2uDxYN4ajZVRJJlj9kExjQn 9K9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=HSnFFZjU; spf=pass (google.com: domain of andrey.zhadchenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=andrey.zhadchenko@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-4983847ceb4si5149485f8f.496.2026.11.10.03.50.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2026 03:50:58 -0800 (PST) Received-SPF: pass (google.com: domain of andrey.zhadchenko@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=HSnFFZjU; spf=pass (google.com: domain of andrey.zhadchenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=andrey.zhadchenko@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=Fu2eQYwPS5x15OhDCMGl7+CaZsme53lsEAXqiEQ66TE=; b=HSnFFZjUad7w L1yxYfKHpqwVxYJNHTHNafVj/dPt9gSNhwIKky5CFW6in7jP9nc7Wh/vY8JLiMNCraJlkVZTPgB0R wnyPr9Q5WrpLIOG+fPAG1JHlVu1lIW0YLxFBfg299uB90nc6odGcndzrroYPcgK0Xillhq6oBy9gY IjV8qLFPByKwoKBBrx5tCyHU9Dn6HVKW5gSL/y/4pM6jA/UFdg53O9RurA8SLAlGW53+rgqbTU3yk 2TS+BDVHlZi5BnOMjp9XlFdd4mP82YvRCKGa5oJv/iQ6+NJp9dCuPDZbjhJ16Bv9lNLXaqK7zbSrY MPikSZBY+m2NvRDme6CFfQ==; Received: from [130.117.225.5] (helo=vz9-demens-1.aci.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xQkJI-00DBlM-1Q; Tue, 10 Nov 2026 12:50:48 +0100 From: Andrey Zhadchenko To: khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Tue, 10 Nov 2026 14:46:26 +0300 Message-ID: <20261110114629.416695-5-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261110114629.416695-1-andrey.zhadchenko@virtuozzo.com> References: <20261110114629.416695-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 4/7] dm-qcow2: add per-qio work infrastructure 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 dm-qcow2 was created to run non-concurrently, so qio never had per work struct field. Let's add one and use it to queue first dm-qcow2 pipeline step: qio preparation. It requires no metadata, so everything is simple here. We would later move more pipeline steps into qio. https://virtuozzo.atlassian.net/browse/VSTOR-95494 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Andrey Zhadchenko --- v2: updated QLIST_EMBEDDED comment drivers/md/dm-qcow2-map.c | 60 ++++++++++++++++++++++++++++----------- drivers/md/dm-qcow2.h | 12 ++++++-- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index c495834a4d29f..7d220dd718021 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -362,6 +362,8 @@ struct qio *qcow2_alloc_qio(mempool_t *pool, bool zero) } ALLOW_ERROR_INJECTION(qcow2_alloc_qio, NULL); +static void do_qio_work(struct work_struct *ws); + void qcow2_init_qio(struct qio *qio, unsigned int bi_op, struct qcow2 *qcow2) { qio->qcow2 = qcow2; @@ -372,7 +374,9 @@ void qcow2_init_qio(struct qio *qio, unsigned int bi_op, struct qcow2 *qcow2) qio->bi_io_vec = NULL; qio->flags = 0; qio->ref_index = REF_INDEX_INVALID; + qio->state = QIO_STATE_START; atomic_set(&qio->remaining, 1); + INIT_WORK(&qio->worker, do_qio_work); /* * Initially set into BLK_STS_OK, while aio complete, @@ -3798,10 +3802,10 @@ static void qio_init_iter_from_rq(struct qio *qio, struct request *rq) qio->bi_iter.bi_bvec_done = 0; } -static void prepare_one_embedded_qio(struct qcow2 *qcow2, struct qio *qio, - struct list_head *deferred_qios) +static void prepare_one_embedded_qio(struct qio *qio, struct list_head *deferred_qios) { struct qcow2_rq *qrq = qio->endio_cb_data; + struct qcow2 *qcow2 = qio->qcow2; struct request *rq = qrq->rq; struct bio_vec *bvec = NULL; LIST_HEAD(list); @@ -3846,15 +3850,6 @@ static void prepare_one_embedded_qio(struct qcow2 *qcow2, struct qio *qio, qio_endio(qio); } -static void process_embedded_qios(struct qcow2 *qcow2, struct list_head *qios, - struct list_head *deferred_qios) -{ - struct qio *qio; - - while ((qio = qio_list_pop(qios))) - prepare_one_embedded_qio(qcow2, qio, deferred_qios); -} - static void process_deferred_qios(struct qcow2 *qcow2, struct list_head *qios) { struct qio *qio; @@ -4371,7 +4366,6 @@ static void process_seek_qios(struct qcow2 *qcow, struct list_head *qios) void do_qcow2_work(struct work_struct *ws) { struct qcow2 *qcow2 = container_of(ws, struct qcow2, worker); - LIST_HEAD(embedded_qios); LIST_HEAD(deferred_qios); LIST_HEAD(zread_qios); LIST_HEAD(bwrite_qios); @@ -4384,7 +4378,6 @@ void do_qcow2_work(struct work_struct *ws) current->flags |= PF_LOCAL_THROTTLE|PF_MEMALLOC_NOIO; spin_lock_irq(&qcow2->deferred_lock); - list_splice_init(&qcow2->qios[QLIST_EMBEDDED], &embedded_qios); list_splice_init(&qcow2->qios[QLIST_DEFERRED], &deferred_qios); list_splice_init(&qcow2->qios[QLIST_ZREAD], &zread_qios); list_splice_init(&qcow2->qios[QLIST_BMERGE_WRITE], &bwrite_qios); @@ -4395,7 +4388,6 @@ void do_qcow2_work(struct work_struct *ws) list_splice_init(&qcow2->qios[QLIST_SEEK], &seek_qios); spin_unlock_irq(&qcow2->deferred_lock); - process_embedded_qios(qcow2, &embedded_qios, &deferred_qios); process_deferred_qios(qcow2, &deferred_qios); process_compressed_read(&zread_qios, &cow_data_qios); process_backward_merge_write(qcow2, &bwrite_qios); @@ -4519,7 +4511,7 @@ static void qcow2_submit_embedded_qio(struct qcow2_target *tgt, struct qio *qio) if (blk_rq_bytes(rq)) { queue_list_id = QLIST_EMBEDDED; - worker = &qcow2->worker; + worker = &qio->worker; } else { WARN_ON_ONCE(qio->bi_op != REQ_OP_FLUSH); queue_list_id = QLIST_FLUSH; @@ -4535,7 +4527,10 @@ static void qcow2_submit_embedded_qio(struct qcow2_target *tgt, struct qio *qio) qio->qcow2 = qcow2; qio->queue_list_id = queue_list_id; qio->ref_index = ref_index; - list_add_tail(&qio->link, &qcow2->qios[qio->queue_list_id]); + if (queue_list_id == QLIST_EMBEDDED) + qio->state = QIO_STATE_START; + else + list_add_tail(&qio->link, &qcow2->qios[qio->queue_list_id]); } spin_unlock_irqrestore(&qcow2->deferred_lock, flags); @@ -4631,6 +4626,39 @@ static void handle_cleanup_mask(struct qio *qio) } } +static void do_qio_work(struct work_struct *ws) +{ + struct qio *qio = container_of(ws, struct qio, worker); + struct qcow2 *qcow2 = qio->qcow2; + struct qcow2_target *tgt = qcow2->tgt; + unsigned int pflags = current->flags; + + current->flags |= PF_LOCAL_THROTTLE|PF_MEMALLOC_NOIO; + + switch (qio->state) { + case QIO_STATE_START: { + LIST_HEAD(deferred_qios); + + prepare_one_embedded_qio(qio, &deferred_qios); + if (list_empty(&deferred_qios)) + break; + + spin_lock_irq(&qcow2->deferred_lock); + list_splice_tail(&deferred_qios, &qcow2->qios[QLIST_DEFERRED]); + spin_unlock_irq(&qcow2->deferred_lock); + queue_work(tgt->wq, &qcow2->worker); + break; + } + + default: + qio->bi_status = BLK_STS_IOERR; + qio_endio(qio); + break; + } + + current_restore_flags(pflags, PF_LOCAL_THROTTLE|PF_MEMALLOC_NOIO); +} + struct qio_data_llseek_hole { struct completion compl; struct qio *higher; diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index ad5286b16883e..c044c630ca238 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -220,8 +220,10 @@ struct qcow2_target { enum { QLIST_EMBEDDED = 0, /* - * List for initial setup embedded qios - * related to prq (in process context). + * Only a queue_list_id, qios are never + * linked to this list: it marks embedded + * qios related to prq, which are set up + * outside main kwork. * This is used only for top qcow2 image. */ QLIST_DEFERRED, @@ -238,6 +240,10 @@ enum { QLIST_INVALID = QLIST_COUNT, }; +enum { + QIO_STATE_START = 0, +}; + struct qcow2 { struct qcow2_target *tgt; struct file *file; @@ -371,6 +377,8 @@ struct qio { struct qcow2 *qcow2; qcow2_endio_t endio_cb; void *endio_cb_data; + struct work_struct worker; + int state; }; #define CLU_OFF(qcow2, pos) (pos & (qcow2->clu_size - 1)) -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel