]> www.infradead.org Git - users/hch/xfsprogs.git/log
users/hch/xfsprogs.git
11 months agolibfrog: add bitmap_clear
Darrick J. Wong [Sat, 3 Aug 2024 05:08:16 +0000 (07:08 +0200)]
libfrog: add bitmap_clear

Uncomment and fix bitmap_clear so that xfs_repair can start using it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
[hch: split from a larger patch]
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agolibxfs: implement some sanity checking for enormous rgcount
Darrick J. Wong [Wed, 3 Jul 2024 21:22:05 +0000 (14:22 -0700)]
libxfs: implement some sanity checking for enormous rgcount

Similar to what we do for suspiciously large sb_agcount values, if
someone tries to get libxfs to load a filesystem with a very large
realtime group count, let's do some basic checks of the rt device to
see if it's really that large.  If the read fails, only load the first
rtgroup and warn the user.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agolibfrog: report rt groups in output
Darrick J. Wong [Wed, 3 Jul 2024 21:22:05 +0000 (14:22 -0700)]
libfrog: report rt groups in output

Report realtime group geometry.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: scrub the realtime group superblock
Darrick J. Wong [Wed, 3 Jul 2024 21:22:04 +0000 (14:22 -0700)]
xfs: scrub the realtime group superblock

Enable scrubbing of realtime group superblocks.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_logprint: report realtime EFIs
Darrick J. Wong [Wed, 3 Jul 2024 21:21:59 +0000 (14:21 -0700)]
xfs_logprint: report realtime EFIs

Decode the EFI format just enough to report if an EFI targets the
realtime device or not.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: make the RT allocator rtgroup aware
Christoph Hellwig [Mon, 5 Aug 2024 20:46:35 +0000 (13:46 -0700)]
xfs: make the RT allocator rtgroup aware

Source kernel commit: 48429f5e97276b8b99a938136db513851bf04ad3

Make the allocator rtgroup aware by either picking a specific group if
there is a hint, or loop over all groups otherwise.  A simple rotor is
provided to pick the placement for initial allocations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Darrick J. Wong [Wed, 3 Jul 2024 21:22:04 +0000 (14:22 -0700)]
fixup

11 months agoxfs: use realtime EFI to free extents when rtgroups are enabled
Darrick J. Wong [Mon, 5 Aug 2024 18:16:44 +0000 (11:16 -0700)]
xfs: use realtime EFI to free extents when rtgroups are enabled

Source kernel commit: 97634bd4ecbe878557002eff401d688a9b56fc32

When rmap is enabled, XFS expects a certain order of operations, which
is: 1) remove the file mapping, 2) remove the reverse mapping, and then
3) free the blocks.  When reflink is enabled, XFS replaces (3) with a
deferred refcount decrement operation that can schedule freeing the
blocks if that was the last refcount.

For realtime files, xfs_bmap_del_extent_real tries to do 1 and 3 in the
same transaction, which will break both rmap and reflink unless we
switch it to use realtime EFIs.  Both rmap and reflink depend on the
rtgroups feature, so let's turn on EFIs for all rtgroups filesystems.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: support error injection when freeing rt extents
Darrick J. Wong [Mon, 5 Aug 2024 18:16:19 +0000 (11:16 -0700)]
xfs: support error injection when freeing rt extents

Source kernel commit: 33a3273ca66de4072947c5e3606400f22c64c296

A handful of fstests expect to be able to test what happens when extent
free intents fail to actually free the extent.  Now that we're
supporting EFIs for realtime extents, add to xfs_rtfree_extent the same
injection point that exists in the regular extent freeing code.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:14:22 +0000 (11:14 -0700)]
fixup

11 months agoxfs: support logging EFIs for realtime extents
Darrick J. Wong [Mon, 5 Aug 2024 18:13:43 +0000 (11:13 -0700)]
xfs: support logging EFIs for realtime extents

Source kernel commit: ba22ecc455d21c9f2c9936b9864e4cf55bba2724

Teach the EFI mechanism how to free realtime extents.  We're going to
need this to enforce proper ordering of operations when we enable
realtime rmap.

Declare a new log intent item type (XFS_LI_EFI_RT) and a separate defer
ops for rt extents.  This keeps the ondisk artifacts and processing code
completely separate between the rt and non-rt cases.  Hopefully this
will make it easier to debug filesystem problems.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:10:11 +0000 (11:10 -0700)]
fixup

11 months agoxfs: store rtgroup information with a bmap intent
Darrick J. Wong [Mon, 5 Aug 2024 18:09:49 +0000 (11:09 -0700)]
xfs: store rtgroup information with a bmap intent

Source kernel commit: b6e3ae52a23a48ba4b7872a228f01138ab65e812

Make the bmap intent items take an active reference to the rtgroup
containing the space that is being mapped or unmapped.  We will need
this functionality once we start enabling rmap and reflink on the rt
volume.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: grow the realtime section when realtime groups are enabled
Darrick J. Wong [Mon, 5 Aug 2024 18:08:10 +0000 (11:08 -0700)]
xfs: grow the realtime section when realtime groups are enabled

Source kernel commit: 44d787858eaf22fbc930e3cadc2228f4ffcf2c3a

Enable growing the rt section when realtime groups are enabled.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:07:53 +0000 (11:07 -0700)]
fixup

11 months agoxfs: encode the rtsummary in big endian format
Darrick J. Wong [Mon, 5 Aug 2024 18:07:31 +0000 (11:07 -0700)]
xfs: encode the rtsummary in big endian format

Source kernel commit: 59fc91c095f19228610035ac2e8a86cfed79c855

Currently, the ondisk realtime summary file counters are accessed in
units of 32-bit words.  There's no endian translation of the contents of
this file, which means that the Bad Things Happen(tm) if you go from
(say) x86 to powerpc.  Since we have a new feature flag, let's take the
opportunity to enforce an endianness on the file.  Encode the summary
information in big endian format, like most of the rest of the
filesystem.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:07:10 +0000 (11:07 -0700)]
fixup

11 months agoxfs: encode the rtbitmap in big endian format
Darrick J. Wong [Mon, 5 Aug 2024 18:06:45 +0000 (11:06 -0700)]
xfs: encode the rtbitmap in big endian format

Source kernel commit: d54d402cff2f2f565b630334aea4b95fa6a3f9e6

Currently, the ondisk realtime bitmap file is accessed in units of
32-bit words.  There's no endian translation of the contents of this
file, which means that the Bad Things Happen(tm) if you go from (say)
x86 to powerpc.  Since we have a new feature flag, let's take the
opportunity to enforce an endianness on the file.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:06:06 +0000 (11:06 -0700)]
fixup

11 months agoxfs: add block headers to realtime bitmap and summary blocks
Darrick J. Wong [Mon, 5 Aug 2024 18:04:41 +0000 (11:04 -0700)]
xfs: add block headers to realtime bitmap and summary blocks

Source kernel commit: e1cfca0e430949ae9484f0d696db06689fbca4b2

Upgrade rtbitmap and rtsummary blocks to have self describing metadata
like most every other thing in XFS.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:02:31 +0000 (11:02 -0700)]
fixup

11 months agoxfs: export the geometry of realtime groups to userspace
Darrick J. Wong [Mon, 5 Aug 2024 20:50:26 +0000 (13:50 -0700)]
xfs: export the geometry of realtime groups to userspace

Source kernel commit: f5a734e12dae026218c45e5f46fe771492f2249d

Create an ioctl so that the kernel can report the status of realtime
groups to userspace.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:56:39 +0000 (10:56 -0700)]
fixup

11 months agoxfs: record rt group metadata errors in the health system
Darrick J. Wong [Mon, 5 Aug 2024 17:54:06 +0000 (10:54 -0700)]
xfs: record rt group metadata errors in the health system

Source kernel commit: a7140fc53796cd6a44328d3f6b6e5815c09b491e

Record the state of per-rtgroup metadata sickness in the rtgroup
structure for later reporting.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:53:31 +0000 (10:53 -0700)]
fixup

11 months agoxfs: add frextents to the lazysbcounters when rtgroups enabled
Darrick J. Wong [Mon, 5 Aug 2024 17:52:55 +0000 (10:52 -0700)]
xfs: add frextents to the lazysbcounters when rtgroups enabled

Source kernel commit: 89d25a402bd8d2ec7fa2904640dfae961f148bf9

Make the free rt extent count a part of the lazy sb counters when the
realtime groups feature is enabled.  This is possible because the patch
to recompute frextents from the rtbitmap during log recovery predates
the code adding rtgroup support, hence we know that the value will
always be correct during runtime.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: add a helper to prevent bmap merges across rtgroup boundaries
Christoph Hellwig [Mon, 5 Aug 2024 17:52:34 +0000 (10:52 -0700)]
xfs: add a helper to prevent bmap merges across rtgroup boundaries

Source kernel commit: a3ae21f825b8790c5cf231e366309dbec3677ddf

Except for the rt superblock, realtime groups do not store any metadata
at the start (or end) of the group.  There is nothing to prevent the
bmap code from merging allocations from multiple groups into a single
bmap record.  Add a helper to check for this case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[djwong: massage the commit message after pulling this into rtgroups]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: check that rtblock extents do not break rtsupers or rtgroups
Darrick J. Wong [Mon, 5 Aug 2024 17:51:58 +0000 (10:51 -0700)]
xfs: check that rtblock extents do not break rtsupers or rtgroups

Source kernel commit: 503fca119d2c8df89256e555c00ecc732fc98e4b

Check that rt block pointers do not point to the realtime superblock and
that allocated rt space extents do not cross rtgroup boundaries.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: export realtime group geometry via XFS_FSOP_GEOM
Darrick J. Wong [Mon, 5 Aug 2024 17:51:09 +0000 (10:51 -0700)]
xfs: export realtime group geometry via XFS_FSOP_GEOM

Source kernel commit: a580e4a73a9eaa96153080f7c81a30333bcc4d81

Export the realtime geometry information so that userspace can query it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:50:50 +0000 (10:50 -0700)]
fixup

11 months agoxfs: update realtime super every time we update the primary fs super
Darrick J. Wong [Mon, 5 Aug 2024 17:49:04 +0000 (10:49 -0700)]
xfs: update realtime super every time we update the primary fs super

Source kernel commit: 8bbee1210019f3cb32d8ddd39223ce65d9da4039

Every time we update parts of the primary filesystem superblock that are
echoed in the rt superblock, we must update the rt super.  Avoid
changing the log to support logging to the rt device by using ordered
buffers.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:47:45 +0000 (10:47 -0700)]
fixup

11 months agolibfrog: add memchr_inv
Darrick J. Wong [Mon, 5 Aug 2024 17:43:34 +0000 (10:43 -0700)]
libfrog: add memchr_inv

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
[hch: split from a larger patch]
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: define the format of rt groups
Darrick J. Wong [Mon, 5 Aug 2024 17:42:44 +0000 (10:42 -0700)]
xfs: define the format of rt groups

Source kernel commit: f13677b8a76a61cbb1c937d250a3bd45019748e8

Define the ondisk format of realtime group metadata, and a superblock
for realtime volumes.  rt supers are protected by a separate rocompat
bit so that we can leave them off if the rt device is zoned.

Add a xfs_sb_version_hasrtgroups so that xfs_repair knows how to zero
the tail of superblocks.

For rt group enabled file systems there is a separate bitmap and summary
file for each group and thus the number of bitmap and summary blocks
needs to be calculated differently.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:39:35 +0000 (10:39 -0700)]
fixup

11 months agoxfs: make RT extent numbers relative to the rtgroup
Christoph Hellwig [Mon, 5 Aug 2024 17:36:45 +0000 (10:36 -0700)]
xfs: make RT extent numbers relative to the rtgroup

Source kernel commit: b8ed01fa4a75b3589000486b3f71568a27aa08f1

To prepare for adding per-rtgroup bitmap files, make the xfs_rtxnum_t
type encode the RT extent number relative to the rtgroup.  The biggest
part of this to clearly distinguish between the relative extent number
that gets masked when converting from a global block number and length
values that just have a factor applied to them when converting from
file system blocks.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 17:34:08 +0000 (10:34 -0700)]
fixup

11 months agoxfs: refactor xfs_rtsummary_blockcount
Christoph Hellwig [Mon, 5 Aug 2024 18:30:26 +0000 (11:30 -0700)]
xfs: refactor xfs_rtsummary_blockcount

Source kernel commit: 650c7d4d4e0b4a461c2b21bd7ba697514d473bb3

Make xfs_rtsummary_blockcount take all the required information from
the mount structure and return the number of summary levels from it
as well.  This cleans up many of the callers and prepares for making the
rtsummary files per-rtgroup where they need to look at different value.

This means we recalculate some values in some callers, but as all these
calculations are outside the fast path and cheap that seems like a price
worth paying.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: refactor xfs_rtbitmap_blockcount
Christoph Hellwig [Mon, 5 Aug 2024 17:30:43 +0000 (10:30 -0700)]
xfs: refactor xfs_rtbitmap_blockcount

Source kernel commit: 35a1dfb9f4fb84ef65ec43c5e0b184f9bc832953

Rename the existing xfs_rtbitmap_blockcount to
xfs_rtbitmap_blockcount_len and add a new xfs_rtbitmap_blockcount wrapper
around it that takes the number of extents from the mount structure.

This will simplify the move to per-rtgroup bitmaps as those will need to
pass in the number of extents per rtgroup instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: remove XFS_ILOCK_RT*
Darrick J. Wong [Wed, 29 May 2024 04:11:10 +0000 (21:11 -0700)]
xfs: remove XFS_ILOCK_RT*

Now that we've centralized the realtime metadata locking routines, get
rid of the ILOCK subclasses since we now use explicit lockdep classes.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 18:29:46 +0000 (11:29 -0700)]
fixup

11 months agoxfs: move RT bitmap and summary information to the rtgroup
Christoph Hellwig [Mon, 5 Aug 2024 16:47:03 +0000 (18:47 +0200)]
xfs: move RT bitmap and summary information to the rtgroup

Source kernel commit: d1ee0317db210b830a817cc66f02ac8ceeb885fa

Move the pointers to the RT bitmap and summary inodes as well as the
summary cache to the rtgroups structure to prepare for having a
separate bitmap and summary inodes for each rtgroup.

Code using the inodes now needs to operate on a rtgroup.  Where easily
possible such code is converted to iterate over all rtgroups, else
rtgroup 0 (the only one that can currently exist) is hardcoded.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 16:38:35 +0000 (18:38 +0200)]
fixup

11 months agoxfs: support caching rtgroup metadata inodes
Darrick J. Wong [Mon, 5 Aug 2024 16:37:33 +0000 (18:37 +0200)]
xfs: support caching rtgroup metadata inodes

Source kernel commit: 53e07653f76bd6b77e9d184ae0ad707af3a7ee04

Create the necessary per-rtgroup infrastructure that we need to load
metadata inodes into memory.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: add a lockdep class key for rtgroup inodes
Darrick J. Wong [Mon, 5 Aug 2024 16:37:00 +0000 (18:37 +0200)]
xfs: add a lockdep class key for rtgroup inodes

Source kernel commit: 8c2ef9cdb92b08063962cbd2f95571042225c125

Add a dynamic lockdep class key for rtgroup inodes.  This will enable
lockdep to deduce inconsistencies in the rtgroup metadata ILOCK locking
order.  Each class can have 8 subclasses, and for now we will only have
2 inodes per group.  This enables rtgroup order and inode order checks
when nesting ILOCKs.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: define locking primitives for realtime groups
Darrick J. Wong [Mon, 5 Aug 2024 14:13:22 +0000 (16:13 +0200)]
xfs: define locking primitives for realtime groups

Source kernel commit: 7938b100ad2829d02776e3e98cfb05d4a3c8a9a1

Define helper functions to lock all metadata inodes related to a
realtime group.  There's not much to look at now, but this will become
important when we add per-rtgroup metadata files and online fsck code
for them.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixups
Christoph Hellwig [Mon, 5 Aug 2024 14:04:13 +0000 (16:04 +0200)]
fixups

11 months agoxfs: create incore realtime group structures
Darrick J. Wong [Tue, 6 Aug 2024 12:53:36 +0000 (05:53 -0700)]
xfs: create incore realtime group structures

Source kernel commit: 2b4dabdbacdecd6d67c63fe052933a5b4a240356

Create an incore object that will contain information about a realtime
allocation group.  This will eventually enable us to shard the realtime
section in a similar manner to how we shard the data section, but for
now just a single object for the entire RT subvolume is created.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agofixup
Christoph Hellwig [Mon, 5 Aug 2024 13:57:22 +0000 (15:57 +0200)]
fixup

11 months agoxfs: replace m_rsumsize with m_rsumblocks
Christoph Hellwig [Mon, 5 Aug 2024 13:53:48 +0000 (15:53 +0200)]
xfs: replace m_rsumsize with m_rsumblocks

Source kernel commit: df5f8e548083f06499fbd1250dde78950d541fc7

Track the RT summary file size in blocks, just like the RT bitmap
file.  While we have users of both units, blocks are used slightly
more often and this matches the bitmap file for consistency.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: remove xfs_{rtbitmap,rtsummary}_wordcount
Christoph Hellwig [Mon, 5 Aug 2024 13:52:21 +0000 (15:52 +0200)]
xfs: remove xfs_{rtbitmap,rtsummary}_wordcount

Source kernel commit: 17b063747dbb4a0c24deebf3ec6d802f0427bac5

xfs_rtbitmap_wordcount and xfs_rtsummary_wordcount are currently unused,
so remove them to simplify refactoring other rtbitmap helpers.  They
can be added back or simply open coded when actually needed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs_db: stop using libxfs_rtsummary_wordcount
Christoph Hellwig [Mon, 5 Aug 2024 18:41:47 +0000 (11:41 -0700)]
xfs_db: stop using libxfs_rtsummary_wordcount

Just use the pre-calculated mount value and shift it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs_repair: stop using libxfs_rt{bitmap,summary}_wordcount
Christoph Hellwig [Mon, 5 Aug 2024 13:50:59 +0000 (15:50 +0200)]
xfs_repair: stop using libxfs_rt{bitmap,summary}_wordcount

We can easily calculate the values by just shifting the mount/sb based
sized without the need of these helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: clean up the ISVALID macro in xfs_bmap_adjacent
Christoph Hellwig [Mon, 5 Aug 2024 13:02:56 +0000 (15:02 +0200)]
xfs: clean up the ISVALID macro in xfs_bmap_adjacent

Source kernel commit: 4472e68dab90ae4bef260fbb2dcd592c8ec2b749

Turn the  ISVALID macro defined and used inside in xfs_bmap_adjacent
that relies on implict context into a proper inline function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs: simplify xfs_rtalloc_query_range
Christoph Hellwig [Wed, 3 Jul 2024 21:21:59 +0000 (14:21 -0700)]
xfs: simplify xfs_rtalloc_query_range

There isn't much of a good reason to pass the xfs_rtalloc_rec structures
that describe extents to xfs_rtalloc_query_range as we really just want
a lower and upper bound xfs_rtxnum_t.  Pass the rtxnum directly and
simply the interface.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: remove xfs_rtb_to_rtxrem
Christoph Hellwig [Wed, 3 Jul 2024 21:21:59 +0000 (14:21 -0700)]
xfs: remove xfs_rtb_to_rtxrem

Simplify the number of block number conversion helpers by removing
xfs_rtb_to_rtxrem.  Any recent compiler is smart enough to eliminate
the double divisions if using separate xfs_rtb_to_rtx and
xfs_rtb_to_rtxoff calls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agolibxfs: remove duplicate rtalloc declarations in libxfs.h
Christoph Hellwig [Tue, 9 Jul 2024 05:46:15 +0000 (22:46 -0700)]
libxfs: remove duplicate rtalloc declarations in libxfs.h

These already come from xfs_rtbitmap.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[djwong: libxfs, not xfs]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: ensure rtx mask/shift are correct after growfs
Christoph Hellwig [Mon, 5 Aug 2024 18:50:51 +0000 (11:50 -0700)]
xfs: ensure rtx mask/shift are correct after growfs

Source kernel commit: 101587dd747fd4fa4df9688892e3ad86dcebc63b

When growfs sets an extent size, it doesn't updated the m_rtxblklog and
m_rtxblkmask values, which could lead to incorrect usage of them if they
were set before and can't be used for the new extent size.

Add a xfs_mount_sb_set_rextsize helper that updates the two fields, and
also use it when calculating the new RT geometry instead of disabling
the optimization there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
11 months agoxfs_repair: refactor generate_rtinfo
Christoph Hellwig [Tue, 30 Jul 2024 20:58:38 +0000 (13:58 -0700)]
xfs_repair: refactor generate_rtinfo

Move the allocation of the computed values into generate_rtinfo, and thus
make the variables holding them private in rt.c, and clean up a few
formatting nits.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[djwong: move functions to fix build errors]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: stop preallocating blocks in mk_rbmino and mk_rsumino
Christoph Hellwig [Tue, 30 Jul 2024 20:31:50 +0000 (13:31 -0700)]
xfs_repair: stop preallocating blocks in mk_rbmino and mk_rsumino

Now that repair is using libxfs_rtfile_initialize_blocks to write to the
rtbitmap and rtsummary inodes, space allocation is already taken care of
that helper and there is no need to preallocate it.  Remove the code to
do so.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: use libxfs_rtfile_initialize_blocks
Christoph Hellwig [Tue, 30 Jul 2024 20:31:06 +0000 (13:31 -0700)]
xfs_repair: use libxfs_rtfile_initialize_blocks

Use libxfs_rtfile_initialize_blocks to write the re-computed rtbitmap
and rtsummary contents.  This removes duplicate code and prepares for
even more sharing once the rtgroup features adds a metadata header to
the rtbitmap and rtsummary blocks.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agomkfs: use xfs_rtfile_initialize_blocks
Christoph Hellwig [Tue, 30 Jul 2024 20:25:34 +0000 (13:25 -0700)]
mkfs: use xfs_rtfile_initialize_blocks

Use the new libxfs helper for initializing the rtbitmap/summary files
for rtgroup-enabled file systems.  Also skip the zeroing of the blocks
for rtgroup file systems as we'll overwrite every block instantly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agomkfs: remove a pointless rtfreesp_init forward declaration
Christoph Hellwig [Tue, 30 Jul 2024 20:24:14 +0000 (13:24 -0700)]
mkfs: remove a pointless rtfreesp_init forward declaration

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: use xfs_validate_rt_geometry
Christoph Hellwig [Tue, 30 Jul 2024 20:22:53 +0000 (13:22 -0700)]
xfs_repair: use xfs_validate_rt_geometry

Use shared libxfs code with the kernel instead of reimplementing it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: always call into phase5()
Christoph Hellwig [Tue, 30 Jul 2024 20:38:26 +0000 (13:38 -0700)]
xfs_repair: always call into phase5()

Make the phase5() function handle the rt file checking for the no-modify
case instead of special casing it in the main repair flow.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: push transaction join out of xfs_rtbitmap_lock and xfs_rtgroup_lock
Christoph Hellwig [Tue, 30 Jul 2024 23:54:04 +0000 (16:54 -0700)]
xfs: push transaction join out of xfs_rtbitmap_lock and xfs_rtgroup_lock

To prepare for being able to join an already locked rtbitmap inode to a
transaction split out separate helpers for joining the transaction from
the locking helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: factor out rtbitmap/summary initialization helpers
Christoph Hellwig [Tue, 30 Jul 2024 17:54:12 +0000 (10:54 -0700)]
xfs: factor out rtbitmap/summary initialization helpers

Add helpers to libxfs that can be shared by growfs and mkfs for
initializing the rtbitmap and summary, and by passing the optional
data pointer also by repair for rebuilding them.  This will become
even more useful when the rtgroups feature adѕ a metadata header
to each block, which means even more shared code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[djwong: minor documentation and data advance tweaks]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: add bounds checking to xfs_rt{bitmap,summary}_read_buf
Christoph Hellwig [Tue, 30 Jul 2024 18:17:10 +0000 (11:17 -0700)]
xfs: add bounds checking to xfs_rt{bitmap,summary}_read_buf

Add a corruption check for passing an invalid block number, which is a
lot easier to understand than the xfs_bmapi_read failure later on.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: assert a valid limit in xfs_rtfind_forw
Christoph Hellwig [Tue, 30 Jul 2024 18:17:09 +0000 (11:17 -0700)]
xfs: assert a valid limit in xfs_rtfind_forw

Protect against developers passing stupid limits when refactoring the
RT code once again.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: remove the limit argument to xfs_rtfind_back
Christoph Hellwig [Tue, 30 Jul 2024 18:17:09 +0000 (11:17 -0700)]
xfs: remove the limit argument to xfs_rtfind_back

All callers pass a 0 limit to xfs_rtfind_back, so remove the argument
and hard code it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: factor out a xfs_validate_rt_geometry helper
Christoph Hellwig [Tue, 30 Jul 2024 18:17:09 +0000 (11:17 -0700)]
xfs: factor out a xfs_validate_rt_geometry helper

Split the RT geometry validation in the early mount code into a
helper than can be reused by repair (from which this code was
apparently originally stolen anyway).

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[djwong: u64 return value for calc_rbmblocks]
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs: remove xfs_validate_rtextents
Christoph Hellwig [Tue, 30 Jul 2024 18:17:09 +0000 (11:17 -0700)]
xfs: remove xfs_validate_rtextents

Replace xfs_validate_rtextents with an open coded check for 0
rtextents.  The name for the function implies it does a lot more
than a zero check, which is more obvious when open coded.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: allow setting current address to log blocks
Darrick J. Wong [Wed, 3 Jul 2024 21:21:58 +0000 (14:21 -0700)]
xfs_db: allow setting current address to log blocks

Add commands so that users can target blocks on an external log device.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: convert rtsummary geometry
Darrick J. Wong [Wed, 3 Jul 2024 21:21:58 +0000 (14:21 -0700)]
xfs_db: convert rtsummary geometry

Teach the rtconvert command to be able to convert realtime blocks and
extents to locations within the rt summary.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: convert rtbitmap geometry
Darrick J. Wong [Wed, 3 Jul 2024 21:21:58 +0000 (14:21 -0700)]
xfs_db: convert rtbitmap geometry

Teach the rtconvert command to be able to convert realtime blocks and
extents to locations within the rt bitmap.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: enable conversion of rt space units
Darrick J. Wong [Wed, 3 Jul 2024 21:21:58 +0000 (14:21 -0700)]
xfs_db: enable conversion of rt space units

Teach the xfs_db convert function about rt extents, rt block numbers,
and how to compute offsets within the rt bitmap and summary files.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: access arbitrary realtime blocks and extents
Darrick J. Wong [Wed, 3 Jul 2024 21:21:57 +0000 (14:21 -0700)]
xfs_db: access arbitrary realtime blocks and extents

Add two commands to xfs_db so that we can point ourselves at any
arbitrary realtime block or extent.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: access realtime file blocks
Darrick J. Wong [Wed, 3 Jul 2024 21:21:57 +0000 (14:21 -0700)]
xfs_db: access realtime file blocks

Now that we have the ability to point the io cursor at the realtime
device, let's make it so that the "dblock" command can walk the contents
of realtime files.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: make the daddr command target the realtime device
Darrick J. Wong [Wed, 3 Jul 2024 21:21:57 +0000 (14:21 -0700)]
xfs_db: make the daddr command target the realtime device

Make it so that users can issue the command "daddr -r XXX" to select
disk block XXX on the realtime device.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: report the realtime device when associated with each io cursor
Darrick J. Wong [Wed, 3 Jul 2024 21:21:57 +0000 (14:21 -0700)]
xfs_db: report the realtime device when associated with each io cursor

When db is reporting on an io cursor and the cursor points to the
realtime device, print that fact.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_db: support passing the realtime device to the debugger
Darrick J. Wong [Wed, 3 Jul 2024 21:21:56 +0000 (14:21 -0700)]
xfs_db: support passing the realtime device to the debugger

Create a new -R flag so that sysadmins can pass the realtime device to
the xfs debugger.  Since we can now have superblocks on the rt device,
we need this to be able to inspect/dump/etc.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agomkfs: add a utility to generate protofiles
Darrick J. Wong [Wed, 3 Jul 2024 21:21:56 +0000 (14:21 -0700)]
mkfs: add a utility to generate protofiles

Add a new utility to generate mkfs protofiles from a directory tree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agomkfs.xfs: enable metadata directories
Darrick J. Wong [Wed, 3 Jul 2024 21:21:56 +0000 (14:21 -0700)]
mkfs.xfs: enable metadata directories

Enable formatting filesystems with metadata directories.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: allow sysadmins to add metadata directories
Darrick J. Wong [Wed, 3 Jul 2024 21:21:56 +0000 (14:21 -0700)]
xfs_repair: allow sysadmins to add metadata directories

Allow the sysadmin to use xfs_repair to upgrade an existing filesystem
to support metadata directories.  This will be needed to upgrade
filesystems to support realtime rmap and reflink.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: do not count metadata directory files when doing quotacheck
Darrick J. Wong [Wed, 3 Jul 2024 21:21:56 +0000 (14:21 -0700)]
xfs_repair: do not count metadata directory files when doing quotacheck

Previously, we stated that files in the metadata directory tree are not
counted in the dquot information.  Fix the offline quotacheck code in
xfs_repair and xfs_check to reflect this.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: truncate and unmark orphaned metadata inodes
Darrick J. Wong [Wed, 3 Jul 2024 21:21:55 +0000 (14:21 -0700)]
xfs_repair: truncate and unmark orphaned metadata inodes

If an inode claims to be a metadata inode but wasn't linked in either
directory tree, remove the attr fork and reset the data fork if the
contents weren't regular extent mappings before moving the inode to the
lost+found.

We don't ifree the inode, because it's possible that the inode was not
actually a metadata inode but simply got corrupted due to bitflips or
something, and we'd rather let the sysadmin examine what's left of the
file instead of photorec'ing it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: drop all the metadata directory files during pass 4
Darrick J. Wong [Wed, 3 Jul 2024 21:21:55 +0000 (14:21 -0700)]
xfs_repair: drop all the metadata directory files during pass 4

Drop the entire metadata directory tree during pass 4 so that we can
reinitialize the entire tree in phase 6.  The existing metadata files
(rtbitmap, rtsummary, quotas) will be reattached to the newly rebuilt
directory tree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: metadata dirs are never plausible root dirs
Darrick J. Wong [Wed, 3 Jul 2024 21:21:55 +0000 (14:21 -0700)]
xfs_repair: metadata dirs are never plausible root dirs

Metadata directories are never candidates to be the root of the
user-accessible directory tree.  Update has_plausible_rootdir to ignore
them all, as well as detecting the case where the superblock incorrectly
thinks both trees have the same root.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: adjust keep_fsinos to handle metadata directories
Darrick J. Wong [Wed, 3 Jul 2024 21:21:55 +0000 (14:21 -0700)]
xfs_repair: adjust keep_fsinos to handle metadata directories

In keep_fsinos, mark the root of the metadata directory tree as inuse.
The realtime bitmap and summary files still come after the root
directories, so this is a fairly simple change to the loop test.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: mark space used by metadata files
Darrick J. Wong [Wed, 3 Jul 2024 21:21:54 +0000 (14:21 -0700)]
xfs_repair: mark space used by metadata files

Track space used by metadata files as a separate incore extent type.
This ensures that we can warn about cross-linked metadata files, even
though we are going to rebuild the entire metadata directory tree in the
end.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: pass private data pointer to scan_lbtree
Darrick J. Wong [Wed, 3 Jul 2024 21:21:54 +0000 (14:21 -0700)]
xfs_repair: pass private data pointer to scan_lbtree

Pass a private data pointer through scan_lbtree.  We'll use this
later when scanning the rtrmapbt to keep track of scan state.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: update incore metadata state whenever we create new files
Darrick J. Wong [Wed, 3 Jul 2024 21:21:54 +0000 (14:21 -0700)]
xfs_repair: update incore metadata state whenever we create new files

Make sure that we update our incore metadata inode bookkeepping whenever
we create new metadata files.  There will be many more of these later.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: don't let metadata and regular files mix
Darrick J. Wong [Wed, 3 Jul 2024 21:21:54 +0000 (14:21 -0700)]
xfs_repair: don't let metadata and regular files mix

Track whether or not inodes thought they were metadata inodes.  We
cannot allow metadata inodes to appear in the regular directory tree,
and we cannot allow regular inodes to appear in the metadata directory
tree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: rebuild the metadata directory
Darrick J. Wong [Wed, 3 Jul 2024 21:21:54 +0000 (14:21 -0700)]
xfs_repair: rebuild the metadata directory

Check the dirents in metadata directories for problems and repair them
if necessary.  Also make sure that the sb-rooted inodes (root, metadir
root, rt bitmap, rt summary) are always allocated in that order.

Note that xfs_repair will always rebuild the metadata directory tree
itself, so we only need to report problems, not fix them.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: check metadata inode flag
Darrick J. Wong [Wed, 3 Jul 2024 21:21:53 +0000 (14:21 -0700)]
xfs_repair: check metadata inode flag

Check whether or not the metadata inode flag is set appropriately.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: refactor grabbing realtime metadata inodes
Darrick J. Wong [Wed, 3 Jul 2024 21:21:53 +0000 (14:21 -0700)]
xfs_repair: refactor grabbing realtime metadata inodes

Create a helper function to grab a realtime metadata inode.  When
metadir arrives, the bitmap and summary inodes can float, so we'll
turn this function into a "load or allocate" function.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: refactor root directory initialization
Darrick J. Wong [Wed, 3 Jul 2024 21:21:53 +0000 (14:21 -0700)]
xfs_repair: refactor root directory initialization

Refactor root directory initialization into a separate function we can
call for both the root dir and the metadir.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: refactor marking of metadata inodes
Darrick J. Wong [Wed, 3 Jul 2024 21:21:53 +0000 (14:21 -0700)]
xfs_repair: refactor marking of metadata inodes

Refactor the mechanics of marking a metadata inode into a helper
function so that we don't have to open-code that for every single
metadata inode.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: refactor fixing dotdot
Darrick J. Wong [Wed, 3 Jul 2024 21:21:52 +0000 (14:21 -0700)]
xfs_repair: refactor fixing dotdot

Pull the code that fixes a directory's dot-dot entry into a separate
helper function so that we can call it on the rootdir and (later) the
metadir.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
11 months agoxfs_repair: dont check metadata directory dirent inumbers
Darrick J. Wong [Wed, 3 Jul 2024 21:21:52 +0000 (14:21 -0700)]
xfs_repair: dont check metadata directory dirent inumbers

Phase 6 always rebuilds the entire metadata directory tree, and repair
quietly ignores all the DIFLAG2_METADATA directory inodes that it finds.
As a result, none of the metadata directories are marked inuse in the
incore data.  Therefore, the is_inode_free checks are not valid for
anything we find in a metadata directory.

Therefore, avoid checking is_inode_free when scanning metadata directory
dirents.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>