Commit 03dc748b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more xfs updates from Darrick Wong:
 "The most notable fix here prevents premature reuse of freed metadata
  blocks, and adding the ability to detect accidental nested
  transactions, which are not allowed here.

   - Restore a disused sysctl control knob that was inadvertently
     dropped during the merge window to avoid fstests regressions.

   - Don't speculatively release freed blocks from the busy list until
     we're actually allocating them, which fixes a rare log recovery
     regression.

   - Don't nest transactions when scanning for free space.

   - Add an idiot^Wmaintainer light to detect nested transactions. ;)"

* tag 'xfs-5.12-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: use current->journal_info for detecting transaction recursion
  xfs: don't nest transactions when scanning for eofblocks
  xfs: don't reuse busy extents on extent trim
  xfs: restore speculative_cow_prealloc_lifetime sysctl
parents 3ab6608e 756b1c34

Documentation/admin-guide/xfs.rst

+10 −6
Original line number Diff line number Diff line
@@ -284,6 +284,9 @@ The following sysctls are available for the XFS filesystem: 
	removes unused preallocation from clean inodes and releases

	the unused space back to the free pool.



  fs.xfs.speculative_cow_prealloc_lifetime

	This is an alias for speculative_prealloc_lifetime.



  fs.xfs.error_level		(Min: 0  Default: 3  Max: 11)

	A volume knob for error reporting when internal errors occur.

	This will generate detailed messages & backtraces for filesystem
@@ -356,12 +359,13 @@ The following sysctls are available for the XFS filesystem: 
Deprecated Sysctls

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



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

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

  Name                                          Removal Schedule

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

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

fs.xfs.irix_sgid_inherit                        September 2025

fs.xfs.irix_symlink_mode                        September 2025

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

fs.xfs.speculative_cow_prealloc_lifetime        September 2025

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





Removed Sysctls

fs/iomap/buffered-io.c

+0 −7
Original line number Diff line number Diff line
@@ -1458,13 +1458,6 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data) 
			PF_MEMALLOC))

		goto redirty;



	/*

	 * Given that we do not allow direct reclaim to call us, we should

	 * never be called in a recursive filesystem reclaim context.

	 */

	if (WARN_ON_ONCE(current->flags & PF_MEMALLOC_NOFS))

		goto redirty;



	/*

	 * Is this page beyond the end of the file?

	 *

fs/xfs/libxfs/xfs_btree.c

+10 −2
Original line number Diff line number Diff line
@@ -2805,7 +2805,7 @@ xfs_btree_split_worker( 
	struct xfs_btree_split_args	*args = container_of(work,

						struct xfs_btree_split_args, work);

	unsigned long		pflags;

	unsigned long		new_pflags = PF_MEMALLOC_NOFS;

	unsigned long		new_pflags = 0;



	/*

	 * we are in a transaction context here, but may also be doing work
@@ -2817,12 +2817,20 @@ xfs_btree_split_worker( 
		new_pflags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD;



	current_set_flags_nested(&pflags, new_pflags);

	xfs_trans_set_context(args->cur->bc_tp);



	args->result = __xfs_btree_split(args->cur, args->level, args->ptrp,

					 args->key, args->curp, args->stat);

	complete(args->done);



	xfs_trans_clear_context(args->cur->bc_tp);

	current_restore_flags_nested(&pflags, new_pflags);



	/*

	 * Do not access args after complete() has run here. We don't own args

	 * and the owner may run and free args before we return here.

	 */

	complete(args->done);



}



/*

fs/xfs/xfs_aops.c

+15 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ xfs_setfilesize_trans_alloc( 
	 * We hand off the transaction to the completion thread now, so

	 * clear the flag here.

	 */

	current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);

	xfs_trans_clear_context(tp);

	return 0;

}
@@ -125,7 +125,7 @@ xfs_setfilesize_ioend( 
	 * thus we need to mark ourselves as being in a transaction manually.

	 * Similarly for freeze protection.

	 */

	current_set_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);

	xfs_trans_set_context(tp);

	__sb_writers_acquired(VFS_I(ip)->i_sb, SB_FREEZE_FS);



	/* we abort the update if there was an IO error */
@@ -568,6 +568,12 @@ xfs_vm_writepage( 
{

	struct xfs_writepage_ctx wpc = { };



	if (WARN_ON_ONCE(current->journal_info)) {

		redirty_page_for_writepage(wbc, page);

		unlock_page(page);

		return 0;

	}



	return iomap_writepage(page, wbc, &wpc.ctx, &xfs_writeback_ops);

}
@@ -578,6 +584,13 @@ xfs_vm_writepages( 
{

	struct xfs_writepage_ctx wpc = { };



	/*

	 * Writing back data in a transaction context can result in recursive

	 * transactions. This is bad, so issue a warning and get out of here.

	 */

	if (WARN_ON_ONCE(current->journal_info))

		return 0;



	xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);

	return iomap_writepages(mapping, wbc, &wpc.ctx, &xfs_writeback_ops);

}

fs/xfs/xfs_extent_busy.c

+0 −14
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ xfs_extent_busy_trim( 
	ASSERT(*len > 0);



	spin_lock(&args->pag->pagb_lock);

restart:

	fbno = *bno;

	flen = *len;

	rbp = args->pag->pagb_tree.rb_node;
@@ -363,19 +362,6 @@ xfs_extent_busy_trim( 
			continue;

		}



		/*

		 * If this is a metadata allocation, try to reuse the busy

		 * extent instead of trimming the allocation.

		 */

		if (!(args->datatype & XFS_ALLOC_USERDATA) &&

		    !(busyp->flags & XFS_EXTENT_BUSY_DISCARDED)) {

			if (!xfs_extent_busy_update_extent(args->mp, args->pag,

							  busyp, fbno, flen,

							  false))

				goto restart;

			continue;

		}



		if (bbno <= fbno) {

			/* start overlap */