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 A132A22324; Tue, 16 Jan 2024 01:06:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M5hKhhJd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0F95C433A6; Tue, 16 Jan 2024 01:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705367172; bh=Ae2QOaopAWfOkgviP326EjI0yrm97MpC0jbjbWovW0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5hKhhJdO7KQykPCce8eCa0vVw7lCMYfOy8bBVfvtuRopF9vker7RneqHDJFKc9E/ zVysVsR8FnYRENSqGj6Va6U3zjdDtv1hPuAYDUVP+m1/yxxhff0DjatV2/rnpUCsjo Va0MQ0Nk/OucZtQoD80aA2SqwkwJrGmxGrJn6U0rsJkmSGK/5xK0hFpKslqyP2NXBi ZJSBHXEZVstowjnDIzvnt5c4K7nRZ2CZVPB3frMp7A07rC65Y8njMY+KYr0qtzd2Ok b4EdV7an5/lnIqJEtGnoFx+iWQUUY5jM2M4OsJoMW04SYBx6Brbc/IcTneJT/iIj2E YP90A/IiRuqXg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ye Bin , Jan Kara , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 16/19] ext4: fix inconsistent between segment fstrim and full fstrim Date: Mon, 15 Jan 2024 20:05:11 -0500 Message-ID: <20240116010532.218428-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116010532.218428-1-sashal@kernel.org> References: <20240116010532.218428-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.12 Content-Transfer-Encoding: 8bit From: Ye Bin [ Upstream commit 68da4c44b994aea797eb9821acb3a4a36015293e ] Suppose we issue two FITRIM ioctls for ranges [0,15] and [16,31] with mininum length of trimmed range set to 8 blocks. If we have say a range of blocks 10-22 free, this range will not be trimmed because it straddles the boundary of the two FITRIM ranges and neither part is big enough. This is a bit surprising to some users that call FITRIM on smaller ranges of blocks to limit impact on the system. Also XFS trims all free space extents that overlap with the specified range so we are inconsistent among filesystems. Let's change ext4_try_to_trim_range() to consider for trimming the whole free space extent that straddles the end of specified range, not just the part of it within the range. Signed-off-by: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20231216010919.1995851-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/mballoc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d70f7a06bab4..7de7e6bea292 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6905,13 +6905,15 @@ static int ext4_try_to_trim_range(struct super_block *sb, __acquires(ext4_group_lock_ptr(sb, e4b->bd_group)) __releases(ext4_group_lock_ptr(sb, e4b->bd_group)) { - ext4_grpblk_t next, count, free_count; + ext4_grpblk_t next, count, free_count, last, origin_start; bool set_trimmed = false; void *bitmap; + last = ext4_last_grp_cluster(sb, e4b->bd_group); bitmap = e4b->bd_bitmap; - if (start == 0 && max >= ext4_last_grp_cluster(sb, e4b->bd_group)) + if (start == 0 && max >= last) set_trimmed = true; + origin_start = start; start = max(e4b->bd_info->bb_first_free, start); count = 0; free_count = 0; @@ -6920,7 +6922,10 @@ __releases(ext4_group_lock_ptr(sb, e4b->bd_group)) start = mb_find_next_zero_bit(bitmap, max + 1, start); if (start > max) break; - next = mb_find_next_bit(bitmap, max + 1, start); + + next = mb_find_next_bit(bitmap, last + 1, start); + if (origin_start == 0 && next >= last) + set_trimmed = true; if ((next - start) >= minblocks) { int ret = ext4_trim_extent(sb, start, next - start, e4b); -- 2.43.0