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 39C0D8017D for ; Fri, 13 Nov 2026 11:18:33 +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 6ADBGJQw016650; Fri, 13 Nov 2026 14:16:20 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ADBGJQw016650 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="cCHQj3VG" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6ADBFl4v016584 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 13 Nov 2026 14:15:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ADBFl4v016584 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-492e3189fc9so467742f8f.1 for ; Fri, 13 Nov 2026 03:15:47 -0800 (PST) X-Gm-Message-State: APuU4Z9ZlkNxXb1J0loEW1GVtf6rS0vWVNpusDZWo+0sHEDkfzEC86jg aNgCQOt9BM6apznPhOAyDUff+e9Wqj/BItuYpNv1VKM3ksJOi0H1qkfBsCuktX8ljxTav1ZatJ9 GIk6wOVbqZrwrRPu1nDME01/OjKPr3TZkX1V5LGzLs/juSlrKLrVDqw== X-Gm-Gg: AYBFou37xSjwe8XQR8OEhyc9Fd6k1XlhIGbbBr3wSYRCaKsayQ+cKUo+4BuXC/R6bqd X/ABNvOLjjznRNq6NJ/9ODHRkHRNwCYSCGYshnonoQrBLRm/BjVxsCUL795Fk466ShA74Tpw/Gu Ag+8bm0ggBxAAh5PDJ6H6IMSYFiGeUZWeoVEGYZb1LeUuhuVdC4+zAw798HKYPJcKoJXWsKaeO+ h73P9S+XGLh/NmSCOIRxs0NveSiu80BSNe/zpyfdmDahEZ3j2nbjiv22mUqvpwfhDSKRZKgytdy jL2R41tC+G4eSBZuAQC90k40LpjVficTQSN75V6TLpOa1EEVUhw3OEqj7igbVGdhTSRRwW/O0om X5gejOxVPcvAD1ma1cnGyHdZQyEaiPQ== X-Received: by 2002:a05:600c:1c28:b0:4bb:56bb:116d with SMTP id 5b1f17b1804b1-4bb56bb4938mr43018495e9.25.1794568546795; Fri, 13 Nov 2026 03:15:46 -0800 (PST) X-Received: by 2002:a05:600c:1c28:b0:4bb:56bb:116d with SMTP id 5b1f17b1804b1-4bb56bb4938mr43017665e9.25.1794568546254; Fri, 13 Nov 2026 03:15:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794568546; cv=none; d=google.com; s=arc-20260327; b=kT69rsiLHDimX8z8P+RNYHdPBxPBrkvbjxQCT1uUFksVbomzmle1fZs0T55qtuW6z0 XK8s2NlKlk6Dqdmk2rZaetpnzb7gEW2meh0UrhnBw/S/fC4rsJN29U7pm3wCvQe+BY7d 8fFZx23Uu8zsy4Uhe7KhUN2/NXUBc6ulc91b2HddI3EPEiVr0TbNbVlM0VkjM4pkWURV WFqpOSNVxHM4CFSyJSvCk1GL4/w0D98ECbwLSv6jKnVjbtMX60ZMmAyVH9ryEM0lV4x+ wMqNZ9djpDULWTpKPD6fvecMqBWeIPIJ75gaUzZGzAKjTwIuSekbB9VVaQXhsk7mZ/lb Jddw== 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=ryD/uJEPq6Ss85J5Gcr5QiKeNnPUPFYKwNdlTNcOs7I=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=bPpBXxe6Y986Z84Jj4orunIaFT1P4C8H38tO5z6t5K9r+1ba3IDl51Qa7cBgVGA2sX 2qqqzoJUjaxUJz4OlecE32tFG5U3N67q3TpBd9exforqm1Xj1LBrolcpV4WHuQghPSNe kOYzg75fvLZU/o2pCA++VjF0WAvvB6ssXwfybytuRHKXU8YqwYj2cmnHk5GxXuWi3t8h lTz6xNbD2N7hqMRdMIddaZcvkkhcL0ZcjUmgR7q+ASiZkZ4t/1TQCRwewCu1/iyvqeuh Dll0HReizF++cIe5Zsg1eSiRR97geshGXPooJpAX7u9qPv+HO1bOdSMqy2oycSV981Ew 1uYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=cCHQj3VG; 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 5b1f17b1804b1-4bb4e2ab760si142790625e9.22.2026.11.13.03.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2026 03:15:46 -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=cCHQj3VG; 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=ryD/uJEPq6Ss85J5Gcr5QiKeNnPUPFYKwNdlTNcOs7I=; b=cCHQj3VGcslK zglW+2i3TKOTT8G1ug3WMjqzjvb3j45/dBmLBfSww6RBRLuJF/KGqsyQzgGjC5L60KygRmBbMQKTw CTqFuRJTJTPTjcJuNzyZGf2NNyMf20v8RSqLQA/mJCE375X4j549RTxF6mDDjHqvHAvvs9hZ38g6T ikGJkjyni/3ZyISpImI/7sqhCww117x5i9d5gAiFMRbkbkhN1FZh3c87fC1nZatoZZhiQIT/I7UAt eVgQZkIO7iqGvAowMBQ7TdNkJgCeRw4aZ6h29LXGH9UK4r16qEKun9eFOYGGc2XzERB7SKOXWldLC blspAut9rvtzKkCyQsYcAg==; 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 1xRpBn-007Dd6-24; Fri, 13 Nov 2026 12:15:42 +0100 From: Andrey Zhadchenko To: khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Fri, 13 Nov 2026 14:11:22 +0300 Message-ID: <20261113111126.793039-5-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261113111126.793039-1-andrey.zhadchenko@virtuozzo.com> References: <20261113111126.793039-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 4/8] 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 v3: no changes 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 b9daa258285e6..496fbcc613488 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; @@ -374,7 +376,9 @@ void qcow2_init_qio(struct qio *qio, unsigned int bi_op, struct qcow2 *qcow2) qio->flags = 0; qio->ref_index = REF_INDEX_INVALID; qio->writer_gen = 0; + 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, @@ -3985,10 +3989,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); @@ -4033,15 +4037,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; @@ -4561,7 +4556,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); @@ -4574,7 +4568,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); @@ -4585,7 +4578,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); @@ -4710,7 +4702,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; @@ -4726,7 +4718,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); @@ -4822,6 +4817,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 3f1d5b5eef26f..ff46cce8587e2 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -227,8 +227,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, @@ -245,6 +247,10 @@ enum { QLIST_INVALID = QLIST_COUNT, }; +enum { + QIO_STATE_START = 0, +}; + struct qcow2 { struct qcow2_target *tgt; struct file *file; @@ -386,6 +392,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