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 480DC80EC8 for ; Thu, 29 Oct 2026 14:09:52 +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 69TE8crv001011; Thu, 29 Oct 2026 17:08:39 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69TE8crv001011 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="gs3Od7Ep" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69TE8Fhh000944 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 29 Oct 2026 17:08:15 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69TE8Fhh000944 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48af5a07314so1429149f8f.2 for ; Thu, 29 Oct 2026 07:08:15 -0700 (PDT) X-Gm-Message-State: AFq9FYJbzT/TOuuUbuH+ompeB6CFEMi4pcOY6Qdti6HwIs6I3PlhdVFm KWFIkG6X3dSIM/7z5x8XWv9TQ6RF68brSqoAapLQ931m2lQwvaEJY1PIDB6Rmytuxwf1OW67Aj9 76iVJ7U1p7SkNN1ZWuahy3MKbLtj6Jkq8Rpejuq73ZJAOovC4YD1u/g== X-Gm-Gg: AYBFou1OlWgS2fDUXz7u37Hfuj2U7xpWe5FVV37nyvei3Pp3v0TY201/RrcF8dZxd3J dWRA0mGJbEPcdayEUeczfBYi4+ix1UCIWKiYGqfHhbrLkVQQcg8sbeYn1HLAHn6WJcGnu/Rm6r6 xvmoHERfz4ov1u+kWnCq4ZQN+nTabjpNjcDRbQEUO1x38Ng4kAs+L6FS3Bw0oWEwsyMg9VSqbNh nQQE2snCs982GRQVGv/7xCDcYqDClmFeCwflr9XWpF4WI3LMiny6N7gpeLDhPkkIKycrVfLi+YF fFQzfKDxbHYmZzVEGjIgZvq1cYSwD2890Ezvtm1nofgiMsIChSGZ9SyHhiH2Eh3thP3P0LMimsH rqb9nY6Q69fialib/fvNybycB/nIJMA== X-Received: by 2002:a05:6000:4919:b0:48e:cd3:64f8 with SMTP id ffacd0b85a97d-48e5d454f04mr12555002f8f.4.1793282895066; Thu, 29 Oct 2026 07:08:15 -0700 (PDT) X-Received: by 2002:a05:6000:4919:b0:48e:cd3:64f8 with SMTP id ffacd0b85a97d-48e5d454f04mr12554903f8f.4.1793282894263; Thu, 29 Oct 2026 07:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793282894; cv=none; d=google.com; s=arc-20260327; b=gFJqNiC3KpVna8c6dqJKEV6iZ4u+YavmwenoSpTIbJAQXrqbaQXp7gbME9thyx2pQn /wagAr5sH4P7e3QeP1mKlIYKIAe6dai5G9iK/urjIKruIPh1q3MaF3Bv1s62FuusWYgK FU0UYN+SfamaNXEpnr/oUnCRr/ZN1FvcbWT+lkcZauM0iKTM8dBRQNKsR1b6mi9iGvQ1 ZESaYFwjrEPHb7upArvCv+s54vlATcA4LCHE/WDFN4QS+CGeZ/zj7htPp3crqunAgwz0 nmF2qhq3dGYct57+xFZE8XsrJq1weMmuLtLgouTbjRErccBfqUhfJSIkqxdRP4ENvpXp YLdw== 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=zEqvWJMeB/r/hHvkM10MLZF/WzWoi9aqTKcUD8CvqjE=; fh=3k0+fZVGiCNBaT40qYgWCtd7msMp1ssBZtvctQUZc8k=; b=StKg3jbOIZloaLY28JcATzjdocuP/nxLpHOg7XFk3+TFJplfzZ/VovpaQ6q/FgxgFC GTIMuvFKPog40l7Q9qbeORe6hpndCFURnAwS/6S81/f26hD460etKwg6rUnaDlnnoxaC kwfYgKyzini8N1GJesFf25zToZgfjExn7cEIOu0vtLHB3ybIerQzRaiLs8qpjtAFLyy5 1j7kviBygkk4j3NeiW01Et+RHveaPfW0B5Gmz4dLBKbu2bj2yAe0+Cyq4N45kPNgyoSV wfg5zMSRvt9Ua5EkFWSXGZHdLfnv56FM1N3kt1neQawpjIbIdKgSumXVJQo/1qzHvnb8 Mx2A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=gs3Od7Ep; 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-48e3ecdb2cfsi43301541f8f.67.2026.10.29.07.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 07:08:14 -0700 (PDT) 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=gs3Od7Ep; 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=zEqvWJMeB/r/hHvkM10MLZF/WzWoi9aqTKcUD8CvqjE=; b=gs3Od7Ep6kPp QWQyWfl3MmQMUgKqEPNHkO/IS715VQF+zM1D3Xql03GRdD5tHuSILqiCth5yjiq1H3K2Fm+yzc93m gXYZ6fhFDQh6lJePbSdWfyK3XeDgeR25/ZJX0emcCSV6Yo8rsDERlX6o2H/Zu/RDoPyJvYOB9JU/b UB09PAND0shIznqji+/AccIH8BByHNbT2egGsaXL0Kmwudbjef0O7jG04RfNDyMhkrvwZLk6y00SM R/z4irxnrpObeOfKevf12mcsnZHuJjUj/pv1hREIVoStfemtMLKBGjKNHG34SiztdQ0c29r3longB uiqYwSF9zdSz0UYohF2lvQ==; 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 1xMQjp-006pKz-3A; Thu, 29 Oct 2026 15:08:11 +0100 From: Andrey Zhadchenko To: ptikhomirov@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Thu, 29 Oct 2026 17:03:43 +0300 Message-ID: <20261029140346.465768-5-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261029140346.465768-1-andrey.zhadchenko@virtuozzo.com> References: <20261029140346.465768-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 4/7] drivers/md/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 --- drivers/md/dm-qcow2-map.c | 60 ++++++++++++++++++++++++++++----------- drivers/md/dm-qcow2.h | 6 ++++ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index c5d68b6b21f12..7afaba0afec14 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, @@ -3770,10 +3774,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); @@ -3818,15 +3822,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; @@ -4343,7 +4338,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); @@ -4356,7 +4350,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); @@ -4367,7 +4360,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); @@ -4491,7 +4483,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; @@ -4507,7 +4499,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); @@ -4599,6 +4594,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 d9b8c38e093f5..003e01a4d3ec9 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -236,6 +236,10 @@ enum { QLIST_INVALID = QLIST_COUNT, }; +enum { + QIO_STATE_START = 0, +}; + struct qcow2 { struct qcow2_target *tgt; struct file *file; @@ -369,6 +373,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