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 60521803F6 for ; Tue, 17 Nov 2026 17:19:16 +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 6AHHI3KN011125; Tue, 17 Nov 2026 20:18:04 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHHI3KN011125 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="VcPR+DVX" 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 6AHHHoEq011065 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 20:17:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHHHoEq011065 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4903fc8537aso7485f8f.0 for ; Tue, 17 Nov 2026 09:17:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErHSkZ/C8gPub7lUpI+qNNptoCkNmD17rLBOJhXEyfDALy/9iAYFOnlj7ycT6InGMfaLGXddUg==@openvz.org X-Gm-Message-State: APuU4Z8EWusXmNWHxN73EVF4NBtb6zlA4BftVn5C8biBF//7fs/WQj08 QLzNDjVBkwo1kfjZJs+ix12kp8gelmnkYY4SPTkuNNFl8U/fiBTF8VdZNIIuVJGOTbH9m53ciWS eISsPDfWQGF9DXrR8d9ytv9O7f5uMzNGtzD7ugKqCksJG6YShr7sLWA== X-Gm-Gg: AZFdTZe6Uu0hHHdVDhgRMJ5uOfb4VN5jq1kivKPXywVaLP3isPyQFoI5L+8ABbSqGzt Y436kkJlITTZqTfC+YuVOf/MHuN66vWmcqVZOyMxP6gYBHsRsH1jrePQFm/wruBAVyzBrFzeqd4 /IXTzBvrXzcxkUgEpzXYacKSw7SHtM/lvEik26hZZG4bDnQt7JcuiC1oInHla0RYKV+siWQviW9 mRLwekcn0kbbMSrYp2OhjIirhcqyQfpoB1XMsOmxL1LpQJq1+ci5PENGIfz7iNwNshYfcMbvFPT QlGmXbqr06/9eM9zEW7cNeoeMsUnzI+eDZWepy9IkqvCRxfcaYn8B7fVKuAs7bF7TFFe/ag0cd3 oPMU36gCbsyFc3AAqm2bWSW+IlJf+ X-Received: by 2002:a5d:5f46:0:b0:4a5:de24:4030 with SMTP id ffacd0b85a97d-4a63ce068d8mr163767f8f.53.1794935869960; Tue, 17 Nov 2026 09:17:49 -0800 (PST) X-Received: by 2002:a5d:5f46:0:b0:4a5:de24:4030 with SMTP id ffacd0b85a97d-4a63ce068d8mr163718f8f.53.1794935869438; Tue, 17 Nov 2026 09:17:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794935869; cv=none; d=google.com; s=arc-20260327; b=EXYuZKkw1HRVK6ibrFXYiU9s3ezEmn8UprU7qaijfuwO966IdDCi/4U72NG5mLhTLx hrD+dcXaWLZ9r37j4uSdgbd1HpI4509oqu2JsIMkpgZ3jfa219YxSd3GzPxbboCqPZJo lQYKQicWRcOTbnjUXWSgCRdupIgqz6pdTV5y/hNBYKtuu/yny+9iLQndmk4p8Tsuv+Si Ho81AzvwQs+R8UOl6HIxiGscLp+DGTdnEbvXaxG8maMJYIzsTnPgaY8NJOJhnX3KpB8/ 0l4+y/AwIkd3wOpfX89qqABGta2QS2ljOtN6t9YBnPLXRhDbG34W8YcZVPBDglOYHdaL TuIQ== 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=E3vCAgcov/hQ3XWh2CqQ9wok33eMAQJstV7H9y+Mjr8=; b=nIil77ikZwM8tjeKERjlFwyAJD2NxQqqBzyuG/lQZKMATVRpcVzA5Xf+etLEhVkair 8Beesfr08NBac0x/mp3zlQxQOWobkkFH4T3EEwrNL5Y+J6LvgIm87JooK0cZoA23gKQV h1HgZls1ol76jmcosub1AF9EPA8Bx2NiQcqifBmBgoyAdC770/+jn9ppiCg8lbL+cd/8 SGnWzm4hcR4WQigWhJDX/srj/o1HLka+YTSxrFK0cBvZL2H4QTQgHMLQiAQUvEybS8U6 eugInxKpstN85B3CQbkBuhQrkDXuduJ84dqhWMYS5CwH4Z+203Uvzi7f8nnEa6YqhOMm SCkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=VcPR+DVX; 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-49c63da380fsi28688301f8f.240.2026.11.17.09.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 09:17:49 -0800 (PST) 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=VcPR+DVX; 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=VcPR+DVX/b7c rTPvNxBi2cLEHS4rhTGMa9eKvVbOf0QTeLEtXeASv0wwgQ2/WYY5r/UKyks8bM4Uqt7SWiNo3NWKq Wfj/NE2rfVgEi0FmBjdfKFxCP1IFLFQCfX+W25YlTCTsGP+m1JNxXyF5lD7UAjL76x2GniXZcDESq 3jbPyhdv+N46L8VT8ckvqF+B4cS1RehS2TbUKQNybcPg3iW/CCXUU1Fcu3P/7wSeOdqizLP2NVGQD cDBwkBYhgBo/KgN4GaDST8vnhodaB4IBF2eNl80B23i77HdGkK/auCYy1ib4Az7Gaa6lrfpCgYB7l ARNDuOO0OgMys2XZ3Q4RWQ==; 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 1xTMkG-00HOVM-0m; Tue, 17 Nov 2026 18:17:38 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 17 Nov 2026 18:17:37 +0100 Message-ID: <20261117171743.3216794-5-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117171743.3216794-1-alexander.ivanov@virtuozzo.com> References: <20261117171743.3216794-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v7 04/10] 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