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 4210280726 for ; Thu, 8 Oct 2026 17:03:31 +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 698H26Fh026180; Thu, 8 Oct 2026 20:02:07 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698H26Fh026180 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="BD8byFRJ" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 698H245s026168 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 20:02:05 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698H245s026168 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48b00febba3so3790000f8f.1 for ; Thu, 08 Oct 2026 10:02:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwC4IK+DVSu4SlJMif7oJsuCjld6MAepYU7pZjmu0tErgpi/Ere+gx9YpExMqp9BDFNn1ec4A==@openvz.org X-Gm-Message-State: AFq9FYKiYiXCKjhP1TOvgOMnAHSw+/sNGPMFNEIrZYGD/n8IRTzG/wLC NoGf88kXonDNr4QprSMLEgt8B5pCEBIUPQIR2M+S2qg+IuA01+ooom3YNWKgnVASV2ein9lJT6F OqLYdPsFE8QNu6wKO/97FT6tmxpXGVQzV6yjiYCrEMcKci68y4PopDQ== X-Gm-Gg: AYBFou0v6FRoYVGg1g02KTuSXFFYQBEYfgJbsQVSqK78DyIqdIxhHTvgK/BnqDxRkvO xelOZYF/vHLY1m0hFw3wnLuSHqgzGk++CY5JrRrKwacV93PONm2gBJSAzAGMZfHb9twQbDf7GbR /h9gWDgCwfk4xKh4I8RmzXYTLu54IGV4+qwC4zfVbkbgML8o1vFpcC4NjepScynOvwTXrYMLjxE xoOciXgyzD5bJGawLfWB4BtBjD7Z6836380zX46NHarwqGBp4vxEPdBbJSwmqFnWkQirf1Q0zAF hUHyiINzNIgr2ExyJB96vkpAjvqudJjW6spIV+7NjJUGQ7+cw0XWlP/MFbDrcYdmnTyR9oAiyWW ioBOquhwjei827aYX662HxlCYjmc= X-Received: by 2002:a05:6000:2210:b0:48c:67d8:efae with SMTP id ffacd0b85a97d-48c7270324cmr10928471f8f.6.1791478924471; Thu, 08 Oct 2026 10:02:04 -0700 (PDT) X-Received: by 2002:a05:6000:2210:b0:48c:67d8:efae with SMTP id ffacd0b85a97d-48c7270324cmr10928366f8f.6.1791478923609; Thu, 08 Oct 2026 10:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791478923; cv=none; d=google.com; s=arc-20260327; b=aO7JoKXodyF+BfoPPKo25clbnzNnIVpvTlZ+ZRUW/PilcNXPX4P1YBkJHAzVF8WLkY /Nj0YU4r5yffthlBPuwxiUV2uwBgD8XYFvpLgBa3x9ZBa0wd2m5q9twZqI2sBEwLuBPX 4mQZFRvZB4RHz4QYYKl0KAa8zGPuGXMgUhkDlRLK9OoNK1mN1+YI2SxhdciKW9/5S753 j4V8Zln7A/wjReGN7warmxplL7CKCB3ghs+hxQSk672YK9nRTdWG+m+aMEfVlzBi3pT/ 0nr0rQFqxZ9D1PPmih91LkKSezrGl3iOdpSmlCrZrhNSVLTHzLQR5qVMhPHcVL7Bda/y /IsQ== 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=6eA/ojkWtmjSAFFH/n70JIOLYQCcksprg+gHW9P7ZR0=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=WuCsShkQBvnM13zWK6qW9Ah7LYatWhIifOl+i2h1wUr+HiXV3nxmDvpVWtDrMcwMAZ BcB+OsRBajDjGV0VOXcG+mTXMMAGxXRbKyRtRCrbnnSYuc7Nh/QAvKJP2nR47w5IPBWR ZrpHbtOfXiowfX2pHY7ErlbrlKk+0d9+80fw+o6gDDL+g7o6yRg+ClidvsKJSz0oT2xE TceG0ILjqvX4RA9FqZMHHVjlFnymKe1AndjbJKZzp6aGQTaJNEZTsL0jKPpiv54NL02D 3d3vQrvqhM7fLovNnXGynuepXpgSDXD5rxWXgvQIJnsJoaTcR38Hd5RJHsTYhHVrl8yf 14iQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=BD8byFRJ; 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-48db657d853si544828f8f.366.2026.10.08.10.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 10:02:03 -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=BD8byFRJ; 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=6eA/ojkWtmjSAFFH/n70JIOLYQCcksprg+gHW9P7ZR0=; b=BD8byFRJFn3I iyQ/pFNg4m96IRcDivNVjiIttmzm4+6fXFOImIt/7I2rjTmpLOK6iRehzzaOqPuR/TBm5Lzy9Bw6m yUYGIegUE0UdwdIberu/rsfZ+9pgp7Ch9C8EbqSq0oSkRpYVnL3oMaYMAajoyjWyMLD3ATVUMYQc9 0ePuvyopkyYSuMt3b185gygcA0PXmMHb3FhYp73p0keCmAlHq7ZnJZ6d8qTuoF0MgVVQ8QM0PSL0f CeBKUlIkWaMRTgmn6m5ryZ120wKJ/z1/z0QwHxMkX0npbqtiSi+BMVANevtbslsoTjjGJFKkVvvKJ 7QF8Um01I4gLA00RO+c5rA==; 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 1xErS2-000z63-3B; Thu, 08 Oct 2026 19:02:00 +0200 From: Alexander Ivanov To: den@openvz.org Date: Thu, 8 Oct 2026 19:01:58 +0200 Message-ID: <20261008170200.646208-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008170200.646208-1-alexander.ivanov@virtuozzo.com> References: <20261008170200.646208-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v4 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 | 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