Commit 5948705a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: don't allocate the xfs_extent_busy structure for zoned RTGs 



Busy extent tracking is primarily used to ensure that freed blocks are
not reused for data allocations before the transaction that deleted them
has been committed to stable storage, and secondarily to drive online
discard.  None of the use cases applies to zoned RTGs, as the zoned
allocator can't overwrite blocks before resetting the zone, which already
flushes out all transactions touching the RTGs.

So the busy extent tracking is not needed for zoned RTGs, and also not
called for zoned RTGs.  But somehow the code to skip allocating and
freeing the structure got lost during the zoned XFS upstreaming process.
This not only causes these structures to unnecessarily allocated, but can
also lead to memory leaks as the xg_busy_extents pointer in the
xfs_group structure is overlayed with the pointer for the linked list
of to be reset zones.

Stop allocating and freeing the structure to not pointlessly allocate
memory which is then leaked when the zone is reset.

Fixes: 080d01c4 ("xfs: implement zoned garbage collection")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: <stable@vger.kernel.org> # v6.15
[cem: Fix type and add stable tag]
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 9b027aa3

fs/xfs/libxfs/xfs_group.c

+9 −5
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ xfs_group_free( 


	xfs_defer_drain_free(&xg->xg_intents_drain);

#ifdef __KERNEL__

	if (xfs_group_has_extent_busy(xg->xg_mount, xg->xg_type))

		kfree(xg->xg_busy_extents);

#endif
@@ -189,9 +190,11 @@ xfs_group_insert( 
	xg->xg_type = type;



#ifdef __KERNEL__

	if (xfs_group_has_extent_busy(mp, type)) {

		xg->xg_busy_extents = xfs_extent_busy_alloc();

		if (!xg->xg_busy_extents)

			return -ENOMEM;

	}

	spin_lock_init(&xg->xg_state_lock);

	xfs_hooks_init(&xg->xg_rmap_update_hooks);

#endif
@@ -210,6 +213,7 @@ xfs_group_insert( 
out_drain:

	xfs_defer_drain_free(&xg->xg_intents_drain);

#ifdef __KERNEL__

	if (xfs_group_has_extent_busy(xg->xg_mount, xg->xg_type))

		kfree(xg->xg_busy_extents);

#endif

	return error;

fs/xfs/xfs_extent_busy.h

+8 −0
Original line number Diff line number Diff line
@@ -68,4 +68,12 @@ static inline void xfs_extent_busy_sort(struct list_head *list) 
	list_sort(NULL, list, xfs_extent_busy_ag_cmp);

}



/*

 * Zoned RTGs don't need to track busy extents, as the actual block freeing only

 * happens by a zone reset, which forces out all transactions that touched the

 * to be reset zone first.

 */

#define xfs_group_has_extent_busy(mp, type) \

	((type) == XG_TYPE_AG || !xfs_has_zoned((mp)))



#endif /* __XFS_EXTENT_BUSY_H__ */