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 700678045D for ; Thu, 22 Oct 2026 14:52: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 69MEoigu009782; Thu, 22 Oct 2026 17:50:44 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MEoigu009782 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ltg0jxoY" 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 69MEod1Z009754 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 22 Oct 2026 17:50:40 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69MEod1Z009754 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48c7fe9736eso1685185f8f.0 for ; Thu, 22 Oct 2026 07:50:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBybehY+gS5OyL5eOiGNaoJvBJcbLNJrMJz9epesZKbRDvvJjLhwOLrT213E49hwL58RaYx6Xg==@openvz.org X-Gm-Message-State: AFq9FYLalfeLpnSzgdIHaXAIBhIsTpKVGUScYPOq8qagLWrYFxV3cmEG ebCcybghWMWQBKmLrIg4O41FHcED5w15WiuGVpGTpPDn5mT2tD0kLk6+KefzPTEaPsoc2biQxnz +ckVfRqH8WdUlRua9Wv2n0jHMNUF+YDQinrUutmNKfUkzuZh57UPWGg== X-Gm-Gg: AYBFou0pgMwy7mqsavnIt3zBbvvo7e0QwKpEAvbjHYIxWOrg2JheJhx09Sanqbcy2or op3wVerUKXzcsCt+qXXvdKhrGI+1+JoEW2HtLFd6uohpd2hgpOKKpdq5ryLA5BV2GfWOqTtSWB4 AdyVt8YvF/Jn5/xgBl4EMtNbtMQUu/VnVV1JV88xKcVRRAUM0FUiiWItw1AbLzjVzhRA7vbWuoy bGhsTRbvDjZg72x4ykzp/poJ4L6S7GSYgfaelZpHzc24RMuQHUAkeVELYdUpjzUBs09mTta2dMA t6Se0w0WEbPzCTugMgNTMidP54Nc2YScRKPTYi6/jHMSKxoupg/nAm0u9TKhQm6gBK5ejWZBkdL +tSBRT9FCUL24d8cxzqjh+5cHAIU= X-Received: by 2002:a05:6000:1606:b0:487:27f9:844 with SMTP id ffacd0b85a97d-48e264f43demr8362266f8f.57.1792680639558; Thu, 22 Oct 2026 07:50:39 -0700 (PDT) X-Received: by 2002:a05:6000:1606:b0:487:27f9:844 with SMTP id ffacd0b85a97d-48e264f43demr8362210f8f.57.1792680638667; Thu, 22 Oct 2026 07:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792680638; cv=none; d=google.com; s=arc-20260327; b=YortUDQWibWlg2z4B7zdfKIBtbwqEMJVwsT27fj2WtW1RzdKimaOgwLqj3jXNAyPKO hyj1GwQ166ZigIVz12x15eYFCt/vvZ3z7NyUPWxJcCaIKC7vyZyZQYBk0QabFKf/pPtz x+BmrpxoAURzCNN/tnpQMtzCod39XAMOc5dXdaSTRLaWZaXPwDbyBmBitUUn1iGHojQC I9M6gSokJ3ZYXC8InpRDo54znocSEnSwNbU0vEwR7S3lGn6DAof1MBYGiBGdz9hKs1L2 nOcJ5ODhbzY3PPyahzVbgjcyc6jdlGO0ayfQ/Pxm1GXeilTienfLuD6w2GRpBXLz69s0 4WNw== 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=Ya9FdcjXVgEyLiitJ4esQ5PswnzK/Bwi/FzkUYmgMfhBm/lc0meF+wUjkrj6H5RhpC kxZD7PzmIyf/myyRH72398xx884C60qGA5icNxM8iOVdwA9rCqzyy1JJf8nirpin+0oA R+t+JZPnoKeHfgrb+nJDNHA5+oiU4By2oKtl1rNQID5UGc3WTrrB0pcxzCqjEvt38UeO nSz1+GjARv82c1Da+YU94Tw0+dHcqsWI9OfGI+a8i/n0DIx7fsEdmudThaJLH/bP8lc0 HcQ8cmOYe7xeCY3ZsXyTSaSP2AH9uiR0UDlbuuZG+yjapbb0C1A7MPxGPFdD6Mp8yE/g oTRQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=ltg0jxoY; 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-48e2586f412si11736975f8f.283.2026.10.22.07.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 07:50:38 -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=ltg0jxoY; 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=ltg0jxoYbfTr lSTXnvcr4/E7XXlSPfPPpajf98gyf6Uv2x7X7G4kLL2pThsrm+2skp540mNVLrgOv+26N7gETytkD KJnpeMxPN19QeSOBErWoaz5vJJ6n5eVGQi0RZssr7rMUipz+zR0N++0yQ2fBPHaNshAPJl5Th47bB axthnfxuHSlO8E7ySp5DaDM3BwmcGeKZ7KgBcIxTpPsaZ+ZFa6rEXi8F3b2IkQycpXgTkARJhLdvd 499UKEbFcm2gjGxZ1XqXGZeFlSoUkHMtx+epI9GaB/SIumFzi/LBEgUAdEa3iXD/fnkTj3uGhvNuY R33+B7p4NRp3og7ibA4brg==; 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 1xJu4C-00GYCQ-2U; Thu, 22 Oct 2026 16:50:35 +0200 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Thu, 22 Oct 2026 16:50:27 +0200 Message-ID: <20261022145032.2128679-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261022145032.2128679-1-alexander.ivanov@virtuozzo.com> References: <20261022145032.2128679-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v7 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