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 4FCCA8017D for ; Thu, 8 Oct 2026 07:40:15 +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 6987d1J4021069; Thu, 8 Oct 2026 10:39:02 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6987d1J4021069 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="evfVKRt8" 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 6987cjnB021029 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 10:38:45 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6987cjnB021029 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4870142f030so3001529f8f.2 for ; Thu, 08 Oct 2026 00:38:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBwonoOm3wrz7NJSiEwoG/MrypJnL0Zug56hbBaW6quT/jmjTz00vKQHpFqQZLnGuKybEWyvXQ==@openvz.org X-Gm-Message-State: AFq9FYLPXT/IFobOn/CY+pmAJOfMtht8mDea7Bhblmmg++1Z6RjdzYMz b/ggW8+UEEttvTBNghG3LZadUziQWDLGwU3t9G0fngP4zwkoVIZJR8ah3u9ei/3+rVDsYS6c6vL 4jG1h3IRI4R/SE69moZNtEsJjTbHK8y5G/+mkeSzlCMqKJ2cMcbIc/A== X-Gm-Gg: AYBFou2RH8To3t3MEwF6Fq3G+d8GZx4u+ZIzAhkpMI+4bGP2sGn9d47WK842OcSeId+ CgZTFVj5StzHDvszS9QTfkRMGvKEahQwkdGaKVTeVsbiKA6Vne8C9GnoV7HO1CBx+qTxTDc+Sr1 yTwX8MgagHzd2fJXdywyE06tREI3CINyFb+9jqle9dzJ6wm+YY//6TF1C3/wiCMDmXVs942bpt8 +QeREYIPToFDIquN+dyJi4+QT1Ox3t7qsnlz+bpWNtnsX7KVw7o6bqJOM4EdeOsjnoc6Ms13bH3 HcDF6uxpcTPORW24S5b0vi7DrflFv8psH34+NNchYgEUAQ/VOMTPC7E6fZfaMrHqTXXMhO6AC0m sA9gx096Q4qNIDCNe2z6m/kl8CHg= X-Received: by 2002:a05:6000:4805:b0:48c:6fa4:fc89 with SMTP id ffacd0b85a97d-48c7275b151mr8123315f8f.12.1791445125075; Thu, 08 Oct 2026 00:38:45 -0700 (PDT) X-Received: by 2002:a05:6000:4805:b0:48c:6fa4:fc89 with SMTP id ffacd0b85a97d-48c7275b151mr8123269f8f.12.1791445124437; Thu, 08 Oct 2026 00:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791445124; cv=none; d=google.com; s=arc-20260327; b=Z4aWUxPMJk4Q3+dtxVDDgK8vZ8N9Mi3egKXywyR51tZLTf/BxpCvcbghzosW+ENWwO TMqnFb+1NU3/HNgWUh7+Mh8wQITfniA0EzfulVOCJrfXMcQ61yc2/sx8WyAom9+raaJL cn9upGv6B7hRRtIfxjRFNQ3HS7vNEZ+rerlvrGkZFcFijN5hsShBTE3Ep2bZ4uznrFXK HulaulVSPqS6dUa1Wgm6l/c0e8MQgGt02HdJ4c07WgpQCUlH8T+M1Q9VcmCj0LF5FfIL 0p5koaugkt/+bj1Jklb9oKarBTWhc3ydehQ1tiqnhAw3gdu0GQdJg+VelFYXOEAS4DtP YAjw== 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=3Myq14ixaihGcVOg+IRuXPOA5LN9VDHWCbXfcOnzxvw=; fh=iR+h9bi3Bh9zMcmhT/g9qNPJn2rboPnO22cA9JfMqyc=; b=Lc726C90YotRzSZaAn8Ai+GMcCFuaepWNFHwCgF75P5bR2TEgIQAqLc9XPMW8bc48I 2ait8Qd+OduMffCdmFNX4fWzBgjoPn/Px3Gxp1RHJwVbRkTv7KBGSxpnUxEeu2vEGfs0 SkYxtzwy+SD6N5HbiQb+kruWWgFdtYlpGFtJWfBk3Qc+Knj8B7f8Le2JgsprAqRaj/Ga f2rtBooyoThWPx074nvN+9Il6D9/UAq7oXM9rffjTOXdMYHkYrFN0eLnlhm/QedrxItS oBXSfbW35ROQj4svmNp9lZb19KnNTeOf0vsZyryrU/cubQ38/xiRGJ+2SjZrHeo9UBxX O4Qw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=evfVKRt8; 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-48c7249a877si9399228f8f.297.2026.10.08.00.38.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 00:38:44 -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=evfVKRt8; 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=3Myq14ixaihGcVOg+IRuXPOA5LN9VDHWCbXfcOnzxvw=; b=evfVKRt8Zn/i B1uFEOzHCsYbOWJUeKteXmiJJXO9WuHH+858M9sTUOeKfSSU9fZND0aAiUJIK5vs2rAQEmEkm7bAJ dgXO8RWS7yA5b0gernS39GbjiMUapYu46tfRH8uZKvJLnVVfgOxLqHbPC/E/D34DPWAdZgrtfitmj 5caN5917avxXa1o5kVvpFGKk2Rp+nq+pjGZaMglhnoLGMRb/x49P/QQpiA+mBbM/eAy9er+1CXRhJ 7yLBocAX4606/0y6Lg4RtfmSrYVIM3/+FQ6V7Z7WjFc6uCk26C5au6tMEux85Z8fVYG6yA8C14BDZ Q66+CrlhNWb58xQk9XYB4w==; 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 1xEieu-007naT-2B; Thu, 08 Oct 2026 09:38:42 +0200 From: Alexander Ivanov To: den@virtuozzo.com Date: Thu, 8 Oct 2026 09:38:34 +0200 Message-ID: <20261008073837.510678-5-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008073837.510678-1-alexander.ivanov@virtuozzo.com> References: <20261008073837.510678-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 4/6] 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. No functional changes. https://virtuozzo.atlassian.net/browse/VSTOR-148171 Feature: dm-ploop: ploop target driver Signed-off-by: Alexander Ivanov --- 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 76fcfa64f875..93119e97ad0c 100644 --- a/drivers/md/dm-ploop-bat.c +++ b/drivers/md/dm-ploop-bat.c @@ -473,23 +473,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; @@ -501,9 +505,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; +} + +/* + * @fd refers to a new delta, which is placed right before top_delta. + * So, userspace has to populate deltas stack from oldest to newest. + */ +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); @@ -524,7 +552,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