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 054158017D for ; Thu, 22 Oct 2026 12:18:44 +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 69MCHO9c008104; Thu, 22 Oct 2026 15:17:25 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MCHO9c008104 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="wm43jHLP" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69MCHI7H008066 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 22 Oct 2026 15:17:18 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MCHI7H008066 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-48dfa054f26so1351232f8f.2 for ; Thu, 22 Oct 2026 05:17:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBzRIX4SruOubowfu3raZr99O82sWBcRGoLTC5yiuP07p941NwSJuXJzs1Oj6uTO8ZeaR0xdrQ==@openvz.org X-Gm-Message-State: AFq9FYKLGIDaHuAMM/sVMmsZ/GhMb7GuGqnhPgeOTGvRJ3Cu4wqAJRdv hCV/YhP0dfvG+INcWu+SEOoRKhnVLZD6s6FmvxAHRhL+ETD3Gp24QSbvypvl9vTj6f8xDBHlbJf FDT/LxG/8+X6ArkUpHubzew/OOio7Ud6VQQ9ki3ZTDrxgg8I1v9twVg== X-Gm-Gg: AYBFou3Uf8VaR7Q7GoHR7yM2BcmEJOalRV9qa/XDfqCOPiBVOPOwfkGNfXvkhtsHZCs nw1lHZq5uA4jxMP8giaLppazXuiRfNIh737zTR+Qc4Q+WlPBOKOMr0ZuhwGGp0G40I8JyLr7oiw xAFVZlN0DXzONX5XCgqQXiBX7guMQQDAKYwT5U2/fPL4qPG3CDbSi/EzyXPOEsh3OZEbtydH0dT BcRc41nfsiXCSN5swsb/a4Mq6wdiPfks2qPO4WCGFmkhoSEBjJEtmuwVZ5XKgekZUqxE2zRE6WU qyeFfx6CBECav82b89hYqOZfgnp9KZJbgv6w1YakkYMr6BR2kwEF0OrcNXTYw2S26bUzIUrjLBT 3AQz4Xw6M9M6ANCpAHodDa7C0T5E= X-Received: by 2002:a5d:42ce:0:b0:488:5af8:eabc with SMTP id ffacd0b85a97d-48e264bc498mr8158233f8f.26.1792671438440; Thu, 22 Oct 2026 05:17:18 -0700 (PDT) X-Received: by 2002:a5d:42ce:0:b0:488:5af8:eabc with SMTP id ffacd0b85a97d-48e264bc498mr8158178f8f.26.1792671437753; Thu, 22 Oct 2026 05:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792671437; cv=none; d=google.com; s=arc-20260327; b=q/BIlvYTZyRu7gaNyu5d/b9wyiTnyoD66V3iRG5aB6tukERT66Gq3gch5txQkoQeOD E/1MsNhTO2KtHM0RE79G348Iiz/Em6PJFv1pMmwXVHHMP/UvzcN9ecQmTSCYSjnNQ4nP phczFGeH4u//8agz9I3Sy9RyehLiU75s6SgTs4ySNrQ11GSIf5trWI7ai3h7XoH9veOu WPVni8fK8E+tVFlM5TlxbKHHt2RBzBE9tYcIB2hF+b+6XzSLxMKFQxZm1G6m2+QINnBi wLa21ejwnTHipSxuPsX8p04NmbhqrQfo4sI6DgVGqgHMOmtOk+JcmTGI/aHVEEWyIA2A 8Rbw== 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=QcRJcyoNb6Kff4K3i7guaBQ+ddBAJjcodktlwbtyeZs=; fh=1MEQxOGYABaQPNQS1Ckioh0rrUOwgCYjd8t5csgx5as=; b=qPNdmsLWvn6UuexqJBOLMFpYuS56nO1T7/E9F9OOU/1Nh6Xs8jVi8udtI3Ln+2HI53 4MNfJpEFt4wOT67d8du3AMQBc9NMFDEgwmH7oe6N4uz6p1kIlNdrdTEV8jf5AJ0+k/I7 +qSIH7KNbCFGtSxur2jUDXrEcYR/2vVgc8O6waRHzFvxGR7f44ACEN5bTptI+FK10zyg DMpd4FnDguXg3+sPd3p3tMbBwmctBItdO0EUVePZdAIhno1tpX5YD+c3q++zdYhCDpei X3xnBI3VoXfEmMuC2FNw8d8ZFlY3xJAzyE9S0K4e0wjxjn1ZCk+3TXIEyn3WjtwHlvyf x7OA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=wm43jHLP; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@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-48e254ec3c5si10564759f8f.27.2026.10.22.05.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 05:17:17 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.ivanov@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=wm43jHLP; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@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=QcRJcyoNb6Kff4K3i7guaBQ+ddBAJjcodktlwbtyeZs=; b=wm43jHLPpaj2 yFpMqqWQhuAeAjA58ya24kyPxx3e4pBIr3MyvKMX0Qmam2ooNHW9ZLbBrAL/IpequBO9HDJgVv8tZ EDV5iGAuHXS0XAiLckTt3dCEK/aXNwFe9RIcGG1Jxe68eQLj3pGSJBcnPHAvhcOk7mA0hHPDEa5s7 gAWQKGnQ7Ig0wPI7iZrvIRZZvKm88KTqS0uauZ0SJt+TTStSTZeDFZf6B+3tiGJOs79sgT8dAS5FG uiFfPDtmr3qdhsDzqADmAcuyjXIiHYBzoBkeFQW14K3EUrNyvoCVkGDtNnub7ZvukBmezIZIsDtuV v1akwujwk82P4+zChpj9Xg==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xJrfn-00Dc1n-2e; Thu, 22 Oct 2026 14:17:14 +0200 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Thu, 22 Oct 2026 14:17:01 +0200 Message-ID: <20261022121706.1890593-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261022121706.1890593-1-alexander.ivanov@virtuozzo.com> References: <20261022121706.1890593-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v6 1/6] dm-qcow2: add qcow2_md_page_read_sync() helper 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 Add a helper, which returns an up to date md page from md cache, or allocates a new one, inserts it and reads it synchronously. On read failure the page is erased from cache and freed. Use it in qcow2_parse_header() instead of open-coded allocation and read of page 0. It will also be used by a later patch in the series. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov Reviewed-by: Denis V. Lunev Reviewed-by: Andrey Zhadchenko --- drivers/md/dm-qcow2-target.c | 41 +++++++++++++++++++++++++++++++----- drivers/md/dm-qcow2.h | 2 ++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index be09615eb8e2..311a23d63a5c 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -418,6 +418,41 @@ int qcow2_alloc_and_insert_md_page(struct qcow2 *qcow2, u64 index, struct md_pag } ALLOW_ERROR_INJECTION(qcow2_alloc_and_insert_md_page, ERRNO); +/* + * Returns up to date md page from cache, or allocates + * a new one and reads it synchronously. + * + * The caller must ensure no read of this page is in flight + * (e.g., the device is suspended): if the page is cached but + * not MD_UPTODATE yet, qcow2_md_page_find_or_postpone() returns + * NULL and the following insert fails. + */ +int qcow2_md_page_read_sync(struct qcow2 *qcow2, u64 id, struct md_page **md) +{ + int ret; + + spin_lock_irq(&qcow2->md_pages_lock); + *md = qcow2_md_page_find_or_postpone(qcow2, id, NULL); + spin_unlock_irq(&qcow2->md_pages_lock); + if (*md) + return 0; + + ret = qcow2_alloc_and_insert_md_page(qcow2, id, md); + if (ret) + return ret; + + ret = qcow2_rw_page_sync(READ, qcow2, id, (*md)->page); + spin_lock_irq(&qcow2->md_pages_lock); + if (ret) + qcow2_md_page_erase(qcow2, *md); + else + (*md)->status |= MD_UPTODATE; + spin_unlock_irq(&qcow2->md_pages_lock); + if (ret) + qcow2_free_md_page(*md); + return ret; +} + static void inflight_ref_exit0(struct percpu_ref *ref) { struct qcow2_target *tgt = container_of(ref, struct qcow2_target, @@ -851,13 +886,9 @@ static int qcow2_parse_header(struct dm_target *ti, struct qcow2 *qcow2, } qcow2->file_preallocated_area_start = qcow2->file_size; - ret = qcow2_alloc_and_insert_md_page(qcow2, 0, &md); - if (ret) - return ret; - ret = qcow2_rw_page_sync(READ, qcow2, md->id, md->page); + ret = qcow2_md_page_read_sync(qcow2, 0, &md); if (ret) return ret; - md->status |= MD_UPTODATE; raw_hdr = kmap(md->page); min_len = to_bytes(ti->len); diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index d9b8c38e093f..69d3ae6fca8a 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -386,6 +386,8 @@ void do_qcow2_work(struct work_struct *ws); void do_qcow2_fsync_work(struct work_struct *ws); int qcow2_alloc_and_insert_md_page(struct qcow2 *qcow2, u64 index, struct md_page **md); +int qcow2_md_page_read_sync(struct qcow2 *qcow2, u64 id, + struct md_page **md); struct md_page *qcow2_md_page_find_or_postpone(struct qcow2 *qcow2, u64 id, struct qio **qio); struct md_page *qcow2_md_page_renumber(struct qcow2 *qcow2, u64 id, -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel