Commit 5ff073d1 authored by Dave Chinner's avatar Dave Chinner Committed by Long Li
Browse files

xfs: always tail align maxlen allocations 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VTE3
CVE: NA

Reference: https://lore.kernel.org/linux-xfs/20240705162450.3481169-1-john.g.garry@oracle.com



--------------------------------

When we do a large allocation, the core free space allocation code
assumes that args->maxlen is aligned to args->prod/args->mod. hence
if we get a maximum sized extent allocated, it does not do tail
alignment of the extent.

However, this assumes that nothing modifies args->maxlen between the
original allocation context setup and trimming the selected free
space extent to size. This assumption has recently been found to be
invalid - xfs_alloc_space_available() modifies args->maxlen in low
space situations - and there may be more situations we haven't yet
found like this.

Force aligned allocation introduces the requirement that extents are
correctly tail aligned, resulting in this occasional latent
alignment failure to be reclassified from an unimportant curiousity
to a must-fix bug.

Removing the assumption about args->maxlen allocations always being
tail aligned is trivial, and should not impact anything because
args->maxlen for inodes with extent size hints configured are
already aligned. Hence all this change does it avoid weird corner
cases that would have resulted in unaligned extent sizes by always
trimming the extent down to an aligned size.

Fixes: 63f4d844 ("fs: xfs: Make file data allocations observe the 'forcealign' flag")
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> [provisional on v1 series comment]
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 5cd67a6e

fs/xfs/libxfs/xfs_alloc.c

+5 −7
Original line number Diff line number Diff line
@@ -408,20 +408,18 @@ xfs_alloc_compute_diff( 
 * Fix up the length, based on mod and prod.

 * len should be k * prod + mod for some k.

 * If len is too small it is returned unchanged.

 * If len hits maxlen it is left alone.

 */

STATIC void

static void

xfs_alloc_fix_len(

	xfs_alloc_arg_t	*args)		/* allocation argument structure */

	struct xfs_alloc_arg	*args)

{

	xfs_extlen_t		k;

	xfs_extlen_t	rlen;

	xfs_extlen_t		rlen = args->len;



	ASSERT(args->mod < args->prod);

	rlen = args->len;

	ASSERT(rlen >= args->minlen);

	ASSERT(rlen <= args->maxlen);

	if (args->prod <= 1 || rlen < args->mod || rlen == args->maxlen ||

	if (args->prod <= 1 || rlen < args->mod ||

	    (args->mod == 0 && rlen < args->prod))

		return;

	k = rlen % args->prod;