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 9DE54802A5 for ; Thu, 8 Oct 2026 10:06:20 +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 698A538g022697; Thu, 8 Oct 2026 13:05:04 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698A538g022697 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="dgAvTO/B" 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 698A4uCJ022674 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 13:04:56 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698A4uCJ022674 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-48c54e690c5so3962734f8f.0 for ; Thu, 08 Oct 2026 03:04:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwuEhlgur+JsI3vYNwQlk8GzqXEJgtROOALIFbF6F7kMsIRZaP6C+dSR4hl/PH8EC4jIDARFw==@openvz.org X-Gm-Message-State: AFq9FYJ0yXy/JTbVS8rzAO4/VH6iRxungW62CS4vbiaX9XWzrzQ+h0BN doGG3ueXUORIOxEwXkj99uhChDGrKHBa38AJ/5EuJnejJ22hb4bSPli/DYUwXL2rCWjYuPiJz20 TOzjKgrSyxLH3OJonH0bpnr6Tawxc+Nc3fEP4lQAKa1mfaSnMffl33Q== X-Gm-Gg: AYBFou2K4Uky2UAgBFk3E1Ol5tcN08yhxcYe+H9WXt/n+EHDHfJ01ZgcERy5A9EjsKe 9QpSRmRNRXPhwcSVAi7zBc65a9oNA/bOQh521g+O1WQOHuelBXgDo4e7Scr0tGfmJ0fjtGBop9b wiBjovTihoEfNgMm9c2v04rrzS1NPEVUiq5beUhZuScA/EjQcBoQNBZdlvMC0UR4JLDEl+CpN8y KrYjE14zK/xrNnW+pEC7SZwsiaNXUaBnIuq7bH7Ep575p2kirZVx4KsF9ixwRF+A1KBWLcf1aUY +CjWU0VDps/o9DlaxdnX7Cz/GRE/6OdL8qhQVY72NvYE+EHyVjU+dKoGnB4gf5s0ndNYuUJjSE+ TMbxqFSkR/Fj8eNF5pWorG2y9ZuQ= X-Received: by 2002:a05:6000:200b:b0:487:27f6:a4e9 with SMTP id ffacd0b85a97d-48c7289d8a6mr9302275f8f.57.1791453895556; Thu, 08 Oct 2026 03:04:55 -0700 (PDT) X-Received: by 2002:a05:6000:200b:b0:487:27f6:a4e9 with SMTP id ffacd0b85a97d-48c7289d8a6mr9302203f8f.57.1791453894851; Thu, 08 Oct 2026 03:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791453894; cv=none; d=google.com; s=arc-20260327; b=EDGw8B4UickyNfcOaRqPam6812oB/M9A6gUVvVBzOUElWb19yY0QGAZklkAdKv1Bya nocjxBfUBfWtm04mBKEy32mdxKZZWxDGv0EVnosRyyCtEuovVvzzQ9JPHPrWTQCnbd3i 1s9dmJpocsYpOW1z6UwU/mjrMQ4ywxx23kN9JU7p3xz6BM+eDHoSdXJCkAu8hTjbPqqJ t1WFv4vB2xXIDkfemwlrB2CnkQO9FswYiBgemoHEd8/jw+16U6V0CKabIuNZYV3F4DfB Dps1d7QFte/3gDKEeESnL64C89ifxIP3wY4T1MaaJoNRXi/ShgFOBabuNrRDbKiFl42r TRHw== 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=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=AjacbGxLrplkNEbRM6VCoiUG+8bPVrHtuq5Uu3APhJT59W29zUHBYFZczF+spWK7a/ 9M3OaKvCcb2VD9666UfDIZaEz5ooiIfaqv9YBGOdVLmWRWXZYzctT5kBF2bkviaV7Rzn fH/DBHt4jIeuPF2ur2QtgnTyUA1bmsQ+XFNDzn+aK7KKyUjnmhELdm4KaTkBV6+Ws45A w6924a96BRqeYPkrcCGcA17sXYG1RDPQlS0I+D2yOG96ZH6XE5BhXXJ1g+niJcIDDp8k eJmXqi2KAXOaa8V/SnTbEygCfHIIOk89WiGHag7USOaar+lF6pfWbwfnM7IV+4ud1x1m yt9Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="dgAvTO/B"; 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-48c724bb536si10334012f8f.461.2026.10.08.03.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 03:04:54 -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="dgAvTO/B"; 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=dgAvTO/BXVOp xf0NYZ3R6OCr2yYqYDtWvrOrOgLpYRO2J9dKLUPbFSvtddfkWbomvhcqbxyIQR/6hM3QhrtvWNoDd CrM4vYdHcJKomk+ySTLja0G3Dwgbkca1n42ADmOVHaWwMS0/X8cqrkeTjhOHsroB+FgzpZonp/ZBn YTf8eUKsvZyP96Pr+j8phsVqWSZELo62LbUZreQaimVgYf1PuiiRAinJVAlhZM0O2sNexM0YNqiKL gjUjP/BqhoMgzExxFlCPgQVcrCA0Biq5RZ33U40mRXn+eZAgw4bU8Jdr4e43whk4NGny7hY5iopwr hLediP6eCwmlwQH4FExOgA==; 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 1xEkwM-00Aash-14; Thu, 08 Oct 2026 12:04:51 +0200 From: Alexander Ivanov To: den@openvz.org Date: Thu, 8 Oct 2026 12:04:47 +0200 Message-ID: <20261008100449.550882-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008100449.550882-1-alexander.ivanov@virtuozzo.com> References: <20261008100449.550882-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 1/3] 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