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 94CC580474 for ; Mon, 26 Oct 2026 14:43:48 +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 69QEgT9V011666; Mon, 26 Oct 2026 17:42:30 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgT9V011666 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Ml6Bc96Y" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69QEgSxr011638 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 26 Oct 2026 17:42:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69QEgSxr011638 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48df730c035so1942015f8f.0 for ; Mon, 26 Oct 2026 07:42:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByTm2z8njkcfVGgBMBqZY93JcgsmNIyZgBlb6rmXWEsONKwDFLmwOalJGjInsQOBz7pxG0ACQ==@openvz.org X-Gm-Message-State: AFq9FYJvlqNyLxExtXP0mRj8PsljDF8Ud6yw4SR1Cch4n2hpCLMpJ+gD PPGlapdMJ5A9tXfCa1CjYSld4+4p/3Hpp5JBIsCG+BHywWHD76qqqAhbbdB/dfkJOTXlT77owVi kHshAhDNtUnNmqIzH5xIHal74L2fWwAs231sH0hrckoGmlfERTby58Q== X-Gm-Gg: AYBFou0MfhO8qvulheGM5UU7g9qiV6RgJHBrYiLbdkoy/tsx6LFbIvr8GxdUSa3bTW1 qSFuWgVfuXUF/6sGAyRGxQpli4N6mrxUH+4x8iXBP4oo08WfZWXcgoBQ4y9/yVb47NRCT4yMmQb jznJ+cvDhbeO/Zqy3XuwtKZc8VHBOVAuMW/our9luM2K39EusdnfsteeB1bJekqzHK3LaCKaLEk +7966VDgntGcJd4hNpChzECGbTU2nA1mxwUmZQl3DMM/04nnsfUWJDjwVSjFifPub0FToBGYiKw cS8Jjpijk8FXqQJ40J8QJ9pQ7gYTtpJN/Qv7XYXM21L7Mo0P+foz2qgHe4PMYSpDkg+0SjGVyYi PGYvhgGEqqxdyIhkYH8OPtDXLJjYG X-Received: by 2002:adf:eb4e:0:b0:48d:ef7d:4b4c with SMTP id ffacd0b85a97d-48e3eb936e5mr8323875f8f.44.1793025747877; Mon, 26 Oct 2026 07:42:27 -0700 (PDT) X-Received: by 2002:adf:eb4e:0:b0:48d:ef7d:4b4c with SMTP id ffacd0b85a97d-48e3eb936e5mr8323827f8f.44.1793025747196; Mon, 26 Oct 2026 07:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793025747; cv=none; d=google.com; s=arc-20260327; b=SUkm3vt2bWsErz/6PthSw6+tWj+JCOcgoGF/QlLMamS7/6/HLOvuqcrMA9inacwl+t 5kgsC+xs4wx6LqezpU/3HwRTTdc/TMk7609wDpy0CG7rd5q4jfm5j1k3JGeg1QE/7G+0 rYeBCwnFnpWtr6vWDDEmt/B7kZRmPPZFswRYkWji1zhbGZo46BQLkgTJxhFI9hTqUeDf Mzk9Nvk6lKJi30Ncojq2HOFRDiKLKRhXNdN+DH0NdidQANKShsqe2+qSTZ3OAc1EKTq+ I/A/t/+sE05/usl/TquwxtFRWPt8BShIhCYqvq8ZYgJ6mWSWMUaRSrgKja1eML3GjOjP +wvA== 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=U30ZiiTowbNQL4On/jtVF8y2asnAvf3yfXvEi0WRHcPtswq7TgGj2jk3xPXHPj0deA Uv3YmQ1imlVSPHMdnH0OM9Uuz3EJispgceiDY6ij591Xz7WT9eiZWVWqYsMfC2vOULo5 qG1fKAH5PG0JAsTMa8S+FcS+SiNyRxkY0UucUz/cPX0I0ubYiR+jl8NAVZJ0mHlBaev2 vdZ04jsgZXnynrglxcY3Fcf1nUCOSXUwPj0pVcKXnV2a0Pz873AIqkKQgprZCjXDSorD 4IPhLyfOIPzmK5RyetF7W+Lz+SyVScVaBR9ehOIS7jTbv/S2SbLyfhPDKXD/o72qfXvV 8ajg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Ml6Bc96Y; 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-48e3eb9cbf8si14404363f8f.40.2026.10.26.07.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 07:42:27 -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=Ml6Bc96Y; 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=Ml6Bc96Y5MKX kM3eiLZur5tEAI3HNhlGvfJ9mniNrQZdhfFt67+BdKZ94ts7RTeuxWxc2zU37KMtl8h66FKi4KEUr Bis3AaC7CbJValKGtDljcfaUIdalI1F+RuJf21yuzodzijagnb4YUSgrs6YUwiRfe3uALpFjqz2Sr /B7cueILsh7Mlw4UhikSJazpSntdPC78xax/OpV+957UQosoqwSvAm8yqo1/Zl9+xWqiORRi3W3zB 21T2vqsh0RKOk1qB0nQwWnzXLjMcyIQaqDuMOnizI/bezPmd5lizAwhk8wSXuKNqYiNi5Y0yrgZBM zBtViBWRYudbAH8TMh4fsg==; 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 1xLLqN-004nT9-1Y; Mon, 26 Oct 2026 15:42:18 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Mon, 26 Oct 2026 15:42:18 +0100 Message-ID: <20261026144223.2787145-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> References: <20261026144223.2787145-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v8 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