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 D4B85803F6 for ; Tue, 10 Nov 2026 11:52:38 +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 6AABpMEs014506; Tue, 10 Nov 2026 14:51:23 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AABpMEs014506 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="JqRspag7" 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 6AABoxtu014443 (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 6AABoxtu014443 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4915ba023d4so1337299f8f.0 for ; Tue, 10 Nov 2026 03:50:59 -0800 (PST) X-Gm-Message-State: APuU4Z+P9erxciadLgJ6L8VRMExMRnteleOyTXMakZgdlRbyABWPZuxo FW1kFroHknPaQpuULEslBEWoJokX5kjh3h6f6OlVQ1UP3hviieqqsF6g/N5hZl34NkmvCobqpiE b35AJv0hg9pOGtDkfgZqtUNh95cQW0uah1JFKa/2Jofrc/RyyorEs2Q== X-Gm-Gg: AYBFou1AwYXcz5GWLbfV0lx2JHeB+tIwMcFluvxoSs8aRQIjKOAtJ6phTFGCnZOpOz2 hDThutFVFk0ikTSIlwIODNi5GO+tL1tWGhWvrMrjBfFmXxmhGhnlw04FvrvFK1ZIgfMvo+h4PE8 LWKZFnxnJ6EnUNhPqRsWWqONVxHHaYFL5oRIMqHhG7SEaidFNNJVLO888s4HOYrmL5BgrjWfGXr 5unjGkUN6RcSKUsgk47l56nHbyFLQgfHUqpzJMquJxTE/NkgTB+iiNCtKQfqk/eq4XQFVwPF2ZZ c5kN02WVqkQOMCyUfOCcInSqe9hLM8ng0afPBa9uqYUTgUY8RCtJpmjJiaj3MsAh50TJbifNy7Y oNfJClAoNaerSw3yAq+seX7YWtYbg X-Received: by 2002:a05:6000:469c:b0:495:12e6:c5d0 with SMTP id ffacd0b85a97d-49830c8ce4bmr2826061f8f.48.1794311459050; Tue, 10 Nov 2026 03:50:59 -0800 (PST) X-Received: by 2002:a05:6000:469c:b0:495:12e6:c5d0 with SMTP id ffacd0b85a97d-49830c8ce4bmr2826042f8f.48.1794311458522; 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=j/rdDXzd/GqoNYR/0hIym4YyNFYkdER/3wxFKB5gijQWsvIKV0HdFQAtZysJYrgk/A wf1+DrDOq03qKeMxc7XojSLkeBrplBSfMdGKg1u8z4cPTrgh7q/KPfeRNXjh8l15dfNw hjUrUhqhFJWMrblR5LM3crNcupfTOevdc+i0Dv7xEUy+UczJEJGTJi/+28jKNaYfPpLD 3moZFP1fXwew8g8FQV617o4xSyBM/cDpSVV+TQv5w9qr/ki5j63H30tk6aRYYWWGzyoA 6tMMEeS2kP4iZ/4OUdthVKgG1GrOL/dfOn1NLWJJD3EW4XzD65ZG+3c/NJExtUtLyAiH qyYQ== 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=1gCGPrGAlKVb2I1NOWsUNkrq2NCXj+TzVLnPh8fG3Uo=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=YSfRucv9iO/dETrZ6FP2HxXXMrM7Q6F/KU0Fnh5c0DlQHcatcIwKXOiwc3BxHEmPWC JNGU/yw0EBRB/Km5UT4xaSGfuuM1ti30FFFv+vLzbJqoPWR0QmgJdjh5Zfw8On+OzGOd weP3NVPvsytzMUKDe9yIUFL+XjR3OSCLXT00ki+0wmQQbNqYW14MiwHZg7RKbDOE9oPS GKReuW0u3uw50kt+exA7ox4P/MH3XJiUDa2DAB0neLsQOdgF9kp4rQFTkFX53PE59sDw b30Wo6eC2JcH8R5PVHvC1Zqr5NuOIBFT6M5IgYD1ilEOeOwkdNEomfgWW4MOPnRM/pFG fY6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=JqRspag7; 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-49837618836si4643293f8f.368.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=JqRspag7; 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=1gCGPrGAlKVb2I1NOWsUNkrq2NCXj+TzVLnPh8fG3Uo=; b=JqRspag7A3TY qxkrw3+eYKrPYlFvqHaOTbXcljuI75pLTx0rpWZGCyw3KKG7N7LgNi2qKEZH6z5tgyVB68Osq7E1m jQ7TMAzNiQGqHc8+5IBeGSLe6JUyruvVY5Vv2+61TohTQfNWMuM9zlroJ1ax6ANAN7nlq2QhgmcWK SiwOiRCdngE5AxcMdG2DIDOTx1qysnhafYAhD0B5sj0i9QpOWk6sYWpPL1Vg+i9htLZZsAxfXt49D CJt25Jdpq8k9j7USK/tg8cGu70SDIjxdJ2K/1GVWnweH8dUO7dM0qmbMz2kbDR8l9cagu2P0hW6Fq R/jzBH/6WejFgw8mLh44MQ==; 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-1M; 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:25 +0300 Message-ID: <20261110114629.416695-4-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 3/7] 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 pass the flag to parse_metadata() and return to the slow path before it looks up R1/R2 pages. They are needed only by COW writes and cluster unmapping discards, which go to the slow path anyway. Besides the useless lookup, R1 is unstable outside main kwork: an R1 page read in parallel with relocate_refcount_table() may stay cached under a stale page id. 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 --- v2: return to the slow path before R1/R2 lookup in parse_metadata(); QIO_NEEDS_MAIN_KWORK instead of magic 2; fixed the "avoid_metadata_changes() flag" typo drivers/md/dm-qcow2-map.c | 55 ++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 49dc3e8119e76..c495834a4d29f 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -2002,6 +2002,12 @@ static int qcow2_handle_r1r2_maps(struct qcow2 *qcow2, loff_t pos, struct qio ** return ret; } +/* + * Returned by parse_metadata() and handle_metadata() with + * @avoid_metadata_changes, when @qio must be processed by main kwork. + */ +#define QIO_NEEDS_MAIN_KWORK 2 + /* * This caches pages of allocated on disk md levels, which are * required for submission @qio, and checks they are stable. @@ -2009,9 +2015,12 @@ static int qcow2_handle_r1r2_maps(struct qcow2 *qcow2, loff_t pos, struct qio ** * Returns: negative in case of error, or 0 if success. * Special case: return 0 with zeroed @qio means @qio was deferred * till some event: reading of md page, end of writeback, etc. + * With @avoid_metadata_changes, return QIO_NEEDS_MAIN_KWORK if @qio + * needs R1/R2: outside main kwork R1 is unstable, see + * __handle_r1r2_maps(). */ static int parse_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); struct md_page *md; @@ -2075,6 +2084,9 @@ static int parse_metadata(struct qcow2 *qcow2, struct qio **qio, if (!qio_may_modify_image(qcow2, *qio)) return 0; + if (avoid_metadata_changes) + return QIO_NEEDS_MAIN_KWORK; + /* Now refcounters table/block */ ret = qcow2_handle_r1r2_maps(qcow2, pos, qio, &map->r1, &map->r2, map->compressed); @@ -3548,24 +3560,31 @@ 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; - ret = parse_metadata(qcow2, qio, map); + ret = parse_metadata(qcow2, qio, map, avoid_metadata_changes); if (ret < 0 || !*qio) /* Error or postponed */ goto check_err; + if (ret == QIO_NEEDS_MAIN_KWORK) + return QIO_NEEDS_MAIN_KWORK; + + if (avoid_metadata_changes && map->compressed) + return QIO_NEEDS_MAIN_KWORK; ret = 1; if (unlikely(qcow2->backward_merge_in_process)) { + if (avoid_metadata_changes) + return QIO_NEEDS_MAIN_KWORK; /* 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 @@ -3573,13 +3592,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 QIO_NEEDS_MAIN_KWORK; 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 QIO_NEEDS_MAIN_KWORK; if (map->clu_is_cow) { /* COW to compressed or shared with snapshot cluster */ ret = prepare_l1l2_replace(qcow2, *qio, map); @@ -3691,13 +3714,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 == QIO_NEEDS_MAIN_KWORK) + return 1; /* * Merge machinery makes out of order merges for present @@ -3709,7 +3736,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); @@ -3717,13 +3744,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) { @@ -3736,6 +3763,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) @@ -3838,7 +3867,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); } } @@ -4774,7 +4803,7 @@ static int qcow2_llseek_hole_qio(struct qio *qio, int whence, loff_t *result) map.qcow2 = qio->qcow2; qptr = qio; - ret = parse_metadata(qio->qcow2, &qptr, &map); + ret = parse_metadata(qio->qcow2, &qptr, &map, false); if (ret < 0) break; if (qptr == NULL) { -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel