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 381428017D for ; Tue, 10 Nov 2026 22:29:34 +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 6AAMSCr2019087; Wed, 11 Nov 2026 01:28:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAMSCr2019087 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=default; t=1794349694; bh=Jkt1w0943H9+2S+2rrcdg2HGDFnuY+DEkFlSfzFYHY8=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=v13xpQrksIOIZvlssUQa2JWRe7Fm4e0luls78jBD6thm1CClj28MGybTB96YCHxM6 HXOHyK2FJpwpf5AKpDKd/bUXLrD+vWF92HK6gJSs65k6QCsBBMs9dHdjS5yMiPgEU1 3G5PECtSDKyl/kyhoUjtVMNkfGqWxJUR6WDDc4q9xn/jRbbHB+qnLEXJ8c6CfDjehT z/KkZv46fvL5bJca3FaYA7QM2GapxQ4ysTlTGL/UGR4nYwaR/ZRB/9aFBBfOwOMkr8 06Dc1h0Es6Ac4ZAxYnFrK4tUeNr31Qm25hjZH+hmzwx1LHDmdre9huteHHAPEYoT8P hiQb+FKDL5JXg== Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AAMS1xs019059 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 11 Nov 2026 01:28:01 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAMS1xs019059 Authentication-Results: mail.openvz.org; dkim=pass (2048-bit key) header.d=openvz.org header.i=@openvz.org header.b="Yp/7k4Sj" Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a0284121c6so19319485e9.3 for ; Tue, 10 Nov 2026 14:28:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErH8BfDOF2n6kB05RtRFlJeEzwEtBk5E01oAoY+TvlWQ/VgTtg4UMG9T/96mGzN+F0W2RxqHBw==@openvz.org X-Gm-Message-State: APuU4Z8WYLVxmYTaamJZ11N7i2rwhmq6lVPxFVTCCR/n2d4G9XYizuPK 15zdWB0V40v3+3Yi9evuXkLtQ3JIsX9tH6rbn/Qo3aH2lnjkiKoPLuTzcPBuAsMA/b1MO8oh6jd KSZQkapMsErv63qfowYKudnU8zkzHqhotARMxWEDcUkYC292J+PXQ+A== X-Gm-Gg: AYBFou2YiL/rIEGWRDMTND3yeGCkZIEA19oTLxAjNsdezw747a4p0e2/sA3OFdwy3Wz dFGuMKG+KynX0FaqVfaKGHPHk9p2wDzZFtSQcoa6eQa3OH+bGXXrDp/yLKxA4rk40Khva+qAHnB zzMVNUXos8es4z8tGbplAm/LuxDoVt81VwZYtzqnJMUrN47AsNcqmxWkqLZIpONPZ52Jvzmew7V VOK/nemgf29tHa9ArVQ7QGsY7hUJn+fwAyUP8GBs9r/M0f3AaXV4tFD8dhijL0lhS+Hd3HR9BYM nPVFI3vYjg== X-Received: by 2002:a05:600c:8707:b0:4a2:fe11:9a8a with SMTP id 5b1f17b1804b1-4ba091aa248mr8367635e9.0.1794349681492; Tue, 10 Nov 2026 14:28:01 -0800 (PST) X-Received: by 2002:a05:600c:8707:b0:4a2:fe11:9a8a with SMTP id 5b1f17b1804b1-4ba091aa248mr8367495e9.0.1794349681138; Tue, 10 Nov 2026 14:28:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794349681; cv=none; d=google.com; s=arc-20260327; b=Q/i3P5ryJMEHiDq8WdWDDrF+KCYmGKydkabp43fvBoEx4Vmm6rGDMRoH+/fDWJDXuh BxhUINmBCat9VkN549CgtRAg/5sva8UF4gB/SFJZSa+ZCbMN316CCu11/jDfXre0AkGE 9fzIeB3D97QWGcsorHw//W8/byT0jztdCb7Pncqn1mbEC65wsXH7PsgdOBvRn55+pMWM RSjTTBEYIKNr8ntj12EyTmlrRoT/O6O5h7Fyukd0ShIOUDT1g7Tc61q/eWUfRDBlPpzm ApZutnch08U9v1o4ZLIU40jFvDzGH5Jfw4caCNrQ6hsI+owtfdkwk2RUIQZ/SW5fEZIF qAMA== 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=7tnBg8b+sn0W3wQtCFpUZKubLH0G0XCe7/bIrSsi0k4=; fh=rGOn4lOLH4NJ6+813X1RWjRSD+DzBB+tfk+kn5gKH/4=; b=ZuneU380WrelTEsHtHOCveKSyTOUTKA4x9RzD9BEpfURHIpKeBXe1vuVFdDwlF1eVW kF7yhL7SMN67HDrFnbZidN0FHfTRs/+klJnKon/St6Js6hdBz9RdGluQQNe+VQ9FY1KR ejI7/sWpnashBwjvtGPRB2kCW+rub6Erk7sNEcd+hDgfDK/27igiKd2uhEETMThIaHX7 N037hHmnvo70W4kgE9ASyXGbourjOPqCgJ64rLWZWgmTB+AqAdCwBkkPoYOtgPKuqcjr b/gLLKWK/plE4mS15aUlZ9dksZ7iH8tkauQDxDDw+xeXtToMkzR2Rp7uN9s/17TU7gpG iZtA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@openvz.org header.s=google header.b="Yp/7k4Sj"; 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-4ba01febb2asor8450965e9.10.2026.11.10.14.28.01 for (Google Transport Security); Tue, 10 Nov 2026 14:28:01 -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="Yp/7k4Sj"; 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=1794349681; x=1794954481; 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=7tnBg8b+sn0W3wQtCFpUZKubLH0G0XCe7/bIrSsi0k4=; b=Yp/7k4Sj3p2K63EuI7fzynrEt1rlP5FLFB2Y+KEr4ydG/waCslnDB3yTgXqd5VsoLP la61eqGX6sxMZZCXOMdb5f7EQ1Z/OgYt8HJQVZyI4doMvtBckaWNUwBpa512c3UKMp2c fXk/SHO8nv4WvIWfRTcC4HxL6wWq6y9uHh0z4vjNGAwPof+EIfSlWNgkN6G3AqyqlXHZ AcwzElrVJMa2Zjq1x0JH/rr6jXS5INux8jCqPoaL9nRjkLI71TVoNLiWXqLUV6nvO0o6 rwKMN5mZaY6kVndJH3qDzRE6KZ/KczgEsPTtEATzZaWfDzL8ByZDSzrfOIYGUDedm2kp plLA== X-Forwarded-Encrypted: i=1; AL+hErHAJ04WQ5RTptHo/3n2usnR+YTgXLeUkUV9C+vsC8RsWoO14TFFLg4Hogsz96As9hE0Yzx1Bg==@openvz.org X-Received: by 2002:a05:600c:3b89:b0:4a2:526b:d3fd with SMTP id 5b1f17b1804b1-4ba09382f8cmr7551325e9.15.1794349680673; Tue, 10 Nov 2026 14:28:00 -0800 (PST) Received: from athena.sw.ru ([2a06:5b06:b600:300:4f78:6441:d0f1:22af]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba09536ebfsm8923155e9.5.2026.11.10.14.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2026 14:28:00 -0800 (PST) From: "Denis V. Lunev" To: khorenko@virtuozzo.com Date: Tue, 10 Nov 2026 23:27:54 +0100 Message-ID: <20261110222756.3236854-3-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110222756.3236854-1-den@openvz.org> References: <20261110222756.3236854-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] ext4: discard the balloon on FITRIM 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 The balloon holds file system space that never carries data, but its blocks are allocated, so ext4_trim_all_free() never discards them, and inflating the balloon is a plain fallocate() that does not discard either. Once the balloon is inflated over blocks that held data, e.g. on an online shrink after files were removed, the device below keeps them allocated: a ploop or qcow2 image keeps host disk space the container can never use, and compaction, which is FITRIM, does not give it back. Walk the balloon after the free space in ext4_trim_fs() and discard its unwritten extents that fall into the requested range. The walk goes to the end of the extent tree, as fallocate() with FALLOC_FL_KEEP_SIZE can leave extents past i_size. Physically adjacent extents are merged into one discard, otherwise every cut at the unwritten extent length limit leaves a partly covered cluster of the image below. A merged run is discarded in chunks, with a check for fatal signals and freezing between them. The walk holds i_rwsem and the invalidate lock exclusively, after waiting for direct I/O and flushing the page cache of the balloon, as punch hole does. No block of the balloon can be freed and reused under the discard, and nothing is written to it meanwhile, so an extent that is still unwritten reads as zeroes before and after the discard. The balloon is hidden from lookup and opened only through EXT4_IOC_OPEN_BALLOON, which takes CAP_SYS_ADMIN, so the lock only waits for ploop inflating or shrinking it. Every FITRIM discards the balloon again, which costs little: dm-ploop completes the discard of an unmapped cluster at once. The balloon is not counted in the trimmed length reported to userspace, and a discard error fails FITRIM. A balloon inflated before this change is released by the next FITRIM. https://virtuozzo.atlassian.net/browse/VSTOR-153590 Feature: fs/ext4: fast online shrink support Signed-off-by: Denis V. Lunev --- fs/ext4/mballoc.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index aaf2c24c514c..5fb87753975d 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -7009,6 +7009,126 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, return ret; } +#define EXT4_BALLOON_DISCARD_CHUNK (128U << 20) + +static int ext4_trim_balloon_run(struct super_block *sb, ext4_fsblk_t pblk, + ext4_fsblk_t len, ext4_fsblk_t start, + ext4_fsblk_t end, ext4_fsblk_t minblocks) +{ + unsigned int gran = max_t(unsigned int, 1, + bdev_discard_granularity(sb->s_bdev) >> sb->s_blocksize_bits); + unsigned int chunk = roundup(EXT4_BALLOON_DISCARD_CHUNK >> + sb->s_blocksize_bits, gran); + ext4_fsblk_t last = pblk + len - 1, next; + int ret; + + if (!len) + return 0; + if (pblk < start) + pblk = start; + if (last > end) + last = end; + if (last < pblk || last - pblk + 1 < minblocks) + return 0; + + /* + * Chunks keep a long run interruptible. They end on multiples of the + * discard granularity, so no cluster below is split between two. + */ + while (pblk <= last) { + u64 rem = pblk; + + next = pblk + chunk - do_div(rem, chunk); + if (next > last + 1) + next = last + 1; + trace_ext4_discard_blocks(sb, pblk, next - pblk); + ret = sb_issue_discard(sb, pblk, next - pblk, GFP_NOFS, 0); + if (ret) + return ret; + pblk = next; + if (ext4_trim_interrupted()) + break; + cond_resched(); + } + + return 0; +} + +/* + * Blocks of the balloon never hold data, but they are allocated, so + * ext4_trim_all_free() never discards them. Discard its unwritten + * extents, merging physically adjacent ones, so that the device below + * can release the space as it does for free blocks. + */ +static int ext4_trim_balloon(struct super_block *sb, ext4_fsblk_t start, + ext4_fsblk_t end, ext4_fsblk_t minblocks) +{ + struct ext4_sb_info *sbi = EXT4_SB(sb); + ext4_fsblk_t run_pblk = 0, run_len = 0; + struct ext4_map_blocks map; + struct inode *inode = NULL; + ext4_lblk_t lblk; + bool unwritten; + int ret, err; + + /* ext4_load_balloon() replaces s_balloon_ino under s_umount */ + down_read(&sb->s_umount); + if (sbi->s_balloon_ino) + inode = igrab(sbi->s_balloon_ino); + up_read(&sb->s_umount); + if (!inode) + return 0; + + /* + * Nobody may write the balloon meanwhile: data written into an + * unwritten extent would be discarded with it. + */ + inode_lock(inode); + inode_dio_wait(inode); + filemap_invalidate_lock(inode->i_mapping); + ret = filemap_write_and_wait(inode->i_mapping); + if (ret) + goto out; + + for (lblk = 0; lblk < EXT_MAX_BLOCKS; lblk += map.m_len) { + if (ext4_trim_interrupted()) + break; + cond_resched(); + + map.m_lblk = lblk; + map.m_len = EXT_MAX_BLOCKS - lblk; + err = ext4_map_blocks(NULL, inode, &map, 0); + if (err < 0) { + ret = err; + break; + } + if (!map.m_len) + break; + + unwritten = err > 0 && (map.m_flags & EXT4_MAP_UNWRITTEN); + if (unwritten && run_len && run_pblk + run_len == map.m_pblk) { + run_len += map.m_len; + continue; + } + + ret = ext4_trim_balloon_run(sb, run_pblk, run_len, start, end, + minblocks); + if (ret) + break; + run_pblk = map.m_pblk; + run_len = unwritten ? map.m_len : 0; + } + if (!ret && !ext4_trim_interrupted()) + ret = ext4_trim_balloon_run(sb, run_pblk, run_len, start, end, + minblocks); +out: + filemap_invalidate_unlock(inode->i_mapping); + inode_unlock(inode); + iput(inode); + + return ret; +} + /** * ext4_trim_fs() -- trim ioctl handle function * @sb: superblock for filesystem @@ -7028,6 +7148,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) ext4_group_t group, first_group, last_group; ext4_grpblk_t cnt = 0, first_cluster, last_cluster; uint64_t start, end, minlen, trimmed = 0; + ext4_fsblk_t last_blk; ext4_fsblk_t first_data_blk = le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block); ext4_fsblk_t max_blks = ext4_blocks_count(EXT4_SB(sb)->s_es); @@ -7061,6 +7182,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) &first_group, &first_cluster); ext4_get_group_no_and_offset(sb, (ext4_fsblk_t) end, &last_group, &last_cluster); + last_blk = end; /* end now represents the last cluster to discard in this group */ end = EXT4_CLUSTERS_PER_GROUP(sb) - 1; @@ -7103,6 +7225,10 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) first_cluster = 0; } + if (!ret && !ext4_trim_interrupted()) + ret = ext4_trim_balloon(sb, start, last_blk, + EXT4_C2B(EXT4_SB(sb), minlen)); + if (!ret) EXT4_SB(sb)->s_last_trim_minblks = minlen; -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel