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 5AB098017D for ; Tue, 13 Oct 2026 07:58:17 +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 69D7u1Gj010057; Tue, 13 Oct 2026 10:56:02 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69D7u1Gj010057 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="YliAFZ9d" 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 69D7tSjx009966 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 13 Oct 2026 10:55:29 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69D7tSjx009966 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48c6a1d4034so2267100f8f.0 for ; Tue, 13 Oct 2026 00:55:28 -0700 (PDT) X-Gm-Message-State: AFq9FYIHubJFT4GRhZQDf7IeLs5kurPFp82ZCsz+Mnhj5VfEheInxEpJ O39GGl2Pv8MqnLvpyEYJkfH0s4daKF7RNSW0IPWuq9j02mmCmn4H7XLvbW25tMy30hFGsegFDEH 2X5v8+BEqvzmg8k8D1Uxr4wxCbRe8cx5ObiuxPeuK9n++DL45Vtm8fw== X-Gm-Gg: AYBFou1gUV/GTAUoOLXhQ2/OC9RVnjmE5KIEWEGUxSmUAcTUYlJSKicx1sFpNEK1UmR 8DmZo4rE7TRVRgnl4ZgX8Ke3ua/2f7ik/g5/bUSM5oaktmJ8yOPWdKdPnITQ6rwq7ij7RBrYKZl vrv5YvH05jOekOrxiXNt2UFwsnQCxEuJwrG/ji1FwIkzSeV9kS5+evsC1PASe/I2FS34dYok89H XKrREe2w2MvfR0R/ubys58afoEds0jHvQ3/K4AniR5KTR3O9eCuF3PVvo1+/qA/MnOpRfcVhihp sBfpKw7bASFc62pGL2mZoA/Uy//OnSa1W46z1/HB3x12hgV5YyqwuBbAyi4tev1zbIQIwgiJFq6 pcBWs8zONqG5GU7XcT/IXtm1cq20= X-Received: by 2002:a05:6000:1a8f:b0:48c:652b:9694 with SMTP id ffacd0b85a97d-48ddb2ca559mr8030139f8f.14.1791878128621; Tue, 13 Oct 2026 00:55:28 -0700 (PDT) X-Received: by 2002:a05:6000:1a8f:b0:48c:652b:9694 with SMTP id ffacd0b85a97d-48ddb2ca559mr8030087f8f.14.1791878127811; Tue, 13 Oct 2026 00:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791878127; cv=none; d=google.com; s=arc-20260327; b=DvUwrceiD52ngZnNEN/5DKEuxRlUsSauknfRUWghbwYJcF8Aao8QwvVebGd1BLyeRm jQPYs+8yVokbUfS+t6LPUrbpHuiBuK5mpNi0pjEJRfixMLMfuHzpcfjNLYsufeL9ErZW YkCsBiCDwixYtvzKGFX8ItnS3UMlu75DtDntluePKh6qoXGSPF4hQeX4/qKXnWDrjbK+ tgl4wu3GrpL+LfgUEhbqqn8xyy1YjzXe95pbPzNlqt8gk354Q5GHCiKgUJqraYoQVTsG H/zvucpEVLuqYxSETyVYAp28Up1m/TGQ/ZxDowyhL7GU4otDCx83WeVV4GIrJdX4QBbD pSew== 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=PyddkjEHIPck8bzYCzzFrzm5PHvZPbMnv8wcMopIueE=; fh=M+TyAUhAp4+t7uzAVeqNdLHW5eNz2FQXSv4TjrRhpCk=; b=Qsu+xvgDjLhtlyi2z5uWeHi/xQD8z66VYG+HGloETL8ygE/sAjAtO30f1Vk0xpU576 0MWKCUv3AKKio9mwAjyPrvcwvIQswnwC3HyWKB16/+APrUr59k9QWSUn+CjYPSHY2rcN +7JVfP587rGJp4sCpuQGdGA98UDVU0Q7rvPLhaJppTfweC9JMCFw/zPVSyVwU+6Sv5at 20xz+4B/1Xi9oMEm5RUQ22FBHjgl0Y723S5quysvgipo5c65b9yywnbL0boxeBk5dCvM koKI38Bdh+B9yvby2/Bq3qVwSK9WddR7Rh5IJZVnggeS5Yhy+f5kdvBngHm2iQp5qcH7 rsQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=YliAFZ9d; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@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-48de0c08675si5147323f8f.386.2026.10.13.00.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 00:55:27 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.ivanov@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=YliAFZ9d; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@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=PyddkjEHIPck8bzYCzzFrzm5PHvZPbMnv8wcMopIueE=; b=YliAFZ9dBYjh sw3szieqr2MKXiMVkDF1nhuv0PNH0GQ5jXQO6TRB8djbSWVobp1+6Gw+48p3SCDVJbez072OH/eDZ A/V0J6EDgn9uCxRO4xLyt52nUjmLhdYMcEUFTpki/XQM5PegwDfD22ebgF2+kgdEbW9eb3DyFd1/B rWhUy0iL3Y3+o0BaHTqIjMEvuvAZS5eAdKOhv19zmp29A/mTXixiPTS6ZWB2Ill0QYgbGPQ1mg/7+ hggSwz6rr4fLEN9VZMbYU30GAmLSo6Z+bWc9y1B+BEGBfo9d71rJ1nCe29ttQm2OayHwXWHk7AqUy pVs3C9uFIERfw+/J20j/JQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xGXIh-004zlI-1e; Tue, 13 Oct 2026 09:55:17 +0200 From: Alexander Ivanov To: den@openvz.org Date: Tue, 13 Oct 2026 09:55:08 +0200 Message-ID: <20261013075513.90618-7-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261013075513.90618-1-alexander.ivanov@virtuozzo.com> References: <20261013075513.90618-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v5 06/11] dm-ploop: factor out ploop_read_delta() from ploop_add_delta() 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 Move reading of delta BAT and applying its mappings to ploop->bat_entries into a separate function ploop_read_delta(). It will be used to reload metadata of already added deltas. ploop_read_delta() takes is_raw from deltas[level], so ploop_add_delta() sets it before the call. Replace the stale comment of ploop_add_delta(): it claimed deltas are added from oldest to newest, while ploop_add_deltas_stack() adds them from top to base, which ploop_read_delta() relies on. No functional changes. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-ploop: ploop target driver Signed-off-by: Alexander Ivanov Reviewed-by: Denis V. Lunev --- drivers/md/dm-ploop-bat.c | 43 +++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/md/dm-ploop-bat.c b/drivers/md/dm-ploop-bat.c index 3427d1a90d81..5a89771a2e02 100644 --- a/drivers/md/dm-ploop-bat.c +++ b/drivers/md/dm-ploop-bat.c @@ -481,23 +481,27 @@ int ploop_check_delta_length(struct ploop *ploop, struct file *file, loff_t *fil ALLOW_ERROR_INJECTION(ploop_check_delta_length, ERRNO); /* - * @fd refers to a new delta, which is placed right before top_delta. - * So, userspace has to populate deltas stack from oldest to newest. + * Read BAT of delta @level and apply its mappings to ploop->bat_entries. + * deltas[@level].is_raw and nr_be of upper deltas must be already set. + * + * Deltas must be read from top to base: mappings of upper deltas take + * precedence (already populated BAT entries are not overwritten), and + * size of the delta is checked against nr_be of the upper one. */ -int ploop_add_delta(struct ploop *ploop, u32 level, struct file *file, bool is_raw) +static int ploop_read_delta(struct ploop *ploop, u32 level, struct file *file, + loff_t *file_size_ret, u32 *nr_be_ret) { struct ploop_delta *deltas = ploop->deltas; struct rb_root md_root = RB_ROOT; - struct file *cloned_file = NULL; loff_t file_size; u32 nr_be; - int ret, i; + int ret; ret = ploop_check_delta_length(ploop, file, &file_size); if (ret) goto out; - if (!is_raw) { + if (!deltas[level].is_raw) { ret = ploop_read_delta_metadata(ploop, file, &md_root, &nr_be); if (ret) goto out; @@ -512,9 +516,33 @@ int ploop_add_delta(struct ploop *ploop, u32 level, struct file *file, bool is_r if (level != ploop_top_level(ploop) && nr_be > deltas[level + 1].nr_be) goto out; - deltas[level].is_raw = is_raw; ploop_apply_delta_mappings(ploop, deltas, level, &md_root, nr_be); + *file_size_ret = file_size; + *nr_be_ret = nr_be; + ret = 0; +out: + ploop_free_md_pages_tree(&md_root); + return ret; +} + +/* + * Add @file as delta @level. Deltas must be added from top to base, + * see ploop_read_delta(). + */ +int ploop_add_delta(struct ploop *ploop, u32 level, struct file *file, bool is_raw) +{ + struct ploop_delta *deltas = ploop->deltas; + struct file *cloned_file = NULL; + loff_t file_size; + u32 nr_be; + int ret, i; + + deltas[level].is_raw = is_raw; + ret = ploop_read_delta(ploop, level, file, &file_size, &nr_be); + if (ret) + goto out; + deltas[level].file = file; deltas[level].mtfile = kcalloc(ploop->nkt_runners, sizeof(*file), GFP_KERNEL); @@ -535,7 +563,6 @@ int ploop_add_delta(struct ploop *ploop, u32 level, struct file *file, bool is_r deltas[level].nr_be = nr_be; ret = 0; out: - ploop_free_md_pages_tree(&md_root); return ret; } ALLOW_ERROR_INJECTION(ploop_add_delta, ERRNO); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel