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 4E0E9803BB for ; Thu, 12 Nov 2026 11:18:02 +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 6ACBGlSi008196; Thu, 12 Nov 2026 14:16:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ACBGlSi008196 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="F3IHhA5j" 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 6ACBGal4008167 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 12 Nov 2026 14:16:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ACBGal4008167 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48e0ef019a4so3588047f8f.3 for ; Thu, 12 Nov 2026 03:16:36 -0800 (PST) X-Gm-Message-State: APuU4Z+pU2u6YSnGDEcO+93qo9Y/VAioxwQ0wYytMAn3CPn3lW4o4BJy 8Bh4YziSXioY3A11GxUnFJlxa24BekJq3QOnzqalzrA6Se/f4URS3Q69UFUFs8RgNb5u/m87UBE 6/rKE0LNUsM36/EQaQVwAOKaCAHn/BuiyjhFdHAh2PvIT4j/+ek5/YA== X-Gm-Gg: AYBFou3wefBjtSa4Jn+Vr2sKQfcUesoyrgIMcwU2UH+D+Ucmd3wPrGI8itw1xfRPSsv rUgjQ5tjGE1iGNm9DEB2LpPvUqDqGD7uPOAUihWLL9DNasfNLmi9ueqJaBm1q2tUeNVRlCuyyZV MtvM8HHtgO4qKwenUY67qJUqVnSy3YNhKOy8tw6ZxLURL8fKMvj8phzfuyiTq21cmdH4eE4L2O/ HD7v928sETxuvKMI6rZY/DQPsb8NubfNbnRVv+Awc5iKyS3dKMj3KcAquamCholJWSpd1lpNcxS ffeyKkOURNrtBoemItm7+CCbE3p+UgWsPgWRJ/fYQMEX46Zk+EB0uXtcKAQWsgkjdNPndRb/4D4 0PhmaX7+vDjo+O+TxfQB7bzyVwzRfeg== X-Received: by 2002:a05:6000:40d9:b0:492:4156:b8f2 with SMTP id ffacd0b85a97d-499c80de8edmr10004027f8f.54.1794482196329; Thu, 12 Nov 2026 03:16:36 -0800 (PST) X-Received: by 2002:a05:6000:40d9:b0:492:4156:b8f2 with SMTP id ffacd0b85a97d-499c80de8edmr10003971f8f.54.1794482195895; Thu, 12 Nov 2026 03:16:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794482195; cv=none; d=google.com; s=arc-20260327; b=RBdjCReNrx1cwqcqGFP+xMcWxCxP+HPX/5TAmOFYr9eehGZYSK97W9EkgbjXKMmP0R qyFbsvXnguqqQ51KfMG9NhGlueA9IJNSkQKZGhuC8cEhrF8/AAgnlfqM//9xuFrPPu0N YrelKHyJGwrpcQ9DgdvAgXXFPvtjzUxqVX7S3Ligk161BwFSfRRbrV7VfPkMMtlj/GJd wl4W9qMMvH8k23dn/LvO+NxiglJWKrNxSYe66fQa8FkTFuKLzjh1DySTpI4DXFWLlfm9 cP9V5K4pN0rbwXX65CwXw+tzO8dU8I0R3ZKFfz9hsLdJVndHcWKg/IbWAIwY56HXcGo9 oHww== 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=32p4EFgSomFNzV7ZW4+niKGE1Hdz/0ZGwj4njbKGD+o=; fh=ElTTnnNtphHTCCOZ+58STyaWac7y7ytLDJZIF4HMMJ4=; b=eJBD/7rDpQshX9ylAckxbRXUPI2E7t9oTuGoR55PEje6d3sbCXB/OIGlrfJ64t/mp6 YsIXhSbE2Vjq+4JgF6Nrqb/SSmv2TfNF3mIw3wEUl7ScwArzn9wV1EDaxy2SRwV/BVaf wbeoL7zpal0K2Kur5Dm+/OJAhrXeBCI75rEc5RGSBAc1T1QtCRnIRnP6x7apiJSBH2me xl2TYjZqdI/0A13nfOXRkj6JuPn790bwmi5F3uiqerjIlHiO5n4U3kpACcJBhD2eKdUv ouYRpMx0OKJE3vhRDcdRcVZnQswLeyrXKhxiMvlb4Totezxer52yXAROECfBZtSgPzKr V/RQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=F3IHhA5j; 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-49835f16f04si16455498f8f.207.2026.11.12.03.16.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 03:16:35 -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=F3IHhA5j; 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=32p4EFgSomFNzV7ZW4+niKGE1Hdz/0ZGwj4njbKGD+o=; b=F3IHhA5jmf2H xoKmF2KghGOYfJKaOgUYni1NCy9OdPIgUzAJT01i1zHlXllIlyzZzQFX5jfGIhxRCksMujaPouu5t +fjG0ERCR0r+VLuB63Onlli4QyiQi1wflEgtaheEVpwDXuLuBNKB4NJetCs0dqZHlxLCa+eJJRu2X w/qsA2gbm+Nx/wuOpiRAeHrhWT19CV9B97getXrEJiujpFD6s5lfK2P+Nch72BZg0Bkb9toU+LLsw Qo50AsuCFiqvjmReU9+zCco0izHeS1wLRckbp4vPtEhpRjord6xqK7sa2+ZA4JqwufYOByKSR5oxD F5yd7L8vPO3+iJi7t4oOxQ==; 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 1xRSj4-00EzHk-2Q; Thu, 12 Nov 2026 12:16:33 +0100 From: Andrey Zhadchenko To: khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com Date: Thu, 12 Nov 2026 14:12:05 +0300 Message-ID: <20261112111205.736027-4-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20261112111205.736027-1-andrey.zhadchenko@virtuozzo.com> References: <20261112111205.736027-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 3/3] dm-qcow2: let discards of one L2 page wait for in-flight writes together 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 Only one discard at a time switches the generation of an L2 page and waits for the previous one to drain. Others queue behind it and then do the same one by one, so N discards of clusters mapped by one L2 page take N drain cycles under write load. This is the common case: discards updating the same L2 page complete its writeback together and come to process_indexes_end() in one batch. A discard, which finds a switch in progress while no write is counted in the new generation yet, has exactly the same writes to wait for as the discard which switched. Let it join: wait for the same previous generation instead of queueing for its own switch. If that generation is already empty, nothing is in flight and the discard goes on immediately. Count the discards waiting for the previous generation instead of keeping a flag, and allow the next switch when the last of them is released. https://virtuozzo.atlassian.net/browse/VSTOR-154659 Feature: dm-qcow2: block device over QCOW2 files driver Signed-off-by: Andrey Zhadchenko --- drivers/md/dm-qcow2-map.c | 29 ++++++++++++++++++++++------- drivers/md/dm-qcow2-target.c | 2 +- drivers/md/dm-qcow2.h | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index b07747f80030f..21f2d34ca371f 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -671,20 +671,34 @@ static bool delay_discard_if_writers(struct qcow2 *qcow2, struct md_page *md, if (atomic_read(&md->active_writers[qio->writer_gen])) goto delay; qio->flags &= ~QIO_DISCARD_WAIT_FL; - md->gen_switched = false; - discard_waiters_to_list(qcow2, md, &wake_list); + if (!--md->discard_waiters) + discard_waiters_to_list(qcow2, md, &wake_list); goto unlock; } - /* another discard already waits: we can't switch without breaking it */ - if (md->gen_switched) - goto delay; - /* * md->active_writers checks are valid only if increases are * from main kwork (as we are) or under md_pages_lock. */ gen = md->writer_gen; + if (md->discard_waiters) { + /* + * New writes since previous switch and another discard + * already waits: do not break it and delay + */ + if (atomic_read(&md->active_writers[gen])) + goto delay; + + gen = !gen; + /* + * No new writes and previous writes just completed + * but waiters haven't been processed yet: proceed + */ + if (!atomic_read(&md->active_writers[gen])) + goto unlock; + goto wait; + } + if (!atomic_read(&md->active_writers[gen])) goto unlock; @@ -693,7 +707,8 @@ static bool delay_discard_if_writers(struct qcow2 *qcow2, struct md_page *md, if (!atomic_read(&md->active_writers[gen])) goto unlock; - md->gen_switched = true; +wait: + md->discard_waiters++; qio->writer_gen = gen; qio->flags |= QIO_DISCARD_WAIT_FL; delay: diff --git a/drivers/md/dm-qcow2-target.c b/drivers/md/dm-qcow2-target.c index 24a42c5a66759..3cdd1ec2aab4b 100644 --- a/drivers/md/dm-qcow2-target.c +++ b/drivers/md/dm-qcow2-target.c @@ -401,7 +401,7 @@ int qcow2_alloc_and_insert_md_page(struct qcow2 *qcow2, u64 index, struct md_pag atomic_set(&(*md)->wpc_readers, 0); (*md)->wpc_noread_count = 0; (*md)->writer_gen = 0; - (*md)->gen_switched = false; + (*md)->discard_waiters = 0; atomic_set(&(*md)->active_writers[0], 0); atomic_set(&(*md)->active_writers[1], 0); INIT_LIST_HEAD(&(*md)->wait_list); diff --git a/drivers/md/dm-qcow2.h b/drivers/md/dm-qcow2.h index 8eb0c49f1e4eb..1e1eb9e4daef0 100644 --- a/drivers/md/dm-qcow2.h +++ b/drivers/md/dm-qcow2.h @@ -136,7 +136,7 @@ struct md_page { #define MD_WRITEBACK_ERROR (1U << 3) /* Last writeback failed with error */ unsigned int status; u8 writer_gen; - bool gen_switched; + u16 discard_waiters; struct page *page; struct list_head wait_list; /* To link in qcow2::{,slow}wb_batch_list and qcow2::QLIST_COMPLETED_WB */ -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel