From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B62B53A1CE6; Wed, 3 Dec 2025 16:32:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779539; cv=none; b=NCFEA/JGnW51gnZs1toocHqGLhg0L9en1sFhMvXkQiDdUXKy34Ag+ASgiv4LAFi6582MC7GlL3mKxuL4IAVaBRInxSv5vXN+mt4UAwE9bKLI+353LhpV8RFU6o60NA+3uG1rgfrvoK2LXK7BJPIMPWdZ9eRxiQmA5isQLZPojHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779539; c=relaxed/simple; bh=UvEO3afFOHzezUTpghc9LqdwIg+ZvJ/lN9e+OFyUXrA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AzZbMIdoMuP7PZ0zjQb4Az6vzNnTaUsyvBb8fJ6dBzRkAnU0vac4oKX5Bi5W5RR50RBy97bxwHdU595HGH0XiVBaKyza9agLdKlj9LkHv6g7/ezK5gqjbQIeTqj5Asl8zFx2Q01bVO1g32Y5WjKo7KzaRlt842ZkDdseI+Q9CwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Axb5/nDS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Axb5/nDS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 237F6C4CEF5; Wed, 3 Dec 2025 16:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764779539; bh=UvEO3afFOHzezUTpghc9LqdwIg+ZvJ/lN9e+OFyUXrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Axb5/nDShzjqBT5GB3NFjYsqin32LRO6yFKGNF4VDtmHdtU5bWGebmwSNWkTKEwZA s5sOBMyn5rzHnKJ70A+13LR9a9kUOzaUXZ2DFsEZuBV8wvzaI9tpF+GGu/IJ2eQ4JC MH5QdEVUx6xFCBGfjnm+pcKq9M/DlPx77sJCiczE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, austinchang , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.1 280/568] btrfs: mark dirty extent range for out of bound prealloc extents Date: Wed, 3 Dec 2025 16:24:42 +0100 Message-ID: <20251203152450.962859953@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: austinchang [ Upstream commit 3b1a4a59a2086badab391687a6a0b86e03048393 ] In btrfs_fallocate(), when the allocated range overlaps with a prealloc extent and the extent starts after i_size, the range doesn't get marked dirty in file_extent_tree. This results in persisting an incorrect disk_i_size for the inode when not using the no-holes feature. This is reproducible since commit 41a2ee75aab0 ("btrfs: introduce per-inode file extent tree"), then became hidden since commit 3d7db6e8bd22 ("btrfs: don't allocate file extent tree for non regular files") and then visible again after commit 8679d2687c35 ("btrfs: initialize inode::file_extent_tree after i_mode has been set"), which fixes the previous commit. The following reproducer triggers the problem: $ cat test.sh MNT=/mnt/test DEV=/dev/vdb mkdir -p $MNT mkfs.btrfs -f -O ^no-holes $DEV mount $DEV $MNT touch $MNT/file1 fallocate -n -o 1M -l 2M $MNT/file1 umount $MNT mount $DEV $MNT len=$((1 * 1024 * 1024)) fallocate -o 1M -l $len $MNT/file1 du --bytes $MNT/file1 umount $MNT mount $DEV $MNT du --bytes $MNT/file1 umount $MNT Running the reproducer gives the following result: $ ./test.sh (...) 2097152 /mnt/test/file1 1048576 /mnt/test/file1 The difference is exactly 1048576 as we assigned. Fix by adding a call to btrfs_inode_set_file_extent_range() in btrfs_fallocate_update_isize(). Fixes: 41a2ee75aab0 ("btrfs: introduce per-inode file extent tree") Signed-off-by: austinchang Reviewed-by: Filipe Manana Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 3814f09dc4ae0..b670d5d72a382 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2828,12 +2828,22 @@ static int btrfs_fallocate_update_isize(struct inode *inode, { struct btrfs_trans_handle *trans; struct btrfs_root *root = BTRFS_I(inode)->root; + u64 range_start; + u64 range_end; int ret; int ret2; if (mode & FALLOC_FL_KEEP_SIZE || end <= i_size_read(inode)) return 0; + range_start = round_down(i_size_read(inode), root->fs_info->sectorsize); + range_end = round_up(end, root->fs_info->sectorsize); + + ret = btrfs_inode_set_file_extent_range(BTRFS_I(inode), range_start, + range_end - range_start); + if (ret) + return ret; + trans = btrfs_start_transaction(root, 1); if (IS_ERR(trans)) return PTR_ERR(trans); -- 2.51.0