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 33A4D8045D for ; Thu, 29 Oct 2026 14:09:50 +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 69TE8RgD000992; Thu, 29 Oct 2026 17:08:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69TE8RgD000992 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Gw7W0mHV" 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 69TE8FpA000941 (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 69TE8FpA000941 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48e0c896d05so1813629f8f.1 for ; Thu, 29 Oct 2026 07:08:15 -0700 (PDT) X-Gm-Message-State: AFq9FYJmbD2hEkVITVGp+kp9VNd7XAtBGQJ497YPHkeQVmsEU8QTiuqy dVNU8nrG65X+BSNunRXplcZsE/DS4oI9/S0NnjEy/jS1IwKfjJtWm9aPpNzx9qVFg7HLwcLbIPy DECzCZgL2Tk6+UVGoOMPDJYYycZpNM78BZG+osTrg3R+mOnRDXmI3nw== X-Gm-Gg: AYBFou205+0ZSN1qNu1PX099MMNg8XTOola1fa6qHqlE5SHCue8+2mg38SqTbkEjU3G 3Q1OYzvnnalGn9gA3FlDw4t9GNS0Ym9wjQGrgwaGxLLOgX/4bNj34IbXqj61B7OgE26NFaNcEFB lgJQ2Vkkrk/WXA30vA95IVcA7RW++tP1ZEwHVAOt/ZcH4ag76eP7JVLpigrIV/shJEjogYSEhri xsC/gyWVb0fKDbcqD78kGfbkKizNrziFH6f9r1TRBxCdmscKjuiHi/0TRVxDOvZ4euFqY7q10r7 W33hwbb9xwWleS3Dce9Oi9yxwI8H6kMoJXVr3YVmwb4ZONPxRPuUejWHq5fF/DeqQnYSw/ui056 L6V5umJ/nSQNIMJB/vLvxMVqvBat2+Q== X-Received: by 2002:a05:6000:2508:b0:48e:6852:aea0 with SMTP id ffacd0b85a97d-48e6852b179mr4637654f8f.48.1793282894880; Thu, 29 Oct 2026 07:08:14 -0700 (PDT) X-Received: by 2002:a05:6000:2508:b0:48e:6852:aea0 with SMTP id ffacd0b85a97d-48e6852b179mr4637565f8f.48.1793282894258; 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=W1Qob0az6EBAL3VSDuRZ6B12lwdhcTGUkqUNrVmGer9cA+30y+iGobN6A71zcNf1g0 jt03nYe7r2u3cqVaUmPWDwn9tqmitkQjjT4O9YC+GoaxWI9Ncp82ZH9wVFWmYuEMcIeK zUrtyv1M2T35ZL0hMpQ7WBj8EiGwacPXWPKBvFQKimUA2kHCzKw/DcwGRY95KD6lZ94K g9qIwf3nZ7pKQHzWcL7p4iL76naG8KS8B/CwPyomI/cunil3ayOdswSCxUdinoFyqxzt iloxbV2mfhbbRuHUnyEUoRusFU5NtRL70P4+BQn1TBXY4v2WMVPjTmBPTQbj57gM6Obs sPDQ== 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=yNGw7H6Vo8bbeq6pCiW17mOZbmUM4UPk6r/2MpCdBHA=; fh=3k0+fZVGiCNBaT40qYgWCtd7msMp1ssBZtvctQUZc8k=; b=H2viQ2WqLaL5LZoKXxymFyTV4DXt6PFqdpNniPOFcbosDfLSZRbvgN2FXpaAFBr5eJ lCRvrsu4FSCse4CPAV0KSZpKKUH6MxLHYFVyaRgsNpoE50EtmL/mgUXkbbkcUO+FQe+4 8LOu5RuD20ryxc7sOYlP6O4dsed/wXdaMQx9urgGN923dJb6WlOb4lQVKic83DBJulWr N0PitGi/U2ppth2X1+HYlEzz93Nj7pAcPqzA487HIQbUE+4iNZ0Pt2diKVLh2tnooi4y oqyldeY/aYmkxXBwSlGlDghPL9fMx1Jzn5nlZQFY1bz57fWJJdAJ594MwXsMyheGeguK lciA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Gw7W0mHV; 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-48e3ed1df93si33250774f8f.414.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=Gw7W0mHV; 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=yNGw7H6Vo8bbeq6pCiW17mOZbmUM4UPk6r/2MpCdBHA=; b=Gw7W0mHVE8js oanAceUJy10UnKG+L7YixRFRwxlImBXnq/VOxc8tRINOrJX+vMjjQmOAfqqmd4WGrycytfSlaQnfK lY7x8slRdlAvD3p/jdhV0qnDKQvuQ/+AgT1MTtMLpYDrscc7smAZIgQpWOkKDww4H1vbuHcRMbY/7 A44yU/jN2D1nU8sQiFc6dTVq0solqssTS+Ps8Vzkf3hfvV23Xp/MzJBo1IoIUv03XaUIbuANMvbdl h7ttQ0fH4euruiU/y4dEI1gOsLz1qZBrCYE0Px2KOZDe8xvuXOffHlFYFBslgsKj28M5iLiH8gdnH XD8isCZUAlCs99lcsCnGyQ==; 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-2z; 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:42 +0300 Message-ID: <20261029140346.465768-4-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 3/7] drivers/md/dm-qcow2: prepare process_one_qio() for fastpath 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 heavily relies on main kwork do_qcow2_work() being sequential. All metadata change happens there and cannot run in parallel. Unfortunately that caps dm-qcow2 performance. But if the request does not require metadata changes we should be able to immediately dispatch it. process_one_qio() and handle_metadata() already know what to do: just add avoid_metadata_changes() flag and return codes. While at it, just return in handle_metadata() instead of setting ret to 0 and jumping to if (ret < 0) label. Also exclude compressed clusters as there are some complications with wpc_readers. 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 | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 1023224484f5b..c5d68b6b21f12 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -3534,7 +3534,7 @@ static int prepare_cluster_discard(struct qcow2 *qcow2, struct qio **qio, } static int handle_metadata(struct qcow2 *qcow2, struct qio **qio, - struct qcow2_map *map) + struct qcow2_map *map, bool avoid_metadata_changes) { bool write = op_is_write((*qio)->bi_op); int ret; @@ -3543,15 +3543,20 @@ static int handle_metadata(struct qcow2 *qcow2, struct qio **qio, if (ret < 0 || !*qio) /* Error or postponed */ goto check_err; + if (avoid_metadata_changes && map->compressed) + return 2; + ret = 1; if (unlikely(qcow2->backward_merge_in_process)) { + if (avoid_metadata_changes) + return 2; /* Keep in mind the below may replace *qio */ ret = prepare_backward_merge(qcow2, qio, map, write); } else if (unlikely(fake_l1cow_qio(*qio)) && (!map->clu_is_cow || (map->level & L2_LEVEL))) { /* Nothing to COW or L1 is mapped exactly once */ qio_endio(*qio); - ret = 0; + return 0; } else if (unlikely(op_is_discard((*qio)->bi_op))) { /* * Discard carries no data and is advisory. If it does not @@ -3559,13 +3564,17 @@ static int handle_metadata(struct qcow2 *qcow2, struct qio **qio, * is not present, end early. */ if (qio_discard_updates_metadata(qcow2, *qio, map)) { + if (avoid_metadata_changes) + return 2; ret = prepare_cluster_discard(qcow2, qio, map); } else if (!map->data_clu_alloced || map->clu_is_cow) { qio_endio(*qio); - ret = 0; + return 0; } } else if (write && (!qio_is_fully_alloced(qcow2, *qio, map) || map->clu_is_cow)) { + if (avoid_metadata_changes) + return 2; if (map->clu_is_cow) { /* COW to compressed or shared with snapshot cluster */ ret = prepare_l1l2_replace(qcow2, *qio, map); @@ -3677,13 +3686,17 @@ static void process_read_qio(struct qcow2 *qcow2, struct qio *qio, qio_endio(qio); } -static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) +static int process_one_qio(struct qcow2 *qcow2, struct qio *qio, bool avoid_metadata_changes) { struct qcow2_map map = { .qcow2 = qcow2, }; bool write; + int ret; - if (!handle_metadata(qcow2, &qio, &map)) - return; + ret = handle_metadata(qcow2, &qio, &map, avoid_metadata_changes); + if (!ret) + return 0; + else if (ret == 2) + return 1; /* * Merge machinery makes out of order merges for present @@ -3695,7 +3708,7 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) if (unlikely(qcow2->backward_merge_in_process) && (fake_merge_qio(qio) || qcow2_file_is_writable(qcow2))) { submit_top_delta_read(&map, qio); - return; + return 0; } write = op_is_write(qio->bi_op); @@ -3703,13 +3716,13 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) /* Process discard early. Don't do COW just to discard */ if (unlikely(op_is_discard(qio->bi_op))) { issue_discard(&map, qio); - return; + return 0; } if (unlikely(map.compressed)) { /* Compressed qio never uses sub-clus */ submit_read_compressed(&map, qio, write); - return; + return 0; } if (!write) { @@ -3722,6 +3735,8 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) else perform_rw_mapped(&map, qio); } + + return 0; } static struct bio_vec *create_bvec_from_rq(struct request *rq) @@ -3824,7 +3839,7 @@ static void process_deferred_qios(struct qcow2 *qcow2, struct list_head *qios) continue; } - process_one_qio(qcow2, qio); + process_one_qio(qcow2, qio, false); } } -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel