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 3F07580474 for ; Wed, 28 Oct 2026 15:08:12 +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 69SF6wZF021100; Wed, 28 Oct 2026 18:06:59 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69SF6wZF021100 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RtPkhQJy" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69SF6pCE021046 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 28 Oct 2026 18:06:51 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69SF6pCE021046 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a0284121c6so9693065e9.3 for ; Wed, 28 Oct 2026 08:06:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxq3nO8PvBKj69/wHXqOxgGok+r7Mgq9PLZw1Za2WhCJ355yw0s5m3930lFseggVtKlcgUEAA==@openvz.org X-Gm-Message-State: AFq9FYIYjC47pQKggk8YT6fFe3HfeeXM7jedtOQWGTt6FHvFxI244piH 2JwfFoqscZY1VweyOSR+A0jE9p2ArzbQtMBypmzVIlXIIB6Mon1AjA3083muFQKSlTarltkJqIr KDK8OjT8BUOQbj1GialWC/wd4QFobUeHWeQ9RdreA2l/x45PWHmyvgQ== X-Gm-Gg: AYBFou0dPBBSFG+jhCaZ8F2Q4WKOJVKgVyBEq9Rn/rJg3+Ab4U7maWyhUHiFm9iRvrE eokwxvFXbvRwYasIQZgk3ar7tnpPXTf3ZAOvUqRYDT0rYSxI+qUQy/+O2kr8gy3zi4Iqec0Jy3g AqHBr1mT299dxF3/talqNeE9BIQ1UN0/PYjwPlUbtZM7DCkV/l/nVgCy9aliET15wbRwrMdYk1h VUGYESgt1GQudzPkhBSdNeOaBtfXT9az1H9ic0VXL4n9AXblQ40pLB0SrR4xhDiMr0hOuDU8kle G79wgX4kTmduNwqc4UpJTUCfgVZUEJJ0yluMZ7R6oajBALw7PzJPniNQRRcbg+YcvcqUn6NVSGD s4CSAKbV98HqmziX+uy9MCRwNE/4x X-Received: by 2002:a05:600c:848c:b0:4a2:a6e:80f5 with SMTP id 5b1f17b1804b1-4a96639b002mr64172395e9.11.1793200010832; Wed, 28 Oct 2026 08:06:50 -0700 (PDT) X-Received: by 2002:a05:600c:848c:b0:4a2:a6e:80f5 with SMTP id 5b1f17b1804b1-4a96639b002mr64171385e9.11.1793200010345; Wed, 28 Oct 2026 08:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793200010; cv=none; d=google.com; s=arc-20260327; b=KgeipyuqNMtDajRZRPrm08P2Up06Cniit84CfEgivZpIN9cgU6Ain6+w6HlsPg0Chf 90hzYd9y87/XSKJT+6n0gHQru9uVFLs/mH64QXahS6orYPBV1SQj9p410vd4Xgw5fJub VVQMdYfdp3HYIj+JYQfWKpACUgo/KlG9mEugwwKoFB6JRy/StPUBVDQona1ZeS4CB+uX zTh1dZcKa5zueOq4YANxVU+0dE8f8/SisxgqHNNHeFdHGp2GgJBLIBsR96MWr/Itz5JA PfuqvdqkNRtGBSvZ1WLoeTNhhg9m/OI+fmy/3tGLSr4ZbAO8VDMqE1izdJ6iYd22O8zj h5Sw== 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=E3vCAgcov/hQ3XWh2CqQ9wok33eMAQJstV7H9y+Mjr8=; b=sds4eDaYZp/ls0/UJ+PAMQo/Q/xGpi5IRBD/AdJtck5ih6q0asPt2jPf0MVBq85kWC GIER8ayVpGF5Apg+6qGpap34/JOHsH4mi21mWVse0DJh5+gTyQC0Hye1QYEFKmjF6y2Z wwYgU85fcapMZn4YNX7VoyIePNYa4WIaA4Q6j5a9px8101+Y9EjkcuzOP1ND8/rQ+RD7 LSe6aAAqYgnhysb+MOX/PlUMfgz2ELMY6mk7jU+BK+E2gZUcYARua5QThiLkzv3LEsQ5 6YkSL/mfNZWHXZXl80XhTiLAraeix2sJ1SqeJiwfj0iuqNilU9WbsqOYkvBoZERBoI1z NYxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=RtPkhQJy; 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-48e3ecdb52fsi24610273f8f.82.2026.10.28.08.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2026 08:06:50 -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=RtPkhQJy; 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=RtPkhQJyA85d pVA908I9GrRO973yInX/RgZNyiPrXK4whZkpoztUw2tR/3zLyerN2vQtwg8dU1aai+60l3C5KnjK6 Uz16lD/c/rFyPEZN0uuKVUr34YiUa836QKduPHjF6Jh25armS5dv4Ml8QCYp+pbR10KH9OJoOz8nT lAYXWUV1Zlqa1q8VAb5CorBn+ldBVb0n56Tn7o0ATzF0PGAMo+oUoj26esZrLkKqPACaFPtagalo7 Brfd7FCh4YPd+RJVSVRvtkvOTppgqGrIhabB0g/14uum2ASYgSUT7s8OU0jVfJwlNuxB3mITb1+M1 BNin8B+3NL77OPFb3X6F0A==; 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 1xM5B1-00AtLl-1T; Wed, 28 Oct 2026 16:06:49 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Wed, 28 Oct 2026 16:06:36 +0100 Message-ID: <20261028150645.3222391-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261028150645.3222391-1-alexander.ivanov@virtuozzo.com> References: <20261028150645.3222391-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v9 01/10] 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