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

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

Pull xfs updates from Darrick Wong:
 "The notable user-visible addition this cycle is ability to remove
  space from the last AG in a filesystem. This is the first of many
  changes needed for full-fledged support for shrinking a filesystem.
  Still needed are (a) the ability to reorganize files and metadata away
  from the end of the fs; (b) the ability to remove entire allocation
  groups; (c) shrink support for realtime volumes; and (d) thorough
  testing of (a-c).

  There are a number of performance improvements in this code drop: Dave
  streamlined various parts of the buffer logging code and reduced the
  cost of various debugging checks, and added the ability to pre-create
  the xattr structures while creating files. Brian eliminated
  transaction reservations that were being held across writeback (thus
  reducing livelock potential.

  Other random pieces: Pavel fixed the repetitve warnings about
  deprecated mount options, I fixed online fsck to behave itself when a
  readonly remount comes in during scrub, and refactored various other
  parts of that code, Christoph contributed a lot of refactoring this
  cycle. The xfs_icdinode structure has been absorbed into the (incore)
  xfs_inode structure, and the format and flags handling around
  xfs_inode_fork structures has been simplified. Chandan provided a
  number of fixes for extent count overflow related problems that have
  been shaken out by debugging knobs added during 5.12.

  Summary:

   - Various minor fixes in online scrub.

   - Prevent metadata files from being automatically inactivated.

   - Validate btree heights by the computed per-btree limits.

   - Don't warn about remounting with deprecated mount options.

   - Initialize attr forks at create time if we suspect we're going to
     need to store them.

   - Reduce memory reallocation workouts in the logging code.

   - Fix some theoretical math calculation errors in logged buffers that
     span multiple discontig memory ranges but contiguous ondisk
     regions.

   - Speedups in dirty buffer bitmap handling.

   - Make type verifier functions more inline-happy to reduce overhead.

   - Reduce debug overhead in directory checking code.

   - Many many typo fixes.

   - Begin to handle the permanent loss of the very end of a filesystem.

   - Fold struct xfs_icdinode into xfs_inode.

   - Deprecate the long defunct BMV_IF_NO_DMAPI_READ from the bmapx
     ioctl.

   - Remove a broken directory block format check from online scrub.

   - Fix a bug where we could produce an unnecessarily tall data fork
     btree when creating an attr fork.

   - Fix scrub and readonly remounts racing.

   - Fix a writeback ioend log deadlock problem by dropping the behavior
     where we could preallocate a setfilesize transaction.

   - Fix some bugs in the new extent count checking code.

   - Fix some bugs in the attr fork preallocation code.

   - Refactor if_flags out of the incore inode fork data structure"

* tag 'xfs-5.13-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (77 commits)
  xfs: remove xfs_quiesce_attr declaration
  xfs: remove XFS_IFEXTENTS
  xfs: remove XFS_IFINLINE
  xfs: remove XFS_IFBROOT
  xfs: only look at the fork format in xfs_idestroy_fork
  xfs: simplify xfs_attr_remove_args
  xfs: rename and simplify xfs_bmap_one_block
  xfs: move the XFS_IFEXTENTS check into xfs_iread_extents
  xfs: drop unnecessary setfilesize helper
  xfs: drop unused ioend private merge and setfilesize code
  xfs: open code ioend needs workqueue helper
  xfs: drop submit side trans alloc for append ioends
  xfs: fix return of uninitialized value in variable error
  xfs: get rid of the ip parameter to xchk_setup_*
  xfs: fix scrub and remount-ro protection when running scrub
  xfs: move the check for post-EOF mappings into xfs_can_free_eofblocks
  xfs: move the xfs_can_free_eofblocks call under the IOLOCK
  xfs: precalculate default inode attribute offset
  xfs: default attr fork size does not handle device inodes
  xfs: inode fork allocation depends on XFS_IFEXTENT flag
  ...
parents f2c80837 76adf92a

Documentation/admin-guide/xfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ and the short name of the data device. They all can be found in: 
================  ===========

  xfs_iwalk-$pid  Inode scans of the entire filesystem. Currently limited to

                  mount time quotacheck.

  xfs-blockgc     Background garbage collection of disk space that have been

  xfs-gc          Background garbage collection of disk space that have been

                  speculatively allocated beyond EOF or for staging copy on

                  write operations.

================  ===========

fs/xfs/libxfs/xfs_ag.c

+115 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#include "xfs_ag.h"

#include "xfs_ag_resv.h"

#include "xfs_health.h"

#include "xfs_error.h"

#include "xfs_bmap.h"

#include "xfs_defer.h"

#include "xfs_log_format.h"

#include "xfs_trans.h"



static int

xfs_get_aghdr_buf(
@@ -485,6 +490,116 @@ xfs_ag_init_headers( 
	return error;

}



int

xfs_ag_shrink_space(

	struct xfs_mount	*mp,

	struct xfs_trans	**tpp,

	xfs_agnumber_t		agno,

	xfs_extlen_t		delta)

{

	struct xfs_alloc_arg	args = {

		.tp	= *tpp,

		.mp	= mp,

		.type	= XFS_ALLOCTYPE_THIS_BNO,

		.minlen = delta,

		.maxlen = delta,

		.oinfo	= XFS_RMAP_OINFO_SKIP_UPDATE,

		.resv	= XFS_AG_RESV_NONE,

		.prod	= 1

	};

	struct xfs_buf		*agibp, *agfbp;

	struct xfs_agi		*agi;

	struct xfs_agf		*agf;

	int			error, err2;



	ASSERT(agno == mp->m_sb.sb_agcount - 1);

	error = xfs_ialloc_read_agi(mp, *tpp, agno, &agibp);

	if (error)

		return error;



	agi = agibp->b_addr;



	error = xfs_alloc_read_agf(mp, *tpp, agno, 0, &agfbp);

	if (error)

		return error;



	agf = agfbp->b_addr;

	/* some extra paranoid checks before we shrink the ag */

	if (XFS_IS_CORRUPT(mp, agf->agf_length != agi->agi_length))

		return -EFSCORRUPTED;

	if (delta >= agi->agi_length)

		return -EINVAL;



	args.fsbno = XFS_AGB_TO_FSB(mp, agno,

				    be32_to_cpu(agi->agi_length) - delta);



	/*

	 * Disable perag reservations so it doesn't cause the allocation request

	 * to fail. We'll reestablish reservation before we return.

	 */

	error = xfs_ag_resv_free(agibp->b_pag);

	if (error)

		return error;



	/* internal log shouldn't also show up in the free space btrees */

	error = xfs_alloc_vextent(&args);

	if (!error && args.agbno == NULLAGBLOCK)

		error = -ENOSPC;



	if (error) {

		/*

		 * if extent allocation fails, need to roll the transaction to

		 * ensure that the AGFL fixup has been committed anyway.

		 */

		xfs_trans_bhold(*tpp, agfbp);

		err2 = xfs_trans_roll(tpp);

		if (err2)

			return err2;

		xfs_trans_bjoin(*tpp, agfbp);

		goto resv_init_out;

	}



	/*

	 * if successfully deleted from freespace btrees, need to confirm

	 * per-AG reservation works as expected.

	 */

	be32_add_cpu(&agi->agi_length, -delta);

	be32_add_cpu(&agf->agf_length, -delta);



	err2 = xfs_ag_resv_init(agibp->b_pag, *tpp);

	if (err2) {

		be32_add_cpu(&agi->agi_length, delta);

		be32_add_cpu(&agf->agf_length, delta);

		if (err2 != -ENOSPC)

			goto resv_err;



		__xfs_bmap_add_free(*tpp, args.fsbno, delta, NULL, true);



		/*

		 * Roll the transaction before trying to re-init the per-ag

		 * reservation. The new transaction is clean so it will cancel

		 * without any side effects.

		 */

		error = xfs_defer_finish(tpp);

		if (error)

			return error;



		error = -ENOSPC;

		goto resv_init_out;

	}

	xfs_ialloc_log_agi(*tpp, agibp, XFS_AGI_LENGTH);

	xfs_alloc_log_agf(*tpp, agfbp, XFS_AGF_LENGTH);

	return 0;

resv_init_out:

	err2 = xfs_ag_resv_init(agibp->b_pag, *tpp);

	if (!err2)

		return error;

resv_err:

	xfs_warn(mp, "Error %d reserving per-AG metadata reserve pool.", err2);

	xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);

	return err2;

}



/*

 * Extent the AG indicated by the @id by the length passed in

 */

fs/xfs/libxfs/xfs_ag.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ struct aghdr_init_data { 
};



int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id);

int xfs_ag_shrink_space(struct xfs_mount *mp, struct xfs_trans **tpp,

			xfs_agnumber_t agno, xfs_extlen_t delta);

int xfs_ag_extend_space(struct xfs_mount *mp, struct xfs_trans *tp,

			struct aghdr_init_data *id, xfs_extlen_t len);

int xfs_ag_get_geometry(struct xfs_mount *mp, xfs_agnumber_t agno,

fs/xfs/libxfs/xfs_ag_resv.c

+5 −1
Original line number Diff line number Diff line
@@ -211,6 +211,10 @@ __xfs_ag_resv_init( 
		ASSERT(0);

		return -EINVAL;

	}



	if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_AG_RESV_FAIL))

		error = -ENOSPC;

	else

		error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space, true);

	if (error) {

		trace_xfs_ag_resv_init_error(pag->pag_mount, pag->pag_agno,

fs/xfs/libxfs/xfs_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -2906,13 +2906,13 @@ xfs_agf_verify( 


	if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 ||

	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) < 1 ||

	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > XFS_BTREE_MAXLEVELS ||

	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > XFS_BTREE_MAXLEVELS)

	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > mp->m_ag_maxlevels ||

	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > mp->m_ag_maxlevels)

		return __this_address;



	if (xfs_sb_version_hasrmapbt(&mp->m_sb) &&

	    (be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 ||

	     be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > XFS_BTREE_MAXLEVELS))

	     be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > mp->m_rmap_maxlevels))

		return __this_address;



	if (xfs_sb_version_hasrmapbt(&mp->m_sb) &&
@@ -2939,7 +2939,7 @@ xfs_agf_verify( 


	if (xfs_sb_version_hasreflink(&mp->m_sb) &&

	    (be32_to_cpu(agf->agf_refcount_level) < 1 ||

	     be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS))

	     be32_to_cpu(agf->agf_refcount_level) > mp->m_refc_maxlevels))

		return __this_address;



	return NULL;