Commit d7044263 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-6.3-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "This batch started with some debugging enhancements to the new
  allocator refactoring that we put in 6.3-rc1 to assist developers in
  rebasing their dev branches.

  As for more serious code changes -- there's a bug fix to make the
  lockless allocator scan the whole filesystem before resorting to the
  locking allocator. We're also adding a selftest for the venerable
  directory/xattr hash function to make sure that it produces consistent
  results so that we can address any fallout as soon as possible.

   - Add a few debugging assertions so that people (me) trying to port
     code to the new allocator functions don't mess up the caller
     requirements

   - Relax some overly cautious lock ordering enforcement in the new
     allocator code, which means that file allocations will locklessly
     scan for the best space they can get before backing off to the
     traditional lock-and-really-get-it behavior

   - Add tracepoints to make it easier to trace the xfs allocator
     behavior

   - Actually test the dir/xattr hash algorithm to make sure it produces
     consistent results across all the platforms XFS supports"

* tag 'xfs-6.3-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: test dir/attr hash when loading module
  xfs: add tracepoints for each of the externally visible allocators
  xfs: walk all AGs if TRYLOCK passed to xfs_alloc_vextent_iterate_ags
  xfs: try to idiot-proof the allocators
parents 4bdec23f 3cfb9290

fs/xfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ xfs-y += xfs_aops.o \ 
				   xfs_bmap_util.o \

				   xfs_bio_io.o \

				   xfs_buf.o \

				   xfs_dahash_test.o \

				   xfs_dir2_readdir.o \

				   xfs_discard.o \

				   xfs_error.o \

fs/xfs/libxfs/xfs_alloc.c

+35 −1
Original line number Diff line number Diff line
@@ -3255,6 +3255,8 @@ xfs_alloc_vextent_finish( 
	XFS_STATS_INC(mp, xs_allocx);

	XFS_STATS_ADD(mp, xs_allocb, args->len);



	trace_xfs_alloc_vextent_finish(args);



out_drop_perag:

	if (drop_perag && args->pag) {

		xfs_perag_rele(args->pag);
@@ -3279,8 +3281,14 @@ xfs_alloc_vextent_this_ag( 
	xfs_agnumber_t		minimum_agno;

	int			error;



	ASSERT(args->pag != NULL);

	ASSERT(args->pag->pag_agno == agno);



	args->agno = agno;

	args->agbno = 0;



	trace_xfs_alloc_vextent_this_ag(args);



	error = xfs_alloc_vextent_check_args(args, XFS_AGB_TO_FSB(mp, agno, 0),

			&minimum_agno);

	if (error) {
@@ -3323,11 +3331,14 @@ xfs_alloc_vextent_iterate_ags( 
	uint32_t		flags)

{

	struct xfs_mount	*mp = args->mp;

	xfs_agnumber_t		restart_agno = minimum_agno;

	xfs_agnumber_t		agno;

	int			error = 0;



	if (flags & XFS_ALLOC_FLAG_TRYLOCK)

		restart_agno = 0;

restart:

	for_each_perag_wrap_range(mp, start_agno, minimum_agno,

	for_each_perag_wrap_range(mp, start_agno, restart_agno,

			mp->m_sb.sb_agcount, agno, args->pag) {

		args->agno = agno;

		error = xfs_alloc_vextent_prepare_ag(args);
@@ -3366,6 +3377,7 @@ xfs_alloc_vextent_iterate_ags( 
	 */

	if (flags) {

		flags = 0;

		restart_agno = minimum_agno;

		goto restart;

	}
@@ -3394,8 +3406,13 @@ xfs_alloc_vextent_start_ag( 
	bool			bump_rotor = false;

	int			error;



	ASSERT(args->pag == NULL);



	args->agno = NULLAGNUMBER;

	args->agbno = NULLAGBLOCK;



	trace_xfs_alloc_vextent_first_ag(args);



	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);

	if (error) {

		if (error == -ENOSPC)
@@ -3442,8 +3459,13 @@ xfs_alloc_vextent_first_ag( 
	xfs_agnumber_t		start_agno;

	int			error;



	ASSERT(args->pag == NULL);



	args->agno = NULLAGNUMBER;

	args->agbno = NULLAGBLOCK;



	trace_xfs_alloc_vextent_start_ag(args);



	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);

	if (error) {

		if (error == -ENOSPC)
@@ -3470,8 +3492,14 @@ xfs_alloc_vextent_exact_bno( 
	xfs_agnumber_t		minimum_agno;

	int			error;



	ASSERT(args->pag != NULL);

	ASSERT(args->pag->pag_agno == XFS_FSB_TO_AGNO(mp, target));



	args->agno = XFS_FSB_TO_AGNO(mp, target);

	args->agbno = XFS_FSB_TO_AGBNO(mp, target);



	trace_xfs_alloc_vextent_near_bno(args);



	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);

	if (error) {

		if (error == -ENOSPC)
@@ -3502,8 +3530,14 @@ xfs_alloc_vextent_near_bno( 
	bool			needs_perag = args->pag == NULL;

	int			error;



	if (!needs_perag)

		ASSERT(args->pag->pag_agno == XFS_FSB_TO_AGNO(mp, target));



	args->agno = XFS_FSB_TO_AGNO(mp, target);

	args->agbno = XFS_FSB_TO_AGBNO(mp, target);



	trace_xfs_alloc_vextent_exact_bno(args);



	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);

	if (error) {

		if (error == -ENOSPC)

fs/xfs/xfs_dahash_test.c

0 → 100644
+662 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/xfs/xfs_dahash_test.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (C) 2023 Oracle.  All Rights Reserved.

 * Author: Darrick J. Wong <djwong@kernel.org>

 */

#ifndef __XFS_DAHASH_TEST_H__

#define __XFS_DAHASH_TEST_H__



int xfs_dahash_test(void);



#endif /* __XFS_DAHASH_TEST_H__ */

fs/xfs/xfs_super.c

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "xfs_attr_item.h"

#include "xfs_xattr.h"

#include "xfs_iunlink_item.h"

#include "xfs_dahash_test.h"



#include <linux/magic.h>

#include <linux/fs_context.h>
@@ -2286,6 +2287,10 @@ init_xfs_fs(void) 


	xfs_check_ondisk_structs();



	error = xfs_dahash_test();

	if (error)

		return error;



	printk(KERN_INFO XFS_VERSION_STRING " with "

			 XFS_BUILD_OPTIONS " enabled\n");