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 3B7AE80024 for ; Thu, 27 Aug 2026 16:10:32 +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 67RG9DIT001611; Thu, 27 Aug 2026 19:09:14 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67RG9DIT001611 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="vAgQzK5r" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67RG9B2a001567 (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 67RG9B2a001567 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47f8398ed9fso5372f8f.0 for ; Thu, 27 Aug 2026 09:09:11 -0700 (PDT) X-Gm-Message-State: AFuF++ngCQUQofV0rvXguBP9k1uLH9tsCOwnAyGBDfwftZD54c8/QRua 89Vcblv7PtHBcx38VGrTKCyB81fQ7lYzBim1eST8liIQr4VuprRitD6XiFUH8sy+5cp0r6+u2yj K+WrrapI2LhXGHCx0/lKfkTm60OIUvuQou8kHRAHAkT9vUsIFZcMatQ== X-Gm-Gg: AR+sD13jQmMq8hvecNIgh87+q64lFIxzc0QoIrSe+CQPJwBToTid2UshyrQDnJs5T9Q D6fk2abGcu/aaQ8wi9UIey6uzOJU4Y78UsC1iH2pensJ5PHV6tFzSvB/zz6UQwD16g15GH0DDZC pXUK8M1Sn1pyLOR5YrMMnO6Zi6qePhxdML2pjZ2d42Otn+wYrmD/y4nxqGKwY7Ja7T1cf+BUq97 /V1qs8XO4fNOZJ8Wz1qAHy2tjE8X+0NEUYHBtHn25EiE3dvszwBUGM0fzsWgHcO9UAXpV/UsXN9 CQQoNH/nTQ+zYA8kSn/KhWLvV6F+yMUGSLNhoCFpyl3Bg2D7M4D5avkUasYGWDXXep/Uu5EiRtj lUQXUdrbIwiDpIA5aLMfYPyCFywVqHA== X-Received: by 2002:adf:ec09:0:b0:481:512b:f0e7 with SMTP id ffacd0b85a97d-482e26ef3e6mr18026729f8f.17.1787846951246; Thu, 27 Aug 2026 09:09:11 -0700 (PDT) X-Received: by 2002:adf:ec09:0:b0:481:512b:f0e7 with SMTP id ffacd0b85a97d-482e26ef3e6mr18026652f8f.17.1787846950793; 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=dJBef6uAfvwuFIIChW0abJEH9RvUeCUb6Gk6CmRXyCiu6YWXuo74YSgbEQuKbNZTQP QDSh/XQlIokyltI9T4hZugaJNm6Sp1f965LUXX5GbRtOQRj4mHtQPMhllbrGc4ZpC7mx MLXbEQeTRTNNYNO2AR/AlSZcKrKSLkaoRf/Uw9KESXWiQ0c8i+F9P7GnCUVc4VQC131T RE5BhsJQTzaJ4P/jhAjri89O6iI46j0YbkptlgwXzD42JUwj9s3KXjf9j/dyiy1UknAp 2WW1w9AfdOcV8DBAY5CrbBe8DoVAi1REWNfZJr3TYCvtMDchGlsRPkg7QGqdhtMLefgi O+xQ== 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=11jenQFq/+OPYhzvVfmAroRzCXi2zpgFP9H/Pb59oJQ=; fh=0/brz1B8ohImS2ERrXZY0dPGpSEyX2H6iLC7bneXJkE=; b=G/Dge+Go5wRlNeqWw+NEFxHdfQp7TXdUvtFBMsIRi4l66iTU3sgKnMaJXRv5id/Vqo y/DBGPWLtEdvkh0SN+aHxwLbBvPSBt0stoI6QumhQtLo/iy4cVCmkhy6pPDJ5Z/iXpM0 LGYgWAoQrVB71/uS8N+GXX4Mgw6sMw9XC8CjqyBTZvRq0Pk0bRpHrUgAcuWnZEtaRwfK /LJ9yuIAGzbjmCnpwBKA7Gx5054pq4hw5cCRcRNPPUIgR0ox/QIGqtb9ESDiGLopMH0e HPgMIz/JyPcD5gCRXcOLgU+oczrHhibL8o1HV2GkePCYkTF39iB3rmHX73USOBBOI0Hg EtLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=vAgQzK5r; 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-482e2787e3bsi8570343f8f.84.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=vAgQzK5r; 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=11jenQFq/+OPYhzvVfmAroRzCXi2zpgFP9H/Pb59oJQ=; b=vAgQzK5rTdMP V4KgS8I/ybhdGNrc2NhIgIvSlSJVKPEHbmcqJJya9uC2/XNT8HOQqhEqYNj3NHHuTBHEQ0Vkm9lo2 9CwLnQRM29NscNXdLeEjZ+9SDsZODXGOfbyyNYtvGQEL9Erz+SFWfFj2u8Dhr6AVLjpMia1qPVBbY 4Itqm2+F8i7fp/pU+2XKpiUDrLeNAgZ0jeznTc4WMh4bzZ+z/SFZSlmF3h/NT8TbLcJw2HhYyo3V6 2gUhb8piZ5jqualzrszQzqOImg/TqJhJtTV3BkcuaXyR36LZFeX47EZkjuiX0w/Rd3ViTv9lKAm2Z jUhBRZ3t9kK3RxzsWALU7g==; 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-0x; Thu, 27 Aug 2026 18:09:08 +0200 From: Andrey Zhadchenko To: ptikhomirov@virtuozzo.com, vasileios.almpanis@virtuozzo.com Date: Thu, 27 Aug 2026 19:06:13 +0300 Message-ID: <20260827160619.303398-6-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 05/11] drivers/md/dm-qcow2: never trigger COW or allocation on discard 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 In handle_metadata() the partial cluster discard fallback is checked only after the COW branches. As a result a discard, whose range touches a shared (snapshot or compressed) cluster or crosses an unmapped unit border over a backing file, is routed into the data COW machinery. COW then tries to submit the discard payload as a data write, but discard qios carry no bvec array: the iov_iter is built from garbage, which triggers the WARN_ON() in __submit_rw_mapped() and writes random kernel memory into the COW'ed cluster. Check for discard before the COW branches: discard is advisory and carries no data, so it must never COW or allocate. End discard early while handling metadata if possible. Otherwise do discard operations before COWs. 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 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/md/dm-qcow2-map.c b/drivers/md/dm-qcow2-map.c index a1bd36a112170..a2e5c37adb7b9 100644 --- a/drivers/md/dm-qcow2-map.c +++ b/drivers/md/dm-qcow2-map.c @@ -3431,9 +3431,18 @@ static int handle_metadata(struct qcow2 *qcow2, struct qio **qio, /* Nothing to COW or L1 is mapped exactly once */ qio_endio(*qio); ret = 0; - } else if (unlikely(op_is_discard((*qio)->bi_op)) && - qio_discard_updates_metadata(qcow2, *qio, map)) { - ret = prepare_cluster_discard(qcow2, qio, map); + } else if (unlikely(op_is_discard((*qio)->bi_op))) { + /* + * Discard carries no data and is advisory. If it does not + * trigger metadata changes or to-be-discarded cluster + * is not present, end early. + */ + if (qio_discard_updates_metadata(qcow2, *qio, map)) { + ret = prepare_cluster_discard(qcow2, qio, map); + } else if (!map->data_clu_alloced || map->clu_is_cow) { + qio_endio(*qio); + ret = 0; + } } else if (write && (!qio_is_fully_alloced(qcow2, *qio, map) || map->clu_is_cow)) { if (map->clu_is_cow) { @@ -3449,13 +3458,6 @@ static int handle_metadata(struct qcow2 *qcow2, struct qio **qio, */ map->backing_file_cow = true; ret = prepare_l1l2_replace(qcow2, *qio, map); - } else if (unlikely(op_is_discard((*qio)->bi_op) && - (map->level & L2_LEVEL))) { - if (!map->data_clu_alloced) { - qio_endio(*qio); - ret = 0; - } - /* Otherwise issue_discard(). */ } else { /* Wants L1 or L2 entry allocation */ ret = prepare_l1l2_allocation(qcow2, *qio, map); @@ -3569,8 +3571,8 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) write = op_is_write(qio->bi_op); - /* Discard with prepared metadata update, see prepare_cluster_discard() */ - if (unlikely(qio->flags & QIO_IS_DISCARD_FL)) { + /* Process discard early. Don't do COW just to discard */ + if (unlikely(op_is_discard(qio->bi_op))) { issue_discard(&map, qio); return; } @@ -3588,8 +3590,6 @@ static void process_one_qio(struct qcow2 *qcow2, struct qio *qio) submit_read_whole_cow_clu(&map, qio); else if (unlikely(map.clu_is_cow || map.backing_file_cow)) submit_read_sliced_cow_clu(&map, qio); - else if (unlikely(op_is_discard(qio->bi_op))) - issue_discard(&map, qio); else perform_rw_mapped(&map, qio); } -- 2.43.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel