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 9C13A808F8 for ; Thu, 8 Oct 2026 14:04:58 +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 698E3kCi024520; Thu, 8 Oct 2026 17:03:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698E3kCi024520 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="q/TIedX1" 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 698E3dxj024490 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Thu, 8 Oct 2026 17:03:40 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 698E3dxj024490 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48589603501so2935977f8f.3 for ; Thu, 08 Oct 2026 07:03:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByw29tRfU+CLk5RO/xblmE7MstBHVe+nh5iU+uAV5rpGoPlBpEsj4iCPjQAmExk0TNWLKzNKA==@openvz.org X-Gm-Message-State: AFq9FYLFpegHPI4A6N1L5qwp09UNOr2i6mHDMAArt2BJK5qV0sIeePQt SQBBxr+CYoKNOkhiqqHY28RvA9XJ6H4VI5qiksEyMwTeu3tATKZ20hTP3SiB3AcMhttPPYT3eJS iTQ816KC8XvyYXW5pBixXNk9VNZG05LdULau16eYVWy950u+MFPBzEw== X-Gm-Gg: AYBFou2P6fgN3f3CJzYGGTliBjVt82xBOY8mB3zp37bfaN6aSc4/GFfH95Yg8xgbcbC m30sVlRiHLEALlFO5lC3qxdnf+SK3O39oR0IBMSz1YUqWUsuuQNueFDxVG5f4y97KKgMyovG0Gf SCQAB/zzfkhvBCYrk9nIj0ocGe+SsmHVQJWmgpc47ZBPtXuN72SFChyC/8pKhWtfwUmxtw87GBi OXwXTwyRylQlsxLEWtzwdxed2cLO+40gLEjZSB2jf80WLzCSsh7qgILVlsdkWdfxtsF/pkz6bi3 jAaX0YQwikpNuQ0hjGMwMxjS6CjcivD3iIDzxoJo65yrdf6vqy2W7nDP/FfCye7nXdpz7TXgRCk zcPXg8j2pPiFMy4ufKOvUwf4Av84= X-Received: by 2002:a05:6000:2c0c:b0:48b:11df:c496 with SMTP id ffacd0b85a97d-48c7288ada0mr11186947f8f.28.1791468219632; Thu, 08 Oct 2026 07:03:39 -0700 (PDT) X-Received: by 2002:a05:6000:2c0c:b0:48b:11df:c496 with SMTP id ffacd0b85a97d-48c7288ada0mr11186843f8f.28.1791468218706; Thu, 08 Oct 2026 07:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1791468218; cv=none; d=google.com; s=arc-20260327; b=qpAWcTyh0bOWL/3Y6pIPxdEOPruknLzWT3zMuoswVfaX8nkdK/b+5O6gpC5x3MWCj3 sovOxWWlLFrJK9ymDI3jX+S1Bk+UrQjRgthMeOe/m7U3gMS/S91YWHc+GExmBkkrTK8L TMH2AF5WDAGvCxy1JlcB+tyuGTnI8EMFxeBB2MXMinsnNANaPCM2Mcf2F7DTB1f8FtJ0 doGj5UQ0xSuajaMoPyZPPJtQ87nXRHNfcoktUolqDbVzqc/YBelWwjwKGE2eSvFB84xo ocPaiwt1kRrNfnizaN2wSPORnNeLTDhOel2yruJ1br1nNmo8nkhnr4i9vTdEI0d3h6gy BTdQ== 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=XDUi6+qTrAq2wwQeujmTRUjutVQI1kqm7CG8WWu75gQ=; fh=jiFD8gjZllyls1UFJ+1kA4uyOnjRU7bVpV3P+S6CTV8=; b=dlBgzEWkJbitmr5DUMsAE+Dq3ACCppr8/ER3jVQDBoR2lOmIC7EdvL4Kx86U/GPDU7 nQeGVEJ6xDw3XFX4zMtXh3H/p+iCfYCNXbXHUGNNqjEDe5yKjffoDiNqvs6YyuvEFFqu h4xAM4xH/FVD4ZQ+mNRIJwoO0uzWugWtUAQ8cxnIF3Fxz3LBZHA8vCkVX6/piN8rXawa NlXTj8mNf4zNTO0i300ZgqRsr7M90IXFLhhGngA1F6XA27eFbA6alpy/AjskIpntf9jn bfDskoWgLIBZlmhbV4dYsbVxjefA2m3bmxu3ZoW2l1t/xD6A5lB8odSw5HURlIeDeHiz PQdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="q/TIedX1"; 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-48c724b84d3si10527650f8f.450.2026.10.08.07.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 07:03:38 -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="q/TIedX1"; 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=XDUi6+qTrAq2wwQeujmTRUjutVQI1kqm7CG8WWu75gQ=; b=q/TIedX1hvX2 GB7EhhVB/PlUAL9trjMlB6qeRkwFF/pXaxCgGV4s0k6ia7uj1L0WS+841NwjSJoGdjpepiWj5I/ei QASF6sdPmOzszytz8n5dSPg5ZiYfMkLTUurEWppv8u+huR5EV0jmwui9c7KY+6eZJXxuJmWXka2tI ZFFs64txTDIxzxqsPspaqNb2JbkhO5X8HIqlmjT9uJQbr0V1HR2PjN31ZHz6zmHJ61XQM6KDN2uRF qLIvrizwskxc419LGBlC6AD7A4/i4cfjpEJicCcWptFcTA0b33+5ZuIGNFr5tMV9p2+jflr5FZx5q tLBytetD1AubsBQO5t1NTg==; 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 1xEofN-00FAkW-2r; Thu, 08 Oct 2026 16:03:35 +0200 From: Alexander Ivanov To: den@openvz.org Date: Thu, 8 Oct 2026 16:03:31 +0200 Message-ID: <20261008140333.614909-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008140333.614909-1-alexander.ivanov@virtuozzo.com> References: <20261008140333.614909-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 3/5] 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 2cb06193eaf9..57a45119f0c4 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,11 +505,35 @@ 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; /* Empty delta has no mappings, and BAT iterators can't handle it */ if (nr_be) 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); @@ -526,7 +554,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