From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id B62F980726 for ; Thu, 8 Oct 2026 07:40:03 +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 6987cjCF021035; Thu, 8 Oct 2026 10:38:46 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6987cjCF021035 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="THIRNtuO" 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 6987ciXw021013 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 10:38:44 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6987ciXw021013 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48af4046a3bso4350959f8f.2 for ; Thu, 08 Oct 2026 00:38:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByierxM81D5/2qzWYtxO8Q2ef1gBOoyYT4ksiaOCi6b3qpeZI6Re+Zmwiou2NSPjVV8wTiFXw==@openvz.org X-Gm-Message-State: AFq9FYJ27maUA19O3Lia32vfo6d+PH4wma8zTgOzndjjYpV8RECTDml0 pmHGVTNrI9rMF+YfHZC3o5ItV2oDoUnxWZjstliML+u0bZgVX7Q5WjfF9B7t1+84NcqEnMCqIMa pXu3r6SkUm5/wxNEjoFr7I5q9bm9rtin7RZUbqvL/Xl5x59Zmv7wMyA== X-Gm-Gg: AYBFou2shompjesUcNbg3alZMScHVz/CL5/llt4iz/2163TTxuJOvHDMuhl7o114L7+ 5X4AUP/tmHRdo1vADSQ0SKsaOoE2dDJfLZwn/BEKO/TegN+YKxli3Jy+sJoMJhygiEK9thihv0a I/sED/H/jener4gud2KSOBmkXBRL5NCAucNeXMDROeUyc4CZodrjXE7Kx1ntT2rq62bkPBXx+Kt c2ZA2TkVtIeOKWdi8CcXeEJEseLIDNQlkT92gZY6YTvdjGSlKiWQrMDtspQ9mAvyWonc9/F4YsW rAdksKF/nL4jkYEXTRNwLtyrxEQ2fzA6AWtEhei00LheJS2ntBoQBQVeYUn9/Dzt5LBNSPgd7K9 erjUx8dDcbPcPJBMciRcCZ1JcgCDl X-Received: by 2002:a05:6000:3cd:b0:488:8568:bb02 with SMTP id ffacd0b85a97d-48c7278837emr7949812f8f.23.1791445124380; Thu, 08 Oct 2026 00:38:44 -0700 (PDT) X-Received: by 2002:a05:6000:3cd:b0:488:8568:bb02 with SMTP id ffacd0b85a97d-48c7278837emr7949776f8f.23.1791445123819; Thu, 08 Oct 2026 00:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791445123; cv=none; d=google.com; s=arc-20260327; b=BEd1Abmy90wPgz7/7ehPhCCBP4tSQjLJevrx2F1xWuPhbEz9g3+6mIWi3T4taXYIqO 3xBCAbmlMcs7lqCSkfQKDzpdzFeFuO6JJPY4sezMYHjqKK0jzNs8bPtw4uOCmZ8XpooL jb+8lovuI6ST5UFBsoMffIJvZjXxgFSVdenX1jaxvgdHFRKvccgcnX39xj02wfE4oaCt 5ASPXmF2eLlzV/QFTpt18kD+gClZRhuymqeXBEU156eGm6W7720qmr4g6WbOI91UO/Ov /dw+arGpmTTV1Va7FCzJKjb8A+wzB1baDwEBlFUMswHNXt5csdE/FUwg0Y+DVmpZPFaH UhYQ== 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=cj5Mm8BMyx0Ds4fbacjpcQAqjUXyK7ds4wR/3CMIzPQ=; fh=iR+h9bi3Bh9zMcmhT/g9qNPJn2rboPnO22cA9JfMqyc=; b=PRMTtDeP9iPvN5lfiai7eDR8fh9MMe2uahZdEuEfDs0F7QtKkt9NNwNWar07acuzM1 fiskwSb273Xlyu222CoeGVCWRr6hpB/BfxTLW0CBQu1Tl8tjuaQmXeYEBYRu6KitJxL0 T4yfqMWEFp2C8wkjnk1rMGK3rlEJDaVlQ4gq/jQefcgqAqHTToahJuhMIqTFJGQZpGDY vakqWeZB9B/mQiZVG9EN026zC7D49KI+DGyY6BmxgfGk7iz/SfVG8I3034a0VENQIwFN G/XU+AYHzKnBzL6chUZo04Pvl9z7tAmfjuO/sz1lLJ5zeb0gJnuPRmdIJ9IAJ3K3emMP FtGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=THIRNtuO; 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-48c724b200bsi8996733f8f.412.2026.10.08.00.38.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 00:38:43 -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=THIRNtuO; 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=cj5Mm8BMyx0Ds4fbacjpcQAqjUXyK7ds4wR/3CMIzPQ=; b=THIRNtuOyufa VxloZu5Yok45b/vtvq1gLKGVt0aa/SkLDQeCdrIXHIwQrIfMKdgDY5gz2rhYU2a8OPwfN6lmu7X6C M3mAqYqCgMPBo9mE3D0wTy9pcYN66lm0G8W+unO7hLHVfEDLXD2UGaW7IpOwADq3yPIv06rc/6bQC 65dj3dNwlIE4EzzQYmkh+bXKEnwz8KSswwJz3GMTCLlzfpqX2CEgE0tC/kQWVdzaw9JRUpdipL5OU N2MgB7W4+RYaAqnDr1iJ66NeS83FF1V0JOwM3/jLMZ5hXFMp6LtYrxJR2XhijYcP0EMIfMD4NNz7u wQcUO0AoZdJE8feX1cKQsg==; 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 1xEieu-007naT-03; Thu, 08 Oct 2026 09:38:41 +0200 From: Alexander Ivanov To: den@virtuozzo.com Date: Thu, 8 Oct 2026 09:38:31 +0200 Message-ID: <20261008073837.510678-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008073837.510678-1-alexander.ivanov@virtuozzo.com> References: <20261008073837.510678-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 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 the next patch. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Alexander Ivanov --- drivers/md/dm-qcow2-target.c | 36 +++++++++++++++++++++++++++++++----- drivers/md/dm-qcow2.h | 2 ++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index be09615eb8e2..3e47e66b4007 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -418,6 +418,36 @@ 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. + */ +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 +881,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