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 175E9803F6 for ; Wed, 11 Nov 2026 11:33:26 +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 6ABBW9MX027683; Wed, 11 Nov 2026 14:32:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ABBW9MX027683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=default; t=1794396734; bh=lkU+lPDsGODn/B8FofVg0Krqnn9fCrzEg1fJfJmlHN4=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=KRoTAPCpwvftmb/ut9ds3imUaj7dgmD4moCHXYBXp5vF0RonNtZap2ALP3Q0e/S6u RwsYaPgSC9BBUQ672x6QMt0s/oIcXGVYVkJNf2y/chvZGQInypxTqiiI5i9h5FGhzW cvSwz4ZnvaSPmzRlKCfCGdIW4D9uYjDdz6iq21gtzfocw29QbZUl/4RS3gwzDUxXKD 9e/lzmejhHdyy0tHZjskGw/s6o/fOlRFN8bASWzKE57nAiz3sPwEGK1/5jfhnHgcc0 2NLya+703Go1cWoFenoYrdgQv8Z1mgMnu/CDnqSYAoghcTJfhf8PWhqzVZR5fOCOAC 0Yz6R9TitAfvA== Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6ABBVhNa027639 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 11 Nov 2026 14:31:45 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6ABBVhNa027639 Authentication-Results: mail.openvz.org; dkim=pass (2048-bit key) header.d=openvz.org header.i=@openvz.org header.b="d+ksy13R" Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4b764ffc014so28272435e9.0 for ; Wed, 11 Nov 2026 03:31:44 -0800 (PST) X-Gm-Message-State: APuU4Z87fu1pa1gxYz4a9KpADq0k8/84nYDTNM/YWBOhX+p2goxJYB+X rOhN0GAdxRLZj2k9tc7w7e+0x+dGlEHERxNB0+SlEPAGSoO7ULlfq9KOhGO4gS7lvVtuawPxwX9 bFD332wFkFdYAbhSDYNs2R5rbsO9EQy6V9Gu39YGOYe1DZYywUvhJIQ== X-Gm-Gg: AYBFou0j/EANsoU6ealK17PT6KEWpec/d2l427NqAyl45lRi/2B3k+vrXLymCzWFB+r L7vY5otpbJ2Jftz2y9E/vrydx8JmG4zrLOQLOIey8CuhSNR9IU+dsvsFFQjYSS1C28G/UPTMJGh 0v+gXj1Ipa+s53i3lYDC0cfUQmTfvSa9bEBE9e+ds6es6c6zsrJjH9L6xxnBn1Z5SooaI4UjA5+ yZKy7NH2dMYd6qRGN76oG+Rtu+4Czqv4vmGxybFu1gTQGhY+fXx0JjdZ2TQxgeqRKHjYvkH5dW6 95dN31pSxg== X-Received: by 2002:a05:600c:1c22:b0:4a3:d327:6ed with SMTP id 5b1f17b1804b1-4ba093b5bdcmr44594155e9.17.1794396703647; Wed, 11 Nov 2026 03:31:43 -0800 (PST) X-Received: by 2002:a05:600c:1c22:b0:4a3:d327:6ed with SMTP id 5b1f17b1804b1-4ba093b5bdcmr44593625e9.17.1794396703140; Wed, 11 Nov 2026 03:31:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794396703; cv=none; d=google.com; s=arc-20260327; b=qEw2opfQMDMyXbA0RbJ3YxPTNZ/hqMRdBUb66qKNOAiHNeSE0RduzmQormY9mMDUjn whS9SPbHnv6ufAqlZpVygs7V6gEW3lq49hHLy54B62GVcXCbD71mu85RUrX2LxqBQwE1 4HIaFU84s+G9IH1r8q1Oxp6EKBSyldspnd23GHalv9JVAHaE1TUuyvRvd+YGUwMro0bb 54DW65PBEZcNRMGcqJpNTecCJ2PB1umhI5lwEzt9FaEFIttrziBouSTdtrjxaXUvQ4hw YMUqLxdY4FMLS0ap6AE24xP+srspRJUhTsaxAqnBg/KVo3dT8rhaoQErLDMQ71RdpjTX 68Aw== 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=KUs6+8wQ5w6WE/fqqylxVexmKAJQwwRnONHNe+/fl10=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=WZaKBdWs+CaP9C/OaSTo59mftT4EELIx7ut6CJmgnf3poQXY6xBTo5gAKyjNScz/um Nlo2M1ur1J8v5TFCPMtedEKYht8U2BtAnWVzvARpk6XL5pZ17X7IAUE1xfw+NUC5kR0X HthZdMqf3Z6M2mZmxXYfmlgzse8GPNrPUWnDMY/Q6bXZbGEhlUQil5F5/7QYg+CC0j5+ faS+eHISspXkmsen6xl4m0HpM/OzYT8/ldjwYJQaFSuF+OFx7oSLBfNGgCQe4O44yeoW W1KZpNbGRBefYRCylAqO63YY0hxxy0pup+jR2CwXL86An8dP6q8scQ2OjYepgQpmjhAI 3ZUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@openvz.org header.s=google header.b=d+ksy13R; spf=softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:c3:490a:ca77:c5a4 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-4ba01ff5114sor14470505e9.12.2026.11.11.03.31.43 for (Google Transport Security); Wed, 11 Nov 2026 03:31:43 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:c3:490a:ca77:c5a4 as permitted sender) client-ip=2a06:5b06:b600:300:c3:490a:ca77:c5a4; Authentication-Results: mx.google.com; dkim=pass header.i=@openvz.org header.s=google header.b=d+ksy13R; spf=softfail (google.com: domain of transitioning den@openvz.org does not designate 2a06:5b06:b600:300:c3:490a:ca77:c5a4 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=1794396703; x=1795001503; 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=KUs6+8wQ5w6WE/fqqylxVexmKAJQwwRnONHNe+/fl10=; b=d+ksy13RRYwJhxQJjkqz8SizSF/fDKpIOQfbMmsBKUrRM4tL/t3ACtkzg93Q0+zVNp G98G+4zJL4KAebUB8at6+ttb2RCcrpZzx1uPr/XSjyKEkEVYC+0yhohBxUY0nKDowZwx Xp2F6y41MC3DsaaH17Nq85EvBEvAYE7AfYd+xSDW4SGKnrpMkPpjVnTcJsR3lmdAaz/m yNSoLkk5urBwr2S/bh0wEzoHlgx02KGWwwMGXx7PmjaJvKr2HfWDZaJJhmbg1ZDvpYmS cFiFPZa6T3/PvQGqQFqIJZ6GIzFDYP9ELtz8L/1y2Mm6XUQw8ivVZi+ILzgtN/kkkSAH 9TtA== X-Received: by 2002:a05:600c:3486:b0:4a1:d8fc:8165 with SMTP id 5b1f17b1804b1-4ba093b981fmr35239085e9.20.1794396702628; Wed, 11 Nov 2026 03:31:42 -0800 (PST) Received: from athena.sw.ru ([2a06:5b06:b600:300:c3:490a:ca77:c5a4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba08ddbe68sm88679885e9.0.2026.11.11.03.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 03:31:42 -0800 (PST) From: "Denis V. Lunev" To: khorenko@virtuozzo.com Date: Wed, 11 Nov 2026 12:31:35 +0100 Message-ID: <20261111113135.4023555-6-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261111113135.4023555-1-den@openvz.org> References: <20261111113135.4023555-1-den@openvz.org> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 5/5] xfs: 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 the free space walk of xfs_ioc_trim() 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 of the data device and discard its unwritten extents that fall into the requested range, merging physically adjacent ones into one discard. The walk goes to the end of the file offset space, as fallocate() with FALLOC_FL_KEEP_SIZE can leave extents past i_size. A merged run is discarded in chunks, with a check for fatal signals and freezing between them. The walk holds the IOLOCK and the MMAPLOCK exclusively, after waiting for direct I/O and flushing the page cache of the balloon. 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 XFS_IOC_OPEN_BALLOON, which takes CAP_SYS_ADMIN, so the locks only wait for ploop inflating or shrinking it. An empty balloon is skipped before taking the locks. Any other one is walked whole on every FITRIM, whatever range it asks for, as its extent map is indexed by file offset; FITRIM is rare enough for that. Discarding the balloon again each time is cheap: dm-ploop completes the discard of an unmapped cluster at once. A discard error or a failure to read the balloon inode fails FITRIM; a balloon that is no longer a regular mutable file is skipped. A balloon inflated before this change is released by the next FITRIM. https://virtuozzo.atlassian.net/browse/VSTOR-153590 Feature: fs/xfs: fast online shrink support Signed-off-by: Denis V. Lunev --- Notes: - The balloon is locked, flushed and walked whole on every FITRIM, whatever the range. This is deliberate: ploop runs FITRIM on compaction, about once a day. Measured on a 4-CPU VM with a balloon of 84-99G over all the free space of a 100G image: a FITRIM after the first one spends 0.3-0.7s in the balloon, on ploop and qcow2, ext4 and xfs, for a contiguous balloon and for one in up to about 10000 pieces. The time goes mostly into discarding clusters that are already unmapped and grows with the size of the balloon and the number of its pieces. The locks held meanwhile only keep ploop from resizing the balloon. Narrowing the walk to the range would need a reverse map from blocks to file offsets. An empty balloon, the common case, is skipped before the locks are taken. - XFS_FSB_TO_BB(mp, minlen) could not wrap in 32 bits: xfs_ioc_trim() rejects a minlen above the AG size, and an AG is at most 1 TiB, 2^31 sectors. The u64 cast keeps the check from depending on that. fs/xfs/xfs_discard.c | 144 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index a6c43e4fdec3..72c6d1bb3fba 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c @@ -22,6 +22,10 @@ #include "xfs_health.h" #include "xfs_rtbitmap.h" #include "xfs_rtgroup.h" +#include "xfs_bit.h" +#include "xfs_inode.h" +#include "xfs_bmap.h" +#include "xfs_super.h" /* * Notes on an efficient, low latency fstrim algorithm @@ -843,6 +847,140 @@ xfs_trim_rtdev_extents( # define xfs_trim_rtdev_extents(...) (-EOPNOTSUPP) #endif /* CONFIG_XFS_RT */ +#define XFS_BALLOON_DISCARD_CHUNK_BB ((128U << 20) >> BBSHIFT) + +static int +xfs_trim_balloon_run( + struct xfs_mount *mp, + xfs_daddr_t daddr, + uint64_t len, + xfs_daddr_t start, + xfs_daddr_t end, + xfs_extlen_t minlen) +{ + struct block_device *bdev = mp->m_ddev_targp->bt_bdev; + unsigned int gran = max(1U, + bdev_discard_granularity(bdev) >> BBSHIFT); + unsigned int chunk = roundup(XFS_BALLOON_DISCARD_CHUNK_BB, gran); + xfs_daddr_t last = daddr + len - 1, next; + int error; + + if (!len) + return 0; + if (daddr < start) + daddr = start; + if (last > end) + last = end; + if (last < daddr || last - daddr + 1 < XFS_FSB_TO_BB(mp, (u64)minlen)) + 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 (daddr <= last) { + u64 rem = daddr; + + next = daddr + chunk - do_div(rem, chunk); + if (next > last + 1) + next = last + 1; + error = blkdev_issue_discard(bdev, daddr, next - daddr, + GFP_KERNEL); + if (error) + return error; + daddr = next; + if (xfs_trim_should_stop()) + break; + cond_resched(); + } + + return 0; +} + +/* + * Blocks of the balloon never hold data, but they are allocated, so the + * free space btree walk 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 +xfs_trim_balloon( + struct xfs_mount *mp, + xfs_daddr_t start, + xfs_daddr_t end, + xfs_extlen_t minlen) +{ + u64 balloon_ino = READ_ONCE(mp->m_balloon_ino); + xfs_daddr_t run_daddr = 0; + uint64_t run_len = 0; + struct xfs_bmbt_irec map; + struct xfs_inode *ip; + xfs_fileoff_t off = 0; + unsigned int lock_mode; + bool unwritten; + int nmaps, error; + + if (!balloon_ino) + return 0; + ip = xfs_balloon_get(mp, balloon_ino, 0); + if (IS_ERR(ip)) + return PTR_ERR(ip) == -EINVAL ? 0 : PTR_ERR(ip); + error = 0; + if (XFS_IS_REALTIME_INODE(ip) || !ip->i_nblocks) + goto out_rele; + + /* + * Nobody may write the balloon meanwhile: data written into an + * unwritten extent would be discarded with it. + */ + xfs_ilock(ip, XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL); + inode_dio_wait(VFS_I(ip)); + error = filemap_write_and_wait(VFS_I(ip)->i_mapping); + if (error) + goto out_unlock; + + while (off < XFS_MAX_FILEOFF) { + if (xfs_trim_should_stop()) + break; + cond_resched(); + + nmaps = 1; + lock_mode = xfs_ilock_data_map_shared(ip); + error = xfs_bmapi_read(ip, off, XFS_MAX_FILEOFF - off, &map, + &nmaps, 0); + xfs_iunlock(ip, lock_mode); + if (error || !nmaps || !map.br_blockcount) + break; + off = map.br_startoff + map.br_blockcount; + + unwritten = xfs_bmap_is_real_extent(&map) && + map.br_state == XFS_EXT_UNWRITTEN; + if (unwritten && run_len && run_daddr + run_len == + XFS_FSB_TO_DADDR(mp, map.br_startblock)) { + run_len += XFS_FSB_TO_BB(mp, map.br_blockcount); + continue; + } + + error = xfs_trim_balloon_run(mp, run_daddr, run_len, start, + end, minlen); + if (error) + break; + run_len = 0; + if (unwritten) { + run_daddr = XFS_FSB_TO_DADDR(mp, map.br_startblock); + run_len = XFS_FSB_TO_BB(mp, map.br_blockcount); + } + } + if (!error && !xfs_trim_should_stop()) + error = xfs_trim_balloon_run(mp, run_daddr, run_len, start, + end, minlen); +out_unlock: + xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL); +out_rele: + xfs_irele(ip); + return error; +} + /* * trim a range of the filesystem. * @@ -915,6 +1053,12 @@ xfs_ioc_trim( error = xfs_trim_datadev_extents(mp, start, end, minlen); if (error) last_error = error; + + if (!xfs_trim_should_stop()) { + error = xfs_trim_balloon(mp, start, end, minlen); + if (error) + last_error = error; + } } if (rt_bdev && !xfs_trim_should_stop()) { -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel