From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.burntcomma.com (mail2.burntcomma.com [217.169.27.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 709332641FC for ; Mon, 10 Nov 2025 17:15:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.169.27.34 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762794926; cv=none; b=afmJRl0E/pEnemFQ2hv0RfjkpbYtd1W+SYPMdc/l0SrjuONopExwpEU9p+52+daqxDSdL01WL7HtHT9aRl9FWAtdyPdALKRQB8aUMASGkLbl4gykFiMA1clJICiOcCgpuhlzCIjTYhmmoy0ygYXZKMs/c3+Pa96CW+yXj/vltWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762794926; c=relaxed/simple; bh=5ELBdrdzXHI7wo1nX0HeZgShNkrQkymWN+0PmxEd5So=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Mime-Version; b=IeIOS7eOjPeCgTVHIOHhJbkydv5RbJZXz00YxdfX6Krg26UUbHi8uAhvl/r0yUy+dwLv+RKsTYoyT2LtSi4CA10P/pItkb7o0kC/GvhBycbNqGSnJ38iS+e3xZDombj1j8ZXAVEXDO4YJbfBtSvxsrku0aXFyXPaflg3q8L/Dc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=harmstone.com; spf=pass smtp.mailfrom=harmstone.com; dkim=pass (1024-bit key) header.d=harmstone.com header.i=@harmstone.com header.b=jA0g0zkR; arc=none smtp.client-ip=217.169.27.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=harmstone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=harmstone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=harmstone.com header.i=@harmstone.com header.b="jA0g0zkR" Received: from beren (beren.burntcomma.com [IPv6:2a02:8012:8cf0:0:ce28:aaff:fe0d:6db2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.burntcomma.com (Postfix) with ESMTPSA id C7EF92D8F8C; Mon, 10 Nov 2025 17:15:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=harmstone.com; s=mail; t=1762794914; bh=d55YVS6sGumNV2zNNQM4qtKVlYQoAHoaSxm5ETImQcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jA0g0zkR2sQKj77nNrSb3oFK2IzZiOclyRJrX4EpmeiUIBZ5NnJ6WsEtQ0Aph4WOX CEkKNaZr8gSbJ5PjxBBygvB2Hjh7giBqcE2nSzZB37zQ7WrVBS5WTRPSVuVO9G08+l sWEwQRjw6gzY3hruF8V+V4sWNbq0oZumhOSrFpCI= From: Mark Harmstone To: linux-btrfs@vger.kernel.org Cc: Mark Harmstone , Boris Burkov Subject: [PATCH v5 04/16] btrfs: remove remapped block groups from the free-space tree Date: Mon, 10 Nov 2025 17:14:28 +0000 Message-ID: <20251110171511.20900-5-mark@harmstone.com> In-Reply-To: <20251110171511.20900-1-mark@harmstone.com> References: <20251110171511.20900-1-mark@harmstone.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit No new allocations can be done from block groups that have the REMAPPED flag set, so there's no value in their having entries in the free-space tree. Prevent a search through the free-space tree being scheduled for such a block group, and prevent any additions to the in-memory free-space tree. Signed-off-by: Mark Harmstone Reviewed-by: Boris Burkov --- fs/btrfs/block-group.c | 19 ++++++++++++++++--- fs/btrfs/free-space-cache.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index b964eacc1610..0e88e52aa909 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -933,6 +933,13 @@ int btrfs_cache_block_group(struct btrfs_block_group *cache, bool wait) if (btrfs_is_zoned(fs_info)) return 0; + /* + * No allocations can be done from remapped block groups, so they have + * no entries in the free-space tree. + */ + if (cache->flags & BTRFS_BLOCK_GROUP_REMAPPED) + return 0; + caching_ctl = kzalloc(sizeof(*caching_ctl), GFP_NOFS); if (!caching_ctl) return -ENOMEM; @@ -1247,10 +1254,16 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, * deletes the block group item from the extent tree, allowing for * another task to attempt to create another block group with the same * item key (and failing with -EEXIST and a transaction abort). + * + * If the REMAPPED flag has been set the block group's free space + * has already been removed, so we can skip the call to + * btrfs_remove_block_group_free_space(). */ - ret = btrfs_remove_block_group_free_space(trans, block_group); - if (ret) - goto out; + if (!(block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED)) { + ret = btrfs_remove_block_group_free_space(trans, block_group); + if (ret) + goto out; + } ret = remove_block_group_item(trans, path, block_group); if (ret < 0) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 6ccb492eae8e..05ce6b5a898f 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -2756,6 +2756,9 @@ int btrfs_add_free_space(struct btrfs_block_group *block_group, { enum btrfs_trim_state trim_state = BTRFS_TRIM_STATE_UNTRIMMED; + if (block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED) + return 0; + if (btrfs_is_zoned(block_group->fs_info)) return __btrfs_add_free_space_zoned(block_group, bytenr, size, true); -- 2.51.0