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

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

Pull more xfs updates from Darrick Wong:
 "The second large pile of new stuff for 5.10, with changes even more
  monumental than last week!

  We are formally announcing the deprecation of the V4 filesystem format
  in 2030. All users must upgrade to the V5 format, which contains
  design improvements that greatly strengthen metadata validation,
  supports reflink and online fsck, and is the intended vehicle for
  handling timestamps past 2038. We're also deprecating the old Irix
  behavioral tweaks in September 2025.

  Coming along for the ride are two design changes to the deferred
  metadata ops subsystem. One of the improvements is to retain correct
  logical ordering of tasks and subtasks, which is a more logical design
  for upper layers of XFS and will become necessary when we add atomic
  file range swaps and commits. The second improvement to deferred ops
  improves the scalability of the log by helping the log tail to move
  forward during long-running operations. This reduces log contention
  when there are a large number of threads trying to run transactions.

  In addition to that, this fixes numerous small bugs in log recovery;
  refactors logical intent log item recovery to remove the last
  remaining place in XFS where we could have nested transactions; fixes
  a couple of ways that intent log item recovery could fail in ways that
  wouldn't have happened in the regular commit paths; fixes a deadlock
  vector in the GETFSMAP implementation (which improves its performance
  by 20%); and fixes serious bugs in the realtime growfs, fallocate, and
  bitmap handling code.

  Summary:

   - Deprecate the V4 filesystem format, some disused mount options, and
     some legacy sysctl knobs now that we can support dates into the
     25th century. Note that removal of V4 support will not happen until
     the early 2030s.

   - Fix some probles with inode realtime flag propagation.

   - Fix some buffer handling issues when growing a rt filesystem.

   - Fix a problem where a BMAP_REMAP unmap call would free rt extents
     even though the purpose of BMAP_REMAP is to avoid freeing the
     blocks.

   - Strengthen the dabtree online scrubber to check hash values on
     child dabtree blocks.

   - Actually log new intent items created as part of recovering log
     intent items.

   - Fix a bug where quotas weren't attached to an inode undergoing bmap
     intent item recovery.

   - Fix a buffer overrun problem with specially crafted log buffer
     headers.

   - Various cleanups to type usage and slightly inaccurate comments.

   - More cleanups to the xattr, log, and quota code.

   - Don't run the (slower) shared-rmap operations on attr fork
     mappings.

   - Fix a bug where we failed to check the LSN of finobt blocks during
     replay and could therefore overwrite newer data with older data.

   - Clean up the ugly nested transaction mess that log recovery uses to
     stage intent item recovery in the correct order by creating a
     proper data structure to capture recovered chains.

   - Use the capture structure to resume intent item chains with the
     same log space and block reservations as when they were captured.

   - Fix a UAF bug in bmap intent item recovery where we failed to
     maintain our reference to the incore inode if the bmap operation
     needed to relog itself to continue.

   - Rearrange the defer ops mechanism to finish newly created subtasks
     of a parent task before moving on to the next parent task.

   - Automatically relog intent items in deferred ops chains if doing so
     would help us avoid pinning the log tail. This will help fix some
     log scaling problems now and will facilitate atomic file updates
     later.

   - Fix a deadlock in the GETFSMAP implementation by using an internal
     memory buffer to reduce indirect calls and copies to userspace,
     thereby improving its performance by ~20%.

   - Fix various problems when calling growfs on a realtime volume would
     not fully update the filesystem metadata.

   - Fix broken Kconfig asking about deprecated XFS when XFS is
     disabled"

* tag 'xfs-5.10-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (48 commits)
  xfs: fix Kconfig asking about XFS_SUPPORT_V4 when XFS_FS=n
  xfs: fix high key handling in the rt allocator's query_range function
  xfs: annotate grabbing the realtime bitmap/summary locks in growfs
  xfs: make xfs_growfs_rt update secondary superblocks
  xfs: fix realtime bitmap/summary file truncation when growing rt volume
  xfs: fix the indent in xfs_trans_mod_dquot
  xfs: do the ASSERT for the arguments O_{u,g,p}dqpp
  xfs: fix deadlock and streamline xfs_getfsmap performance
  xfs: limit entries returned when counting fsmap records
  xfs: only relog deferred intent items if free space in the log gets low
  xfs: expose the log push threshold
  xfs: periodically relog deferred intent items
  xfs: change the order in which child and parent defer ops are finished
  xfs: fix an incore inode UAF in xfs_bui_recover
  xfs: clean up xfs_bui_item_recover iget/trans_alloc/ilock ordering
  xfs: clean up bmap intent item recovery checking
  xfs: xfs_defer_capture should absorb remaining transaction reservation
  xfs: xfs_defer_capture should absorb remaining block reservations
  xfs: proper replay of deferred ops queued during log recovery
  xfs: remove XFS_LI_RECOVERED
  ...
parents 69456535 89464554

Documentation/admin-guide/xfs.rst

+31 −1
Original line number Diff line number Diff line
@@ -210,6 +210,28 @@ When mounting an XFS filesystem, the following options are accepted. 
	inconsistent namespace presentation during or after a

	failover event.



Deprecation of V4 Format

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



The V4 filesystem format lacks certain features that are supported by

the V5 format, such as metadata checksumming, strengthened metadata

verification, and the ability to store timestamps past the year 2038.

Because of this, the V4 format is deprecated.  All users should upgrade

by backing up their files, reformatting, and restoring from the backup.



Administrators and users can detect a V4 filesystem by running xfs_info

against a filesystem mountpoint and checking for a string containing

"crc=".  If no such string is found, please upgrade xfsprogs to the

latest version and try again.



The deprecation will take place in two parts.  Support for mounting V4

filesystems can now be disabled at kernel build time via Kconfig option.

The option will default to yes until September 2025, at which time it

will be changed to default to no.  In September 2030, support will be

removed from the codebase entirely.



Note: Distributors may choose to withdraw V4 format support earlier than

the dates listed above.



Deprecated Mount Options

========================
@@ -217,6 +239,9 @@ Deprecated Mount Options 
===========================     ================

  Name				Removal Schedule

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

Mounting with V4 filesystem     September 2030

ikeep/noikeep			September 2025

attr2/noattr2			September 2025

===========================     ================
@@ -331,7 +356,12 @@ The following sysctls are available for the XFS filesystem: 
Deprecated Sysctls

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



None at present.

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

  Name				Removal Schedule

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

fs.xfs.irix_sgid_inherit        September 2025

fs.xfs.irix_symlink_mode        September 2025

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





Removed Sysctls

fs/xfs/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -22,6 +22,31 @@ config XFS_FS 
	  system of your root partition is compiled as a module, you'll need

	  to use an initial ramdisk (initrd) to boot.



config XFS_SUPPORT_V4

	bool "Support deprecated V4 (crc=0) format"

	depends on XFS_FS

	default y

	help

	  The V4 filesystem format lacks certain features that are supported

	  by the V5 format, such as metadata checksumming, strengthened

	  metadata verification, and the ability to store timestamps past the

	  year 2038.  Because of this, the V4 format is deprecated.  All users

	  should upgrade by backing up their files, reformatting, and restoring

	  from the backup.



	  Administrators and users can detect a V4 filesystem by running

	  xfs_info against a filesystem mountpoint and checking for a string

	  beginning with "crc=".  If the string "crc=0" is found, the

	  filesystem is a V4 filesystem.  If no such string is found, please

	  upgrade xfsprogs to the latest version and try again.



	  This option will become default N in September 2025.  Support for the

	  V4 format will be removed entirely in September 2030.  Distributors

	  can say N here to withdraw support earlier.



	  To continue supporting the old V4 format (crc=0), say Y.

	  To close off an attack surface, say N.



config XFS_QUOTA

	bool "XFS Quota support"

	depends on XFS_FS

fs/xfs/libxfs/xfs_attr_remote.c

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ xfs_attr3_rmt_verify( 
{

	struct xfs_attr3_rmt_hdr *rmt = ptr;



	if (!xfs_sb_version_hascrc(&mp->m_sb))

		return __this_address;

	if (!xfs_verify_magic(bp, rmt->rm_magic))

		return __this_address;

	if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid))

fs/xfs/libxfs/xfs_bmap.c

+12 −7
Original line number Diff line number Diff line
@@ -5046,20 +5046,25 @@ xfs_bmap_del_extent_real( 


	flags = XFS_ILOG_CORE;

	if (whichfork == XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) {

		xfs_fsblock_t	bno;

		xfs_filblks_t	len;

		xfs_extlen_t	mod;



		bno = div_u64_rem(del->br_startblock, mp->m_sb.sb_rextsize,

				  &mod);

		ASSERT(mod == 0);

		len = div_u64_rem(del->br_blockcount, mp->m_sb.sb_rextsize,

				  &mod);

		ASSERT(mod == 0);



		if (!(bflags & XFS_BMAPI_REMAP)) {

			xfs_fsblock_t	bno;



			bno = div_u64_rem(del->br_startblock,

					mp->m_sb.sb_rextsize, &mod);

			ASSERT(mod == 0);



			error = xfs_rtfree_extent(tp, bno, (xfs_extlen_t)len);

			if (error)

				goto done;

		}



		do_fx = 0;

		nblks = len * mp->m_sb.sb_rextsize;

		qfield = XFS_TRANS_DQ_RTBCOUNT;

fs/xfs/libxfs/xfs_da_format.h

+9 −9
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ typedef struct xfs_da_blkinfo { 
 */

#define XFS_DA3_NODE_MAGIC	0x3ebe	/* magic number: non-leaf blocks */

#define XFS_ATTR3_LEAF_MAGIC	0x3bee	/* magic number: attribute leaf blks */

#define	XFS_DIR3_LEAF1_MAGIC	0x3df1	/* magic number: v2 dirlf single blks */

#define	XFS_DIR3_LEAFN_MAGIC	0x3dff	/* magic number: v2 dirlf multi blks */

#define XFS_DIR3_LEAF1_MAGIC	0x3df1	/* magic number: v3 dirlf single blks */

#define XFS_DIR3_LEAFN_MAGIC	0x3dff	/* magic number: v3 dirlf multi blks */



struct xfs_da3_blkinfo {

	/*
@@ -746,14 +746,14 @@ xfs_attr3_leaf_name_local(xfs_attr_leafblock_t *leafp, int idx) 
 */

static inline int xfs_attr_leaf_entsize_remote(int nlen)

{

	return ((uint)sizeof(xfs_attr_leaf_name_remote_t) - 1 + (nlen) + \

		XFS_ATTR_LEAF_NAME_ALIGN - 1) & ~(XFS_ATTR_LEAF_NAME_ALIGN - 1);

	return round_up(sizeof(struct xfs_attr_leaf_name_remote) - 1 +

			nlen, XFS_ATTR_LEAF_NAME_ALIGN);

}



static inline int xfs_attr_leaf_entsize_local(int nlen, int vlen)

{

	return ((uint)sizeof(xfs_attr_leaf_name_local_t) - 1 + (nlen) + (vlen) +

		XFS_ATTR_LEAF_NAME_ALIGN - 1) & ~(XFS_ATTR_LEAF_NAME_ALIGN - 1);

	return round_up(sizeof(struct xfs_attr_leaf_name_local) - 1 +

			nlen + vlen, XFS_ATTR_LEAF_NAME_ALIGN);

}



static inline int xfs_attr_leaf_entsize_local_max(int bsize)

CRA Git | Maintained and supported by SUSTech CRA and CCSE