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 258F8803F6 for ; Fri, 13 Nov 2026 11:18:13 +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 6ADBFmXt016606; Fri, 13 Nov 2026 14:15:49 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ADBFmXt016606 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="fE/U2PS4" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6ADBFkBa016570 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 13 Nov 2026 14:15:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ADBFkBa016570 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-49337a224a8so514230f8f.3 for ; Fri, 13 Nov 2026 03:15:47 -0800 (PST) X-Gm-Message-State: APuU4Z8dt6er+fslWGSOALH0s2nLMP8hzhqBzNxnzvhG5GBGW8pRtDJN dqFEzr+ORq9qWniry241+0mfUqb/RQM520SbTjcvsAz9XfpdcuwRINL1BYiJpmADz4dMjt2927L qoYrbC4n2t1SXX1azr2gFD0JSMgAxyWc7vUx3YBzGry2NMx9J0dvqhw== X-Gm-Gg: AYBFou0QK/roxqBRAMEy2VfY1JdC1uCX+U/UbGj+nQPZoYHFT81/7kJtKZokT/tnK9g Zxox/vXG16JiRrxAPAeIgQ3rbMAQtov0tSRVV8W+ZkCN88BIGzdIzKwybfs8SFCH1PPWmw4n5lz xSMsQJpr76jXBuWrgnAlYkTBtntEJHhJJsDIzdUgGo0F5PnEqXgXSCfPS9EZJjz6tLSc7IpyW9X W2VbeGH5Spqh5hU8xclpxkTUolwgRiQGfByiwI3XWhFrxQp2u3pzU8XsVfu2iKkSrabd/OKoCR+ WAPzRUVar4TAhwSkIXAGYCOlEAXUZfqYcUZ8fB+OaxSRbNRCKXLd/lUgFdoE5m/XLrjoUQzv5sh ddfOQwxX1pOB5kBfuRSmfew618+sm3g== X-Received: by 2002:a05:600c:3b93:b0:4a2:883:4adb with SMTP id 5b1f17b1804b1-4bb55a82b21mr47316635e9.22.1794568546726; Fri, 13 Nov 2026 03:15:46 -0800 (PST) X-Received: by 2002:a05:600c:3b93:b0:4a2:883:4adb with SMTP id 5b1f17b1804b1-4bb55a82b21mr47316075e9.22.1794568546218; Fri, 13 Nov 2026 03:15:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794568546; cv=none; d=google.com; s=arc-20260327; b=ZIqysWLwxBFPqbVS/+huPzpreVXuSmuWg/VdBmtK/6/JFt/ym2m3k8CsEFsTv2yKUg bgJ6kY3M2EjRMO2tFQt6w6fvamZLcN5ObOtb7TktxavwCOLREPUoKYjnNXMYH3rLPDSI u5FJIrNxTKMmpZRKPdaFhswR/1cyyVRZI/aJvGDN+eXgQjaDxVtsiFNS1esHn5jgIKmh e71ewjTGHj90SNKTIoCCavEbNk1GDDvLAZGyE3JE51qdgSKS6AaZ3E5cZw87YGhTB18d KN+ParjqSj5RoIsLAjh0D238lpTmKXQKwkFCmdqe8JfTGbF4zMTq00GEnD49TFDBKYUI kPDQ== 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=hQ8/QeuTPSpVdkz5pWVj5cpQoNufvbtfMYZ7u3ZNIbc=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=Nfmd7i8SrPiVcX3Yk31PS47bDY1c/UDhtxMkW5HAUMRAZfBe+vHbqhmkGrRQYQfiZJ oAOPpKtpqlEr0kBFm4KIsl8cJUBi7q5fvb6BBCSsT8DKE3ebfJWGYNwUIuDZ+kKJUlHZ xLuuALZI18GUSs3yiHtG1l819qGEhIXhxB+W4NjGSAzfupOIUbI0geMHjQ1lzImAABcm d1B1TZASdZ2S4Zck+oe6J5Z6OZiPKTlUoir1vlKhPLi1OUIBxFlbxgG1ohJwzWGurvND HHwPz9Ghpm1ki6P1tmBF9YjgLXVmoVTpTsUJgudJtMIoeYHAqhwrNauQDURdkEc2HL9K 9Hjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="fE/U2PS4"; 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-49c63da3c38si4947062f8f.251.2026.11.13.03.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2026 03:15:46 -0800 (PST) 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="fE/U2PS4"; 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=hQ8/QeuTPSpVdkz5pWVj5cpQoNufvbtfMYZ7u3ZNIbc=; b=fE/U2PS4/qJN teqn6NEvRZgEjFHjp9k2dBWqK2KqLU+SIZEJYwbxlj7+kh5m6rL8fjWvprRwQSJFsXkkG2Zj+Ws1Y GNuT5CdpeRZHJY/s4D+OrQ/B7T7fj3SgVixlcYj3RW6Fh+cfTa1fVUJyorfZv/HZ6T12f8Krcwhgy U3BZeox+vPNzsBtRsPFSczZSJKubOQOu7829mUzxUAIFgPyYR2GNsLtPCNloi9bRKv0XDbDBXN8eu Ti7ncC4EcPnkKH4A4NG7l23Snknfzi9Lg7f+PDSWNee2RmNWQ+qtnsT2cow+wzvGP8pLV8dVB06IV t0CnhSqNsSb1oVPp5ThMgw==; 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 1xRpBn-007Dd6-1u; Fri, 13 Nov 2026 12:15:42 +0100 From: Andrey Zhadchenko To: khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Fri, 13 Nov 2026 14:11:21 +0300 Message-ID: <20261113111126.793039-4-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261113111126.793039-1-andrey.zhadchenko@virtuozzo.com> References: <20261113111126.793039-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 3/8] dm-qcow2: count fast path writes in parse_metadata() 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 perform_rw_mapped() reads md->status and md->wbd without md_pages_lock and counts the write in md writers, relying on dm-qcow2 sequential nature: main kwork parses a qio and submits it in one pass. Outside main kwork an L1/L2 page changes only when its writeback ends, and parse_l2() already delays writes to the changed indexes of a page under writeback. This does not hold for the per-qio fast path, which parses L2 and submits in parallel with main kwork. The fast path takes only writes to fully allocated clusters mapped exactly once, whose indexes are neither locked nor changed in a dirty or under writeback L2 page. In between, main kwork may still discard or zero the same range, which is a valid race with the write, or allocate other subclusters of the cluster, which does not affect the write. But a discard unmapping the cluster lets it be reused, and a write landing after that corrupts the new owner. The discard waits for writes counted in md writers, but the counter is valid only if it is increased from main kwork or under md_pages_lock. So count a fast path write in parse_metadata() under the same md_pages_lock hold, which checks the L2 entry. A discard switches the writer generation after it clears the entry under the lock, so either the fast path sees the entry cleared, or the discard waits for the write. Drop the count, if the qio goes to main kwork afterwards. A partial discard on the fast path punches a hole in the cluster, so it is counted the same way and drops the count after the punch. A discard of a shared cluster punches nothing and is not counted. Add @fast parameter to perform_rw_mapped(). With it, skip the md->wbd attach, which the fast path never needs, and the writers increase. https://virtuozzo.atlassian.net/browse/VSTOR-95494 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Andrey Zhadchenko --- v3: new patch, replaces "wait for L2 writeback in perform_rw_mapped()": a fast path write or partial discard is counted in md writers under the lock which checks its L2 entry, so a discard unmapping the cluster waits for it before the cluster is freed drivers/md/dm-qcow2-map.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index 5e254c11ae7b8..b9daa258285e6 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -2160,9 +2160,14 @@ static int parse_metadata(struct qcow2 *qcow2, struct qio **qio, /* Find DATA cluster (from L2 page) */ pos = ret = parse_l2(qcow2, map, qio, write); - if (ret > 0 && write && avoid_metadata_changes) + if (ret > 0 && write && avoid_metadata_changes) { l2_in_flight = dirty_or_writeback(qcow2, md, map->l2.index_in_page + !!(qcow2->ext_l2)); + /* A discard is counted only if it is going to punch a hole */ + if (!l2_in_flight && + (!op_is_discard((*qio)->bi_op) || !map->clu_is_cow)) + inc_writers(md, *qio); + } unlock: spin_unlock_irq(&qcow2->md_pages_lock); if (ret <= 0) /* Err, delayed, DATA is not allocated, or zero read */ @@ -3089,7 +3094,7 @@ static void data_rw_complete(struct qio *qio) } } -static void perform_rw_mapped(struct qcow2_map *map, struct qio *qio) +static void perform_rw_mapped(struct qcow2_map *map, struct qio *qio, bool fast) { struct qcow2 *qcow2 = map->qcow2; struct md_page *md = map->l2.md; @@ -3112,15 +3117,16 @@ static void perform_rw_mapped(struct qcow2_map *map, struct qio *qio) * so lock is not needed for MD_DIRTY/changed_indexes visibility. */ index_in_page = map->l2.index_in_page + !!(qcow2->ext_l2); - if (rw == WRITE && (md->status & MD_DIRTY) && - test_bit(index_in_page, md->wbd->changed_indexes)) { - spin_lock_irqsave(&qcow2->md_pages_lock, flags); - md->wbd->nr_submitted++; - qio->data = md->wbd; - spin_unlock_irqrestore(&qcow2->md_pages_lock, flags); - } - if (rw == WRITE) + if (rw == WRITE && !fast) { + if ((md->status & MD_DIRTY) && + test_bit(index_in_page, md->wbd->changed_indexes)) { + spin_lock_irqsave(&qcow2->md_pages_lock, flags); + md->wbd->nr_submitted++; + qio->data = md->wbd; + spin_unlock_irqrestore(&qcow2->md_pages_lock, flags); + } inc_writers(md, qio); + } map_and_submit_rw(qcow2, map->data_clu_pos, qio); } @@ -3608,6 +3614,8 @@ static void issue_discard(struct qcow2_map *map, struct qio *qio) if (!map->clu_is_cow) { pos = bio_sector_to_file_pos(qcow2, qio, map); ret = qcow2_punch_hole(qcow2->file, pos, qio->bi_iter.bi_size); + if (qio->writer_md) + dec_writers(qio); if (ret) { qio->bi_status = errno_to_blk_status(ret); @@ -3878,7 +3886,7 @@ static void process_read_qio(struct qcow2 *qcow2, struct qio *qio, qcow2_dispatch_qios(qio->qcow2, qio, NULL); } else { /* Mapped */ - perform_rw_mapped(map, qio); + perform_rw_mapped(map, qio, false); } qio = split; @@ -3899,8 +3907,11 @@ static int process_one_qio(struct qcow2 *qcow2, struct qio *qio, bool fast) ret = handle_metadata(qcow2, &qio, &map, fast); if (!ret) return 0; - if (ret == QIO_NEEDS_MAIN_KWORK) + if (ret == QIO_NEEDS_MAIN_KWORK) { + if (qio->writer_md) + dec_writers(qio); return 1; + } /* * Merge machinery makes out of order merges for present @@ -3937,7 +3948,7 @@ static int process_one_qio(struct qcow2 *qcow2, struct qio *qio, bool fast) else if (unlikely(map.clu_is_cow || map.backing_file_cow)) submit_read_sliced_cow_clu(&map, qio); else - perform_rw_mapped(&map, qio); + perform_rw_mapped(&map, qio, fast); } return 0; -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel