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 02F29803BB for ; Thu, 12 Nov 2026 11:17:58 +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 6ACBGbZ7008182; Thu, 12 Nov 2026 14:16:38 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ACBGbZ7008182 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="w4C//uNi" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6ACBGaKL008169 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 12 Nov 2026 14:16:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ACBGaKL008169 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4ba078abd78so13294395e9.1 for ; Thu, 12 Nov 2026 03:16:36 -0800 (PST) X-Gm-Message-State: APuU4Z+om3LD0QuQbZNqIaE3Ba5HyDmjH3mPiGZf6IgvKbw13dMfxu4h woaeZKiKryDsWJA11JevTDREfnlp6GHiH2KBVMxwc0cb/3iPZhLTOhVayFz3q/wV2lnNojzo79W Dada1iW5zWd80nNLhYYZQpJx0GNdXh8yCAxedCT0moZbmoaNWkv1Q7Q== X-Gm-Gg: AYBFou14Gk9Q6KiJBRtxOROlgC8qQlpQvvFgzu3vxati+GTWWNQ8dJyhzKurbO+IQKd Yny6Gx5ukwmgsY2QPCHIFMz0eGERLp2CCyDELG/3iaJKeywH1jnOZMpYEHwGeFOyWbWDdnDvXN2 0I74SamG71RtTk3J9usfpnwFukB/FgtveEzBA+5Zcb6whGLkmxCsKXzvSenBKQPW+fhBsh8aOt5 LesL4GiqPbmA6wPQB7UmCBUxaYCyWP2UskJW5JAXaFAYjUPBgUlqWOLgUO0J5qshupXPrC7La08 49a6vmDoBIX6k5fnTYgE58wD4rjQYGkQF+/LEo9ooFDJbXTcQL95WNQLEVpqPzOeGMLWqE37ccx cuM5o7mbJF4HBxJP/jcB/Md47h7Ta X-Received: by 2002:a05:600c:3b93:b0:49d:1fa8:b266 with SMTP id 5b1f17b1804b1-4ba093c512fmr102358835e9.26.1794482196376; Thu, 12 Nov 2026 03:16:36 -0800 (PST) X-Received: by 2002:a05:600c:3b93:b0:49d:1fa8:b266 with SMTP id 5b1f17b1804b1-4ba093c512fmr102358415e9.26.1794482195899; Thu, 12 Nov 2026 03:16:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794482195; cv=none; d=google.com; s=arc-20260327; b=ZC9d+rtY3t2KHbG/upAZJlL+k7UaTva2rLUR3fbJNQuqEvu0qVSyT/rfknM31DDibb tkfo8EuJXrSzN4s4Q4GPx+fDJjG6sl2L7UJ0g0zaZme6iZ689dbB5FS+ja0dVPYIgs8z zrTVhOvXHqo0AkZRAXYIZsDrOLCP7oXDd6B9exJt2uGKEQ2pqOHLlA5jvMCnjVFq1SPa rAC7CjsXYBnu7FXYZE5I0cqDmgi1R1EiBWqoUmoDSkHS8Ky6sE7nQB3CH50cy4MqwgzQ BuihN6R8cjo8/mMzcRHgzJzPc6kLyTFJNAiEQD7sy8VHEAJrmVv02GAnMmbXX2pTdYne J3Rg== 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=qLNZ+lgbvSEioYAAYBj3077lPKY5dJwm5NHrH36r5zw=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=BGPJxWKQK3sWcuTWSxLvNhqq+fC26+PS0B6k+1uv0T3sushYBnUxPmsR/UMrThhWCU OqbEukbq7SJkcf4ZQL/n1YLdy22frjrREskYP0WmavoduCJLVfiu8QaEpyNSKSxsMQEq vyojTyAIXMjO4Ge4TngjKkr1lJ7Z9NAj+A8U3HqB6umyVcGDMLRqWGbmuOz5HJs/HVYy XbGCCSEerfgWZI2xeN452yM17GTnEWGnUoqmY+LdflO4xUKh7i2a/Rp3RT8I3mdnMhr5 XfBGKr0DFXtnk6mmWdcOhCYBo8z4O6YelvAtxiz72zL4mVHULw80itFoFVJT179vFjaz mxkw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="w4C//uNi"; 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-49a3be34af6si7944516f8f.201.2026.11.12.03.16.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 03:16:35 -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="w4C//uNi"; 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=qLNZ+lgbvSEioYAAYBj3077lPKY5dJwm5NHrH36r5zw=; b=w4C//uNi3Ew0 7n00i5XDhXXgp5ynHOlDh4W3XRLXoBYH+OxMjVr5VmSw/QNqZa+spPnjxWIvqSihHpv2P8Dd5yctn wI5oLSQxWpWK32xOtWJw08pxOwdm2NPVKhfMhsfUAYFxceN7u5fJVcEy7L+8THxDW446HLwRKbME2 Ck+9eiTz3hoFiTKyz4EBwkKWGivQEYjIdARLzRBp+v4OS8bh6AdWRqqkz1qk0/WdX9cmADvnIuzwd gycOPpkLjFCyinlY59q+7an2brNGoA1du3eunoXcn4bRqCXmWmbP690L+c+Jtkd2wj4PJuxVmIoaC jMjkC5wyZAzPsFabS4Ok+A==; 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 1xRSj4-00EzHk-2D; Thu, 12 Nov 2026 12:16:33 +0100 From: Andrey Zhadchenko To: khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Thu, 12 Nov 2026 14:12:03 +0300 Message-ID: <20261112111205.736027-2-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261112111205.736027-1-andrey.zhadchenko@virtuozzo.com> References: <20261112111205.736027-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 1/3] dm-qcow2: count in-flight data writes per L2 page 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 A discard, which frees a cluster, has to know when data writes submitted to the cluster earlier are completed. Nothing tracks them now: a write goes from perform_rw_mapped() straight to the image file and is not linked to anything a discard could wait for. Count every data write submitted from perform_rw_mapped() in the L2 page mapping its cluster, from submission till completion. The counter is split in two generations and a write is counted in the current one. This allows the next patch to switch the generation and to wait for the previous one to drain without being starved by new writes. The counting is done from the main work only, so the generation is stable there and no lock is needed. No functional change: nobody switches the generation or waits for the counters yet. https://virtuozzo.atlassian.net/browse/VSTOR-154659 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Andrey Zhadchenko --- drivers/md/dm-qcow2-map.c | 22 ++++++++++++++++++++++ drivers/md/dm-qcow2-target.c | 3 +++ drivers/md/dm-qcow2.h | 8 ++++++++ 3 files changed, 33 insertions(+) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 34d9d9810f601..2c0e7bdb251dc 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -368,10 +368,12 @@ void qcow2_init_qio(struct qio *qio, unsigned int bi_op, struct qcow2 *qcow2) qio->queue_list_id = QLIST_DEFERRED; qio->ext = NULL; qio->data = NULL; + qio->writer_md = NULL; qio->bi_op = bi_op; qio->bi_io_vec = NULL; qio->flags = 0; qio->ref_index = REF_INDEX_INVALID; + qio->writer_gen = 0; atomic_set(&qio->remaining, 1); /* @@ -613,6 +615,21 @@ static bool delay_if_has_wpc_readers(struct qcow2 *qcow2, struct md_page *md, return ret; } +static void inc_writers(struct md_page *md, struct qio *qio) +{ + qio->writer_md = md; + qio->writer_gen = md->writer_gen; + atomic_inc(&md->active_writers[qio->writer_gen]); +} + +static void dec_writers(struct qio *qio) +{ + struct md_page *md = qio->writer_md; + + qio->writer_md = NULL; + atomic_dec(&md->active_writers[qio->writer_gen]); +} + static u32 calc_cow_mask(struct qcow2 *qcow2, u64 ext_l2, struct qio *qio, bool wants_backing, bool wants_data, bool wants_zeroes) @@ -2863,6 +2880,9 @@ static void data_rw_complete(struct qio *qio) bi_status = errno_to_blk_status(qio->ret); } + if (qio->writer_md) + dec_writers(qio); + wbd = qio->data; if (wbd) { WARN_ON_ONCE(!write); @@ -2919,6 +2939,8 @@ static void perform_rw_mapped(struct qcow2_map *map, struct qio *qio) qio->data = md->wbd; spin_unlock_irqrestore(&qcow2->md_pages_lock, flags); } + if (rw == WRITE) + inc_writers(md, qio); map_and_submit_rw(qcow2, map->data_clu_pos, qio); } diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 8337efc5c6238..07ca928002e0a 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -399,6 +399,9 @@ int qcow2_alloc_and_insert_md_page(struct qcow2 *qcow2, u64 index, struct md_pag (*md)->lockd = NULL; atomic_set(&(*md)->wpc_readers, 0); (*md)->wpc_noread_count = 0; + (*md)->writer_gen = 0; + atomic_set(&(*md)->active_writers[0], 0); + atomic_set(&(*md)->active_writers[1], 0); INIT_LIST_HEAD(&(*md)->wait_list); INIT_LIST_HEAD(&(*md)->wpc_readers_wait_list); INIT_LIST_HEAD(&(*md)->wb_link); diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index ad5286b16883e..5755788e0e5ae 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -135,6 +135,7 @@ struct md_page { #define MD_WRITEBACK (1U << 2) /* Writeback was submitted */ #define MD_WRITEBACK_ERROR (1U << 3) /* Last writeback failed with error */ unsigned int status; + u8 writer_gen; struct page *page; struct list_head wait_list; /* To link in qcow2::{,slow}wb_batch_list and qcow2::QLIST_COMPLETED_WB */ @@ -148,6 +149,11 @@ struct md_page { atomic_t wpc_readers; int wpc_noread_count; /* Read is prohibited, if positive */ struct list_head wpc_readers_wait_list; + /* + * Data writes in flight to clusters mapped by this L2 page, split + * in two generations. New writes are counted in writer_gen one. + */ + atomic_t active_writers[2]; }; enum qcow2_backward_merge_state { @@ -357,6 +363,7 @@ struct qio { * bio processing should resume. */ u8 queue_list_id:4; + u8 writer_gen:1; atomic_t remaining; @@ -365,6 +372,7 @@ struct qio { int ret; /* iocb result */ void (*complete)(struct qio *me); void *data; + struct md_page *writer_md; /* Some operations (COW) require special destruction or requeue */ struct qio_ext *ext; struct list_head link; -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel