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 AE695803BB for ; Tue, 10 Nov 2026 07:53:05 +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 6AA7poos011893; Tue, 10 Nov 2026 10:51:51 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7poos011893 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="FG8mJcAZ" 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 6AA7pjDb011848 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 10:51:45 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AA7pjDb011848 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48fcb657f32so1210036f8f.2 for ; Mon, 09 Nov 2026 23:51:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErG/xIk9+VPUIgMNy249nL381txJ+hW86twY+QNo1fAQ07Mbuoh5G91FSpmk2BrQPdjxvcbVCQ==@openvz.org X-Gm-Message-State: APuU4Z/L9eY8mR/iXJjFKaiEFHuLUFMXulJEJkNzXJgIw8KMwejdzcYH s44HmAh7fd+EPAvJ69KBEo9tmEftzshPV2m0P/yi/ue607t5gOJb/NceCmcHQ+aQMf9hRB5Zarl cg0d0n5kH9xNRvatFbziDLptWAhwyti5XbnmGizdE2e6p/DTVKGB9qw== X-Gm-Gg: AYBFou2dRjO52exS7T1evxTBG0F6lMxfPVHQj/oUm0tfKoE68UClYNvPg2GegzrCsgv lT/CtwMxRWOUh6klSHKSYhteXH+c3xkG+TJKxr7RIsbV+rd8YbPL6k6+nH/BCA4SvJ8cj4B5Adb bD+zsNnQjSeJXs/QeIOdxFNs4Fb3pj5AG908EDgIgj4oy/nXhMn9ONvYB/wVuUuGUOJ0T/Krl6E kCm3WMF3aXZsJZBqU7p2VTZvWHEA/hnlUDUepi95GuzKENKY1CNVF+d/7QNPC/pSss7Cz527QQx PyzE5MYJMaoMQGfK68x7OzbhDg61rlDsnSx+lInoWyhJ1D3mIWEQtF2R0sRovuP2WrWkKyu4YGb rvsZ4UockFKntLtS5iROkBg0DVt2k X-Received: by 2002:a05:6000:250e:b0:491:7ab7:81a1 with SMTP id ffacd0b85a97d-498308b98b3mr3758427f8f.46.1794297105512; Mon, 09 Nov 2026 23:51:45 -0800 (PST) X-Received: by 2002:a05:6000:250e:b0:491:7ab7:81a1 with SMTP id ffacd0b85a97d-498308b98b3mr3758393f8f.46.1794297105037; Mon, 09 Nov 2026 23:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794297105; cv=none; d=google.com; s=arc-20260327; b=fL2rP/bhQFhcusi+1qt9KxKndSoO7vbl/wnyrf/JZKruSfB7Rub5WEYApoSSZkWe4z aDB98SqhCxVaqBQ91BtmUAsAwA+fK7kjI3t7CReHEEaHjuriFpv5ZnO2uj64uN9YS2uk O88IXd0xlL2MY/gy2OAyYHzvSW3bq+e2qb62zdNgsfyLv2Z4jY8oNHPL1elOttru9cZg ZzuDGRMpvXpvSzzTc8WbNbfwYKXwIzGSGV2LTjbNoAGbDXWg4qDbHzkR+lrVO4k9+95Q kxqH5bkQ3L37E6SoRsOvx4HyjrlSHaQACmlSDmtbOvBBAdiWmGuEtQNE1xl30zNI76fU t47Q== 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=+jWujBFUS4dH0702LGIDbdh/t70yPiAKKWsh1FZS3ms=; fh=E3vCAgcov/hQ3XWh2CqQ9wok33eMAQJstV7H9y+Mjr8=; b=lzUsoGvHEtg/5rw9KFGItwJQRvwz2DAGoEQPV4NZRSeL6s4anqHZequtnv0xkzRTdd YN+hEJgejKJujvgWmFpDt3QWfrg3IHJ4EgEkHolxoSLJY43LcSX0NhtRXd/cq+lv450H AFiSetmjR4Ugsy6po9mISqc8Y7xdvzBMT+oDi4Z2EOCv2rZ+3kK0VW4hOklxedIN9pho QRciT3//cSysq7coHwVYOWUjVEGkt7fJ8yWKQnHCLUbebeWEOXBdiYj7qExvfVGrfs/s sFXq/zskFvbQ5nCoC+ZPbB0aSKR4R5w/4rxy9h7rDLVx+gtwXz//vtRhOqaskaGkdGdq I1qQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=FG8mJcAZ; 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-498478f4f3dsi3045870f8f.487.2026.11.09.23.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2026 23:51:44 -0800 (PST) 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=FG8mJcAZ; 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=+jWujBFUS4dH0702LGIDbdh/t70yPiAKKWsh1FZS3ms=; b=FG8mJcAZ2NT1 k4w1vdFsu0FkfWvkRNIxRZfoMt0Kb3Jy0TT3AVwoFAWVyZEVpJiz7HPW7ZPJlBH3jpkaB77h94cGH K9KuZgYz2p3WoRySdeGCF8Brx9fxRGcfgxGoxMthIGK/vtGe8TXHd8vfnEILZBKFAniQc/yVHGvJF F1gcQ3r5Kr8A5iU1m6YWemsTJ2mI8JLy4YRpTSic1k7SVZiM5O6O9u5RP/z0WyDWrt4urQr05u5Bi /bbg8DnFaC8T8zNLBHV8w/c1Ai0M2vpLVeGNDnv0jZ66TBP2553aTxlFM6szW0wn2qVxpH8teUaG+ QThyyrusRtJuz8zIt86veA==; 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 1xQgZm-008dOX-2z; Tue, 10 Nov 2026 08:51:35 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 10 Nov 2026 08:51:29 +0100 Message-ID: <20261110075140.1475607-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> References: <20261110075140.1475607-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v12 01/12] 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 | 48 ++++++++++++++++++++++++++++++++---- drivers/md/dm-qcow2.h | 2 ++ 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 7c572bd66e1c..0cbbd8e4f493 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -418,6 +418,48 @@ 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. Sets *md to NULL on error. + * + * The caller must ensure nobody else looks this page up until this + * returns (e.g., the device is suspended). A lookup before MD_UPTODATE + * is set queues its qio on md->wait_list, which is never woken here, + * and the page is freed with the qio still queued on read error. + * A cached page that is not MD_UPTODATE yet makes the insert fail. + */ +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) + goto err; + + ret = qcow2_rw_page_sync(READ, qcow2, id, (*md)->page); + if (ret) { + spin_lock_irq(&qcow2->md_pages_lock); + qcow2_md_page_erase(qcow2, *md); + spin_unlock_irq(&qcow2->md_pages_lock); + qcow2_free_md_page(*md); + goto err; + } + + spin_lock_irq(&qcow2->md_pages_lock); + (*md)->status |= MD_UPTODATE; + spin_unlock_irq(&qcow2->md_pages_lock); + return 0; +err: + *md = NULL; + return ret; +} + static void inflight_ref_exit0(struct percpu_ref *ref) { struct qcow2_target *tgt = container_of(ref, struct qcow2_target, @@ -851,13 +893,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 ad5286b16883..5abc7f5ad239 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -388,6 +388,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