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 376D0803F6 for ; Tue, 10 Nov 2026 18:57:22 +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 6AAIu96t018175; Tue, 10 Nov 2026 21:56:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAIu96t018175 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=default; t=1794336972; bh=Vpy6UWiuTppNM+STyakAvvcp2w3Sdin2YL3WCINblfM=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=XrjuxD+2/w8vmZdgY2jnpeh1uxVjOrfrHEvP7t73CDUWCYHwo93tn0MaEmb55LnSH MjxC44DMiO2lq+we/6J2PptHv5D/7WcAxUurQPrtq4U/kaasHo2aMPJiye6t2pGzMl RCkfRt/mc1i8p0cRIzQ0XJcrRXvTIcgCRGuMqaEyeUN7R3MlXg+tUKUz5+DY76PFMP /brZq+Y148V8r4NpdSPNsKtNm4HmD7edivPskh2WYZ7yz5MwabIp4nuhcKyCl6mVIX fuzgBOV8ipKw/OesWqnlM4aO1g8hE3J7StRP2R/uGsp7unO18Dg/W+KCF0N1gBxH1l ufh5n2Seczefw== Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AAIu0ag018150 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 21:56:00 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAIu0ag018150 Authentication-Results: mail.openvz.org; dkim=pass (2048-bit key) header.d=openvz.org header.i=@openvz.org header.b="LFTAHPUx" Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4a204ac318aso11660735e9.2 for ; Tue, 10 Nov 2026 10:56:00 -0800 (PST) X-Gm-Message-State: APuU4Z8nL1RzMwROhb/mI0GgD/WU7SucjMdKL33nvi4K7ZoE61K+5PCV QyC/9WY1v4QGl9L43gr5MyxLCaOCfSDdatccPsR86HmG/1Mkr5e53lFouJKa/jyeja8MWgcGXi1 8rJZvlLX0vBuMqbhso1LhNrrTdDQe5Pov/3bYqir/j/A5H5XlD7Yb/A== X-Gm-Gg: AYBFou0QNdoTE2AQ5QJ4ZmNQr92ddMIWMlBMPfI+Llwlk1N0X84HK34It0QTA3wEtoO WDIRm2yZ+fKKM6ScntBsJumqobYH/tfgopln/qHSCFplql6n0yf2+hUAPQgvm5Q+TewGeQOw9/s ipjoJlKSDXEhfgnD5qIk7lNV520yzgeSo+8/7yBKU8GuGF5e8mlPEOghY658ut8WwLyhqbBN3kL cs3CqyBrE3/4ZlwsHl+wlFcdG6FklvucwFpKRExym5X/55IvuFPt3etgytGpKI2WAUk/NlrSay6 67cupK+XbA== X-Received: by 2002:a05:600c:19d0:b0:4a1:cef3:fb3a with SMTP id 5b1f17b1804b1-4ba093805dfmr615525e9.9.1794336960237; Tue, 10 Nov 2026 10:56:00 -0800 (PST) X-Received: by 2002:a05:600c:19d0:b0:4a1:cef3:fb3a with SMTP id 5b1f17b1804b1-4ba093805dfmr615315e9.9.1794336959830; Tue, 10 Nov 2026 10:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794336959; cv=none; d=google.com; s=arc-20260327; b=Sabh2e6S/CxPbxcQw57pA/6ILaYkJkaUAki3W0lXppJfAMZn5GqfXSRwrNQh36Ypww KsGJ1i0Inp5jK6Od1EkY1ZpeuwT451aqF0KveyDkh2LcR4P1xjE854DgePXSm4RY8YGs DT5dkaN83LOX+ZD2e2w3rWjhRTMZz2fENuLbJOosQksqp8fVichb39ep254W+OAUcugu V74SScs9vzFdkSlZtUUf0SREcwVvrbk3ox0Z0K0bTuKf9TuqItaK4CvM1qzYOq2QWuMo RGQKWfoQ1sTKEEjSMg46Fmo2j/oNj1nhwYgpFhA2nq0CcVSsgy2TOHrpW+MjpCOElY+d nh3Q== 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=PCCR1tGLSeJVOi2UGHhgnHuNkUoD8+Wbx93MUC7yeAE=; fh=ozrYJQ1t3QIP6s65KBq5xgJxiFM2qf+5wwn3ABTusyU=; b=KFr3J2KjyWNbgQvtVEDMqY9+K8gkGwu+Odrmy4Gv8BSNv45mltXqIbDhvp7kUdcz3e UuW/X4T15YVDkibmt7l77EdkF95nFx9PfZ2yvAKfUTmWojlKC5v87QcYniUOP5Dv5wEg XoBKAYUlDc+a2/4SzxanxJJot1r8yeSsa9wU9dQQsA03Z1NoyEfz8LvRD3ofIgPenfFo PoKPK9+FwHg16zIF03JaZ4wDfZh2dWzgi4aFVDsqTfb9FuFE9Be7oZrni19R4KJQUofI 9bhzDXIpjh8adeHNszO9tN+6wYshXS/EgsDQDyJ6AeF3pCU3XJCMJ0FY6Quwi/J9/pUQ ZyBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@openvz.org header.s=google header.b=LFTAHPUx; spf=softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:4f78:6441:d0f1:22af as permitted sender) smtp.mailfrom=den@openvz.org; dara=neutral header.i=@openvz.org Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-4ba01fcad00sor6092695e9.2.2026.11.10.10.55.59 for (Google Transport Security); Tue, 10 Nov 2026 10:55:59 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:4f78:6441:d0f1:22af as permitted sender) client-ip=2a06:5b06:b600:300:4f78:6441:d0f1:22af; Authentication-Results: mx.google.com; dkim=pass header.i=@openvz.org header.s=google header.b=LFTAHPUx; spf=softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:4f78:6441:d0f1:22af as permitted sender) smtp.mailfrom=den@openvz.org; dara=neutral header.i=@openvz.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1794336959; x=1794941759; darn=openvz.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PCCR1tGLSeJVOi2UGHhgnHuNkUoD8+Wbx93MUC7yeAE=; b=LFTAHPUx3VzLue4XtT3FCFhSYhhqDueW3BiIVuQPZyJKFn1/Do60EhFagPf29qxhRB fkNkz7NfsYDAAzZQujVUt4k7w9lCXxTsHviKnISc3DkgZBjy0MZerd/8NfdK1C98UWe3 tTDviin4ZbAQgltPEaX4VQQAoNvrT9+Bn3wAH7CTnMJcVXLIBs2u9tTdudZyTQWWyfr3 1eHuJSu7vyqig2aW33Pkl8rHdjKWY5z1IleutQ/LzPpU4QccE6XV2mxW8M4LH2SjEL2c DNgcOQtUQmQwXklRZndgjCPX7TqUPtKXT8VJ89Zgai8dWsCQltyzwWVbSYs3K/3OrR5y tB3Q== X-Received: by 2002:a05:600c:3c87:b0:4b8:fdd8:f2c9 with SMTP id 5b1f17b1804b1-4ba093c1c0bmr298285e9.35.1794336959380; Tue, 10 Nov 2026 10:55:59 -0800 (PST) Received: from athena.sw.ru ([2a06:5b06:b600:300:4f78:6441:d0f1:22af]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba02387ed4sm55207475e9.4.2026.11.10.10.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2026 10:55:59 -0800 (PST) From: "Denis V. Lunev" To: khorenko@virtuozzo.com Date: Tue, 10 Nov 2026 19:55:53 +0100 Message-ID: <20261110185554.2970417-3-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110185554.2970417-1-den@openvz.org> References: <20261110185554.2970417-1-den@openvz.org> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 2/3] dm-ploop: refuse flip_upper_deltas onto a lower delta smaller than the device 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 From: Denis V. Lunev A flip_upper_deltas after a grow of the device, with the lower delta left at its old size, makes a top delta whose header and BAT cover fewer entries than the device. After resume the BAT writeback puts the grown header into page 0 of that file and the BAT pages past its old size onto its data clusters, and the image no longer opens. Today ploop_check_delta_before_flip() oopses on such a flip before it gets that far, as its walk runs past the end of the BAT of the lower delta. Fixing the walk alone would let the flip through. Read the header of the lower delta on every flip, not only under PLOOP_DEBUG, and refuse with -EBADSLT when it has fewer BAT entries than the device, as ploop_add_delta() refuses a lower delta bigger than the upper one. Compare entries, not BAT pages: fewer entries in the same number of pages still gives a stack that ploop_add_delta() refuses on the next load. The reverse merge of the ploop library grows the lower delta to the size of the device before it flips, so it never gets the refusal. Fixes: 6ddad5a4d226 ("dm-ploop: Add ploop target driver") https://virtuozzo.atlassian.net/browse/VSTOR-153445 Feature: dm-ploop: ploop target driver Signed-off-by: Denis V. Lunev --- drivers/md/dm-ploop-cmd.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c index d6abbdc3c7e3..5549ba448594 100644 --- a/drivers/md/dm-ploop-cmd.c +++ b/drivers/md/dm-ploop-cmd.c @@ -1118,20 +1118,27 @@ static int ploop_set_noresume(struct ploop *ploop, char *mode) static int ploop_check_delta_before_flip(struct ploop *ploop, struct file *file) { - int ret = 0; -#ifdef PLOOP_DEBUG - u32 i, end, *d_bat_entries, clu, nr_be; struct rb_root md_root = RB_ROOT; + u32 nr_be; + int ret; +#ifdef PLOOP_DEBUG + u32 i, end, *d_bat_entries, clu; struct md_page *md, *d_md; struct rb_node *node; bool stop = false; +#endif ret = ploop_read_delta_metadata(ploop, file, &md_root, &nr_be); if (ret) { PL_ERR("Error reading metadata"); - goto out; + return ret; } + ret = -EBADSLT; + if (nr_be < ploop->nr_bat_entries) + goto free; + ret = 0; +#ifdef PLOOP_DEBUG /* Points to hdr since md_page[0] also contains hdr. */ d_md = ploop_md_first_entry(&md_root); @@ -1164,10 +1171,9 @@ static int ploop_check_delta_before_flip(struct ploop *ploop, struct file *file) break; d_md = ploop_md_next_entry(d_md); } - - ploop_free_md_pages_tree(&md_root); -out: #endif +free: + ploop_free_md_pages_tree(&md_root); return ret; } -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel