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 262088006A for ; Thu, 27 Aug 2026 16:10:45 +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 67RG9WgR001655; Thu, 27 Aug 2026 19:09:33 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67RG9WgR001655 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="EKd3ETFm" 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 67RG9BJM001583 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 27 Aug 2026 19:09:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67RG9BJM001583 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-482e95788d3so678361f8f.2 for ; Thu, 27 Aug 2026 09:09:11 -0700 (PDT) X-Gm-Message-State: AFuF++kHZy2GqeoDkiOxIknRIXu1NyzCn4vGK5a5zSzsVWrKOPP9tIny X/bozSdj76hwf/skN9WOGbbe3Sb76xTfs8b/92U8NjCr9ztE6TAsCzCk6KnxHFzxf17i469e6AJ IYf5cb/U0WhubJXLfJpTQo/hB9GVEYm+dCVxtu66MDubmUviNVqXS0g== X-Gm-Gg: AR+sD10WGBL+4jJ+h4HhVI4TsIOGqSBTtNNU3bI/cp4hAsuGJ+PmyIrZ3HePY73a0Lf l6T0IVdXimBGapFDnSFnLPjbN1DjWDFbVCAB+auILZvpqU0YoMeF/nXqCPBduNMT4kdHXZZNfuL r7iCKFkzVw9FUYxY+9gO4of0yUkQr+eRQQfYwtZ0y1LmjKYOlTQaDhy+y+SiNWqCqsLQlDv8hZ9 uPQOgRCi4/2bo+gu8DkK6lh3no4WGZEeksOYFgGNh8Qh5zKYvBMM4JMVXJui/ghixKmR56nGyd0 g9l00n3oqasX6z/BIekTtyano3vncB1Wqk0FOsKvq1JujKCSa6xcvRLpsX9azRq3Spr1iRf2Y0N 9W/KIzpKHY4RiEF95ScbDHEV5Fu9Q X-Received: by 2002:a05:6000:4b14:b0:482:ea2b:c598 with SMTP id ffacd0b85a97d-482ea2bc770mr14422671f8f.6.1787846951515; Thu, 27 Aug 2026 09:09:11 -0700 (PDT) X-Received: by 2002:a05:6000:4b14:b0:482:ea2b:c598 with SMTP id ffacd0b85a97d-482ea2bc770mr14422478f8f.6.1787846950748; Thu, 27 Aug 2026 09:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787846950; cv=none; d=google.com; s=arc-20260327; b=Rjo6gx9nye7hYj5z/zj4R2motuR4BSFxZkLB5d6/zgWfinTJvyV8o6UCl0Bvsp1wv+ jbSUSKWzHh+j1srjc8ioL9OlZ+5h5I6hZDdaIdaR6IC3M55vhQejBOh6/txIsLjiGVvb hJq7AzOIbdpRJ4cxcQBDk5A9TAvDaM7swITtDUBxg/R0O6XCT6uP57tKXlKRMkP0TLxr VaIq62tkLD2vkGEfWCMhbn7DHUB86XyIqsrG5s3vqzQ9hm5sIkYjFlPaFoS2mTdTmaGo hWpcYgdgEjgIl8XZc+pHw7FlOGp15ZVmZfxmcWU92eLbtgWXhDI6kh8oR9svd4I8v3qD dnQQ== 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=5I6WSdCVZRCDUmjweQWh3VmPoHI6z4NpLHfEMvT+FXw=; fh=0/brz1B8ohImS2ERrXZY0dPGpSEyX2H6iLC7bneXJkE=; b=jDAKq2VpxhJLVkLPz/usgOyrdLFr4XzkdLYMg6w2PZGcj084jKe2C/Oc7JEwYDDLny d1VKXEBzqyqP7mcxDYhkvPfE7R9KCnzsW8fLm/HDVRDq8emq41GcrmpaPpT47sxY60as PEF/6BNOgsWoBUe/yH4ZrV6d7gAe+7QWloYPgV5bZzYeJCExAqewBTJDIxf0BLBbr/xu jw4VX5oOairkbG/QV87+A5XuI36+4uP1jccpIz+JmVTZhXoygDxM5a1VoQAVZQl4Vd32 qhCfYmyfbCLIf0kLzwKB5UG9Ef50ZlTpkt+kAG2afUgD918DMv8LdCwxcKlUykayrmAt 9rgg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=EKd3ETFm; spf=pass (google.com: domain of andrey.zhadchenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=andrey.zhadchenko@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-482e2787cf1si8900905f8f.15.2026.08.27.09.09.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 09:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of andrey.zhadchenko@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=EKd3ETFm; spf=pass (google.com: domain of andrey.zhadchenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=andrey.zhadchenko@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=5I6WSdCVZRCDUmjweQWh3VmPoHI6z4NpLHfEMvT+FXw=; b=EKd3ETFmLj05 xncqhEZ4jmZR+UayrczwxzBzj571tLfS+DrOBuTVFn69dMXmFx/6fL5TVEv6p29mIinClcwI+ADGY YYE0H2KpoCQbT6RgKYlEqAAj3v/8E+yxHoV+Pk6mxR+97YkkNub0QLgT1nBC1RYIFsHmaozwrNPge dUSNMWUmzP8g1YQmuU4xhYS9VxVVN2FaPQ++QPADKu804DBpeYA97z86aVSTb3jfzHjZ0gxGTGFIP YCcmtEZ89kSac3LIu4v5BqN6ztv+Nj8qAb5jq5j93CSfyzLjH0zfTxKQiayT3AkUqAHjhkkwdnMbt /SC4UmmB2tr1ZQ7gUqlcSg==; Received: from [130.117.225.5] (helo=vz9-demens-1.aci.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1wzccs-00FHQJ-0Y; Thu, 27 Aug 2026 18:09:07 +0200 From: Andrey Zhadchenko To: ptikhomirov@virtuozzo.com, vasileios.almpanis@virtuozzo.com Date: Thu, 27 Aug 2026 19:06:10 +0300 Message-ID: <20260827160619.303398-3-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260827160619.303398-1-andrey.zhadchenko@virtuozzo.com> References: <20260827160619.303398-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH VZ10 v4 02/11] drivers/md/dm-qcow2: fix revert_cluster_alloc() for ext_l2 case 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 This function walks over all changed u64 values in md. With ext_l2 half of them holds subcluster description. Firstly it reverts these values to saved pe_page, which is fine, but then it tries to revert r1r2 changes. It makes no sense when the value is a subcluster description. Teach the function to skip subcluster descriptions: do it based on a new lx_level in struct wb_desc. Add new argument to prepare_l_entry_update() and set it there. The warning also could have tripped for ext_l2 entries, so drop it entirely. The function effectively reverts not only cluster alloc, so rename it to revert_l_entries_update() to mimic prepare_l_entry_update(). Feature: dm-qcow2: block device over QCOW2 files driver https://virtuozzo.atlassian.net/browse/VSTOR-139406 Signed-off-by: Andrey Zhadchenko --- drivers/md/dm-qcow2-map.c | 28 ++++++++++++++++++---------- drivers/md/dm-qcow2-target.c | 2 +- drivers/md/dm-qcow2.h | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 506458f04888e..651730bd15901 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -1297,18 +1297,19 @@ static void do_md_page_read_complete(int ret, struct qcow2 *qcow2, } /* Be careful with dirty_or_writeback()/etc! Check races. */ -static void revert_clusters_alloc(struct qcow2 *qcow2, struct wb_desc *wbd) +static void revert_l_entries_update(struct qcow2 *qcow2, struct wb_desc *wbd) { struct qcow2_map_item r1, r2; struct page *pe_page; + bool skip_odd; u64 pos, old; int i, ret; + skip_odd = qcow2->ext_l2 && wbd->lx_level == L2_LEVEL; + lockdep_assert_held(&qcow2->md_pages_lock); for_each_set_bit(i, wbd->changed_indexes, LX_INDEXES_PER_PAGE) { pos = get_u64_from_be_page(wbd->md->page, i); - WARN_ON_ONCE(!(pos & ~LX_REFCOUNT_EXACTLY_ONE) || - !(pos & LX_REFCOUNT_EXACTLY_ONE)); /* Here we restore prealloced and compressed clu mappings */ pe_page = wbd->pe_page; @@ -1321,6 +1322,9 @@ static void revert_clusters_alloc(struct qcow2 *qcow2, struct wb_desc *wbd) } set_u64_to_be_page(wbd->md->page, i, 0); + if (skip_odd && (i & 1)) + continue; /* pos contains ext_l2 part of L2 entry */ + spin_unlock(&qcow2->md_pages_lock); pos &= ~LX_REFCOUNT_EXACTLY_ONE; @@ -1369,7 +1373,7 @@ static void complete_wbd(struct qcow2 *qcow2, struct wb_desc *wbd) unsigned long flags; spin_lock_irqsave(&qcow2->md_pages_lock, flags); - revert_clusters_alloc(qcow2, wbd); + revert_l_entries_update(qcow2, wbd); clear_writeback_status(qcow2, wbd->md, wbd->ret, &wait_list, &end_list); spin_unlock_irqrestore(&qcow2->md_pages_lock, flags); @@ -2433,7 +2437,7 @@ static loff_t allocate_cluster(struct qcow2 *qcow2, struct qio *qio, #define LU_IGN_CHANGED_IND (1 << 3) static int prepare_l_entry_update(struct qcow2 *qcow2, struct qio *qio, struct md_page *md, u32 index_in_page, - u64 *pval, u32 arg_mask) + u64 *pval, u32 arg_mask, u8 lx_level) { bool wants_pe_page = (arg_mask & LU_WANTS_PE_PAGE); struct wb_desc *new_wbd = NULL; @@ -2453,6 +2457,7 @@ static int prepare_l_entry_update(struct qcow2 *qcow2, struct qio *qio, if (!new_wbd) return -ENOMEM; new_wbd->md = md; + new_wbd->lx_level = lx_level; } else if (wants_pe_page && !md->wbd->pe_page) { pe_page = alloc_page(GFP_NOIO|__GFP_ZERO); if (!pe_page) @@ -2515,7 +2520,8 @@ static int prepare_l1l2_allocation(struct qcow2 *qcow2, struct qio *qio, /* Allocate cluster for L2 entries, and prepare L1 update */ ret = prepare_l_entry_update(qcow2, qio, map->l1.md, map->l1.index_in_page, &val, - LU_SET_ONE_MASK|LU_WANTS_ALLOC); + LU_SET_ONE_MASK | LU_WANTS_ALLOC, + L1_LEVEL); if (ret <= 0) return ret; @@ -2541,7 +2547,8 @@ static int prepare_l1l2_allocation(struct qcow2 *qcow2, struct qio *qio, ret = prepare_l_entry_update(qcow2, qio, map->l2.md, map->l2.index_in_page, - &map->data_clu_pos, arg_mask); + &map->data_clu_pos, arg_mask, + L2_LEVEL); if (ret <= 0) return ret; @@ -2562,7 +2569,7 @@ static int prepare_l1l2_allocation(struct qcow2 *qcow2, struct qio *qio, return prepare_l_entry_update(qcow2, qio, map->l2.md, map->l2.index_in_page + 1, - &val, arg_mask); + &val, arg_mask, L2_LEVEL); } /* @@ -3979,7 +3986,7 @@ static void process_cow_indexes_write(struct qcow2 *qcow2, ret = prepare_l_entry_update(qcow2, qio, lx_md, ext->lx_index_in_page, &ext->allocated_clu_pos, - arg_mask); + arg_mask, ext->cow_level); if (ret < 0) { qio->bi_status = errno_to_blk_status(ret); qio_endio(qio); @@ -3990,7 +3997,8 @@ static void process_cow_indexes_write(struct qcow2 *qcow2, arg_mask &= ~LU_SET_ONE_MASK; ret = prepare_l_entry_update(qcow2, qio, lx_md, ext->lx_index_in_page + 1, - &ext->new_ext_l2, arg_mask); + &ext->new_ext_l2, arg_mask, + L2_LEVEL); WARN_ON_ONCE(ret < 0); } diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 3f65897ce9da2..0f1d3e3c5258e 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -174,7 +174,7 @@ void qcow2_flush_deferred_activity(struct qcow2_target *tgt, struct qcow2 *qcow2 int i; /* - * We need second iteration, since revert_clusters_alloc() + * We need second iteration, since revert_l_entries_update() * may start timer again after failed wb. */ for (i = 0; i < 2; i++) { diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 86f0688e7345a..aa3487007523f 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -118,6 +118,7 @@ struct wb_desc { struct list_head dependent_list; int nr_submitted; bool completed; + u8 lx_level; int ret; }; -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel