xfs: all pending online scrub improvements
Subsystems (3)
PATCH 1/4 xfs: all pending online scrub improvements
Hi everyone,
As I've mentioned several times throughout 2022, I would like to merge the online fsck feature in time for the 2023 LTS kernel. The first big step in this process is to merge all the pending bug fixes, validation improvements, and general reorganization of the existing metadata scrubbing functionality.
This first deluge starts with the design document for the entirety of the online fsck feature. The design doc should be familiar to most of you, as it's been on the list for review for months already. It outlines in brief the problems we're trying to solve, the use cases and testing plan, and the fundamental data structures and algorithms underlying the entire feature.
After that come all the code changes to wrap up the metadata checking part of the feature. The biggest piece here is the scrub drains that allow scrub to quiesce deferred ops targeting AGs so that it can cross-reference recordsets. Most of the rest is tweaking the btree code so that we can do keyspace scans to look for conflicting records.
For this review, I would like people to focus the following:
- Are the major subsystems sufficiently documented that you could figure out what the code does?
- Do you see any problems that are severe enough to cause long term support hassles? (e.g. bad API design, writing weird metadata to disk)
- Can you spot mis-interactions between the subsystems?
- What were my blind spots in devising this feature?
- Are there missing pieces that you'd like to help build?
- Can I just merge all of this?
The one thing that is /not/ in scope for this review are requests for more refactoring of existing subsystems. While there are usually valid arguments for performing such cleanups, those are separate tasks to be prioritized separately. I will get to them after merging online fsck.
I've been running daily online scrubs of every computer I own for the last five years, which has helped me iron out real problems in (limited scope) production. All issues observed in that time have been corrected in this submission.
As a warning, the patches will likely take several days to trickle in. All four patch deluges are based off kernel 6.2-rc1, xfsprogs 6.1, and fstests 2022-12-25.
Thank you all for your participation in the XFS community. Have a safe New Years, and I'll see you all next year!
--D
cover xfs: design documentation for online fsck
Hi all,
After six years of development and a nearly two year hiatus from patchbombing, I think it is time to resume the process of merging the online fsck feature into XFS. The full patchset comprises 105 separate patchsets that capture 470 patches across the kernel, xfsprogs, and fstests projects.
I would like to merge this feature into upstream in time for the 2023 LTS kernel. As of 5.15 (aka last year's LTS), we have merged all generally useful infrastructure improvements into the regular filesystem. The only changes to the core filesystem that remain are the ones that are only useful to online fsck itself. In other words, the vast majority of the new code in the patchsets comprising the online fsck feature are is mostly self contained and can be turned off via Kconfig.
Many of you readers might be wondering -- why have I chosen to make one large submission with 100+ patchsets comprising ~500 patches? Why didn't I merge small pieces of functionality bit by bit and revise common code as necessary? Well, the simple answer is that in the past six years, the fundamental algorithms have been revised repeatedly as I've built out the functionality. In other words, the codebase as it is now has the benefit that I now know every piece that's necessary to get the job done in a reasonable manner and within the constraints laid out by community reviews. I believe this has reduced code churn in mainline and freed up my time so that I can iterate faster.
As a concession to the mail servers, I'm breaking up the submission into smaller pieces; I'm only pushing the design document and the revisions to the existing scrub code, which is the first 20% of the patches. Also, I'm arbitrarily restarting the version numbering by reversioning all patchsets from version 22 to epoch 23, version 1.
The big question to everyone reading this is: How might I convince you that there is more merit in merging the whole feature and dealing with the consequences than continuing to maintain it out of tree?
---------
To prepare the XFS community and potential patch reviewers for the upstream submission of the online fsck feature, I decided to write a document capturing the broader picture behind the online repair development effort. The document begins by defining the problems that online fsck aims to solve and outlining specific use cases for the functionality.
Using that as a base, the rest of the design document presents the high level algorithms that fulfill the goals set out at the start and the interactions between the large pieces of the system. Case studies round out the design documentation by adding the details of exactly how specific parts of the online fsck code integrate the algorithms with the filesystem.
The goal of this effort is to help the XFS community understand how the gigantic online repair patchset works. The questions I submit to the community reviewers are:
1. As you read the design doc (and later the code), do you feel that you understand what's going on well enough to try to fix a bug if you found one?
2. What sorts of interactions between systems (or between scrub and the rest of the kernel) am I missing?
3. Do you feel confident enough in the implementation as it is now that the benefits of merging the feature (as EXPERIMENTAL) outweigh any potential disruptions to XFS at large?
4. Are there problematic interactions between subsystems that ought to be cleared up before merging?
5. Can I just merge all of this?
I intend to commit this document to the kernel's documentation directory when we start merging the patchset, albeit without the links to git.kernel.org. A much more readable version of this is posted at:
https://djwong.org/docs/xfs-online-fsck-design/
v2: add missing sections about: all the in-kernel data structures and
new apis that the scrub and repair functions use; how xattrs and directories are checked; how space btree records are checked; and add more details to the parts where all these bits tie together. Proofread for verb tense inconsistencies and eliminate vague 'we' usage. Move all the discussion of what we can do with pageable kernel memory into a single source file and section. Document where log incompat feature locks fit into the locking model.
v3: resync with 6.0, fix a few typos, begin discussion of the merging
plan for this megapatchset.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=online-fsck-design
--- Documentation/filesystems/index.rst | 1 .../filesystems/xfs-online-fsck-design.rst | 4975 ++++++++++++++++++++ .../filesystems/xfs-self-describing-metadata.rst | 1 3 files changed, 4977 insertions(+) create mode 100644 Documentation/filesystems/xfs-online-fsck-design.rst
cover xfs: variable and naming cleanups for intent items
In reply to Darrick J. WongHi all,
Before we start changing how the deferred intent items work, let us first cut down on the repeated boxing and unboxing of intent item parameters, and tidy up the variable naming to be consistent between types.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=intents-naming-cleanups
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=intents-naming-cleanups
--- fs/xfs/libxfs/xfs_alloc.c | 32 +++++---- fs/xfs/libxfs/xfs_bmap.c | 32 ++++----- fs/xfs/libxfs/xfs_bmap.h | 5 - fs/xfs/libxfs/xfs_refcount.c | 96 +++++++++++++--------------- fs/xfs/libxfs/xfs_refcount.h | 4 - fs/xfs/libxfs/xfs_rmap.c | 52 +++++++-------- fs/xfs/libxfs/xfs_rmap.h | 6 +- fs/xfs/xfs_bmap_item.c | 137 +++++++++++++++++------------------------ fs/xfs/xfs_extfree_item.c | 99 +++++++++++++++-------------- fs/xfs/xfs_refcount_item.c | 110 +++++++++++++++------------------ fs/xfs/xfs_rmap_item.c | 142 ++++++++++++++++++++---------------------- fs/xfs/xfs_trace.h | 15 +--- 12 files changed, 335 insertions(+), 395 deletions(-)
cover xfs: make intent items take a perag reference
In reply to Darrick J. WongHi all,
Now that we've cleaned up some code warts in the deferred work item processing code, let's make intent items take an active perag reference from their creation until they are finally freed by the defer ops machinery. This change facilitates the scrub drain in the next patchset and will make it easier for the future AG removal code to detect a busy AG in need of quiescing.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=intents-perag-refs
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=intents-perag-refs
--- fs/xfs/libxfs/xfs_ag.c | 6 +--- fs/xfs/libxfs/xfs_alloc.c | 22 +++++++-------- fs/xfs/libxfs/xfs_alloc.h | 12 ++++++-- fs/xfs/libxfs/xfs_bmap.c | 1 + fs/xfs/libxfs/xfs_bmap.h | 4 +++ fs/xfs/libxfs/xfs_ialloc_btree.c | 7 +++-- fs/xfs/libxfs/xfs_refcount.c | 33 +++++++++------------- fs/xfs/libxfs/xfs_refcount.h | 4 +++ fs/xfs/libxfs/xfs_refcount_btree.c | 5 ++- fs/xfs/libxfs/xfs_rmap.c | 29 +++++++------------ fs/xfs/libxfs/xfs_rmap.h | 4 +++ fs/xfs/scrub/repair.c | 3 +- fs/xfs/xfs_bmap_item.c | 29 +++++++++++++++++++ fs/xfs/xfs_extfree_item.c | 54 +++++++++++++++++++++++++----------- fs/xfs/xfs_refcount_item.c | 36 +++++++++++++++++++++--- fs/xfs/xfs_rmap_item.c | 32 +++++++++++++++++++-- 16 files changed, 196 insertions(+), 85 deletions(-)
cover xfs: pass perag references around when possible
In reply to Darrick J. WongHi all,
Avoid the cost of perag radix tree lookups by passing around active perag references when possible.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pass-perag-refs
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pass-perag-refs
--- fs/xfs/libxfs/xfs_ag.c | 15 +++++++++++++++ fs/xfs/libxfs/xfs_ag.h | 1 + fs/xfs/libxfs/xfs_alloc_btree.c | 4 +--- fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +--- fs/xfs/libxfs/xfs_refcount_btree.c | 5 +---- fs/xfs/libxfs/xfs_rmap_btree.c | 5 +---- fs/xfs/xfs_iunlink_item.c | 4 +--- fs/xfs/xfs_iwalk.c | 3 +-- fs/xfs/xfs_trace.h | 1 + 9 files changed, 23 insertions(+), 19 deletions(-)
cover xfs: drain deferred work items when scrubbing
In reply to Darrick J. WongHi all,
The design doc for XFS online fsck contains a long discussion of the eventual consistency models in use for XFS metadata. In that chapter, we note that it is possible for scrub to collide with a chain of deferred space metadata updates, and proposes a lightweight solution:
The use of a pending-intents counter so that scrub can wait for the system to drain all chains.
This patchset implements that scrub drain. The first patch implements the basic mechanism, and the subsequent patches reduce the runtime overhead by converting the implementation to use sloppy counters and introducing jump labels to avoid walking into scrub hooks when it isn't running. This last paradigm repeats elsewhere in this megaseries.
v23.1: make intent items take an active ref to the perag structure and
document why we bump and drop the intent counts when we do
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-drain-intents
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-drain-intents
--- fs/xfs/Kconfig | 5 ++ fs/xfs/Makefile | 2 + fs/xfs/libxfs/xfs_ag.c | 4 + fs/xfs/libxfs/xfs_ag.h | 8 +++ fs/xfs/libxfs/xfs_defer.c | 6 +- fs/xfs/scrub/agheader.c | 9 +++ fs/xfs/scrub/alloc.c | 3 + fs/xfs/scrub/bmap.c | 3 + fs/xfs/scrub/btree.c | 1 fs/xfs/scrub/common.c | 129 ++++++++++++++++++++++++++++++++++++++++---- fs/xfs/scrub/common.h | 15 +++++ fs/xfs/scrub/dabtree.c | 1 fs/xfs/scrub/fscounters.c | 7 ++ fs/xfs/scrub/health.c | 2 + fs/xfs/scrub/ialloc.c | 2 + fs/xfs/scrub/inode.c | 3 + fs/xfs/scrub/quota.c | 3 + fs/xfs/scrub/refcount.c | 9 +++ fs/xfs/scrub/repair.c | 3 + fs/xfs/scrub/rmap.c | 3 + fs/xfs/scrub/scrub.c | 63 ++++++++++++++++----- fs/xfs/scrub/scrub.h | 6 ++ fs/xfs/scrub/trace.h | 69 ++++++++++++++++++++++++ fs/xfs/xfs_bmap_item.c | 10 +++ fs/xfs/xfs_drain.c | 121 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_drain.h | 80 +++++++++++++++++++++++++++ fs/xfs/xfs_extfree_item.c | 2 + fs/xfs/xfs_linux.h | 1 fs/xfs/xfs_refcount_item.c | 2 + fs/xfs/xfs_rmap_item.c | 2 + fs/xfs/xfs_trace.h | 71 ++++++++++++++++++++++++ 31 files changed, 614 insertions(+), 31 deletions(-) create mode 100644 fs/xfs/xfs_drain.c create mode 100644 fs/xfs/xfs_drain.h
cover xfs: standardize btree record checking code
In reply to Darrick J. WongHi all,
While I was cleaning things up for 6.1, I noticed that the btree _query_range and _query_all functions don't perform the same checking that the _get_rec functions perform. In fact, they don't perform /any/ sanity checking, which means that callers aren't warned about impossible records.
Therefore, hoist the record validation and complaint logging code into separate functions, and call them from any place where we convert an ondisk record into an incore record. For online scrub, we can replace checking code with a call to the record checking functions in libxfs, thereby reducing the size of the codebase.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=btree-complain-bad-records
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=btree-complain-bad-records
--- fs/xfs/libxfs/xfs_alloc.c | 82 ++++++++++++++++++++++++--------- fs/xfs/libxfs/xfs_alloc.h | 6 ++ fs/xfs/libxfs/xfs_bmap.c | 31 ++++++++++++ fs/xfs/libxfs/xfs_bmap.h | 2 + fs/xfs/libxfs/xfs_ialloc.c | 77 +++++++++++++++++++++---------- fs/xfs/libxfs/xfs_ialloc.h | 2 + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 - fs/xfs/libxfs/xfs_ialloc_btree.h | 2 - fs/xfs/libxfs/xfs_inode_fork.c | 3 + fs/xfs/libxfs/xfs_refcount.c | 73 +++++++++++++++++++---------- fs/xfs/libxfs/xfs_refcount.h | 2 + fs/xfs/libxfs/xfs_rmap.c | 95 ++++++++++++++++++++++++-------------- fs/xfs/libxfs/xfs_rmap.h | 12 +++-- fs/xfs/scrub/alloc.c | 24 +++++----- fs/xfs/scrub/bmap.c | 6 ++ fs/xfs/scrub/ialloc.c | 24 ++-------- fs/xfs/scrub/refcount.c | 14 +----- fs/xfs/scrub/rmap.c | 44 ++---------------- 18 files changed, 303 insertions(+), 198 deletions(-)
cover xfs: hoist scrub record checks into libxfs
In reply to Darrick J. WongHi all,
There are a few things about btree records that scrub checked but the libxfs _get_rec functions didn't. Move these bits into libxfs so that everyone can benefit.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=btree-hoist-scrub-checks
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=btree-hoist-scrub-checks
--- fs/xfs/libxfs/xfs_ialloc.c | 4 ++++ fs/xfs/libxfs/xfs_rmap.c | 27 +++++++++++++++++++++++++++ fs/xfs/scrub/ialloc.c | 6 ------ fs/xfs/scrub/rmap.c | 22 ---------------------- 4 files changed, 31 insertions(+), 28 deletions(-)
cover xfs: fix rmap btree key flag handling
In reply to Darrick J. WongHi all,
This series fixes numerous flag handling bugs in the rmapbt key code. The most serious transgression is that key comparisons completely strip out all flag bits from rm_offset, including the ones that participate in record lookups. The second problem is that for years we've been letting the unwritten flag (which is an attribute of a specific record and not part of the record key) escape from leaf records into key records.
The solution to the second problem is to filter attribute flags when creating keys from records, and the solution to the first problem is to preserve *only* the flags used for key lookups. The ATTR and BMBT flags are a part of the lookup key, and the UNWRITTEN flag is a record attribute.
This has worked for years without generating user complaints because ATTR and BMBT extents cannot be shared, so key comparisons succeed solely on rm_startblock. Only file data fork extents can be shared, and those records never set any of the three flag bits, so comparisons that dig into rm_owner and rm_offset work just fine.
A filesystem written with an unpatched kernel and mounted on a patched kernel will work correctly because the ATTR/BMBT flags have been conveyed into keys correctly all along, and we still ignore the UNWRITTEN flag in any key record. This was what doomed my previous attempt to correct this problem in 2019.
A filesystem written with a patched kernel and mounted on an unpatched kernel will also work correctly because unpatched kernels ignore all flags.
With this patchset applied, the scrub code gains the ability to detect rmap btrees with incorrectly set attr and bmbt flags in the key records. After three years of testing, I haven't encountered any problems.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=rmap-btree-fix-key-handling
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=rmap-btree-fix-key-handling
--- fs/xfs/libxfs/xfs_rmap_btree.c | 40 +++++++++++++++++++++++------- fs/xfs/scrub/btree.c | 10 ++++++++ fs/xfs/scrub/btree.h | 2 ++ fs/xfs/scrub/rmap.c | 53 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 10 deletions(-)
cover xfs: enhance btree key scrubbing
In reply to Darrick J. WongHi all,
This series fixes the scrub btree block checker to ensure that the keys in the parent block accurately represent the block, and check the ordering of all interior key records.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-btree-key-enhancements
--- fs/xfs/scrub/btree.c | 63 ++++++++++++++++++++++++++++++++++++++++++++------ fs/xfs/scrub/btree.h | 8 ++++++ 2 files changed, 63 insertions(+), 8 deletions(-)
cover xfs: detect incorrect gaps in refcount btree
In reply to Darrick J. WongHi all,
The next few patchsets address a deficiency in scrub that I found while QAing the refcount btree scrubber. If there's a gap between refcount records, we need to cross-reference that gap with the reverse mappings to ensure that there are no overlapping records in the rmap btree. If we find any, then the refcount btree is not consistent. This is not a property that is specific to the refcount btree; they all need to have this sort of keyspace scanning logic to detect inconsistencies.
To do this accurately, we need to be able to scan the keyspace of a btree (which we already do) to be able to tell the caller if the keyspace is empty, sparse, or fully covered by records. The first few patches add the keyspace scanner to the generic btree code, along with the ability to mask off parts of btree keys because when we scan the rmapbt, we only care about space usage, not the owners.
The final patch closes the scanning gap in the refcountbt scanner.
v23.1: create helpers for the key extraction and comparison functions,
improve documentation, and eliminate the ->mask_key indirect
callsIf you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-refcount-gaps
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-detect-refcount-gaps
--- fs/xfs/libxfs/xfs_alloc.c | 11 +- fs/xfs/libxfs/xfs_alloc.h | 4 - fs/xfs/libxfs/xfs_alloc_btree.c | 28 ++++- fs/xfs/libxfs/xfs_bmap_btree.c | 19 +++ fs/xfs/libxfs/xfs_btree.c | 208 ++++++++++++++++++++++++++---------- fs/xfs/libxfs/xfs_btree.h | 141 ++++++++++++++++++++++++ fs/xfs/libxfs/xfs_ialloc_btree.c | 22 +++- fs/xfs/libxfs/xfs_refcount.c | 11 +- fs/xfs/libxfs/xfs_refcount.h | 4 - fs/xfs/libxfs/xfs_refcount_btree.c | 21 +++- fs/xfs/libxfs/xfs_rmap.c | 15 ++- fs/xfs/libxfs/xfs_rmap.h | 4 - fs/xfs/libxfs/xfs_rmap_btree.c | 61 ++++++++--- fs/xfs/libxfs/xfs_types.h | 12 ++ fs/xfs/scrub/agheader.c | 5 + fs/xfs/scrub/alloc.c | 7 + fs/xfs/scrub/bmap.c | 11 +- fs/xfs/scrub/btree.c | 24 ++-- fs/xfs/scrub/ialloc.c | 2 fs/xfs/scrub/inode.c | 1 fs/xfs/scrub/refcount.c | 124 ++++++++++++++++++++- fs/xfs/scrub/rmap.c | 6 + fs/xfs/scrub/scrub.h | 2 23 files changed, 612 insertions(+), 131 deletions(-)
cover xfs: detect incorrect gaps in inode btree
In reply to Darrick J. WongHi all,
This series continues the corrections for a couple of problems I found in the inode btree scrubber. The first problem is that we don't directly check the inobt records have a direct correspondence with the finobt records, and vice versa. The second problem occurs on filesystems with sparse inode chunks -- the cross-referencing we do detects sparseness, but it doesn't actually check the consistency between the inobt hole records and the rmap data.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-inobt-gaps
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-detect-inobt-gaps
--- fs/xfs/libxfs/xfs_ialloc.c | 84 ++++++++------ fs/xfs/libxfs/xfs_ialloc.h | 5 - fs/xfs/scrub/ialloc.c | 268 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 269 insertions(+), 88 deletions(-)
cover xfs: detect incorrect gaps in rmap btree
In reply to Darrick J. WongHi all,
Following in the theme of the last two patchsets, this one strengthens the rmap btree record checking so that scrub can count the number of space records that map to a given owner and that do not map to a given owner. This enables us to determine exclusive ownership of space that can't be shared.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-rmapbt-gaps
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-detect-rmapbt-gaps
--- fs/xfs/libxfs/xfs_rmap.c | 198 ++++++++++++++++++++++++++++++++-------------- fs/xfs/libxfs/xfs_rmap.h | 18 +++- fs/xfs/scrub/agheader.c | 10 +- fs/xfs/scrub/bmap.c | 14 +++ fs/xfs/scrub/btree.c | 2 fs/xfs/scrub/ialloc.c | 4 - fs/xfs/scrub/inode.c | 2 fs/xfs/scrub/rmap.c | 45 ++++++---- fs/xfs/scrub/scrub.h | 2 9 files changed, 198 insertions(+), 97 deletions(-)
cover xfs: fix iget/irele usage in online fsck
In reply to Darrick J. WongHi all,
This patchset fixes a handful of problems relating to how we get and release incore inodes in the online scrub code. The first patch fixes how we handle DONTCACHE -- our reasons for setting (or clearing it) depend entirely on the runtime environment at irele time. Hence we can refactor iget and irele to use our own wrappers that set that context appropriately.
The second patch fixes a race between the iget call in the inode core scrubber and other writer threads that are allocating or freeing inodes in the same AG by changing the behavior of xchk_iget (and the inode core scrub setup function) to return either an incore inode or the AGI buffer so that we can be sure that the inode cannot disappear on us.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-iget-fixes
--- fs/xfs/scrub/bmap.c | 2 fs/xfs/scrub/common.c | 267 +++++++++++++++++++++++++++++++++++++++++-------- fs/xfs/scrub/common.h | 10 ++ fs/xfs/scrub/dir.c | 2 fs/xfs/scrub/inode.c | 180 ++++++++++++++++++++++++++++----- fs/xfs/scrub/parent.c | 9 +- fs/xfs/scrub/scrub.c | 2 fs/xfs/xfs_icache.c | 3 - fs/xfs/xfs_icache.h | 11 +- 9 files changed, 398 insertions(+), 88 deletions(-)
cover xfs: fix iget usage in directory scrub
In reply to Darrick J. WongHi all,
In this series, we fix some problems with how the directory scrubber grabs child inodes. First, we want to reduce EDEADLOCK returns by replacing fixed-iteration loops with interruptible trylock loops. Second, we add UNTRUSTED to the child iget call so that we can detect a dirent that points to an unallocated inode. Third, we fix a bug where we weren't checking the inode pointed to by dotdot entries at all.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-dir-iget-fixes
--- fs/xfs/scrub/common.c | 22 ----- fs/xfs/scrub/common.h | 1 fs/xfs/scrub/dir.c | 79 +++++++------------ fs/xfs/scrub/parent.c | 203 +++++++++++++++++++++++-------------------------- 4 files changed, 126 insertions(+), 179 deletions(-)
cover xfs: detect mergeable and overlapping btree records
In reply to Darrick J. WongHi all,
While I was doing differential fuzz analysis between xfs_scrub and xfs_repair, I noticed that xfs_repair was only partially effective at detecting btree records that can be merged, and xfs_scrub totally didn't notice at all.
For every interval btree type except for the bmbt, there should never exist two adjacent records with adjacent keyspaces because the blockcount field is always large enough to span the entire keyspace of the domain. This is because the free space, rmap, and refcount btrees have a blockcount field large enough to store the maximum AG length, and there can never be an allocation larger than an AG.
The bmbt is a different story due to its ondisk encoding where the blockcount is only 21 bits wide. Because AGs can span up to 2^31 blocks and the RT volume can span up to 2^52 blocks, a preallocation of 2^22 blocks will be expressed as two records of 2^21 length. We don't opportunistically combine records when doing bmbt operations, which is why the fsck tools have never complained about this scenario.
Offline repair is partially effective at detecting mergeable records because I taught it to do that for the rmap and refcount btrees. This series enhances the free space, rmap, and refcount scrubbers to detect mergeable records. For the bmbt, it will flag the file as being eligible for an optimization to shrink the size of the data structure.
The last patch in this set also enhances the rmap scrubber to detect records that overlap incorrectly. This check is done automatically for non-overlapping btree types, but we have to do it separately for the rmapbt because there are constraints on which allocation types are allowed to overlap.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-mergeable-records
--- fs/xfs/scrub/alloc.c | 29 ++++++++++- fs/xfs/scrub/bmap.c | 39 +++++++++++++-- fs/xfs/scrub/refcount.c | 44 ++++++++++++++++ fs/xfs/scrub/rmap.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 230 insertions(+), 8 deletions(-)
cover xfs: clean up memory management in xattr scrub
In reply to Darrick J. WongHi all,
Currently, the extended attribute scrubber uses a single VLA to store all the context information needed in various parts of the scrubber code. This includes xattr leaf block space usage bitmaps, and the value buffer used to check the correctness of remote xattr value block headers. We try to minimize the insanity through the use of helper functions, but this is a memory management nightmare. Clean this up by making the bitmap and value pointers explicit members of struct xchk_xattr_buf.
Second, strengthen the xattr checking by teaching it to look for overlapping data structures in the shortform attr data.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-fix-xattr-memory-mgmt
--- fs/xfs/scrub/attr.c | 298 +++++++++++++++++++++++++++++++++++--------------- fs/xfs/scrub/attr.h | 60 +--------- fs/xfs/scrub/scrub.c | 3 + fs/xfs/scrub/scrub.h | 10 ++ 4 files changed, 231 insertions(+), 140 deletions(-)
cover xfs: rework online fsck incore bitmap
In reply to Darrick J. WongHi all,
In this series, we make some changes to the incore bitmap code: First, we shorten the prefix to 'xbitmap'. Then, we rework some utility functions for later use by online repair and clarify how the walk functions are supposed to be used.
Finally, we use all these new pieces to convert the incore bitmap to use an interval tree instead of linked lists. This lifts the limitation that callers had to be careful not to set a range that was already set; and gets us ready for the btree rebuilder functions needing to be able to set bits in a bitmap and generate maximal contiguous extents for the set ranges.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-bitmap-rework
--- fs/xfs/scrub/agheader_repair.c | 99 ++++++----- fs/xfs/scrub/bitmap.c | 367 +++++++++++++++++++++++++--------------- fs/xfs/scrub/bitmap.h | 33 ++-- fs/xfs/scrub/repair.c | 104 ++++++----- 4 files changed, 358 insertions(+), 245 deletions(-)
cover xfs: strengthen rmapbt scrubbing
In reply to Darrick J. WongHi all,
This series strengthens space allocation record cross referencing by using AG block bitmaps to compute the difference between space used according to the rmap records and the primary metadata, and reports cross-referencing errors for any discrepancies.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-strengthen-rmap-checking
--- fs/xfs/Makefile | 2 fs/xfs/scrub/bitmap.c | 55 +++++++++ fs/xfs/scrub/bitmap.h | 70 ++++++++++++ fs/xfs/scrub/repair.h | 1 fs/xfs/scrub/rmap.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 410 insertions(+), 2 deletions(-)
cover xfs: fix rmap btree key flag handling
In reply to Darrick J. WongHi all,
This series fixes numerous flag handling bugs in the rmapbt key code. The most serious transgression is that key comparisons completely strip out all flag bits from rm_offset, including the ones that participate in record lookups. The second problem is that for years we've been letting the unwritten flag (which is an attribute of a specific record and not part of the record key) escape from leaf records into key records.
The solution to the second problem is to filter attribute flags when creating keys from records, and the solution to the first problem is to preserve *only* the flags used for key lookups. The ATTR and BMBT flags are a part of the lookup key, and the UNWRITTEN flag is a record attribute.
This has worked for years without generating user complaints because ATTR and BMBT extents cannot be shared, so key comparisons succeed solely on rm_startblock. Only file data fork extents can be shared, and those records never set any of the three flag bits, so comparisons that dig into rm_owner and rm_offset work just fine.
A filesystem written with an unpatched kernel and mounted on a patched kernel will work correctly because the ATTR/BMBT flags have been conveyed into keys correctly all along, and we still ignore the UNWRITTEN flag in any key record. This was what doomed my previous attempt to correct this problem in 2019.
A filesystem written with a patched kernel and mounted on an unpatched kernel will also work correctly because unpatched kernels ignore all flags.
With this patchset applied, the scrub code gains the ability to detect rmap btrees with incorrectly set attr and bmbt flags in the key records. After three years of testing, I haven't encountered any problems. Online scrub is amended to recommend rebuilding of rmap btrees with the unwritten flag set in key records.
The xfsprogs counterpart to this series amends xfs_repair to report key records with the unwritten flag bit set, just prior to rebuilding the rmapbt. It also exposes the bit via xfs_db to enable testing back and forth.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=rmap-btree-fix-key-handling
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=rmap-btree-fix-key-handling
--- db/btblock.c | 4 +++ libxfs/xfs_rmap_btree.c | 40 ++++++++++++++++++++++++------- repair/scan.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 93 insertions(+), 11 deletions(-)
cover fstests: refactor online fsck stress tests
In reply to Darrick J. WongHi all,
This series prepares us to begin creating stress tests for the XFS online fsck feature. We start by hoisting the loop control code out of the one existing test (xfs/422) into common/fuzzy, and then we commence rearranging the code to make it easy to generate more and more tests. Eventually we will race fsstress against online scrub and online repair to make sure that xfs_scrub running on a correct filesystem cannot take it down by accident.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=refactor-scrub-stress
--- common/fuzzy | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/group-names.txt | 1 tests/xfs/422 | 109 ++------------------ tests/xfs/422.out | 4 - 4 files changed, 285 insertions(+), 101 deletions(-)
cover fstests: refactor GETFSMAP stress tests
In reply to Darrick J. WongHi all,
Refactor the fsmap racing tests to use the general scrub stress loop infrastructure that we've now created, and then add a bit more functionality so that we can test racing remounting the filesystem readonly and readwrite.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=refactor-fsmap-stress
--- common/fuzzy | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++- ltp/fsstress.c | 18 ++++++ tests/xfs/517 | 91 +----------------------------- tests/xfs/517.out | 4 - tests/xfs/732 | 38 +++++++++++++ tests/xfs/732.out | 2 + tests/xfs/847 | 38 +++++++++++++ tests/xfs/847.out | 2 + tests/xfs/848 | 38 +++++++++++++ tests/xfs/848.out | 2 + 10 files changed, 300 insertions(+), 94 deletions(-) create mode 100755 tests/xfs/732 create mode 100644 tests/xfs/732.out create mode 100755 tests/xfs/847 create mode 100644 tests/xfs/847.out create mode 100755 tests/xfs/848 create mode 100644 tests/xfs/848.out
cover fstests: race online scrub with mount state changes
In reply to Darrick J. WongHi all,
Introduce the ability to run xfs_scrub(8) itself from our online fsck stress test harness. Create two new tests to race scrub and repair against fsstress, and four more tests to do the same but racing against fs freeze and ro remounts.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=race-scrub-and-mount-state-changes
--- common/fuzzy | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++--- tests/xfs/285 | 44 ++++++++++--------------------------- tests/xfs/285.out | 4 +-- tests/xfs/286 | 46 ++++++++++----------------------------- tests/xfs/286.out | 4 +-- tests/xfs/733 | 39 +++++++++++++++++++++++++++++++++ tests/xfs/733.out | 2 ++ tests/xfs/771 | 39 +++++++++++++++++++++++++++++++++ tests/xfs/771.out | 2 ++ tests/xfs/824 | 40 ++++++++++++++++++++++++++++++++++ tests/xfs/824.out | 2 ++ tests/xfs/825 | 40 ++++++++++++++++++++++++++++++++++ tests/xfs/825.out | 2 ++ 13 files changed, 252 insertions(+), 75 deletions(-) create mode 100755 tests/xfs/733 create mode 100644 tests/xfs/733.out create mode 100755 tests/xfs/771 create mode 100644 tests/xfs/771.out create mode 100755 tests/xfs/824 create mode 100644 tests/xfs/824.out create mode 100755 tests/xfs/825 create mode 100644 tests/xfs/825.out
PATCH 1/14 xfs: document the motivation for online fsck design
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Start the first chapter of the online fsck design documentation. This covers the motivations for creating this in the first place.
--- Documentation/filesystems/index.rst | 1 .../filesystems/xfs-online-fsck-design.rst | 199 ++++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 Documentation/filesystems/xfs-online-fsck-design.rst
Documentation/filesystems/index.rst +1 -0
@@ -123,4 +123,5 @@ Documentation for filesystem implementations. vfat xfs-delayed-logging-design xfs-self-describing-metadata + xfs-online-fsck-design zonefs
Documentation/filesystems/xfs-online-fsck-design.rst new file +199 -0
199 lines not on this page · raw message
PATCH 2/14 xfs: document the general theory underlying online fsck design
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Start the second chapter of the online fsck design documentation. This covers the general theory underlying how online fsck works.
--- .../filesystems/xfs-online-fsck-design.rst | 366 ++++++++++++++++++++ 1 file changed, 366 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +366 -0
@@ -197,3 +197,369 @@ metadata to enable targeted checking and repair operations while the system is running. This capability will be coupled to automatic system management so that autonomous self-healing of XFS maximizes service availability. + +2. Theory of Operation +====================== + +Because it is necessary for online fsck to lock and scan live metadata objects, +online fsck consists of three separate code components. +The first is the userspace driver program ``xfs_scrub``, which is responsible +for identifying individual metadata items, scheduling work items for them, +reacting to the outcomes appropriately, and reporting results to the system +administrator. +The second and third are in the kernel, which implements functions to check +and repair each type of online fsck work item. + ++------------------------------------------------------------------+ +| **Note**: | ++------------------------------------------------------------------+ +| For brevity, this document shortens the phrase "online fsck work | +| item" to "scrub item". | ++------------------------------------------------------------------+ + +Scrub item types are delineated in a manner consistent with the Unix design +philosophy, which is to say that each item should handle one aspect of a +metadata structure, and handle it well. + +Scope +----- + +In principle, online fsck should be able to check and to repair everything that +the offline fsck program can handle. +However, the adjective *online* brings with it the limitation that online fsck +cannot deal with anything that prevents the filesystem from going on line, i.e. +mounting. +This limitation means that maintenance of the offline fsck tool will continue. +A second limitation of online fsck is that it must follow the same resource +sharing and lock acquisition rules as the regular filesystem. +This means that scrub cannot take *any* shortcuts to save time, because doing +so could lead to concurrency problems. +In other words, online fsck will never be able to fix 100% of the +inconsistencies that offline fsck can repair, and a complete run of online fsck +may take longer. +However, both of these limitations are acceptable tradeoffs to satisfy the +different motivations of online fsck, which are to **minimize system downtime** +and to **increase predictability of operation**. + +.. _scrubphases: + +Phases of Work +-------------- + +The userspace driver program ``xfs_scrub`` splits the work of checking and +repairing an entire filesystem into seven phases. +Each phase concentrates on checking specific types of scrub items and depends +on the success of all previous phases. +The seven phases are as follows: + +1. Collect geometry information about the mounted filesystem and computer, + discover the online fsck capabilities of the kernel, and open the + underlying storage devices. + +2. Check allocation group metadata, all realtime volume metadata, and all quota + files. + Each metadata structure is scheduled as a separate scrub item. + If corruption is found in the inode header or inode btree and ``xfs_scrub`` + is permitted to perform repairs, then those scrub items are repaired to + prepare for phase 3. + Repairs are implemented by resubmitting the scrub item to the kernel with + the repair flag enabled; this is discussed in the next section. + Optimizations and all other repairs are deferred to phase 4. + +3. Check all metadata of every file in the filesystem. + Each metadata structure is also scheduled as a separate scrub item. + If repairs are needed, ``xfs_scrub`` is permitted to perform repairs, + and there were no problems detected during phase 2, then those scrub items + are repaired. + Optimizations and unsuccessful repairs are deferred to phase 4. + +4. All remaining repairs and scheduled optimizations are performed during this + phase, if the caller permits them. + Before starting repairs, the summary counters are checked and any necessary + repairs are performed so that subsequent repairs will not fail the resource + reservation step due to wildly incorrect summary counters. + Unsuccesful repairs are requeued as long as forward progress on repairs is + made somewhere in the filesystem. + Free space in the filesystem is trimmed at the end of phase 4 if the + filesystem is clean. + +5. By the start of this phase, all primary and secondary filesystem metadata + must be correct. + Summary counters such as the free space counts and quota resource counts + are checked and corrected. + Directory entry names and extended attribute names are checked for + suspicious entries such as control characters or confusing Unicode sequences + appearing in names. + +6. If the caller asks for a media scan, read all allocated and written data + file extents in the filesystem. + The ability to use hardware-assisted data file integrity checking is new + to online fsck; neither of the previous tools have this capability. + If media errors occur, they will be mapped to the owning files and reported. + +7. Re-check the summary counters and presents the caller with a summary of + space usage and file counts. + +Steps for Each Scrub Item +------------------------- + +The kernel scrub code uses a three-step strategy for checking and repairing +the one aspect of a metadata object represented by a scrub item: + +1. The scrub item of interest is checked for corruptions; opportunities for + optimization; and for values that are directly controlled by the system + administrator but look suspicious. + If the item is not corrupt or does not need optimization, resource are + released and the positive scan results are returned to userspace. + If the item is corrupt or could be optimized but the caller does not permit + this, resources are released and the negative scan results are returned to + userspace. + Otherwise, the kernel moves on to the second step. + +2. The repair function is called to rebuild the data structure. + Repair functions generally choose rebuild a structure from other metadata + rather than try to salvage the existing structure. + If the repair fails, the scan results from the first step are returned to + userspace. + Otherwise, the kernel moves on to the third step. + +3. In the third step, the kernel runs the same checks over the new metadata + item to assess the efficacy of the repairs. + The results of the reassessment are returned to userspace. + +Classification of Metadata +-------------------------- + +Each type of metadata object (and therefore each type of scrub item) is +classified as follows: + +Primary Metadata +```````````````` + +Metadata structures in this category should be most familiar to filesystem +users either because they are directly created by the user or they index +objects created by the user +Most filesystem objects fall into this class. +Resource and lock acquisition for scrub code follows the same order as regular +filesystem accesses. + +Primary metadata objects are the simplest for scrub to process. +The principal filesystem object (either an allocation group or an inode) that +owns the item being scrubbed is locked to guard against concurrent updates. +The check function examines every record associated with the type for obvious +errors and cross-references healthy records against other metadata to look for +inconsistencies. +Repairs for this class of scrub item are simple, since the repair function +starts by holding all the resources acquired in the previous step. +The repair function scans available metadata as needed to record all the +observations needed to complete the structure. +Next, it stages the observations in a new ondisk structure and commits it +atomically to complete the repair. +Finally, the storage from the old data structure are carefully reaped. + +Because ``xfs_scrub`` locks a primary object for the duration of the repair, +this is effectively an offline repair operation performed on a subset of the +filesystem. +This minimizes the complexity of the repair code because it is not necessary to +handle concurrent updates from other threads, nor is it necessary to access +any other part of the filesystem. +As a result, indexed structures can be rebuilt very quickly, and programs +trying to access the damaged structure will be blocked until repairs complete. +The only infrastructure needed by the repair code are the staging area for +observations and a means to write new structures to disk. +Despite these limitations, the advantage that online repair holds is clear: +targeted work on individual shards of the filesystem avoids total loss of +service. + +This mechanism is described in section 2.1 ("Off-Line Algorithm") of +V. Srinivasan and M. J. Carey, `"Performance of On-Line Index Construction +Algorithms" <https://dl.acm.org/doi/10.5555/645336.649870>`_, +*Extending Database Technology*, pp. 293-309, 1992. + +Most primary metadata repair functions stage their intermediate results in an +in-memory array prior to formatting the new ondisk structure, which is very +similar to the list-based algorithm discussed in section 2.3 ("List-Based +Algorithms") of Srinivasan. +However, any data structure builder that maintains a resource lock for the +duration of the repair is *always* an offline algorithm. + +Secondary Metadata +`````````````````` + +Metadata structures in this category reflect records found in primary metadata, +but are only needed for online fsck or for reorganization of the filesystem. +Resource and lock acquisition for scrub code do not follow the same order as +regular filesystem accesses, and may involve full filesystem scans. + +Secondary metadata objects are difficult for scrub to process, because scrub +attaches to the secondary object but needs to check primary metadata, which +runs counter to the usual order of resource acquisition. +Check functions can be limited in scope to reduce runtime. +Repairs, however, require a full scan of primary metadata, which can take a +long time to complete. +Under these conditions, ``xfs_scrub`` cannot lock resources for the entire +duration of the repair. + +Instead, repair functions set up an in-memory staging structure to store +observations. +Depending on the requirements of the specific repair function, the staging +index can have the same format as the ondisk structure, or it can have a design +specific to that repair function. +The next step is to release all locks and start the filesystem scan. +When the repair scanner needs to record an observation, the staging data are +locked long enough to apply the update. +Simultaneously, the repair function hooks relevant parts of the filesystem to +apply updates to the staging data if the the update pertains to an object that +has already been scanned by the index builder. +Once the scan is done, the owning object is re-locked, the live data is used to +write a new ondisk structure, and the repairs are committed atomically. +The hooks are disabled and the staging staging area is freed. +Finally, the storage from the old data structure are carefully reaped. + +Introducing concurrency helps online repair avoid various locking problems, but +comes at a high cost to code complexity. +Live filesystem code has to be hooked so that the repair function can observe +updates in progress. +The staging area has to become a fully functional parallel structure so that +updates can be merged from the hooks. +Finally, the hook, the filesystem scan, and the inode locking model must be +sufficiently well integrated that a hook event can decide if a given update +should be applied to the staging structure. + +In theory, the scrub implementation could apply these same techniques for +primary metadata, but doing so would make it massively more complex and less +performant. +Programs attempting to access the damaged structures are not blocked from +operation, which may cause application failure or an unplanned filesystem +shutdown. + +Inspiration for the secondary metadata repair strategy was drawn from section +2.4 of Srinivasan above, and sections 2 ("NSF: Inded Build Without Side-File") +and 3.1.1 ("Duplicate Key Insert Problem") in C. Mohan, `"Algorithms for +Creating Indexes for Very Large Tables Without Quiescing Updates" +<https://dl.acm.org/doi/10.1145/130283.130337>`_, 1992. + +The sidecar index mentioned above bears some resemblance to the side file +method mentioned in Srinivasan and Mohan. +Their method consists of an index builder that extracts relevant record data to +build the new structure as quickly as possible; and an auxiliary structure that +captures all updates that would be committed to the index by other threads were +the new index already online. +After the index building scan finishes, the updates recorded in the side file +are applied to the new index. +To avoid conflicts between the index builder and other writer threads, the +builder maintains a publicly visible cursor that tracks the progress of the +scan through the record space. +To avoid duplication of work between the side file and the index builder, side +file updates are elided when the record ID for the update is greater than the +cursor position within the record ID space. + +To minimize changes to the rest of the codebase, XFS online repair keeps the +replacement index hidden until it's completely ready to go. +In other words, there is no attempt to expose the keyspace of the new index +while repair is running. +The complexity of such an approach would be very high and perhaps more +appropriate to building *new* indices. + +**Question**: Can the full scan and live update code used to facilitate a +repair also be used to implement a comprehensive check? + +*Answer*: Probably, though this has not been yet been studied. + +Summary Information +``````````````````` + +Metadata structures in this last category summarize the contents of primary +metadata records. +These are often used to speed up resource usage queries, and are many times +smaller than the primary metadata which they represent. +Check and repair both require full filesystem scans, but resource and lock +acquisition follow the same paths as regular filesystem accesses. + +The superblock summary counters have special requirements due to the underlying +implementation of the incore counters, and will be treated separately. +Check and repair of the other types of summary counters (quota resource counts +and file link counts) employ the same filesystem scanning and hooking +techniques as outlined above, but because the underlying data are sets of +integer counters, the staging data need not be a fully functional mirror of the +ondisk structure. + +Inspiration for quota and file link count repair strategies were drawn from +sections 2.12 ("Online Index Operations") through 2.14 ("Incremental View +Maintenace") of G. Graefe, `"Concurrent Queries and Updates in Summary Views +and Their Indexes" +<http://www.odbms.org/wp-content/uploads/2014/06/Increment-locks.pdf>`_, 2011. + +Since quotas are non-negative integer counts of resource usage, online +quotacheck can use the incremental view deltas described in section 2.14 to +track pending changes to the block and inode usage counts in each transaction, +and commit those changes to a dquot side file when the transaction commits. +Delta tracking is necessary for dquots because the index builder scans inodes, +whereas the data structure being rebuilt is an index of dquots. +Link count checking combines the view deltas and commit step into one because +it sets attributes of the objects being scanned instead of writing them to a +separate data structure. +Each online fsck function will be discussed as case studies later in this +document. + +Risk Management +--------------- + +During the development of online fsck, several risk factors were identified +that may make the feature unsuitable for certain distributors and users. +Steps can be taken to mitigate or eliminate those risks, though at a cost to +functionality. + +- **Decreased performance**: Adding metadata indices to the filesystem + increases the time cost of persisting changes to disk, and the reverse space + mapping and directory parent pointers are no exception. + System administrators who require the maximum performance can disable the + reverse mapping features at format time, though this choice dramatically + reduces the ability of online fsck to find inconsistencies and repair them. + +- **Incorrect repairs**: As with all software, there might be defects in the + software that result in incorrect repairs being written to the filesystem. + Systematic fuzz testing (detailed in the next section) is employed by the + authors to find bugs early, but it might not catch everything. + The kernel build system provides Kconfig options (``CONFIG_XFS_ONLINE_SCRUB`` + and ``CONFIG_XFS_ONLINE_REPAIR``) to enable distributors to choose not to + accept this risk. + The xfsprogs build system has a configure option (``--enable-scrub=no``) that + disables building of the ``xfs_scrub`` binary, though this is not a risk + mitigation if the kernel functionality remains enabled. + +- **Inability to repair**: Sometimes, a filesystem is too badly damaged to be + repairable. + If the keyspaces of several metadata indices overlap in some manner but a + coherent narrative cannot be formed from records collected, then the repair + fails. + To reduce the chance that a repair will fail with a dirty transaction and + render the filesystem unusable, the online repair functions have been + designed to stage and validate all new records before committing the new + structure. + +- **Misbehavior**: Online fsck requires many privileges -- raw IO to block + devices, opening files by handle, ignoring Unix discretionary access control, + and the ability to perform administrative changes. + Running this automatically in the background scares people, so the systemd + background service is configured to run with only the privileges required. + Obviously, this cannot address certain problems like the kernel crashing or + deadlocking, but it should be sufficient to prevent the scrub process from + escaping and reconfiguring the system. + The cron job does not have this protection. + +- **Fuzz Kiddiez**: There are many people now who seem to think that running + automated fuzz testing of ondisk artifacts to find mischevious behavior and + spraying exploit code onto the public mailing list for instant zero-day + disclosure is somehow of some social benefit. + In the view of this author, the benefit is realized only when the fuzz + operators help to **fix** the flaws, but this opinion apparently is not + widely shared among security "researchers". + The XFS maintainers' continuing ability to manage these events presents an + ongoing risk to the stability of the development process. + Automated testing should front-load some of the risk while the feature is + considered EXPERIMENTAL. + +Many of these risks are inherent to software programming. +Despite this, it is hoped that this new functionality will prove useful in +reducing unexpected downtime.
PATCH 3/14 xfs: document the testing plan for online fsck
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Start the third chapter of the online fsck design documentation. This covers the testing plan to make sure that both online and offline fsck can detect arbitrary problems and correct them without making things worse.
--- .../filesystems/xfs-online-fsck-design.rst | 187 ++++++++++++++++++++ 1 file changed, 187 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +187 -0
@@ -563,3 +563,190 @@ functionality. Many of these risks are inherent to software programming. Despite this, it is hoped that this new functionality will prove useful in reducing unexpected downtime. + +3. Testing Plan +=============== + +As stated before, fsck tools have three main goals: + +1. Detect inconsistencies in the metadata; + +2. Eliminate those inconsistencies; and + +3. Minimize further loss of data. + +Demonstrations of correct operation are necessary to build users' confidence +that the software behaves within expectations. +Unfortunately, it was not really feasible to perform regular exhaustive testing +of every aspect of a fsck tool until the introduction of low-cost virtual +machines with high-IOPS storage. +With ample hardware availability in mind, the testing strategy for the online +fsck project involves differential analysis against the existing fsck tools and +systematic testing of every attribute of every type of metadata object. +Testing can be split into four major categories, as discussed below. + +Integrated Testing with fstests +------------------------------- + +The primary goal of any free software QA effort is to make testing as +inexpensive and widespread as possible to maximize the scaling advantages of +community. +In other words, testing should maximize the breadth of filesystem configuration +scenarios and hardware setups. +This improves code quality by enabling the authors of online fsck to find and +fix bugs early, and helps developers of new features to find integration +issues earlier in their development effort. + +The Linux filesystem community shares a common QA testing suite, +`fstests <https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/>`_, for +functional and regression testing. +Even before development work began on online fsck, fstests (when run on XFS) +would run both the ``xfs_check`` and ``xfs_repair -n`` commands on the test and +scratch filesystems between each test. +This provides a level of assurance that the kernel and the fsck tools stay in +alignment about what constitutes consistent metadata. +During development of the online checking code, fstests was modified to run +``xfs_scrub -n`` between each test to ensure that the new checking code +produces the same results as the two existing fsck tools. + +To start development of online repair, fstests was modified to run +``xfs_repair`` to rebuild the filesystem's metadata indices between tests. +This ensures that offline repair does not crash, leave a corrupt filesystem +after it exists, or trigger complaints from the online check. +This also established a baseline for what can and cannot be repaired offline. +To complete the first phase of development of online repair, fstests was +modified to be able to run ``xfs_scrub`` in a "force rebuild" mode. +This enables a comparison of the effectiveness of online repair as compared to +the existing offline repair tools. + +General Fuzz Testing of Metadata Blocks +--------------------------------------- + +XFS benefits greatly from having a very robust debugging tool, ``xfs_db``. + +Before development of online fsck even began, a set of fstests were created +to test the rather common fault that entire metadata blocks get corrupted. +This required the creation of fstests library code that can create a filesystem +containing every possible type of metadata object. +Next, individual test cases were created to create a test filesystem, identify +a single block of a specific type of metadata object, trash it with the +existing ``blocktrash`` command in ``xfs_db``, and test the reaction of a +particular metadata validation strategy. + +This earlier test suite enabled XFS developers to test the ability of the +in-kernel validation functions and the ability of the offline fsck tool to +detect and eliminate the inconsistent metadata. +This part of the test suite was extended to cover online fsck in exactly the +same manner. + +In other words, for a given fstests filesystem configuration: + +* For each metadata object existing on the filesystem: + + * Write garbage to it + + * Test the reactions of: + + 1. The kernel verifiers to stop obviously bad metadata + 2. Offline repair (``xfs_repair``) to detect and fix + 3. Online repair (``xfs_scrub``) to detect and fix + +Targeted Fuzz Testing of Metadata Records +----------------------------------------- + +A quick conversation with the other XFS developers revealed that the existing +test infrastructure could be extended to provide a much more powerful +facility: targeted fuzz testing of every metadata field of every metadata +object in the filesystem. +``xfs_db`` can modify every field of every metadata structure in every +block in the filesystem to simulate the effects of memory corruption and +software bugs. +Given that fstests already contains the ability to create a filesystem +containing every metadata format known to the filesystem, ``xfs_db`` can be +used to perform exhaustive fuzz testing! + +For a given fstests filesystem configuration: + +* For each metadata object existing on the filesystem... + + * For each record inside that metadata object... + + * For each field inside that record... + + * For each conceivable type of transformation that can be applied to a bit field... + + 1. Clear all bits + 2. Set all bits + 3. Toggle the most significant bit + 4. Toggle the middle bit + 5. Toggle the least significant bit + 6. Add a small quantity + 7. Subtract a small quantity + 8. Randomize the contents + + * ...test the reactions of: + + 1. The kernel verifiers to stop obviously bad metadata + 2. Offline checking (``xfs_repair -n``) + 3. Offline repair (``xfs_repair``) + 4. Online checking (``xfs_scrub -n``) + 5. Online repair (``xfs_scrub``) + 6. Both repair tools (``xfs_scrub`` and then ``xfs_repair`` if online repair doesn't succeed) + +This is quite the combinatoric explosion! + +Fortunately, having this much test coverage makes it easy for XFS developers to +check the responses of XFS' fsck tools. +Since the introduction of the fuzz testing framework, these tests have been +used to discover incorrect repair code and missing functionality for entire +classes of metadata objects in ``xfs_repair``. +The enhanced testing was used to finalize the deprecation of ``xfs_check`` by +confirming that ``xfs_repair`` could detect at least as many corruptions as +the older tool. + +These tests have been very valuable for ``xfs_scrub`` in the same ways -- they +allow the online fsck developers to compare online fsck against offline fsck, +and they enable XFS developers to find deficiencies in the code base. + +Proposed patchsets include +`general fuzzer improvements +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=fuzzer-improvements>`_, +`fuzzing baselines +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=fuzz-baseline>`_, +and `improvements in fuzz testing comprehensiveness +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=more-fuzz-testing>`_. + +Stress Testing +-------------- + +A unique requirement to online fsck is the ability to operate on a filesystem +concurrently with regular workloads. +Although it is of course impossible to run ``xfs_scrub`` with *zero* observable +impact on the running system, the online repair code should never introduce +inconsistencies into the filesystem metadata, and regular workloads should +never notice resource starvation. +To verify that these conditions are being met, fstests has been enhanced in +the following ways: + +* For each scrub item type, create a test to exercise checking that item type + while running ``fsstress``. +* For each scrub item type, create a test to exercise repairing that item type + while running ``fsstress``. +* Race ``fsstress`` and ``xfs_scrub -n`` to ensure that checking the whole + filesystem doesn't cause problems. +* Race ``fsstress`` and ``xfs_scrub`` in force-rebuild mode to ensure that + force-repairing the whole filesystem doesn't cause problems. +* Race ``xfs_scrub`` in check and force-repair mode against ``fsstress`` while + freezing and thawing the filesystem. +* Race ``xfs_scrub`` in check and force-repair mode against ``fsstress`` while + remounting the filesystem read-only and read-write. +* The same, but running ``fsx`` instead of ``fsstress``. (Not done yet?) + +Success is defined by the ability to run all of these tests without observing +any unexpected filesystem shutdowns due to corrupted metadata, kernel hang +check warnings, or any other sort of mischief. + +Proposed patchsets include `general stress testing +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=race-scrub-and-mount-state-changes>`_ +and the `evolution of existing per-function stress testing +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=refactor-scrub-stress>`_.
PATCH 4/14 xfs: document the user interface for online fsck
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Start the fourth chapter of the online fsck design documentation, which discusses the user interface and the background scrubbing service.
--- .../filesystems/xfs-online-fsck-design.rst | 114 ++++++++++++++++++++ 1 file changed, 114 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +114 -0
@@ -750,3 +750,117 @@ Proposed patchsets include `general stress testing <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=race-scrub-and-mount-state-changes>`_ and the `evolution of existing per-function stress testing <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfstests-dev.git/log/?h=refactor-scrub-stress>`_. + +4. User Interface +================= + +The primary user of online fsck is the system administrator, just like offline +repair. +Online fsck presents two modes of operation to administrators: +A foreground CLI process for online fsck on demand, and a background service +that performs autonomous checking and repair. + +Checking on Demand +------------------ + +For administrators who want the absolute freshest information about the +metadata in a filesystem, ``xfs_scrub`` can be run as a foreground process on +a command line. +The program checks every piece of metadata in the filesystem while the +administrator waits for the results to be reported, just like the existing +``xfs_repair`` tool. +Both tools share a ``-n`` option to perform a read-only scan, and a ``-v`` +option to increase the verbosity of the information reported. + +A new feature of ``xfs_scrub`` is the ``-x`` option, which employs the error +correction capabilities of the hardware to check data file contents. +The media scan is not enabled by default because it may dramatically increase +program runtime and consume a lot of bandwidth on older storage hardware. + +The output of a foreground invocation is captured in the system log. + +The ``xfs_scrub_all`` program walks the list of mounted filesystems and +initiates ``xfs_scrub`` for each of them in parallel. +It serializes scans for any filesystems that resolve to the same top level +kernel block device to prevent resource overconsumption. + +Background Service +------------------ + +To reduce the workload of system administrators, the ``xfs_scrub`` package +provides a suite of `systemd <https://systemd.io/>`_ timers and services that +run online fsck automatically on weekends. +The background service configures scrub to run with as little privilege as +possible, the lowest CPU and IO priority, and in a CPU-constrained single +threaded mode. +It is hoped that this minimizes the amount of load generated on the system and +avoids starving regular workloads. + +The output of the background service is also captured in the system log. +If desired, reports of failures (either due to inconsistencies or mere runtime +errors) can be emailed automatically by setting the ``EMAIL_ADDR`` environment +variable in the following service files: + +* ``[email protected]`` +* ``[email protected]`` +* ``xfs_scrub_all_fail.service`` + +The decision to enable the background scan is left to the system administrator. +This can be done by enabling either of the following services: + +* ``xfs_scrub_all.timer`` on systemd systems +* ``xfs_scrub_all.cron`` on non-systemd systems + +This automatic weekly scan is configured out of the box to perform an +additional media scan of all file data once per month. +This is less foolproof than, say, storing file data block checksums, but much +more performant if application software provides its own integrity checking, +redundancy can be provided elsewhere above the filesystem, or the storage +device's integrity guarantees are deemed sufficient. + +The systemd unit file definitions have been subjected to a security audit +(as of systemd 249) to ensure that the xfs_scrub processes have as little +access to the rest of the system as possible. +This was performed via ``systemd-analyze security``, after which privileges +were restricted to the minimum required, sandboxing was set up to the maximal +extent possible with sandboxing and system call filtering; and access to the +filesystem tree was restricted to the minimum needed to start the program and +access the filesystem being scanned. +The service definition files restrict CPU usage to 80% of one CPU core, and +apply as nice of a priority to IO and CPU scheduling as possible. +This measure was taken to minimize delays in the rest of the filesystem. +No such hardening has been performed for the cron job. + +Proposed patchset: +`Enabling the xfs_scrub background service +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-media-scan-service>`_. + +Health Reporting +---------------- + +XFS caches a summary of each filesystem's health status in memory. +The information is updated whenever ``xfs_scrub`` is run, or whenever +inconsistencies are detected in the filesystem metadata during regular +operations. +System administrators should use the ``health`` command of ``xfs_spaceman`` to +download this information into a human-readable format. +If problems have been observed, the administrator can schedule a reduced +service window to run the online repair tool to correct the problem. +Failing that, the administrator can decide to schedule a maintenance window to +run the traditional offline repair tool to correct the problem. + +**Question**: Should the health reporting integrate with the new inotify fs +error notification system? + +**Question**: Would it be helpful for sysadmins to have a daemon to listen for +corruption notifications and initiate a repair? + +*Answer*: These questions remain unanswered, but should be a part of the +conversation with early adopters and potential downstream users of XFS. + +Proposed patchsets include +`wiring up health reports to correction returns +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=corruption-health-reports>`_ +and +`preservation of sickness info during memory reclaim +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=indirect-health-reporting>`_.
PATCH 5/14 xfs: document the filesystem metadata checking strategy
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Begin the fifth chapter of the online fsck design documentation, where we discuss the details of the data structures and algorithms used by the kernel to examine filesystem metadata and cross-reference it around the filesystem.
--- .../filesystems/xfs-online-fsck-design.rst | 579 ++++++++++++++++++++ .../filesystems/xfs-self-describing-metadata.rst | 1 2 files changed, 580 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +579 -0
@@ -864,3 +864,582 @@ Proposed patchsets include and `preservation of sickness info during memory reclaim <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=indirect-health-reporting>`_. + +5. Kernel Algorithms and Data Structures +======================================== + +This section discusses the key algorithms and data structures of the kernel +code that provide the ability to check and repair metadata while the system +is running. +The first chapters in this section reveal the pieces that provide the +foundation for checking metadata. +The remainder of this section presents the mechanisms through which XFS +regenerates itself. + +Self Describing Metadata +------------------------ + +Starting with XFS version 5 in 2012, XFS updated the format of nearly every +ondisk block header to record a magic number, a checksum, a universally +"unique" identifier (UUID), an owner code, the ondisk address of the block, +and a log sequence number. +When loading a block buffer from disk, the magic number, UUID, owner, and +ondisk address confirm that the retrieved block matches the specific owner of +the current filesystem, and that the information contained in the block is +supposed to be found at the ondisk address. +The first three components enable checking tools to disregard alleged metadata +that doesn't belong to the filesystem, and the fourth component enables the +filesystem to detect lost writes. + +The logging code maintains the checksum and the log sequence number of the last +transactional update. +Checksums are useful for detecting torn writes and other mischief between the +computer and its storage devices. +Sequence number tracking enables log recovery to avoid applying out of date +log updates to the filesystem. + +These two features improve overall runtime resiliency by providing a means for +the filesystem to detect obvious corruption when reading metadata blocks from +disk, but these buffer verifiers cannot provide any consistency checking +between metadata structures. + +For more information, please see the documentation for +Documentation/filesystems/xfs-self-describing-metadata.rst + +Reverse Mapping +--------------- + +The original design of XFS (circa 1993) is an improvement upon 1980s Unix +filesystem design. +In those days, storage density was expensive, CPU time was scarce, and +excessive seek time could kill performance. +For performance reasons, filesystem authors were reluctant to add redundancy to +the filesystem, even at the cost of data integrity. +Filesystems designers in the early 21st century choose different strategies to +increase internal redundancy -- either storing nearly identical copies of +metadata, or more space-efficient techniques such as erasure coding. +Obvious corruptions are typically repaired by copying replicas or +reconstructing from codes. + +For XFS, a different redundancy strategy was chosen to modernize the design: +a secondary space usage index that maps allocated disk extents back to their +owners. +By adding a new index, the filesystem retains most of its ability to scale +well to heavily threaded workloads involving large datasets, since the primary +file metadata (the directory tree, the file block map, and the allocation +groups) remain unchanged. +Although the reverse-mapping feature increases overhead costs for space +mapping activities just like any other system that improves redundancy, it +has two critical advantages: first, the reverse index is key to enabling online +fsck and other requested functionality such as filesystem reorganization, +better media failure reporting, and shrinking. +Second, the different ondisk storage format of the reverse mapping btree +defeats device-level deduplication, because the filesystem requires real +redundancy. + +A criticism of adding the secondary index is that it does nothing to improve +the robustness of user data storage itself. +This is a valid point, but adding a new index for file data block checksums +increases write amplification and turns data overwrites into copy-writes, which +age the filesystem prematurely. +In keeping with thirty years of precedent, users who want file data integrity +can supply as powerful a solution as they require. +As for metadata, the complexity of adding a new secondary index of space usage +is much less than adding volume management and storage device mirroring to XFS +itself. +Perfection of RAID and volume management are best left to existing layers in +the kernel. + +The information captured in a reverse space mapping record is as follows: + +.. code-block:: c + + struct xfs_rmap_irec { + xfs_agblock_t rm_startblock; /* extent start block */ + xfs_extlen_t rm_blockcount; /* extent length */ + uint64_t rm_owner; /* extent owner */ + uint64_t rm_offset; /* offset within the owner */ + unsigned int rm_flags; /* state flags */ + }; + +The first two fields capture the location and size of the physical space, +in units of filesystem blocks. +The owner field tells scrub which metadata structure or file inode have been +assigned this space. +For space allocated to files, the offset field tells scrub where the space was +mapped within the file fork. +Finally, the flags field provides extra information about the space usage -- +is this an attribute fork extent? A file mapping btree extent? Or an +unwritten data extent? + +Online filesystem checking judges the consistency of each primary metadata +record by comparing its information against all other space indices. +The reverse mapping index plays a key role in the consistency checking process +because it contains a centralized alternate copy of all space allocation +information. +Program runtime and ease of resource acquisition are the only real limits to +what online checking can consult. +For example, a file data extent mapping can be checked against: + +* The absence of an entry in the free space information. +* The absence of an entry in the inode index. +* The absence of an entry in the reference count data if the file is not + marked as having shared extents. +* The correspondence of an entry in the reverse mapping information. + +A key observation here is that only the reverse mapping can provide a positive +affirmation of correctness if the primary metadata is in doubt. +The checking code for most primary metadata follows a path similar to the +one outlined above. + +A second observation to make about this secondary index is that proving its +consistency with the primary metadata is difficult. +Demonstrating that a given reverse mapping record exactly corresponds to the +primary space metadata involves a full scan of all primary space metadata, +which is very time intensive. +Scanning activity for online fsck can only use non-blocking lock acquisition +primitives if the locking order is not the regular order as used by the rest of +the filesystem. +This means that forward progress during this part of a scan of the reverse +mapping data cannot be guaranteed if system load is especially heavy. +Therefore, it is not practical for online check to detect reverse mapping +records that lack a counterpart in the primary metadata. +Instead, scrub relies on rigorous cross-referencing during the primary space +mapping structure checks. + +Reverse mappings also play a key role in reconstruction of primary metadata. +The secondary information is general enough for online repair to synthesize a +complete copy of any primary space management metadata by locking that +resource, querying all reverse mapping indices looking for records matching +the relevant resource, and transforming the mapping into an appropriate format. +The details of how these records are staged, written to disk, and committed +into the filesystem are covered in subsequent sections. + +Checking and Cross-Referencing +------------------------------ + +The first step of checking a metadata structure is to examine every record +contained within the structure and its relationship with the rest of the +system. +XFS contains multiple layers of checking to try to prevent inconsistent +metadata from wreaking havoc on the system. +Each of these layers contributes information that helps the kernel to make +three decisions about the health of a metadata structure: + +- Is a part of this structure obviously corrupt (``XFS_SCRUB_OFLAG_CORRUPT``) ? +- Is this structure inconsistent with the rest of the system + (``XFS_SCRUB_OFLAG_XCORRUPT``) ? +- Is there so much damage around the filesystem that cross-referencing is not + possible (``XFS_SCRUB_OFLAG_XFAIL``) ? +- Can the structure be optimized to improve performance or reduce the size of + metadata (``XFS_SCRUB_OFLAG_PREEN``) ? +- Does the structure contain data that is not inconsistent but deserves review + by the system administrator (``XFS_SCRUB_OFLAG_WARNING``) ? + +The following sections describe how the metadata scrubbing process works. + +Metadata Buffer Verification +```````````````````````````` + +The lowest layer of metadata protection in XFS are the metadata verifiers built +into the buffer cache. +These functions perform inexpensive internal consistency checking of the block +itself, and answer these questions: + +- Does the block belong to this filesystem? + +- Does the block belong to the structure that asked for the read? + This assumes that metadata blocks only have one owner, which is always true + in XFS. + +- Is the type of data stored in the block within a reasonable range of what + scrub is expecting? + +- Does the physical location of the block match the location it was read from? + +- Does the block checksum match the data? + +The scope of the protections here are very limited -- verifiers can only +establish that the filesystem code is reasonably free of gross corruption bugs +and that the storage system is reasonably competent at retrieval. +Corruption problems observed at runtime cause the generation of health reports, +failed system calls, and in the extreme case, filesystem shutdowns if the +corrupt metadata force the cancellation of a dirty transaction. + +Every online fsck scrubbing function is expected to read every ondisk metadata +block of a structure in the course of checking the structure. +Corruption problems observed during a check are immediately reported to +userspace as corruption; during a cross-reference, they are reported as a +failure to cross-reference once the full examination is complete. +Reads satisfied by a buffer already in cache (and hence already verified) +bypass these checks. + +Internal Consistency Checks +``````````````````````````` + +The next higher level of metadata protection is the internal record +verification code built into the filesystem. +These checks are split between the buffer verifiers, the in-filesystem users of +the buffer cache, and the scrub code itself, depending on the amount of higher +level context required. +The scope of checking is still internal to the block. +For performance reasons, regular code may skip some of these checks unless +debugging is enabled or a write is about to occur. +Scrub functions, of course, must check all possible problems. +Either way, these higher level checking functions answer these questions: + +- Does the type of data stored in the block match what scrub is expecting? + +- Does the block belong to the owning structure that asked for the read? + +- If the block contains records, do the records fit within the block? + +- If the block tracks internal free space information, is it consistent with + the record areas? + +- Are the records contained inside the block free of obvious corruptions? + +Record checks in this category are more rigorous and more time-intensive. +For example, block pointers and inumbers are checked to ensure that they point +within the dynamically allocated parts of an allocation group and within +the filesystem. +Names are checked for invalid characters, and flags are checked for invalid +combinations. +Other record attributes are checked for sensible values. +Btree records spanning an interval of the btree keyspace are checked for +correct order and lack of mergeability (except for file fork mappings). + +Validation of Userspace-Controlled Record Attributes +```````````````````````````````````````````````````` + +Various pieces of filesystem metadata are directly controlled by userspace. +Because of this nature, validation work cannot be more precise than checking +that a value is within the possible range. +These fields include: + +- Superblock fields controlled by mount options +- Filesystem labels +- File timestamps +- File permissions +- File size +- File flags +- Names present in directory entries, extended attribute keys, and filesystem + labels +- Extended attribute key namespaces +- Extended attribute values +- File data block contents +- Quota limits +- Quota timer expiration (if resource usage exceeds the soft limit) + +Cross-Referencing Space Metadata +```````````````````````````````` + +The next higher level of checking is cross-referencing records between metadata +structures. +For regular runtime code, the cost of these checks is considered to be +prohibitively expensive, but as scrub is dedicated to rooting out +inconsistencies, it must pursue all avenues of inquiry. +The exact set of cross-referencing is highly dependent on the context of the +data structure being checked. + +The XFS btree code has keyspace scanning functions that online fsck uses to +cross reference one structure with another. +Specifically, scrub can scan the key space of an index to determine if that +keyspace is fully, sparsely, or not at all mapped to records. +For the reverse mapping btree, it is possible to mask parts of the key for the +purposes of performing a keyspace scan so that scrub can decide if the rmap +btree contains records mapping a certain extent of physical space without the +sparsenses of the rest of the rmap keyspace getting in the way. + +Btree blocks undergo the following checks before cross-referencing: + +- Does the type of data stored in the block match what scrub is expecting? + +- Does the block belong to the owning structure that asked for the read? + +- Do the records fit within the block? + +- Are the records contained inside the block free of obvious corruptions? + +- Are the name hashes in the correct order? + +- Do node pointers within the btree point to valid block addresses for the type + of btree? + +- Do child pointers point towards the leaves? + +- Do sibling pointers point across the same level? + +- For each node block record, does the record key accurate reflect the contents + of the child block? + +Space allocation records are cross-referenced as follows: + +1. Any space mentioned by any metadata structure are cross-referenced as + follows: + + - Does the reverse mapping index list only the appropriate owner as the + owner of each block? + + - Are none of the blocks claimed as free space? + + - If these aren't file data blocks, are none of the blocks claimed as space + shared by different owners? + +2. Btree blocks are cross-referenced as follows: + + - Everything in class 1 above. + + - If there's a parent node block, do the keys listed for this block match the + keyspace of this block? + + - Do the sibling pointers point to valid blocks? Of the same level? + + - Do the child pointers point to valid blocks? Of the next level down? + +3. Free space btree records are cross-referenced as follows: + + - Everything in class 1 and 2 above. + + - Does the reverse mapping index list no owners of this space? + + - Is this space not claimed by the inode index for inodes? + + - Is it not mentioned by the reference count index? + + - Is there a matching record in the other free space btree? + +4. Inode btree records are cross-referenced as follows: + + - Everything in class 1 and 2 above. + + - Is there a matching record in free inode btree? + + - Do cleared bits in the holemask correspond with inode clusters? + + - Do set bits in the freemask correspond with inode records with zero link + count? + +5. Inode records are cross-referenced as follows: + + - Everything in class 1. + + - Do all the fields that summarize information about the file forks actually + match those forks? + + - Does each inode with zero link count correspond to a record in the free + inode btree? + +6. File fork space mapping records are cross-referenced as follows: + + - Everything in class 1 and 2 above. + + - Is this space not mentioned by the inode btrees? + + - If this is a CoW fork mapping, does it correspond to a CoW entry in the + reference count btree? + +7. Reference count records are cross-referenced as follows: + + - Everything in class 1 and 2 above. + + - Within the space subkeyspace of the rmap btree (that is to say, all + records mapped to a particular space extent and ignoring the owner info), + are there the same number of reverse mapping records for each block as the + reference count record claims? + +Proposed patchsets are the series to find gaps in +`refcount btree +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-refcount-gaps>`_, +`inode btree +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-inobt-gaps>`_, and +`rmap btree +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-rmapbt-gaps>`_ records; +to find +`mergeable records +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-detect-mergeable-records>`_; +and to +`improve cross referencing with rmap +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-strengthen-rmap-checking>`_ +before starting a repair. + +Checking Extended Attributes +```````````````````````````` + +Extended attributes implement a key-value store that enable fragments of data +to be attached to any file. +Both the kernel and userspace can access the keys and values, subject to +namespace and privilege restrictions. +Most typically these fragments are metadata about the file -- origins, security +contexts, user-supplied labels, indexing information, etc. + +Names can be as long as 255 bytes and can exist in several different +namespaces. +Values can be as large as 64KB. +A file's extended attributes are stored in blocks mapped by the attr fork. +The mappings point to leaf blocks, remote value blocks, or dabtree blocks. +Block 0 in the attribute fork is always the top of the structure, but otherwise +each of the three types of blocks can be found at any offset in the attr fork. +Leaf blocks contain attribute key records that point to the name and the value. +Names are always stored elsewhere in the same leaf block. +Values that are less than 3/4 the size of a filesystem block are also stored +elsewhere in the same leaf block. +Remote value blocks contain values that are too large to fit inside a leaf. +If the leaf information exceeds a single filesystem block, a dabtree (also +rooted at block 0) is created to map hashes of the attribute names to leaf +blocks in the attr fork. + +Checking an extended attribute structure is not so straightfoward due to the +lack of separation between attr blocks and index blocks. +Scrub must read each block mapped by the attr fork and ignore the non-leaf +blocks: + +1. Walk the dabtree in the attr fork (if present) to ensure that there are no + irregularities in the blocks or dabtree mappings that do not point to + attr leaf blocks. + +2. Walk the blocks of the attr fork looking for leaf blocks. + For each entry inside a leaf: + + a. Validate that the name does not contain invalid characters. + + b. Read the attr value. + This performs a named lookup of the attr name to ensure the correctness + of the dabtree. + If the value is stored in a remote block, this also validates the + integrity of the remote value block. + +Checking and Cross-Referencing Directories +`````````````````````````````````````````` + +The filesystem directory tree is a directed acylic graph structure, with files +constituting the nodes, and directory entries (dirents) constituting the edges. +Directories are a special type of file containing a set of mappings from a +255-byte sequence (name) to an inumber. +These are called directory entries, or dirents for short. +Each directory file must have exactly one directory pointing to the file. +A root directory points to itself. +Directory entries point to files of any type. +Each non-directory file may have multiple directories point to it. + +In XFS, directories are implemented as a file containing up to three 32GB +partitions. +The first partition contains directory entry data blocks. +Each data block contains variable-sized records associating a user-provided +name with an inumber and, optionally, a file type. +If the directory entry data grows beyond one block, the second partition (which +exists as post-EOF extents) is populated with a block containing free space +information and an index that maps hashes of the dirent names to directory data +blocks in the first partition. +This makes directory name lookups very fast. +If this second partition grows beyond one block, the third partition is +populated with a linear array of free space information for faster +expansions. +If the free space has been separated and the second partition grows again +beyond one block, then a dabtree is used to map hashes of dirent names to +directory data blocks. + +Checking a directory is pretty straightfoward: + +1. Walk the dabtree in the second partition (if present) to ensure that there + are no irregularities in the blocks or dabtree mappings that do not point to + dirent blocks. + +2. Walk the blocks of the first partition looking for directory entries. + Each dirent is checked as follows: + + a. Does the name contain no invalid characters? + + b. Does the inumber correspond to an actual, allocated inode? + + c. Does the child inode have a nonzero link count? + + d. If a file type is included in the dirent, does it match the type of the + inode? + + e. If the child is a subdirectory, does the child's dotdot pointer point + back to the parent? + + f. If the directory has a second partition, perform a named lookup of the + dirent name to ensure the correctness of the dabtree. + +3. Walk the free space list in the third partition (if present) to ensure that + the free spaces it describes are really unused. + +Checking operations involving :ref:`parents <dirparent>` and +:ref:`file link counts <nlinks>` are discussed in more detail in later +sections. + +Checking Directory/Attribute Btrees +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +As stated in previous sections, the directory/attribute btree (dabtree) index +maps user-provided names to improve lookup times by avoiding linear scans. +Internally, it maps a 32-bit hash of the name to a block offset within the +appropriate file fork. + +The internal structure of a dabtree closely resembles the btrees that record +fixed-size metadata records -- each dabtree block contains a magic number, a +checksum, sibling pointers, a UUID, a tree level, and a log sequence number. +The format of leaf and node records are the same -- each entry points to the +next level down in the hierarchy, with dabtree node records pointing to dabtree +leaf blocks, and dabtree leaf records pointing to non-dabtree blocks elsewhere +in the fork. + +Checking and cross-referencing the dabtree is very similar to what is done for +space btrees: + +- Does the type of data stored in the block match what scrub is expecting? + +- Does the block belong to the owning structure that asked for the read? + +- Do the records fit within the block? + +- Are the records contained inside the block free of obvious corruptions? + +- Are the name hashes in the correct order? + +- Do node pointers within the dabtree point to valid fork offsets for dabtree + blocks? + +- Do leaf pointers within the dabtree point to valid fork offsets for directory + or attr leaf blocks? + +- Do child pointers point towards the leaves? + +- Do sibling pointers point across the same level? + +- For each dabtree node record, does the record key accurate reflect the + contents of the child dabtree block? + +- For each dabtree leaf record, does the record key accurate reflect the + contents of the directory or attr block? + +Cross-Referencing Summary Counters +`````````````````````````````````` + +XFS maintains three classes of summary counters: available resources, quota +resource usage, and file link counts. + +In theory, the amount of available resources (data blocks, inodes, realtime +extents) can be found by walking the entire filesystem. +This would make for very slow reporting, so a transactional filesystem can +maintain summaries of this information in the superblock. +Cross-referencing these values against the filesystem metadata should be a +simple matter of walking the free space and inode metadata in each AG and the +realtime bitmap, but there are complications that will be discussed in +:ref:`more detail <fscounters>` later. + +:ref:`Quota usage <quotacheck>` and :ref:`file link count <nlinks>` +checking are sufficiently complicated to warrant separate sections. + +Post-Repair Reverification +`````````````````````````` + +After performing a repair, the checking code is run a second time to validate +the new structure, and the results of the health assessment are recorded +internally and returned to the calling process. +This step is critical for enabling system administrator to monitor the status +of the filesystem and the progress of any repairs. +For developers, it is a useful means to judge the efficacy of error detection +and correction in the online and offline checking tools.
Documentation/filesystems/xfs-self-describing-metadata.rst +1 -0
@@ -1,4 +1,5 @@ .. SPDX-License-Identifier: GPL-2.0 +.. _xfs_self_describing_metadata: ============================ XFS Self Describing Metadata
PATCH 6/14 xfs: document how online fsck deals with eventual consistency
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Writes to an XFS filesystem employ an eventual consistency update model to break up complex multistep metadata updates into small chained transactions. This is generally good for performance and scalability because XFS doesn't need to prepare for enormous transactions, but it also means that online fsck must be careful not to attempt a fsck action unless it can be shown that there are no other threads processing a transaction chain. This part of the design documentation covers the thinking behind the consistency model and how scrub deals with it.
--- .../filesystems/xfs-online-fsck-design.rst | 303 ++++++++++++++++++++ 1 file changed, 303 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +303 -0
@@ -1443,3 +1443,306 @@ This step is critical for enabling system administrator to monitor the status of the filesystem and the progress of any repairs. For developers, it is a useful means to judge the efficacy of error detection and correction in the online and offline checking tools. + +Eventual Consistency vs. Online Fsck +------------------------------------ + +Midway through the development of online scrubbing, the fsstress tests +uncovered a misinteraction between online fsck and compound transaction chains +created by other writer threads that resulted in false reports of metadata +inconsistency. +The root cause of these reports is the eventual consistency model introduced by +the expansion of deferred work items and compound transaction chains when +reverse mapping and reflink were introduced. + +Originally, transaction chains were added to XFS to avoid deadlocks when +unmapping space from files. +Deadlock avoidance rules require that AGs only be locked in increasing order, +which makes it impossible (say) to use a single transaction to free a space +extent in AG 7 and then try to free a now superfluous block mapping btree block +in AG 3. +To avoid these kinds of deadlocks, XFS creates Extent Freeing Intent (EFI) log +items to commit to freeing some space in one transaction while deferring the +actual metadata updates to a fresh transaction. +The transaction sequence looks like this: + +1. The first transaction contains a physical update to the file's block mapping + structures to remove the mapping from the btree blocks. + It then attaches to the in-memory transaction an action item to schedule + deferred freeing of space. + Concretely, each transaction maintains a list of ``struct + xfs_defer_pending`` objects, each of which maintains a list of ``struct + xfs_extent_free_item`` objects. + Returning to the example above, the action item tracks the freeing of both + the unmapped space from AG 7 and the block mapping btree (BMBT) block from + AG 3. + Deferred frees recorded in this manner are committed in the log by creating + an EFI log item from the ``struct xfs_extent_free_item`` object and + attaching the log item to the transaction. + When the log is persisted to disk, the EFI item is written into the ondisk + transaction record. + EFIs can list up to 16 extents to free, all sorted in AG order. + +2. The second transaction contains a physical update to the free space btrees + of AG 3 to release the former BMBT block and a second physical update to the + free space btrees of AG 7 to release the unmapped file space. + Observe that the the physical updates are resequenced in the correct order + when possible. + Attached to the transaction is a an extent free done (EFD) log item. + The EFD contains a pointer to the EFI logged in transaction #1 so that log + recovery can tell if the EFI needs to be replayed. + +If the system goes down after transaction #1 is written back to the filesystem +but before #2 is committed, a scan of the filesystem metadata would show +inconsistent filesystem metadata because there would not appear to be any owner +of the unmapped space. +Happily, log recovery corrects this inconsistency for us -- when recovery finds +an intent log item but does not find a corresponding intent done item, it will +reconstruct the incore state of the intent item and finish it. +In the example above, the log must replay both frees described in the recovered +EFI to complete the recovery phase. + +There are two subtleties to XFS' transaction chaining strategy to consider. +The first is that log items must be added to a transaction in the correct order +to prevent conflicts with principal objects that are not held by the +transaction. +In other words, all per-AG metadata updates for an unmapped block must be +completed before the last update to free the extent, and extents should not +be reallocated until that last update commits to the log. +The second subtlety comes from the fact that AG header buffers are (usually) +released between each transaction in a chain. +This means that other threads can observe an AG in an intermediate state, +but as long as the first subtlety is handled, this should not affect the +correctness of filesystem operations. +Unmounting the filesystem flushes all pending work to disk, which means that +offline fsck never sees the temporary inconsistencies caused by deferred work +item processing. +In this manner, XFS employs a form of eventual consistency to avoid deadlocks +and increase parallelism. + +During the design phase of the reverse mapping and reflink features, it was +decided that it was impractical to cram all the reverse mapping updates for a +single filesystem change into a single transaction because a single file +mapping operation can explode into many small updates: + +* The block mapping update itself +* A reverse mapping update for the block mapping update +* Fixing the freelist +* A reverse mapping update for the freelist fix + +* A shape change to the block mapping btree +* A reverse mapping update for the btree update +* Fixing the freelist (again) +* A reverse mapping update for the freelist fix + +* An update to the reference counting information +* A reverse mapping update for the refcount update +* Fixing the freelist (a third time) +* A reverse mapping update for the freelist fix + +* Freeing any space that was unmapped and not owned by any other file +* Fixing the freelist (a fourth time) +* A reverse mapping update for the freelist fix + +* Freeing the space used by the block mapping btree +* Fixing the freelist (a fifth time) +* A reverse mapping update for the freelist fix + +Free list fixups are not usually needed more than once per AG per transaction +chain, but it is theoretically possible if space is very tight. +For copy-on-write updates this is even worse, because this must be done once to +remove the space from a staging area and again to map it into the file! + +To deal with this explosion in a calm manner, XFS expands its use of deferred +work items to cover most reverse mapping updates and all refcount updates. +This reduces the worst case size of transaction reservations by breaking the +work into a long chain of small updates, which increases the degree of eventual +consistency in the system. +Again, this generally isn't a problem because XFS orders its deferred work +items carefully to avoid resource reuse conflicts between unsuspecting threads. + +However, online fsck changes the rules -- remember that although physical +updates to per-AG structures are coordinated by locking the buffers for AG +headers, buffer locks are dropped between transactions. +Once scrub acquires resources and takes locks for a data structure, it must do +all the validation work without releasing the lock. +If the main lock for a space btree is an AG header buffer lock, scrub may have +interrupted another thread that is midway through finishing a chain. +For example, if a thread performing a copy-on-write has completed a reverse +mapping update but not the corresponding refcount update, the two AG btrees +will appear inconsistent to scrub and an observation of corruption will be +recorded. This observation will not be correct. +If a repair is attempted in this state, the results will be catastrophic! + +Several solutions to this problem were evaluated upon discovery of this flaw: + +1. Add a higher level lock to allocation groups and require writer threads to + acquire the higher level lock in AG order before making any changes. + This would be very difficult to implement in practice because it is + difficult to determine which locks need to be obtained, and in what order, + without simulating the entire operation. + Performing a dry run of a file operation to discover necessary locks would + make the filesystem very slow. + +2. Make the deferred work coordinator code aware of consecutive intent items + targeting the same AG and have it hold the AG header buffers locked across + the transaction roll between updates. + This would introduce a lot of complexity into the coordinator since it is + only loosely coupled with the actual deferred work items. + It would also fail to solve the problem because deferred work items can + generate new deferred subtasks, but all subtasks must be complete before + work can start on a new sibling task. + +3. Teach online fsck to walk all transactions waiting for whichever lock(s) + protect the data structure being scrubbed to look for pending operations. + The checking and repair operations must factor these pending operations into + the evaluations being performed. + This solution is a nonstarter because it is *extremely* invasive to the main + filesystem. + +4. Recognize that only online fsck has this requirement of total consistency + of AG metadata, and that online fsck should be relatively rare as compared + to filesystem change operations. + For each AG, maintain a count of intent items targetting that AG. + When online fsck wants to examine an AG, it should lock the AG header + buffers to quiesce all transaction chains that want to modify that AG, and + only proceed with the scrub if the count is zero. + In other words, scrub only proceeds if it can lock the AG header buffers and + there can't possibly be any intents in progress. + This may lead to fairness and starvation issues, but regular filesystem + updates take precedence over online fsck activity. + +Intent Drains +````````````` + +The fourth solution is implemented in the current iteration of online fsck, +with atomic_t providing the active intent counter. + +There are two key properties to the drain mechanism. +First, the counter is incremented when a deferred work item is *queued* to a +transaction, and it is decremented after the associated intent done log item is +*committed* to another transaction. +The second property is that deferred work can be added to a transaction without +holding an AG header lock, but per-AG work items cannot be marked done without +locking that AG header buffer to log the physical updates and the intent done +log item. +The first property enables scrub to yield to running transaction chains, which +is an explicit deprioritization of online fsck to benefit file operations. +The second property of the drain is key to the correct coordination of scrub, +since scrub will always be able to decide if a conflict is possible. + +For regular filesystem code, the drain works as follows: + +1. Call the appropriate subsystem function to add a deferred work item to a + transaction. + +2. The function calls ``xfs_drain_bump`` to increase the counter. + +3. When the deferred item manager wants to finish the deferred work item, it + calls ``->finish_item`` to complete it. + +4. The ``->finish_item`` implementation logs some changes and calls + ``xfs_drain_drop`` to decrease the sloppy counter and wake up any threads + waiting on the drain. + +5. The subtransaction commits, which unlocks the resource associated with the + intent item. + +For scrub, the drain works as follows: + +1. Lock the resource(s) associated with the metadata being scrubbed. + For example, a scan of the refcount btree would lock the AGI and AGF header + buffers. + +2. If the counter is zero (``xfs_drain_busy`` returns false), there are no + chains in progress and the operation may proceed. + +3. Otherwise, release the resources grabbed in step 1. + +4. Wait for the intent counter to reach zero (``xfs_drain_intents``), then go + back to step 1 unless a signal has been caught. + +To avoid polling in step 4, the drain provides a waitqueue for scrub threads to +be woken up whenever the intent count drops to zero. + +The proposed patchset is the +`scrub intent drain series +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-drain-intents>`_. + +.. _jump_labels: + +Static Keys (aka Jump Label Patching) +````````````````````````````````````` + +Online fsck for XFS separates the regular filesystem from the checking and +repair code as much as possible. +However, there are a few parts of online fsck (such as the intent drains, and +later, live update hooks) where it is useful for the online fsck code to know +what's going on in the rest of the filesystem. +Since it is not expected that online fsck will be constantly running in the +background, it is very important to minimize the runtime overhead imposed by +these hooks when online fsck is compiled into the kernel but not actively +running on behalf of userspace. +Taking locks in the hot path of a writer thread to access a data structure only +to find that no further action is necessary is expensive -- on the author's +computer, this have an overhead of 40-50ns per access. +Fortunately, the kernel supports dynamic code patching, which enables XFS to +replace a static branch to hook code with ``nop`` sleds when online fsck isn't +running. +This sled has an overhead of however long it takes the instruction decoder to +skip past the sled, which seems to be on the order of less than 1ns and +does not access memory outside of instruction fetching. + +When online fsck enables the static key, the sled is replaced with an +unconditional branch to call the hook code. +The switchover is quite expensive (~22000ns) but is paid entirely by the +program that invoked online fsck, and can be amortized if multiple threads +enter online fsck at the same time, or if multiple filesystems are being +checked at the same time. +Changing the branch direction requires taking the CPU hotplug lock, and since +CPU initialization requires memory allocation, online fsck must be careful not +to change a static key while holding any locks or resources that could be +accessed in the memory reclaim paths. +To minimize contention on the CPU hotplug lock, care should be taken not to +enable or disable static keys unnecessarily. + +Because static keys are intended to minimize hook overhead for regular +filesystem operations when xfs_scrub is not running, the intended usage +patterns are as follows: + +- The hooked part of XFS should declare a static-scoped static key that + defaults to false. + The ``DEFINE_STATIC_KEY_FALSE`` macro takes care of this. + The static key itself should be declared as a ``static`` variable. + +- When deciding to invoke code that's only used by scrub, the regular + filesystem should call the ``static_branch_unlikely`` predicate to avoid the + scrub-only hook code if the static key is not enabled. + +- The regular filesystem should export helper functions that call + ``static_branch_inc`` to enable and ``static_branch_dec`` to disable the + static key. + Wrapper functions make it easy to compile out the relevant code if the kernel + distributor turns off online fsck at build time. + +- Scrub functions wanting to turn on scrub-only XFS functionality should call + the ``xchk_fshooks_enable`` from the setup function to enable a specific + hook. + This must be done before obtaining any resources that are used by memory + reclaim. + Callers had better be sure they really need the functionality gated by the + static key; the ``TRY_HARDER`` flag is useful here. + +Online scrub has resource acquisition helpers (e.g. ``xchk_perag_lock``) to +handle locking AGI and AGF buffers for all scrubber functions. +If it detects a conflict between scrub and the running transactions, it will +try to wait for intents to complete. +If the caller of the helper has not enabled the static key, the helper will +return -EDEADLOCK, which should result in the scrub being restarted with the +``TRY_HARDER`` flag set. +The scrub setup function should detect that flag, enable the static key, and +try the scrub again. +Scrub teardown disables all static keys obtained by ``xchk_fshooks_enable``. + +For more information, please see the kernel documentation of +Documentation/staging/static-keys.rst.
PATCH 7/14 xfs: document pageable kernel memory
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a discussion of pageable kernel memory, since online fsck needs quite a bit more memory than most other parts of the filesystem to stage records and other information.
--- .../filesystems/xfs-online-fsck-design.rst | 490 ++++++++++++++++++++ 1 file changed, 490 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +490 -0
@@ -383,6 +383,8 @@ Algorithms") of Srinivasan. However, any data structure builder that maintains a resource lock for the duration of the repair is *always* an offline algorithm. +.. _secondary_metadata: + Secondary Metadata ``````````````````
@@ -1746,3 +1748,491 @@ Scrub teardown disables all static keys obtained by ``xchk_fshooks_enable``. For more information, please see the kernel documentation of Documentation/staging/static-keys.rst. + +.. _xfile: + +Pageable Kernel Memory +---------------------- + +Demonstrations of the first few prototypes of online repair revealed new +technical requirements that were not originally identified. +For the first demonstration, the code walked whatever filesystem +metadata it needed to synthesize new records and inserted records into a new +btree as it found them. +This was subpar since any additional corruption or runtime errors encountered +during the walk would shut down the filesystem. +After remount, the blocks containing the half-rebuilt data structure would not +be accessible until another repair was attempted. +Solving the problem of half-rebuilt data structures will be discussed in the +next section. + +For the second demonstration, the synthesized records were instead stored in +kernel slab memory. +Doing so enabled online repair to abort without writing to the filesystem if +the metadata walk failed, which prevented online fsck from making things worse. +However, even this approach needed improving upon. + +There are four reasons why traditional Linux kernel memory management isn't +suitable for storing large datasets: + +1. Although it is tempting to allocate a contiguous block of memory to create a + C array, this cannot easily be done in the kernel because it cannot be + relied upon to allocate multiple contiguous memory pages. + +2. While disparate physical pages can be virtually mapped together, installed + memory might still not be large enough to stage the entire record set in + memory while constructing a new btree. + +3. To overcome these two difficulties, the implementation was adjusted to use + doubly linked lists, which means every record object needed two 64-bit list + head pointers, which is a lot of overhead. + +4. Kernel memory is pinned, which can drive the system out of memory, leading + to OOM kills of unrelated processes. + +For the third iteration, attention swung back to the possibility of using +byte-indexed array-like storage to reduce the overhead of in-memory records. +At any given time, online repair does not need to keep the entire record set in +memory, which means that individual records can be paged out. +Creating new temporary files in the XFS filesystem to store intermediate data +was explored and rejected for some types of repairs because a filesystem with +compromised space and inode metadata should never be used to fix compromised +space or inode metadata. +However, the kernel already has a facility for byte-addressable and pageable +storage: shmfs. +In-kernel graphics drivers (most notably i915) take advantage of shmfs files +to store intermediate data that doesn't need to be in memory at all times, so +that usage precedent is already established. +Hence, the ``xfile`` was born! + +xfile Access Models +``````````````````` + +A survey of the intended uses of xfiles suggested these use cases: + +1. Arrays of fixed-sized records (space management btrees, directory and + extended attribute entries) + +2. Sparse arrays of fixed-sized records (quotas and link counts) + +3. Large binary objects (BLOBs) of variable sizes (directory and extended + attribute names and values) + +4. Staging btrees in memory (reverse mapping btrees) + +5. Arbitrary contents (realtime space management) + +To support the first four use cases, high level data structures wrap the xfile +to share functionality between online fsck functions. +The rest of this section discusses the interfaces that the xfile presents to +four of those five higher level data structures. +The fifth use case is discussed in the :ref:`realtime summary <rtsummary>` case +study. + +The most general storage interface supported by the xfile enables the reading +and writing of arbitrary quantities of data at arbitrary offsets in the xfile. +This capability is provided by ``xfile_pread`` and ``xfile_pwrite`` functions, +which behave similarly to their userspace counterparts. +XFS is very record-based, which suggests that the ability to load and store +complete records is important. +To support these cases, a pair of ``xfile_obj_load`` and ``xfile_obj_store`` +functions are provided to read and persist objects into an xfile. +They are internally the same as pread and pwrite, except that they treat any +error as an out of memory error. +For online repair, squashing error conditions in this manner is an acceptable +behavior because the only reaction is to abort the operation back to userspace. +All five xfile usecases can be serviced by these four functions. + +However, no discussion of file access idioms is complete without answering the +question, "But what about mmap?" +It would be *much* more convenient if kernel code could access pageable kernel +memory with pointers, just like userspace code does with regular memory. +Like any other filesystem that uses the page cache, reads and writes of xfile +data lock the cache page and map it into the kernel address space for the +duration of the operation. +Unfortunately, shmfs can only write a file page to the swap device if the page +is unmapped and unlocked, which means the xfile risks causing OOM problems +unless it is careful not to pin too many pages. +Therefore, the xfile steers most of its users towards programmatic access so +that backing pages are not kept locked in memory for longer than is necessary. +However, for callers performing quick linear scans of xfile data, +``xfile_get_page`` and ``xfile_put_page`` functions are provided to pin a page +in memory. +So far, the only code to use these functions are the xfarray :ref:`sorting +<xfarray_sort>` algorithms. + +xfile Access Coordination +````````````````````````` + +For security reasons, xfiles must be owned privately by the kernel. +They are marked ``S_PRIVATE`` to prevent interference from the security system, +must never be mapped into process file descriptor tables, and their pages must +never be mapped into userspace processes. + +To avoid locking recursion issues with the VFS, all accesses to the shmfs file +are performed by manipulating the page cache directly. +xfile writes call the ``->write_begin`` and ``->write_end`` functions of the +xfile's address space to grab writable pages, copy the caller's buffer into the +page, and release the pages. +xfile reads call ``shmem_read_mapping_page_gfp`` to grab pages directly before +copying the contents into the caller's buffer. +In other words, xfiles ignore the VFS read and write code paths to avoid +having to create a dummy ``struct kiocb`` and to avoid taking inode and +freeze locks. + +If an xfile is shared between threads to stage repairs, the caller must provide +its own locks to coordinate access. + +.. _xfarray: + +Arrays of Fixed-Sized Records +````````````````````````````` + +In XFS, each type of indexed space metadata (free space, inodes, reference +counts, file fork space, and reverse mappings) consists of a set of fixed-size +records indexed with a classic B+ tree. +Directories have a set of fixed-size dirent records that point to the names, +and extended attributes have a set of fixed-size attribute keys that point to +names and values. +Quota counters and file link counters index records with numbers. +During a repair, scrub needs to stage new records during the gathering step and +retrieve them during the btree building step. + +Although this requirement can be satisfied by calling the read and write +methods of the xfile directly, it is simpler for callers for there to be a +higher level abstraction to take care of computing array offsets, to provide +iterator functions, and to deal with sparse records and sorting. +The ``xfarray`` abstraction presents a linear array for fixed-size records atop +the byte-accessible xfile. + +.. _xfarray_access_patterns: + +Array Access Patterns +^^^^^^^^^^^^^^^^^^^^^ + +Array access patterns in online fsck tend to fall into three categories. +Iteration of records is assumed to be necessary for all cases and will be +covered in the next section. + +The first type of caller handles records that are indexed by position. +Gaps may exist between records, and a record may be updated multiple times +during the collection step. +In other words, these callers want a sparse linearly addressed table file. +The typical use case are quota records or file link count records. +Access to array elements is performed programmatically via ``xfarray_load`` and +``xfarray_store`` functions, which wrap the similarly-named xfile functions to +provide loading and storing of array elements at arbitrary array indices. +Gaps are defined to be null records, and null records are defined to be a +sequence of all zero bytes. +Null records are detected by calling ``xfarray_element_is_null``. +They are created either by calling ``xfarray_unset`` to null out an existing +record or by never storing anything to an array index. + +The second type of caller handles records that are not indexed by position +and do not require multiple updates to a record. +The typical use case here is rebuilding space btrees and key/value btrees. +These callers can add records to the array without caring about array indices +via the ``xfarray_append`` function, which stores a record at the end of the +array. +For callers that require records to be presentable in a specific order (e.g. +rebuilding btree data), the ``xfarray_sort`` function can arrange the sorted +records; this function will be covered later. + +The third type of caller is a bag, which is useful for counting records. +The typical use case here is constructing space extent reference counts from +reverse mapping information. +Records can be put in the bag in any order, they can be removed from the bag +at any time, and uniqueness of records is left to callers. +The ``xfarray_store_anywhere`` function is used to insert a record in any +null record slot in the bag; and the ``xfarray_unset`` function removes a +record from the bag. + +The proposed patchset is the +`big in-memory array +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=big-array>`_. + +Iterating Array Elements +^^^^^^^^^^^^^^^^^^^^^^^^ + +Most users of the xfarray require the ability to iterate the records stored in +the array. +Callers can probe every possible array index with the following: + +.. code-block:: c + + xfarray_idx_t i; + foreach_xfarray_idx(array, i) { + xfarray_load(array, i, &rec); + + /* do something with rec */ + } + +All users of this idiom must be prepared to handle null records or must already +know that there aren't any. + +For xfarray users that want to iterate a sparse array, the ``xfarray_iter`` +function ignores indices in the xfarray that have never been written to by +calling ``xfile_seek_data`` (which internally uses ``SEEK_DATA``) to skip areas +of the array that are not populated with memory pages. +Once it finds a page, it will skip the zeroed areas of the page. + +.. code-block:: c + + xfarray_idx_t i = XFARRAY_CURSOR_INIT; + while ((ret = xfarray_iter(array, &i, &rec)) == 1) { + /* do something with rec */ + } + +.. _xfarray_sort: + +Sorting Array Elements +^^^^^^^^^^^^^^^^^^^^^^ + +During the fourth demonstration of online repair, a community reviewer remarked +that for performance reasons, online repair ought to load batches of records +into btree record blocks instead of inserting records into a new btree one at a +time. +The btree insertion code in XFS is responsible for maintaining correct ordering +of the records, so naturally the xfarray must also support sorting the record +set prior to bulk loading. + +The sorting algorithm used in the xfarray is actually a combination of adaptive +quicksort and a heapsort subalgorithm in the spirit of +`Sedgewick <https://algs4.cs.princeton.edu/23quicksort/>`_ and +`pdqsort <https://github.com/orlp/pdqsort>`_, with customizations for the Linux +kernel. +To sort records in a reasonably short amount of time, ``xfarray`` takes +advantage of the binary subpartitioning offered by quicksort, but it also uses +heapsort to hedge aginst performance collapse if the chosen quicksort pivots +are poor. +Both algorithms are (in general) O(n * lg(n)), but there is a wide performance +gulf between the two implementations. + +The Linux kernel already contains a reasonably fast implementation of heapsort. +It only operates on regular C arrays, which limits the scope of its usefulness. +There are two key places where the xfarray uses it: + +* Sorting any record subset backed by a single xfile page. + +* Loading a small number of xfarray records from potentially disparate parts + of the xfarray into a memory buffer, and sorting the buffer. + +In other words, ``xfarray`` uses heapsort to constrain the nested recursion of +quicksort, thereby mitigating quicksort's worst runtime behavior. + +Choosing a quicksort pivot is a tricky business. +A good pivot splits the set to sort in half, leading to the divide and conquer +behavior that is crucial to O(n * lg(n)) performance. +A poor pivot barely splits the subset at all, leading to O(n\ :sup:`2`) +runtime. +The xfarray sort routine tries to avoid picking a bad pivot by sampling nine +records into a memory buffer and using the kernel heapsort to identify the +median of the nine. + +Most modern quicksort implementations employ Tukey's "ninther" to select a +pivot from a classic C array. +Typical ninther implementations pick three unique triads of records, sort each +of the triads, and then sort the middle value of each triad to determine the +ninther value. +As stated previously, however, xfile accesses are not entirely cheap. +It turned out to be much more performant to read the nine elements into a +memory buffer, run the kernel's in-memory heapsort on the buffer, and choose +the 4th element of that buffer as the pivot. +Tukey's ninthers are described in J. W. Tukey, `The ninther, a technique for +low-effort robust (resistant) location in large samples`, in *Contributions to +Survey Sampling and Applied Statistics*, edited by H. David, (Academic Press, +1978), pp. 251–257. + +The partitioning of quicksort is fairly textbook -- rearrange the record +subset around the pivot, then set up the current and next stack frames to +sort with the larger and the smaller halves of the pivot, respectively. +This keeps the stack space requirements to log2(record count). + +As a final performance optimization, the hi and lo scanning phase of quicksort +keeps examined xfile pages mapped in the kernel for as long as possible to +reduce map/unmap cycles. +Surprisingly, this reduces overall sort runtime by nearly half again after +accounting for the application of heapsort directly onto xfile pages. + +Blob Storage +```````````` + +Extended attributes and directories add an additional requirement for staging +records: arbitrary byte sequences of finite length. +Each directory entry record needs to store entry name, +and each extended attribute needs to store both the attribute name and value. +The names, keys, and values can consume a large amount of memory, so the +``xfblob`` abstraction was created to simplify management of these blobs +atop an xfile. + +Blob arrays provide ``xfblob_load`` and ``xfblob_store`` functions to retrieve +and persist objects. +The store function returns a magic cookie for every object that it persists. +Later, callers provide this cookie to the ``xblob_load`` to recall the object. +The ``xfblob_free`` function frees a specific blob, and the ``xfblob_truncate`` +function frees them all because compaction is not needed. + +The details of repairing directories and extended attributes will be discussed +in a subsequent section about atomic extent swapping. +However, it should be noted that these repair functions only use blob storage +to cache a small number of entries before adding them to a temporary ondisk +file, which is why compaction is not required. + +The proposed patchset is at the start of the +`extended attribute repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-xattrs>`_ series. + +.. _xfbtree: + +In-Memory B+Trees +````````````````` + +The chapter about :ref:`secondary metadata<secondary_metadata>` mentioned that +checking and repairing of secondary metadata commonly requires coordination +between a live metadata scan of the filesystem and writer threads that are +updating that metadata. +Keeping the scan data up to date requires requires the ability to propagate +metadata updates from the filesystem into the data being collected by the scan. +This *can* be done by appending concurrent updates into a separate log file and +applying them before writing the new metadata to disk, but this leads to +unbounded memory consumption if the rest of the system is very busy. +Another option is to skip the side-log and commit live updates from the +filesystem directly into the scan data, which trades more overhead for a lower +maximum memory requirement. +In both cases, the data structure holding the scan results must support indexed +access to perform well. + +Given that indexed lookups of scan data is required for both strategies, online +fsck employs the second strategy of committing live updates directly into +scan data. +Because xfarrays are not indexed and do not enforce record ordering, they +are not suitable for this task. +Conveniently, however, XFS has a library to create and maintain ordered reverse +mapping records: the existing rmap btree code! +If only there was a means to create one in memory. + +Recall that the :ref:`xfile <xfile>` abstraction represents memory pages as a +regular file, which means that the kernel can create byte or block addressable +virtual address spaces at will. +The XFS buffer cache specializes in abstracting IO to block-oriented address +spaces, which means that adaptation of the buffer cache to interface with +xfiles enables reuse of the entire btree library. +Btrees built atop an xfile are collectively known as ``xfbtrees``. +The next few sections describe how they actually work. + +The proposed patchset is the +`in-memory btree +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=in-memory-btrees>`_ +series. + +Using xfiles as a Buffer Cache Target +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Two modifications are necessary to support xfiles as a buffer cache target. +The first is to make it possible for the ``struct xfs_buftarg`` structure to +host the ``struct xfs_buf`` rhashtable, because normally those are held by a +per-AG structure. +The second change is to modify the buffer ``ioapply`` function to "read" cached +pages from the xfile and "write" cached pages back to the xfile. +Multiple access to individual buffers is controlled by the ``xfs_buf`` lock, +since the xfile does not provide any locking on its own. +With this adaptation in place, users of the xfile-backed buffer cache use +exactly the same APIs as users of the disk-backed buffer cache. +The separation between xfile and buffer cache implies higher memory usage since +they do not share pages, but this property could some day enable transactional +updates to an in-memory btree. +Today, however, it simply eliminates the need for new code. + +Space Management with an xfbtree +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Space management for an xfile is very simple -- each btree block is one memory +page in size. +These blocks use the same header format as an on-disk btree, but the in-memory +block verifiers ignore the checksums, assuming that xfile memory is no more +corruption-prone than regular DRAM. +Reusing existing code here is more important than absolute memory efficiency. + +The very first block of an xfile backing an xfbtree contains a header block. +The header describes the owner, height, and the block number of the root +xfbtree block. + +To allocate a btree block, use ``xfile_seek_data`` to find a gap in the file. +If there are no gaps, create one by extending the length of the xfile. +Preallocate space for the block with ``xfile_prealloc``, and hand back the +location. +To free an xfbtree block, use ``xfile_discard`` (which internally uses +``FALLOC_FL_PUNCH_HOLE``) to remove the memory page from the xfile. + +Populating an xfbtree +^^^^^^^^^^^^^^^^^^^^^ + +An online fsck function that wants to create an xfbtree should proceed as +follows: + +1. Call ``xfile_create`` to create an xfile. + +2. Call ``xfs_alloc_memory_buftarg`` to create a buffer cache target structure + pointing to the xfile. + +3. Pass the buffer cache target, buffer ops, and other information to + ``xfbtree_create`` to write an initial tree header and root block to the + xfile. + Each btree type should define a wrapper that passes necessary arguments to + the creation function. + For example, rmap btrees define ``xfs_rmapbt_mem_create`` to take care of + all the necessary details for callers. + A ``struct xfbtree`` object will be returned. + +4. Pass the xfbtree object to the btree cursor creation function for the + btree type. + Following the example above, ``xfs_rmapbt_mem_cursor`` takes care of this + for callers. + +5. Pass the btree cursor to the regular btree functions to make queries against + and to update the in-memory btree. + For example, a btree cursor for an rmap xfbtree can be passed to the + ``xfs_rmap_*`` functions just like any other btree cursor. + See the :ref:`next section<xfbtree_commit>` for information on dealing with + xfbtree updates that are logged to a transaction. + +6. When finished, delete the btree cursor, destroy the xfbtree object, free the + buffer target, and the destroy the xfile to release all resources. + +.. _xfbtree_commit: + +Committing Logged xfbtree Buffers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Although it is a clever hack to reuse the rmap btree code to handle the staging +structure, the ephemeral nature of the in-memory btree block storage presents +some challenges of its own. +The XFS transaction manager must not commit buffer log items for buffers backed +by an xfile because the log format does not understand updates for devices +other than the data device. +An ephemeral xfbtree probably will not exist by the time the AIL checkpoints +log transactions back into the filesystem, and certainly won't exist during +log recovery. +For these reasons, any code updating an xfbtree in transaction context must +remove the buffer log items from the transaction and write the updates into the +backing xfile before committing or cancelling the transaction. + +The ``xfbtree_trans_commit`` and ``xfbtree_trans_cancel`` functions implement +this functionality as follows: + +1. Find each buffer log item whose buffer targets the xfile. + +2. Record the dirty/ordered status of the log item. + +3. Detach the log item from the buffer. + +4. Queue the buffer to a special delwri list. + +5. Clear the transaction dirty flag if the only dirty log items were the ones + that were detached in step 3. + +6. Submit the delwri list to commit the changes to the xfile, if the updates + are being committed. + +After removing xfile logged buffers from the transaction in this manner, the +transaction can be committed or cancelled.
PATCH 8/14 xfs: document btree bulk loading
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a discussion of the btree bulk loading code, which makes it easy to take an in-memory recordset and write it out to disk in an efficient manner. This also enables atomic switchover from the old to the new structure with minimal potential for leaking the old blocks.
--- .../filesystems/xfs-online-fsck-design.rst | 632 ++++++++++++++++++++ 1 file changed, 632 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +632 -0
@@ -2236,3 +2236,635 @@ this functionality as follows: After removing xfile logged buffers from the transaction in this manner, the transaction can be committed or cancelled. + +Bulk Loading of Ondisk B+Trees +------------------------------ + +As mentioned previously, early iterations of online repair built new btree +structures by creating a new btree and adding observations individually. +Loading a btree one record at a time had a slight advantage of not requiring +the incore records to be sorted prior to commit, but was very slow and leaked +blocks if the system went down during a repair. +Loading records one at a time also meant that repair could not control the +loading factor of the blocks in the new btree. + +Fortunately, the venerable ``xfs_repair`` tool had a more efficient means for +rebuilding a btree index from a collection of records -- bulk btree loading. +This was implemented rather inefficiently code-wise, since ``xfs_repair`` +had separate copy-pasted implementations for each btree type. + +To prepare for online fsck, each of the four bulk loaders were studied, notes +were taken, and the four were refactored into a single generic btree bulk +loading mechanism. +Those notes in turn have been refreshed and are presented below. + +Geometry Computation +```````````````````` + +The zeroth step of bulk loading is to assemble the entire record set that will +be stored in the new btree, and sort the records. +Next, call ``xfs_btree_bload_compute_geometry`` to compute the shape of the +btree from the record set, the type of btree, and any load factor preferences. +This information is required for resource reservation. + +First, the geometry computation computes the minimum and maximum records that +will fit in a leaf block from the size of a btree block and the size of the +block header. +Roughly speaking, the maximum number of records is:: + + maxrecs = (block_size - header_size) / record_size + +The XFS design specifies that btree blocks should be merged when possible, +which means the minimum number of records is half of maxrecs:: + + minrecs = maxrecs / 2 + +The next variable to determine is the desired loading factor. +This must be at least minrecs and no more than maxrecs. +Choosing minrecs is undesirable because it wastes half the block. +Choosing maxrecs is also undesirable because adding a single record to each +newly rebuilt leaf block will cause a tree split, which causes a noticeable +drop in performance immediately afterwards. +The default loading factor was chosen to be 75% of maxrecs, which provides a +reasonably compact structure without any immediate split penalties. +If space is tight, the loading factor will be set to maxrecs to try to avoid +running out of space:: + + leaf_load_factor = enough space ? (maxrecs + minrecs) / 2 : maxrecs + +Load factor is computed for btree node blocks using the combined size of the +btree key and pointer as the record size:: + + maxrecs = (block_size - header_size) / (key_size + ptr_size) + minrecs = maxrecs / 2 + node_load_factor = enough space ? (maxrecs + minrecs) / 2 : maxrecs + +Once that's done, the number of leaf blocks required to store the record set +can be computed as:: + + leaf_blocks = ceil(record_count / leaf_load_factor) + +The number of node blocks needed to point to the next level down in the tree +is computed as:: + + n_blocks = (n == 0 ? leaf_blocks : node_blocks[n]) + node_blocks[n + 1] = ceil(n_blocks / node_load_factor) + +The entire computation is performed recursively until the current level only +needs one block. +The resulting geometry is as follows: + +- For AG-rooted btrees, this level is the root level, so the height of the new + tree is ``level + 1`` and the space needed is the summation of the number of + blocks on each level. + +- For inode-rooted btrees where the records in the top level do not fit in the + inode fork area, the height is ``level + 2``, the space needed is the + summation of the number of blocks on each level, and the inode fork points to + the root block. + +- For inode-rooted btrees where the records in the top level can be stored in + the inode fork area, then the root block can be stored in the inode, the + height is ``level + 1``, and the space needed is one less than the summation + of the number of blocks on each level. + This only becomes relevant when non-bmap btrees gain the ability to root in + an inode, which is a future patchset and only included here for completeness. + +.. _newbt: + +Reserving New B+Tree Blocks +``````````````````````````` + +Once repair knows the number of blocks needed for the new btree, it allocates +those blocks using the free space information. +Each reserved extent is tracked separately by the btree builder state data. +To improve crash resilience, the reservation code also logs an Extent Freeing +Intent (EFI) item in the same transaction as each space allocation and attaches +its in-memory ``struct xfs_extent_free_item`` object to the space reservation. +If the system goes down, log recovery will use the unfinished EFIs to free the +unused space, the free space, leaving the filesystem unchanged. + +Each time the btree builder claims a block for the btree from a reserved +extent, it updates the in-memory reservation to reflect the claimed space. +Block reservation tries to allocate as much contiguous space as possible to +reduce the number of EFIs in play. + +While repair is writing these new btree blocks, the EFIs created for the space +reservations pin the tail of the ondisk log. +It's possible that other parts of the system will remain busy and push the head +of the log towards the pinned tail. +To avoid livelocking the filesystem, the EFIs must not pin the tail of the log +for too long. +To alleviate this problem, the dynamic relogging capability of the deferred ops +mechanism is reused here to commit a transaction at the log head containing an +EFD for the old EFI and new EFI at the head. +This enables the log to release the old EFI to keep the log moving forwards. + +EFIs have a role to play during the commit and reaping phases; please see the +next section and the section about :ref:`reaping<reaping>` for more details. + +Proposed patchsets are the +`bitmap rework +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-bitmap-rework>`_ +and the +`preparation for bulk loading btrees +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-prep-for-bulk-loading>`_. + + +Writing the New Tree +```````````````````` + +This part is pretty simple -- the btree builder (``xfs_btree_bulkload``) claims +a block from the reserved list, writes the new btree block header, fills the +rest of the block with records, and adds the new leaf block to a list of +written blocks. +Sibling pointers are set every time a new block is added to the level. +When it finishes writing the record leaf blocks, it moves on to the node +blocks. +To fill a node block, it walks each block in the next level down in the tree +to compute the relevant keys and write them into the parent node. +When it reaches the root level, it is ready to commit the new btree! + +The first step to commit the new btree is to persist the btree blocks to disk +synchronously. +This is a little complicated because a new btree block could have been freed +in the recent past, so the builder must use ``xfs_buf_delwri_queue_here`` to +remove the (stale) buffer from the AIL list before it can write the new blocks +to disk. +Blocks are queued for IO using a delwri list and written in one large batch +with ``xfs_buf_delwri_submit``. + +Once the new blocks have been persisted to disk, control returns to the +individual repair function that called the bulk loader. +The repair function must log the location of the new root in a transaction, +clean up the space reservations that were made for the new btree, and reap the +old metadata blocks: + +1. Commit the location of the new btree root. + +2. For each incore reservation: + + a. Log Extent Freeing Done (EFD) items for all the space that was consumed + by the btree builder. The new EFDs must point to the EFIs attached to + the reservation to prevent log recovery from freeing the new blocks. + + b. For unclaimed portions of incore reservations, create a regular deferred + extent free work item to be free the unused space later in the + transaction chain. + + c. The EFDs and EFIs logged in steps 2a and 2b must not overrun the + reservation of the committing transaction. + If the btree loading code suspects this might be about to happen, it must + call ``xrep_defer_finish`` to clear out the deferred work and obtain a + fresh transaction. + +3. Clear out the deferred work a second time to finish the commit and clean + the repair transaction. + +The transaction rolling in steps 2c and 3 represent a weakness in the repair +algorithm, because a log flush and a crash before the end of the reap step can +result in space leaking. +Online repair functions minimize the chances of this occuring by using very +large transactions, which each can accomodate many thousands of block freeing +instructions. +Repair moves on to reaping the old blocks, which will be presented in a +subsequent :ref:`section<reaping>` after a few case studies of bulk loading. + +Case Study: Rebuilding the Inode Index +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The high level process to rebuild the inode index btree is: + +1. Walk the reverse mapping records to generate ``struct xfs_inobt_rec`` + records from the inode chunk information and a bitmap of the old inode btree + blocks. + +2. Append the records to an xfarray in inode order. + +3. Use the ``xfs_btree_bload_compute_geometry`` function to compute the number + of blocks needed for the inode btree. + If the free space inode btree is enabled, call it again to estimate the + geometry of the finobt. + +4. Allocate the number of blocks computed in the previous step. + +5. Use ``xfs_btree_bload`` to write the xfarray records to btree blocks and + generate the internal node blocks. + If the free space inode btree is enabled, call it again to load the finobt. + +6. Commit the location of the new btree root block(s) to the AGI. + +7. Reap the old btree blocks using the bitmap created in step 1. + +Details are as follows. + +The inode btree maps inumbers to the ondisk location of the associated +inode records, which means that the inode btrees can be rebuilt from the +reverse mapping information. +Reverse mapping records with an owner of ``XFS_RMAP_OWN_INOBT`` marks the +location of the old inode btree blocks. +Each reverse mapping record with an owner of ``XFS_RMAP_OWN_INODES`` marks the +location of at least one inode cluster buffer. +A cluster is the smallest number of ondisk inodes that can be allocated or +freed in a single transaction; it is never smaller than 1 fs block or 4 inodes. + +For the space represented by each inode cluster, ensure that there are no +records in the free space btrees nor any records in the reference count btree. +If there are, the space metadata inconsistencies are reason enough to abort the +operation. +Otherwise, read each cluster buffer to check that its contents appear to be +ondisk inodes and to decide if the file is allocated +(``xfs_dinode.i_mode != 0``) or free (``xfs_dinode.i_mode == 0``). +Accumulate the results of successive inode cluster buffer reads until there is +enough information to fill a single inode chunk record, which is 64 consecutive +numbers in the inumber keyspace. +If the chunk is sparse, the chunk record may include holes. + +Once the repair function accumulates one chunk's worth of data, it calls +``xfarray_append`` to add the inode btree record to the xfarray. +This xfarray is walked twice during the btree creation step -- once to populate +the inode btree with all inode chunk records, and a second time to populate the +free inode btree with records for chunks that have free non-sparse inodes. +The number of records for the inode btree is the number of xfarray records, +but the record count for the free inode btree has to be computed as inode chunk +records are stored in the xfarray. + +The proposed patchset is the +`AG btree repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-ag-btrees>`_ +series. + +Case Study: Rebuilding the Space Reference Counts +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The high level process to rebuild the reference count btree is: + +1. Walk the reverse mapping records to generate ``struct xfs_refcount_irec`` + records for any space having more than one reverse mapping and add them to + the xfarray. + Any records owned by ``XFS_RMAP_OWN_COW`` are also added to the xfarray. + Use any records owned by ``XFS_RMAP_OWN_REFC`` to create a bitmap of old + refcount btree blocks. + +2. Sort the records in physical extent order, putting the CoW staging extents + at the end of the xfarray. + +3. Use the ``xfs_btree_bload_compute_geometry`` function to compute the number + of blocks needed for the new tree. + +4. Allocate the number of blocks computed in the previous step. + +5. Use ``xfs_btree_bload`` to write the xfarray records to btree blocks and + generate the internal node blocks. + +6. Commit the location of new btree root block to the AGF. + +7. Reap the old btree blocks using the bitmap created in step 1. + +Details are as follows; the same algorithm is used by ``xfs_repair`` to +generate refcount information from reverse mapping records. + +Reverse mapping records are used to rebuild the reference count information. +Reference counts are required for correct operation of copy on write for shared +file data. +Imagine the reverse mapping entries as rectangles representing extents of +physical blocks, and that the rectangles can be laid down to allow them to +overlap each other. +From the diagram below, it is apparent that a reference count record must start +or end wherever the height of the stack changes. +In other words, the record emission stimulus is level-triggered:: + + █ ███ + ██ █████ ████ ███ ██████ + ██ ████ ███████████ ████ █████████ + ████████████████████████████████ ███████████ + ^ ^ ^^ ^^ ^ ^^ ^^^ ^^^^ ^ ^^ ^ ^ ^ + 2 1 23 21 3 43 234 2123 1 01 2 3 0 + +The ondisk reference count btree does not store the refcount == 0 cases because +the free space btree already records which blocks are free. +Extents being used to stage copy-on-write operations should be the only records +with refcount == 1. +Single-owner file blocks aren't recorded in either the free space or the +reference count btrees. + +Given the reverse mapping btree which orders records by physical block number, +a starting physical block (``sp``), a bag-like data structure to hold mappings +that cover ``sp``, and the next physical block where the level changes +(``np``), reference count information is constructed from reverse mapping data +as follows: + +While there are still unprocessed mappings in the reverse mapping btree: + +1. Set ``sp`` to the physical block of the next unprocessed reverse mapping + record. + +2. Add to the bag all the reverse mappings where ``rm_startblock`` == ``sp``. + +3. Set ``np`` to the physical block where the bag size will change. + This is the minimum of (``rm_startblock`` of the next unprocessed mapping) + and (``rm_startblock`` + ``rm_blockcount`` of each mapping in the bag). + +4. Record the bag size as ``old_bag_size``. + +5. While the bag isn't empty, + + a. Remove from the bag all mappings where ``rm_startblock`` + + ``rm_blockcount`` == ``np``. + + b. Add to the bag all reverse mappings where ``rm_startblock`` == ``np``. + + c. If the bag size isn't ``old_bag_size``, store the refcount record + ``(sp, np - sp, old_bag_size)`` in the refcount xfarray. + + d. If the bag is empty, break out of this inner loop. + + e. Set ``old_bag_size`` to ``bag_size``. + + f. Set ``sp`` = ``np``. + + g. Set ``np`` to the physical block where the bag size will change. + Go to step 3 above. + +The bag-like structure in this case is a type 2 xfarray as discussed in the +:ref:`xfarray access patterns<xfarray_access_patterns>` section. +Reverse mappings are added to the bag using ``xfarray_store_anywhere`` and +removed via ``xfarray_unset``. +Bag members are examined through ``xfarray_iter`` loops. + +The proposed patchset is the +`AG btree repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-ag-btrees>`_ +series. + +Case Study: Rebuilding File Fork Mapping Indices +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The high level process to rebuild a data/attr fork mapping btree is: + +1. Walk the reverse mapping records to generate ``struct xfs_bmbt_rec`` + records from the reverse mapping records for that inode and fork. + Append these records to an xfarray. + Compute the bitmap of the old bmap btree blocks from the ``BMBT_BLOCK`` + records. + +2. Use the ``xfs_btree_bload_compute_geometry`` function to compute the number + of blocks needed for the new tree. + +3. Sort the records in file offset order. + +4. If the extent records would fit in the inode fork immediate area, commit the + records to that immediate area and skip to step 8. + +5. Allocate the number of blocks computed in the previous step. + +6. Use ``xfs_btree_bload`` to write the xfarray records to btree blocks and + generate the internal node blocks. + +7. Commit the new btree root block to the inode fork immediate area. + +8. Reap the old btree blocks using the bitmap created in step 1. + +There are some complications here: +First, it's possible to move the fork offset to adjust the sizes of the +immediate areas if the data and attr forks are not both in BMBT format. +Second, if there are sufficiently few fork mappings, it may be possible to use +EXTENTS format instead of BMBT, which may require a conversion. +Third, the incore extent map must be reloaded carefully to avoid disturbing +any delayed allocation extents. + +The proposed patchset is the +`file repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-inodes>`_ +series. + +.. _reaping: + +Reaping Old Metadata Blocks +--------------------------- + +Whenever online fsck builds a new data structure to replace one that is +suspect, there is a question of how to find and dispose of the blocks that +belonged to the old structure. +The laziest method of course is not to deal with them at all, but this slowly +leads to service degradations as space leaks out of the filesystem. +Hopefully, someone will schedule a rebuild of the free space information to +plug all those leaks. +Offline repair rebuilds all space metadata after recording the usage of +the files and directories that it decides not to clear, hence it can build new +structures in the discovered free space and avoid the question of reaping. + +As part of a repair, online fsck relies heavily on the reverse mapping records +to find space that is owned by the corresponding rmap owner yet truly free. +Cross referencing rmap records with other rmap records is necessary because +there may be other data structures that also think they own some of those +blocks (e.g. crosslinked trees). +Permitting the block allocator to hand them out again will not push the system +towards consistency. + +For space metadata, the process of finding extents to dispose of generally +follows this format: + +1. Create a bitmap of space used by data structures that must be preserved. + The space reservations used to create the new metadata can be used here if + the same rmap owner code is used to denote all of the objects being rebuilt. + +2. Survey the reverse mapping data to create a bitmap of space owned by the + same ``XFS_RMAP_OWN_*`` number for the metadata that is being preserved. + +3. Use the bitmap disunion operator to subtract (1) from (2). + The remaining set bits represent candidate extents that could be freed. + The process moves on to step 4 below. + +Repairs for file-based metadata such as extended attributes, directories, +symbolic links, quota files and realtime bitmaps are performed by building a +new structure attached to a temporary file and swapping the forks. +Afterward, the mappings in the old file fork are the candidate blocks for +disposal. + +The process for disposing of old extents is as follows: + +4. For each candidate extent, count the number of reverse mapping records for + the first block in that extent that do not have the same rmap owner for the + data structure being repaired. + + - If zero, the block has a single owner and can be freed. + + - If not, the block is part of a crosslinked structure and must not be + freed. + +5. Starting with the next block in the extent, figure out how many more blocks + have the same zero/nonzero other owner status as that first block. + +6. If the region is crosslinked, delete the reverse mapping entry for the + structure being repaired and move on to the next region. + +7. If the region is to be freed, mark any corresponding buffers in the buffer + cache as stale to prevent log writeback. + +8. Free the region and move on. + +However, there is one complication to this procedure. +Transactions are of finite size, so the reaping process must be careful to roll +the transactions to avoid overruns. +Overruns come from two sources: + +a. EFIs logged on behalf of space that is no longer occupied + +b. Log items for buffer invalidations + +This is also a window in which a crash during the reaping process can leak +blocks. +As stated earlier, online repair functions use very large transactions to +minimize the chances of this occurring. + +The proposed patchset is the +`preparation for bulk loading btrees +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-prep-for-bulk-loading>`_ +series. + +Case Study: Reaping After a Regular Btree Repair +```````````````````````````````````````````````` + +Old reference count and inode btrees are the easiest to reap because they have +rmap records with special owner codes: ``XFS_RMAP_OWN_REFC`` for the refcount +btree, and ``XFS_RMAP_OWN_INOBT`` for the inode and free inode btrees. +Creating a list of extents to reap the old btree blocks is quite simple, +conceptually: + +1. Lock the relevant AGI/AGF header buffers to prevent allocation and frees. + +2. For each reverse mapping record with an rmap owner corresponding to the + metadata structure being rebuilt, set the corresponding range in a bitmap. + +3. Walk the current data structures that have the same rmap owner. + For each block visited, clear that range in the above bitmap. + +4. Each set bit in the bitmap represents a block that could be a block from the + old data structures and hence is a candidate for reaping. + In other words, ``(rmap_records_owned_by & ~blocks_reachable_by_walk)`` + are the blocks that might be freeable. + +If it is possible to maintain the AGF lock throughout the repair (which is the +common case), then step 2 can be performed at the same time as the reverse +mapping record walk that creates the records for the new btree. + +Case Study: Rebuilding the Free Space Indices +````````````````````````````````````````````` + +The high level process to rebuild the free space indices is: + +1. Walk the reverse mapping records to generate ``struct xfs_alloc_rec_incore`` + records from the gaps in the reverse mapping btree. + +2. Append the records to an xfarray. + +3. Use the ``xfs_btree_bload_compute_geometry`` function to compute the number + of blocks needed for each new tree. + +4. Allocate the number of blocks computed in the previous step from the free + space information collected. + +5. Use ``xfs_btree_bload`` to write the xfarray records to btree blocks and + generate the internal node blocks for the free space by block index. + Call it again for the free space by length index. + +6. Commit the locations of the new btree root blocks to the AGF. + +7. Reap the old btree blocks by looking for space that is not recorded by the + reverse mapping btree, the new free space btrees, or the AGFL. + +Repairing the free space btrees has three key complications over a regular +btree repair: + +First, free space is not explicitly tracked in the reverse mapping records. +Hence, the new free space records must be inferred from gaps in the physical +space component of the keyspace of the reverse mapping btree. + +Second, free space repairs cannot use the common btree reservation code because +new blocks are reserved out of the free space btrees. +This is impossible when repairing the free space btrees themselves. +However, repair holds the AGF buffer lock for the duration of the free space +index reconstruction, so it can use the collected free space information to +supply the blocks for the new free space btrees. +It is not necessary to back each reserved extent with an EFI because the new +free space btrees are constructed in what the ondisk filesystem thinks is +unowned space. +However, if reserving blocks for the new btrees from the collected free space +information changes the number of free space records, repair must re-estimate +the new free space btree geometry with the new record count until the +reservation is sufficient. +As part of committing the new btrees, repair must ensure that reverse mappings +are created for the reserved blocks and that unused reserved blocks are +inserted into the free space btrees. +Deferrred rmap and freeing operations are used to ensure that this transition +is atomic, similar to the other btree repair functions. + +Third, finding the blocks to reap after the repair is not overly +straightforward. +Blocks for the free space btrees and the reverse mapping btrees are supplied by +the AGFL. +Blocks put onto the AGFL have reverse mapping records with the owner +``XFS_RMAP_OWN_AG``. +This ownership is retained when blocks move from the AGFL into the free space +btrees or the reverse mapping btrees. +When repair walks reverse mapping records to synthesize free space records, it +creates a bitmap (``ag_owner_bitmap``) of all the space claimed by +``XFS_RMAP_OWN_AG`` records. +The repair context maintains a second bitmap corresponding to the rmap btree +blocks and the AGFL blocks (``rmap_agfl_bitmap``). +When the walk is complete, the bitmap disunion operation ``(ag_owner_bitmap & +~rmap_agfl_bitmap)`` computes the extents that are used by the old free space +btrees. +These blocks can then be reaped using the methods outlined above. + +The proposed patchset is the +`AG btree repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-ag-btrees>`_ +series. + +.. _rmap_reap: + +Case Study: Reaping After Repairing Reverse Mapping Btrees +`````````````````````````````````````````````````````````` + +Old reverse mapping btrees are less difficult to reap after a repair. +As mentioned in the previous section, blocks on the AGFL, the two free space +btree blocks, and the reverse mapping btree blocks all have reverse mapping +records with ``XFS_RMAP_OWN_AG`` as the owner. +The full process of gathering reverse mapping records and building a new btree +are described in the case study of +:ref:`live rebuilds of rmap data <rmap_repair>`, but a crucial point from that +discussion is that the new rmap btree will not contain any records for the old +rmap btree, nor will the old btree blocks be tracked in the free space btrees. +The list of candidate reaping blocks is computed by setting the bits +corresponding to the gaps in the new rmap btree records, and then clearing the +bits corresponding to extents in the free space btrees and the current AGFL +blocks. +The result ``(new_rmapbt_gaps & ~(agfl | bnobt_records))`` are reaped using the +methods outlined above. + +The rest of the process of rebuildng the reverse mapping btree is discussed +in a separate :ref:`case study<rmap_repair>`. + +The proposed patchset is the +`AG btree repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-ag-btrees>`_ +series. + +Case Study: Rebuilding the AGFL +``````````````````````````````` + +The allocation group free block list (AGFL) is repaired as follows: + +1. Create a bitmap for all the space that the reverse mapping data claims is + owned by ``XFS_RMAP_OWN_AG``. + +2. Subtract the space used by the two free space btrees and the rmap btree. + +3. Subtract any space that the reverse mapping data claims is owned by any + other owner, to avoid re-adding crosslinked blocks to the AGFL. + +4. Once the AGFL is full, reap any blocks leftover. + +5. The next operation to fix the freelist will right-size the list.
PATCH 9/14 xfs: document online file metadata repair code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add to the fifth chapter of the online fsck design documentation, where we discuss the details of the data structures and algorithms used by the kernel to repair file metadata.
--- .../filesystems/xfs-online-fsck-design.rst | 150 ++++++++++++++++++++ 1 file changed, 150 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +150 -0
@@ -2868,3 +2868,153 @@ The allocation group free block list (AGFL) is repaired as follows: 4. Once the AGFL is full, reap any blocks leftover. 5. The next operation to fix the freelist will right-size the list. + +Inode Record Repairs +-------------------- + +Inode records must be handled carefully, because they have both ondisk records +("dinodes") and an in-memory ("cached") representation. +There is a very high potential for cache coherency issues if online fsck is not +careful to access the ondisk metadata *only* when the ondisk metadata is so +badly damaged that the filesystem cannot load the in-memory representation. +When online fsck wants to open a damaged file for scrubbing, it must use +specialized resource acquisition functions that return either the in-memory +representation *or* a lock on whichever object is necessary to prevent any +update to the ondisk location. + +The only repairs that should be made to the ondisk inode buffers are whatever +is necessary to get the in-core structure loaded. +This means fixing whatever is caught by the inode cluster buffer and inode fork +verifiers, and retrying the ``iget`` operation. +If the second ``iget`` fails, the repair has failed. + +Once the in-memory representation is loaded, repair can lock the inode and can +subject it to comprehensive checks, repairs, and optimizations. +Most inode attributes are easy to check and constrain, or are user-controlled +arbitrary bit patterns; these are both easy to fix. +Dealing with the data and attr fork extent counts and the file block counts is +more complicated, because computing the correct value requires traversing the +forks, or if that fails, leaving the fields invalid and waiting for the fork +fsck functions to run. + +The proposed patchset is the +`inode +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-inodes>`_ +repair series. + +Quota Record Repairs +-------------------- + +Similar to inodes, quota records ("dquots") also have both ondisk records and +an in-memory representation, and hence are subject to the same cache coherency +issues. +Somewhat confusingly, both are known as dquots in the XFS codebase. + +The only repairs that should be made to the ondisk quota record buffers are +whatever is necessary to get the in-core structure loaded. +Once the in-memory representation is loaded, the only attributes needing +checking are obviously bad limits and timer values. + +Quota usage counters are checked, repaired, and discussed separately in the +section about :ref:`live quotacheck <quotacheck>`. + +The proposed patchset is the +`quota +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-quota>`_ +repair series. + +.. _fscounters: + +Freezing to Fix Summary Counters +-------------------------------- + +Filesystem summary counters track availability of filesystem resources such +as free blocks, free inodes, and allocated inodes. +This information could be compiled by walking the free space and inode indexes, +but this is a slow process, so XFS maintains a copy in the ondisk superblock +that should reflect the ondisk metadata, at least when the filesystem has been +unmounted cleanly. +For performance reasons, XFS also maintains incore copies of those counters, +which are key to enabling resource reservations for active transactions. +Writer threads reserve the worst-case quantities of resources from the +incore counter and give back whatever they don't use at commit time. +It is therefore only necessary to serialize on the superblock when the +superblock is being committed to disk. + +The lazy superblock counter feature introduced in XFS v5 took this even further +by training log recovery to recompute the summary counters from the AG headers, +which eliminated the need for most transactions even to touch the superblock. +The only time XFS commits the summary counters is at filesystem unmount. +To reduce contention even further, the incore counter is implemented as a +percpu counter, which means that each CPU is allocated a batch of blocks from a +global incore counter and can satisfy small allocations from the local batch. + +The high-performance nature of the summary counters makes it difficult for +online fsck to check them, since there is no way to quiesce a percpu counter +while the system is running. +Although online fsck can read the filesystem metadata to compute the correct +values of the summary counters, there's no way to hold the value of a percpu +counter stable, so it's quite possible that the counter will be out of date by +the time the walk is complete. +Earlier versions of online scrub would return to userspace with an incomplete +scan flag, but this is not a satisfying outcome for a system administrator. +For repairs, the in-memory counters must be stabilize while walking the +filesystem metadata to get an accurate reading and install it in the percpu +counter. + +To satisfy this requirement, online fsck must prevent other programs in the +system from initiating new writes to the filesystem, it must disable background +garbage collection threads, and it must wait for existing writer programs to +exit the kernel. +Once that has been established, scrub can walk the AG free space indexes, the +inode btrees, and the realtime bitmap to compute the correct value of all +four summary counters. +This is very similar to a filesystem freeze. + +The initial implementation used the actual VFS filesystem freeze mechanism to +quiesce filesystem activity. +With the filesystem frozen, it is possible to resolve the counter values with +exact precision, but there are many problems with calling the VFS methods +directly: + +- Other programs can unfreeze the filesystem without our knowledge. + This leads to incorrect scan results and incorrect repairs. + +- Adding an extra lock to prevent others from thawing the filesystem required + the addition of a ``->freeze_super`` function to wrap ``freeze_fs()``. + This in turn caused other subtle problems because it turns out that the VFS + ``freeze_super`` and ``thaw_super`` functions can drop the last reference to + the VFS superblock, and any subsequent access becomes a UAF bug! + This can happen if the filesystem is unmounted while the underlying block + device has frozen the filesystem. + This problem could be solved by grabbing extra references to the superblock, + but it felt suboptimal given the other inadequacies of this approach: + +- The log need not be quiesced to check the summary counters, but a VFS freeze + initiates one anyway. + This adds unnecessary runtime to live fscounter fsck operations. + +- Quiescing the log means that XFS flushes the (possibly incorrect) counters to + disk as part of cleaning the log. + +- A bug in the VFS meant that freeze could complete even when sync_filesystem + fails to flush the filesystem and returns an error. + This bug was fixed in Linux 5.17. + +The author established that the only component of online fsck that requires the +ability to freeze the filesystem is the fscounter scrubber, so the code for +this could be localized to that source file. +fscounter freeze behaves the same as the VFS freeze method, except: + +- The final freeze state is set one higher than ``SB_FREEZE_COMPLETE`` to + prevent other threads from thawing the filesystem. + +- It does not quiesce the log. + +With this code in place, it is now possible to pause the filesystem for just +long enough to check and correct the summary counters. + +The proposed patchset is the +`summary counter cleanup +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-fscounters>`_ +series.
PATCH 10/14 xfs: document full filesystem scans for online fsck
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Certain parts of the online fsck code need to scan every file in the entire filesystem. It is not acceptable to block the entire filesystem while this happens, which means that we need to be clever in allowing scans to coordinate with ongoing filesystem updates. We also need to hook the filesystem so that regular updates propagate to the staging records.
--- .../filesystems/xfs-online-fsck-design.rst | 677 ++++++++++++++++++++ 1 file changed, 677 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +677 -0
@@ -3018,3 +3018,680 @@ The proposed patchset is the `summary counter cleanup <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-fscounters>`_ series. + +Full Filesystem Scans +--------------------- + +Certain types of metadata can only be checked by walking every file in the +entire filesystem to record observations and comparing the observations against +what's recorded on disk. +Like every other type of online repair, repairs are made by writing those +observations to disk in a replacement structure and committing it atomically. +However, it is not practical to shut down the entire filesystem to examine +hundreds of billions of files because the downtime would be excessive. +Therefore, online fsck must build the infrastructure to manage a live scan of +all the files in the filesystem. +There are two questions that need to be solved to perform a live walk: + +- How does scrub manage the scan while it is collecting data? + +- How does the scan keep abreast of changes being made to the system by other + threads? + +.. _iscan: + +Coordinated Inode Scans +``````````````````````` + +In the original Unix filesystems of the 1970s, each directory entry contained +an index number (*inumber*) which was used as an index into on ondisk array +(*itable*) of fixed-size records (*inodes*) describing a file's attributes and +its data block mapping. +This system is described by J. Lions, `"inode (5659)" +<http://www.lemis.com/grog/Documentation/Lions/>`_ in *Lions' Commentary on +UNIX, 6th Edition*, (Dept. of Computer Science, the University of New South +Wales, November 1977), pp. 18-2; and later by D. Ritchie and K. Thompson, +`"Implementation of the File System" +<https://archive.org/details/bstj57-6-1905/page/n8/mode/1up>`_, from *The UNIX +Time-Sharing System*, (The Bell System Technical Journal, July 1978), pp. +1913-4. + +XFS retains most of this design, except now inumbers are search keys over all +the space in the data section filesystem. +They form a continuous keyspace that can be expressed as a 64-bit integer, +though the inodes themselves are sparsely distributed within the keyspace. +Scans proceed in a linear fashion across the inumber keyspace, starting from +``0x0`` and ending at ``0xFFFFFFFFFFFFFFFF``. +Naturally, a scan through a keyspace requires a scan cursor object to track the +scan progress. +Because this keyspace is sparse, this cursor contains two parts. +The first part of this scan cursor object tracks the inode that will be +examined next; call this the examination cursor. +Somewhat less obviously, the scan cursor object must also track which parts of +the keyspace have already been visited, which is critical for deciding if a +concurrent filesystem update needs to be incorporated into the scan data. +Call this the visited inode cursor. + +Advancing the scan cursor is a multi-step process encapsulated in +``xchk_iscan_iter``: + +1. Lock the AGI buffer of the AG containing the inode pointed to by the visited + inode cursor. + This guarantee that inodes in this AG cannot be allocated or freed while + advancing the cursor. + +2. Use the per-AG inode btree to look up the next inumber after the one that + was just visited, since it may not be keyspace adjacent. + +3. If there are no more inodes left in this AG: + + a. Move the examination cursor to the point of the inumber keyspace that + corresponds to the start of the next AG. + + b. Adjust the visited inode cursor to indicate that it has "visited" the + last possible inode in the current AG's inode keyspace. + XFS inumbers are segmented, so the cursor needs to be marked as having + visited the entire keyspace up to just before the start of the next AG's + inode keyspace. + + c. Unlock the AGI and return to step 1 if there are unexamined AGs in the + filesystem. + + d. If there are no more AGs to examine, set both cursors to the end of the + inumber keyspace. + The scan is now complete. + +4. Otherwise, there is at least one more inode to scan in this AG: + + a. Move the examination cursor ahead to the next inode marked as allocated + by the inode btree. + + b. Adjust the visited inode cursor to point to the inode just prior to where + the examination cursor is now. + Because the scanner holds the AGI buffer lock, no inodes could have been + created in the part of the inode keyspace that the visited inode cursor + just advanced. + +5. Get the incore inode for the inumber of the examination cursor. + By maintaining the AGI buffer lock until this point, the scanner knows that + it was safe to advance the examination cursor across the entire keyspace, + and that it has stabilized this next inode so that it cannot disappear from + the filesystem until the scan releases the incore inode. + +6. Drop the AGI lock and return the incore inode to the caller. + +Online fsck functions scan all files in the filesystem as follows: + +1. Start a scan by calling ``xchk_iscan_start``. + +2. Advance the scan cursor (``xchk_iscan_iter``) to get the next inode. + If one is provided: + + a. Lock the inode to prevent updates during the scan. + + b. Scan the inode. + + c. While still holding the inode lock, adjust the visited inode cursor + (``xchk_iscan_mark_visited``) to point to this inode. + + d. Unlock and release the inode. + +8. Call ``xchk_iscan_finish`` to complete the scan. + +There are subtleties with the inode cache that complicate grabbing the incore +inode for the caller. +Obviously, it is an absolute requirement that the inode metadata be consistent +enough to load it into the inode cache. +Second, if the incore inode is stuck in some intermediate state, the scan +coordinator must release the AGI and push the main filesystem to get the inode +back into a loadable state. + +The proposed patches are the +`inode scanner +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-iscan>`_ +series. + +Inode Management +```````````````` + +In regular filesystem code, references to allocated XFS incore inodes are +always obtained (``xfs_iget``) outside of transaction context because the +creation of the incore context for ane xisting file does not require metadata +updates. +However, it is important to note that references to incore inodes obtained as +part of file creation must be performed in transaction context because the +filesystem must ensure the atomicity of the ondisk inode btree index updates +and the initialization of the actual ondisk inode. + +References to incore inodes are always released (``xfs_irele``) outside of +transaction context because there are a handful of activities that might +require ondisk updates: + +- The VFS may decide to kick off writeback as part of a ``DONTCACHE`` inode + release. + +- Speculative preallocations need to be unreserved. + +- An unlinked file may have lost its last reference, in which case the entire + file must be inactivated, which involves releasing all of its resources in + the ondisk metadata and freeing the inode. + +These activities are collectively called inode inactivation. +Inactivation has two parts -- the VFS part, which initiates writeback on all +dirty file pages, and the XFS part, which cleans up XFS-specific information +and frees the inode if it was unlinked. +If the inode is unlinked (or unconnected after a file handle operation), the +kernel drops the inode into the inactivation machinery immediately. + +During normal operation, resource acquisition for an update follows this order +to avoid deadlocks: + +1. Inode reference (``iget``). + +2. Filesystem freeze protection, if repairing (``mnt_want_write_file``). + +3. Inode ``IOLOCK`` (VFS ``i_rwsem``) lock to control file IO. + +4. Inode ``MMAPLOCK`` (page cache ``invalidate_lock``) lock for operations that + can update page cache mappings. + +5. Log feature enablement. + +6. Transaction log space grant. + +7. Space on the data and realtime devices for the transaction. + +8. Incore dquot references, if a file is being repaired. + Note that they are not locked, merely acquired. + +9. Inode ``ILOCK`` for file metadata updates. + +10. AG header buffer locks / Realtime metadata inode ILOCK. + +11. Realtime metadata buffer locks, if applicable. + +12. Extent mapping btree blocks, if applicable. + +Resources are often released in the reverse order, though this is not required. +However, online fsck differs from regular XFS operations because it may examine +an object that normally is acquired in a later stage of the locking order, and +then decide to cross-reference the object with an object that is acquired +earlier in the order. +The next few sections detail the specific ways in which online fsck takes care +to avoid deadlocks. + +iget and irele During a Scrub +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +An inode scan performed on behalf of a scrub operation runs in transaction +context, and possibly with resources already locked and bound to it. +This isn't much of a problem for ``iget`` since it can operate in the context +of an existing transaction, as long as all of the bound resources are acquired +before the inode reference in the regular filesystem. + +When the VFS ``iput`` function is given a linked inode with no other +references, it normally puts the inode on an LRU list in the hope that it can +save time if another process re-opens the file before the system runs out +of memory and frees it. +Filesystem callers can short-circuit the LRU process by setting a ``DONTCACHE`` +flag on the inode to cause the kernel to try to drop the inode into the +inactivation machinery immediately. + +In the past, inactivation was always done from the process that dropped the +inode, which was a problem for scrub because scrub may already hold a +transaction, and XFS does not support nesting transactions. +On the other hand, if there is no scrub transaction, it is desirable to drop +otherwise unused inodes immediately to avoid polluting caches. +To capture these nuances, the online fsck code has a separate ``xchk_irele`` +function to set or clear the ``DONTCACHE`` flag to get the required release +behavior. + +Proposed patchsets include fixing +`scrub iget usage +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-iget-fixes>`_ and +`dir iget usage +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-dir-iget-fixes>`_. + +Locking Inodes +^^^^^^^^^^^^^^ + +In regular filesystem code, the VFS and XFS will acquire multiple IOLOCK locks +in a well-known order: parent → child when updating the directory tree, and +``struct inode`` address order otherwise. +For regular files, the MMAPLOCK can be acquired after the IOLOCK to stop page +faults. +If two MMAPLOCKs must be acquired, they are acquired in ``struct +address_space`` order. +Due to the structure of existing filesystem code, IOLOCKs and MMAPLOCKs must be +acquired before transactions are allocated. +If two ILOCKs must be acquired, they are acquired in inumber order. + +Inode lock acquisition must be done carefully during a coordinated inode scan. +Online fsck cannot abide these conventions, because for a directory tree +scanner, the scrub process holds the IOLOCK of the file being scanned and it +needs to take the IOLOCK of the file at the other end of the directory link. +If the directory tree is corrupt because it contains a cycle, ``xfs_scrub`` +cannot use the regular inode locking functions and avoid becoming trapped in an +ABBA deadlock. + +Solving both of these problems is straightforward -- any time online fsck +needs to take a second lock of the same class, it uses trylock to avoid an ABBA +deadlock. +If the trylock fails, scrub drops all inode locks and use trylock loops to +(re)acquire all necessary resources. +Trylock loops enable scrub to check for pending fatal signals, which is how +scrub avoids deadlocking the filesystem or becoming an unresponsive process. +However, trylock loops means that online fsck must be prepared to measure the +resource being scrubbed before and after the lock cycle to detect changes and +react accordingly. + +.. _dirparent: + +Case Study: Finding a Directory Parent +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Consider the directory parent pointer repair code as an example. +Online fsck must verify that the dotdot dirent of a directory points up to a +parent directory, and that the parent directory contains exactly one dirent +pointing down to the child directory. +Fully validating this relationship (and repairing it if possible) requires a +walk of every directory on the filesystem while holding the child locked, and +while updates to the directory tree are being made. +The coordinated inode scan provides a way to walk the filesystem without the +possibility of missing an inode. +The child directory is kept locked to prevent updates to the dotdot dirent, but +if the scanner fails to lock a parent, it can drop and relock both the child +and the prospective parent. +If the dotdot entry changes while the directory is unlocked, then a move or +rename operation must have changed the child's parentage, and the scan can +exit early. + +The proposed patchset is the +`directory repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-dirs>`_ +series. + +.. _fshooks: + +Filesystem Hooks +````````````````` + +The second piece of support that online fsck functions need during a full +filesystem scan is the ability to stay informed about updates being made by +other threads in the filesystem, since comparisons against the past are useless +in a dynamic environment. +Two pieces of Linux kernel infrastructure enable online fsck to monitor regular +filesystem operations: filesystem hooks and :ref:`static keys<jump_labels>`. + +Filesystem hooks convey information about an ongoing filesystem operation to +a downstream consumer. +In this case, the downstream consumer is always an online fsck function. +Because multiple fsck functions can run in parallel, online fsck uses the Linux +notifier call chain facility to dispatch updates to any number of interested +fsck processes. +Call chains are a dynamic list, which means that they can be configured at +run time. +Because these hooks are private to the XFS module, the information passed along +contains exactly what the checking function needs to update its observations. + +The current implementation of XFS hooks uses SRCU notifier chains to reduce the +impact to highly threaded workloads. +Regular blocking notifier chains use a rwsem and seem to have a much lower +overhead for single-threaded applications. +However, it may turn out that the combination of blocking chains and static +keys are a more performant combination; more study is needed here. + +The following pieces are necessary to hook a certain point in the filesystem: + +- A ``struct xfs_hooks`` object must be embedded in a convenient place such as + a well-known incore filesystem object. + +- Each hook must define an action code and a structure containing more context + about the action. + +- Hook providers should provide appropriate wrapper functions and structs + around the ``xfs_hooks`` and ``xfs_hook`` objects to take advantage of type + checking to ensure correct usage. + +- A callsite in the regular filesystem code must be chosen to call + ``xfs_hooks_call`` with the action code and data structure. + This place should be adjacent to (and not earlier than) the place where + the filesystem update is committed to the transaction. + In general, when the filesystem calls a hook chain, it should be able to + handle sleeping and should not be vulnerable to memory reclaim or locking + recursion. + However, the exact requirements are very dependent on the context of the hook + caller and the callee. + +- The online fsck function should define a structure to hold scan data, a lock + to coordinate access to the scan data, and a ``struct xfs_hook`` object. + The scanner function and the regular filesystem code must acquire resources + in the same order; see the next section for details. + +- The online fsck code must contain a C function to catch the hook action code + and data structure. + If the object being updated has already been visited by the scan, then the + hook information must be applied to the scan data. + +- Prior to unlocking inodes to start the scan, online fsck must call + ``xfs_hooks_setup`` to initialize the ``struct xfs_hook``, and + ``xfs_hooks_add`` to enable the hook. + +- Online fsck must call ``xfs_hooks_del`` to disable the hook once the scan is + complete. + +The number of hooks should be kept to a minimum to reduce complexity. +Static keys are used to reduce the overhead of filesystem hooks to nearly +zero when online fsck is not running. + +.. _liveupdate: + +Live Updates During a Scan +`````````````````````````` + +The code paths of the online fsck scanning code and the :ref:`hooked<fshooks>` +filesystem code look like this:: + + other program + ↓ + inode lock ←────────────────────┐ + ↓ │ + AG header lock │ + ↓ │ + filesystem function │ + ↓ │ + notifier call chain │ same + ↓ ├─── inode + scrub hook function │ lock + ↓ │ + scan data mutex ←──┐ same │ + ↓ ├─── scan │ + update scan data │ lock │ + ↑ │ │ + scan data mutex ←──┘ │ + ↑ │ + inode lock ←────────────────────┘ + ↑ + scrub function + ↑ + inode scanner + ↑ + xfs_scrub + +These rules must be followed to ensure correct interactions between the +checking code and the code making an update to the filesystem: + +- Prior to invoking the notifier call chain, the filesystem function being + hooked must acquire the same lock that the scrub scanning function acquires + to scan the inode. + +- The scanning function and the scrub hook function must coordinate access to + the scan data by acquiring a lock on the scan data. + +- Scrub hook function must not add the live update information to the scan + observations unless the inode being updated has already been scanned. + The scan coordinator has a helper predicate (``xchk_iscan_want_live_update``) + for this. + +- Scrub hook functions must not change the caller's state, including the + transaction that it is running. + They must not acquire any resources that might conflict with the filesystem + function being hooked. + +- The hook function can abort the inode scan to avoid breaking the other rules. + +The inode scan APIs are pretty simple: + +- ``xchk_iscan_start`` starts a scan + +- ``xchk_iscan_iter`` grabs a reference to the next inode in the scan or + returns zero if there is nothing left to scan + +- ``xchk_iscan_want_live_update`` to decide if an inode has already been + visited in the scan. + This is critical for hook functions to decide if they need to update the + in-memory scan information. + +- ``xchk_iscan_mark_visited`` to mark an inode as having been visited in the + scan + +- ``xchk_iscan_finish`` to finish the scan + +The proposed patches are at the start of the +`online quotacheck +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-quota>`_ +series. + +.. _quotacheck: + +Case Study: Quota Counter Checking +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +It is useful to compare the mount time quotacheck code to the online repair +quotacheck code. +Mount time quotacheck does not have to contend with concurrent operations, so +it does the following: + +1. Make sure the ondisk dquots are in good enough shape that all the incore + dquots will actually load, and zero the resource usage counters in the + ondisk buffer. + +2. Walk every inode in the filesystem. + Add each file's resource usage to the incore dquot. + +3. Walk each incore dquot. + If the incore dquot is not being flushed, add the ondisk buffer backing the + incore dquot to a delayed write (delwri) list. + +4. Write the buffer list to disk. + +Like most online fsck functions, online quotacheck can't write to regular +filesystem objects until the newly collected metadata reflect all filesystem +state. +Therefore, online quotacheck records file resource usage to a shadow dquot +index implemented with a sparse ``xfarray``, and only writes to the real dquots +once the scan is complete. +Handling transactional updates is tricky because quota resource usage updates +are handled in phases to minimize contention on dquots: + +1. The inodes involved are joined and locked to a transaction. + +2. For each dquot attached to the file: + + a. The dquot is locked. + + b. A quota reservation is added to the dquot's resource usage. + The reservation is recorded in the transaction. + + c. The dquot is unlocked. + +3. Changes in actual quota usage are tracked in the transaction. + +4. At transaction commit time, each dquot is examined again: + + a. The dquot is locked again. + + b. Quota usage changes are logged and unused reservation is given back to + the dquot. + + c. The dquot is unlocked. + +For online quotacheck, hooks are placed in steps 2 and 4. +The step 2 hook creates a shadow version of the transaction dquot context +(``dqtrx``) that operates in a similar manner to the regular code. +The step 4 hook commits the shadow ``dqtrx`` changes to the shadow dquots. +Notice that both hooks are called with the inode locked, which is how the +live update coordinates with the inode scanner. + +The quotacheck scan looks like this: + +1. Set up a coordinated inode scan. + +2. For each inode returned by the inode scan iterator: + + a. Grab and lock the inode. + + b. Determine that inode's resource usage (data blocks, inode counts, + realtime blocks) and add that to the shadow dquots for the user, group, + and project ids associated with the inode. + + c. Unlock and release the inode. + +3. For each dquot in the system: + + a. Grab and lock the dquot. + + b. Check the dquot against the shadow dquots created by the scan and updated + by the live hooks. + +Live updates are key to being able to walk every quota record without +needing to hold any locks for a long duration. +If repairs are desired, the real and shadow dquots are locked and their +resource counts are set to the values in the shadow dquot. + +The proposed patchset is the +`online quotacheck +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-quota>`_ +series. + +.. _nlinks: + +Case Study: File Link Count Checking +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +File link count checking also uses live update hooks. +The coordinated inode scanner is used to visit all directories on the +filesystem, and per-file link count records are stored in a sparse ``xfarray`` +indexed by inumber. +During the scanning phase, each entry in a directory generates observation +data as follows: + +1. If the entry is a dotdot (``'..'``) entry of the root directory, the + directory's parent link count is bumped because the root directory's dotdot + entry is self referential. + +2. If the entry is a dotdot entry of a subdirectory, the parent's backref + count is bumped. + +3. If the entry is neither a dot nor a dotdot entry, the target file's parent + count is bumped. + +4. If the target is a subdirectory, the parent's child link count is bumped. + +A crucial point to understand about how the link count inode scanner interacts +with the live update hooks is that the scan cursor tracks which *parent* +directories have been scanned. +In other words, the live updates ignore any update about ``A → B`` when A has +not been scanned, even if B has been scanned. +Furthermore, a subdirectory A with a dotdot entry pointing back to B is +accounted as a backref counter in the shadow data for A, since child dotdot +entries affect the parent's link count. +Live update hooks are carefully placed in all parts of the filesystem that +create, change, or remove directory entries, since those operations involve +bumplink and droplink. + +For any file, the correct link count is the number of parents plus the number +of child subdirectories. +Non-directories never have children of any kind. +The backref information is used to detect inconsistencies in the number of +links pointing to child subdirectories and the number of dotdot entries +pointing back. + +After the scan completes, the link count of each file can be checked by locking +both the inode and the shadow data, and comparing the link counts. +A second coordinated inode scan cursor is used for comparisons. +Live updates are key to being able to walk every inode without needing to hold +any locks between inodes. +If repairs are desired, the inode's link count is set to the value in the +shadow information. +If no parents are found, the file must be :ref:`reparented <orphanage>` to the +orphanage to prevent the file from being lost forever. + +The proposed patchset is the +`file link count repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-nlinks>`_ +series. + +.. _rmap_repair: + +Case Study: Rebuilding Reverse Mapping Records +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Most repair functions follow the same pattern: lock filesystem resources, +walk the surviving ondisk metadata looking for replacement metadata records, +and use an :ref:`in-memory array <xfarray>` to store the gathered observations. +The primary advantage of this approach is the simplicity and modularity of the +repair code -- code and data are entirely contained within the scrub module, +do not require hooks in the main filesystem, and are usually the most efficient +in memory use. +A secondary advantage of this repair approach is atomicity -- once the kernel +decides a structure is corrupt, no other threads can access the metadata until +the kernel finishes repairing and revalidating the metadata. + +For repairs going on within a shard of the filesystem, these advantages +outweigh the delays inherent in locking the shard while repairing parts of the +shard. +Unfortunately, repairs to the reverse mapping btree cannot use the "standard" +btree repair strategy because it must scan every space mapping of every fork of +every file in the filesystem, and the filesystem cannot stop. +Therefore, rmap repair foregoes atomicity between scrub and repair. +It combines a :ref:`coordinated inode scanner <iscan>`, :ref:`live update hooks +<liveupdate>`, and an :ref:`in-memory rmap btree <xfbtree>` to complete the +scan for reverse mapping records. + +1. Set up an xfbtree to stage rmap records. + +2. While holding the locks on the AGI and AGF buffers acquired during the + scrub, generate reverse mappings for all AG metadata: inodes, btrees, CoW + staging extents, and the internal log. + +3. Set up an inode scanner. + +4. Hook into rmap updates for the AG being repaired so that the live scan data + can receive updates to the rmap btree from the rest of the filesystem during + the file scan. + +5. For each space mapping found in either fork of each file scanned, + decide if the mapping matches the AG of interest. + If so: + + a. Create a btree cursor for the in-memory btree. + + b. Use the rmap code to add the record to the in-memory btree. + + c. Use the :ref:`special commit function <xfbtree_commit>` to write the + xfbtree changes to the xfile. + +6. For each live update received via the hook, decide if the owner has already + been scanned. + If so, apply the live update into the scan data: + + a. Create a btree cursor for the in-memory btree. + + b. Replay the operation into the in-memory btree. + + c. Use the :ref:`special commit function <xfbtree_commit>` to write the + xfbtree changes to the xfile. + This is performed with an empty transaction to avoid changing the + caller's state. + +7. When the inode scan finishes, create a new scrub transaction and relock the + two AG headers. + +8. Compute the new btree geometry using the number of rmap records in the + shadow btree, like all other btree rebuilding functions. + +9. Allocate the number of blocks computed in the previous step. + +10. Perform the usual btree bulk loading and commit to install the new rmap + btree. + +11. Reap the old rmap btree blocks as discussed in the case study about how + to :ref:`reap after rmap btree repair <rmap_reap>`. + +12. Free the xfbtree now that it not needed. + +The proposed patchset is the +`rmap repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-rmap-btree>`_ +series.
PATCH 11/14 xfs: document metadata file repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
File-based metadata (such as xattrs and directories) can be extremely large. To reduce the memory requirements and maximize code reuse, it is very convenient to create a temporary file, use the regular dir/attr code to store salvaged information, and then atomically swap the extents between the file being repaired and the temporary file. Record the high level concepts behind how temporary files and atomic content swapping should work, and then present some case studies of what the actual repair functions do.
--- .../filesystems/xfs-online-fsck-design.rst | 574 ++++++++++++++++++++ 1 file changed, 574 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +574 -0
@@ -3252,6 +3252,8 @@ Proposed patchsets include fixing `dir iget usage <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=scrub-dir-iget-fixes>`_. +.. _ilocking: + Locking Inodes ^^^^^^^^^^^^^^
@@ -3695,3 +3697,575 @@ The proposed patchset is the `rmap repair <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-rmap-btree>`_ series. + +Staging Repairs with Temporary Files on Disk +-------------------------------------------- + +XFS stores a substantial amount of metadata in file forks: directories, +extended attributes, symbolic link targets, free space bitmaps and summary +information for the realtime volume, and quota records. +File forks map 64-bit logical file fork space extents to physical storage space +extents, similar to how a memory management unit maps 64-bit virtual addresses +to physical memory addresses. +Therefore, file-based tree structures (such as directories and extended +attributes) use blocks mapped in the file fork offset address space that point +to other blocks mapped within that same address space, and file-based linear +structures (such as bitmaps and quota records) compute array element offsets in +the file fork offset address space. + +In the initial iteration of file metadata repair, the damaged metadata blocks +would be scanned for salvageable data; the extents in the file fork would be +reaped; and then a new structure would be built in its place. +This strategy did not survive the introduction of the atomic repair requirement +expressed earlier in this document. +The second iteration explored building a second structure at a high offset +in the fork from the salvage data, reaping the old extents, and using a +``COLLAPSE_RANGE`` operation to slide the new extents into place. +This had many drawbacks: + +- Array structures are linearly addressed, and the regular filesystem codebase + does not have the concept of a linear offset that could be applied to the + record offset computation to build an alternate copy. + +- Extended attributes are allowed to use the entire attr fork offset address + space. + +- Even if repair could build an alternate copy of a data structure in a + different part of the fork address space, the atomic repair commit + requirement means that online repair would have to be able to perform a log + assisted ``COLLAPSE_RANGE`` operation to ensure that the old structure was + completely replaced. + +- A crash after construction of the secondary tree but before the range + collapse would leave unreachable blocks in the file fork. + This would likely confuse things further. + +- Reaping blocks after a repair is not a simple operation, and initiating a + reap operation from a restarted range collapse operation during log recovery + is daunting. + +- Directory entry blocks and quota records record the file fork offset in the + header area of each block. + An atomic range collapse operation would have to rewrite this part of each + block header. + Rewriting a single field in block headers is not a huge problem, but it's + something to be aware of. + +- Each block in a directory or extended attributes btree index contains sibling + and child block pointers. + Were the atomic commit to use a range collapse operation, each block would + have to be rewritten very carefully to preserve the graph structure. + Doing this as part of a range collapse means rewriting a large number of + blocks repeatedly, which is not conducive to quick repairs. + +The third iteration of the design for file metadata repair went for a totally +new strategy -- create a temporary file in the XFS filesystem, write a new +structure at the correct offsets into the temporary file, and atomically swap +the fork mappings (and hence the fork contents) to commit the repair. +Once the repair is complete, the old fork can be reaped as necessary; if the +system goes down during the reap, the iunlink code will delete the blocks +during log recovery. + +**Note**: All space usage and inode indices in the filesystem *must* be +consistent to use a temporary file safely! +This dependency is the reason why online repair can only use pageable kernel +memory to stage ondisk space usage information. + +Swapping extents with a temporary file still requires a rewrite of the owner +field of the block headers, but this is *much* simpler than moving tree blocks +individually. +Furthermore, the buffer verifiers do not verify owner fields (since they are +not aware of the inode that owns the block), which makes reaping of old file +blocks much simpler. +Extent swapping requires that AG space metadata and the file fork metadata of +the file being repaired are all consistent with respect to each other, but +that's already a requirement for correct operation of files in general. +There is, however, a slight downside -- if the system crashes during the reap +phase and the fork extents are crosslinked, the iunlink processing will fail +because freeing space will find the extra reverse mappings and abort. + +Temporary files created for repair are similar to ``O_TMPFILE`` files created +by userspace. +They are not linked into a directory and the entire file will be reaped when +the last reference to the file is lost. +The key differences are that these files must have no access permission outside +the kernel at all, they must be specially marked to prevent them from being +opened by handle, and they must never be linked into the directory tree. + +Using a Temporary File +`````````````````````` + +Online repair code should use the ``xrep_tempfile_create`` function to create a +temporary file inside the filesystem. +This allocates an inode, marks the in-core inode private, and attaches it to +the scrub context. +These files are hidden from userspace, may not be added to the directory tree, +and must be kept private. + +Temporary files only use two inode locks: the IOLOCK and the ILOCK. +The MMAPLOCK is not needed here, because there must not be page faults from +userspace for data fork blocks. +The usage patterns of these two locks are the same as for any other XFS file -- +access to file data are controlled via the IOLOCK, and access to file metadata +are controlled via the ILOCK. +Locking helpers are provided so that the temporary file and its lock state can +be cleaned up by the scrub context. +To comply with the nested locking strategy laid out in the :ref:`inode +locking<ilocking>` section, it is recommended that scrub functions use the +xrep_tempfile_ilock*_nowait lock helpers. + +Data can be written to a temporary file by two means: + +1. ``xrep_tempfile_copyin`` can be used to set the contents of a regular + temporary file from an xfile. + +2. The regular directory, symbolic link, and extended attribute functions can + be used to write to the temporary file. + +Once a good copy of a data file has been constructed in a temporary file, it +must be conveyed to the file being repaired, which is the topic of the next +section. + +The proposed patches are in the +`realtime summary repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-rtsummary>`_ +series. + +Atomic Extent Swapping +---------------------- + +Once repair builds a temporary file with a new data structure written into +it, it must commit the new changes into the existing file. +It is not possible to swap the inumbers of two files, so instead the new +metadata must replace the old. +This suggests the need for the ability to swap extents, but the existing extent +swapping code used by the file defragmenting tool ``xfs_fsr`` is not sufficient +for online repair because: + +a. When the reverse-mapping btree is enabled, the swap code must keep the + reverse mapping information up to date with every exchange of mappings. + Therefore, it can only exchange one mapping per transaction, and each + transaction is independent. + +b. Reverse-mapping is critical for the operation of online fsck, so the old + defragmentation code (which swapped entire extent forks in a single + operation) is not useful here. + +c. Defragmentation is assumed to occur between two files with identical + contents. + For this use case, an incomplete exchange will not result in a user-visible + change in file contents, even if the operation is interrupted. + +d. Online repair needs to swap the contents of two files that are by definition + *not* identical. + For directory and xattr repairs, the user-visible contents might be the + same, but the contents of individual blocks may be very different. + +e. Old blocks in the file may be cross-linked with another structure and must + not reappear if the system goes down mid-repair. + +These problems are overcome by creating a new deferred operation and a new type +of log intent item to track the progress of an operation to exchange two file +ranges. +The new deferred operation type chains together the same transactions used by +the reverse-mapping extent swap code. +The new log item records the progress of the exchange to ensure that once an +exchange begins, it will always run to completion, even there are +interruptions. + +The proposed patchset is the +`atomic extent swap +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=atomic-file-updates>`_ +series. + +Using Log-Incompatible Feature Flags +```````````````````````````````````` + +Starting with XFS v5, the superblock contains a ``sb_features_log_incompat`` +field to indicate that the log contains records that might not readable by all +kernels that could mount this filesystem. +In short, log incompat features protect the log contents against kernels that +will not understand the contents. +Unlike the other superblock feature bits, log incompat bits are ephemeral +because an empty (clean) log does not need protection. +The log cleans itself after its contents have been committed into the +filesystem, either as part of an unmount or because the system is otherwise +idle. +Because upper level code can be working on a transaction at the same time that +the log cleans itself, it is necessary for upper level code to communicate to +the log when it is going to use a log incompatible feature. + +The log coordinates access to incompatible features through the use of one +``struct rw_semaphore`` for each feature. +The log cleaning code tries to take this rwsem in exclusive mode to clear the +bit; if the lock attempt fails, the feature bit remains set. +Filesystem code signals its intention to use a log incompat feature in a +transaction by calling ``xlog_use_incompat_feat``, which takes the rwsem in +shared mode. +The code supporting a log incompat feature should create wrapper functions to +obtain the log feature and call ``xfs_add_incompat_log_feature`` to set the +feature bits in the primary superblock. +The superblock update is performed transactionally, so the wrapper to obtain +log assistance must be called just prior to the creation of the transaction +that uses the functionality. +For a file operation, this step must happen after taking the IOLOCK and the +MMAPLOCK, but before allocating the transaction. +When the transaction is complete, the ``xlog_drop_incompat_feat`` function +is called to release the feature. +The feature bit will not be cleared from the superblock until the log becomes +clean. + +Log-assisted extended attribute updates and atomic extent swaps both use log +incompat features and provide convenience wrappers around the functionality. + +Mechanics of an Atomic Extent Swap +`````````````````````````````````` + +Swapping entire file forks is a complex task. +The goal is to exchange all file fork mappings between two file fork offset +ranges. +There are likely to be many extent mappings in each fork, and the edges of +the mappings aren't necessarily aligned. +Furthermore, there may be other updates that need to happen after the swap, +such as exchanging file sizes, inode flags, or conversion of fork data to local +format. +This is roughly the format of the new deferred extent swap work item: + +.. code-block:: c + + struct xfs_swapext_intent { + /* Inodes participating in the operation. */ + struct xfs_inode *sxi_ip1; + struct xfs_inode *sxi_ip2; + + /* File offset range information. */ + xfs_fileoff_t sxi_startoff1; + xfs_fileoff_t sxi_startoff2; + xfs_filblks_t sxi_blockcount; + + /* Set these file sizes after the operation, unless negative. */ + xfs_fsize_t sxi_isize1; + xfs_fsize_t sxi_isize2; + + /* XFS_SWAP_EXT_* log operation flags */ + uint64_t sxi_flags; + }; + +The new log intent item contains enough information to track two logical fork +offset ranges: ``(inode1, startoff1, blockcount)`` and ``(inode2, startoff2, +blockcount)``. +Each step of a swap operation exchanges the largest file range mapping possible +from one file to the other. +After each step in the swap operation, the two startoff fields are incremented +and the blockcount field is decremented to reflect the progress made. +The flags field captures behavioral parameters such as swapping the attr fork +instead of the data fork and other work to be done after the extent swap. +The two isize fields are used to swap the file size at the end of the operation +if the file data fork is the target of the swap operation. + +When the extent swap is initiated, the sequence of operations is as follows: + +1. Create a deferred work item for the extent swap. + At the start, it should contain the entirety of the file ranges to be + swapped. + +2. Call ``xfs_defer_finish`` to start processing of the exchange. + This will log an extent swap intent item to the transaction for the deferred + extent swap work item. + +3. Until ``sxi_blockcount`` of the deferred extent swap work item is zero, + + a. Read the block maps of both file ranges starting at ``sxi_startoff1`` and + ``sxi_startoff2``, respectively, and compute the longest extent that can + be swapped in a single step. + This is the minimum of the two ``br_blockcount`` s in the mappings. + Keep advancing through the file forks until at least one of the mappings + contains written blocks. + Mutual holes, unwritten extents, and extent mappings to the same physical + space are not exchanged. + + For the next few steps, this document will refer to the mapping that came + from file 1 as "map1", and the mapping that came from file 2 as "map2". + + b. Create a deferred block mapping update to unmap map1 from file 1. + + c. Create a deferred block mapping update to unmap map2 from file 2. + + d. Create a deferred block mapping update to map map1 into file 2. + + e. Create a deferred block mapping update to map map2 into file 1. + + f. Log the block, quota, and extent count updates for both files. + + g. Extend the ondisk size of either file if necessary. + + h. Log an extent swap done log item for the extent swap intent log item + that was read at the start of step 3. + + i. Compute the amount of file range that has just been covered. + This quantity is ``(map1.br_startoff + map1.br_blockcount - + sxi_startoff1)``, because step 3a could have skipped holes. + + j. Increase the starting offsets of ``sxi_startoff1`` and ``sxi_startoff2`` + by the number of blocks computed in the previous step, and decrease + ``sxi_blockcount`` by the same quantity. + This advances the cursor. + + k. Log a new extent swap intent log item reflecting the advanced state of + the work item. + + l. Return the proper error code (EAGAIN) to the deferred operation manager + to inform it that there is more work to be done. + The operation manager completes the deferred work in steps 3b-3e before + moving back to the start of step 3. + +4. Perform any post-processing. + This will be discussed in more detail in subsequent sections. + +If the filesystem goes down in the middle of an operation, log recovery will +find the most recent unfinished extent swap log intent item and restart from +there. +This is how extent swapping guarantees that an outside observer will either see +the old broken structure or the new one, and never a mismash of both. + +Extent Swapping with Regular User Files +``````````````````````````````````````` + +As mentioned earlier, XFS has long had the ability to swap extents between +files, which is used almost exclusively by ``xfs_fsr`` to defragment files. +The earliest form of this was the fork swap mechanism, where the entire +contents of data forks could be exchanged between two files by exchanging the +raw bytes in each inode fork's immediate area. +When XFS v5 came along with self-describing metadata, this old mechanism grew +some log support to continue rewriting the owner fields of BMBT blocks during +log recovery. +When the reverse mapping btree was later added to XFS, the only way to maintain +the consistency of the fork mappings with the reverse mapping index was to +develop an iterative mechanism that used deferred bmap and rmap operations to +swap mappings one at a time. +This mechanism is identical to steps 2-3 from the procedure above except for +the new tracking items, because the atomic extent swap mechanism is an +iteration of an existing mechanism and not something totally novel. +For the narrow case of file defragmentation, the file contents must be +identical, so the recovery guarantees are not much of a gain. + +Atomic extent swapping is much more flexible than the existing swapext +implementations because it can guarantee that the caller never sees a mix of +old and new contents even after a crash, and it can operate on two arbitrary +file fork ranges. +The extra flexibility enables several new use cases: + +- **Atomic commit of file writes**: A userspace process opens a file that it + wants to update. + Next, it opens a temporary file and calls the file clone operation to reflink + the first file's contents into the temporary file. + Writes to the original file should instead be written to the temporary file. + Finally, the process calls the atomic extent swap system call + (``FIEXCHANGE_RANGE``) to exchange the file contents, thereby committing all + of the updates to the original file, or none of them. + +- **Transactional file updates**: The same mechanism as above, but the caller + only wants the commit to occur if the original file's contents have not + changed. + To make this happen, the calling process snapshots the file modification and + change timestamps of the original file before reflinking its data to the + temporary file. + When the program is ready to commit the changes, it passes the timestamps + into the kernel as arguments to the atomic extent swap system call. + The kernel only commits the changes if the provided timestamps match the + original file. + +- **Emulation of atomic block device writes**: Export a block device with a + logical sector size matching the filesystem block size to force all writes + to be aligned to the filesystem block size. + Stage all writes to a temporary file, and when that is complete, call the + atomic extent swap system call with a flag to indicate that holes in the + temporary file should be ignored. + This emulates an atomic device write in software, and can support arbitrary + scattered writes. + +Preparation for Extent Swapping +``````````````````````````````` + +There are a few things that need to be taken care of before initiating an +atomic extent swap operation. +First, regular files require the page cache to be flushed to disk before the +operation begins, and directio writes to be quiesced. +Like any filesystem operation, extent swapping must determine the maximum +amount of disk space and quota that can be consumed on behalf of both files in +the operation, and reserve that quantity of resources to avoid an unrecoverable +out of space failure once it starts dirtying metadata. +The preparation step scans the ranges of both files to estimate: + +- Data device blocks needed to handle the repeated updates to the fork + mappings. +- Change in data and realtime block counts for both files. +- Increase in quota usage for both files, if the two files do not share the + same set of quota ids. +- The number of extent mappings that will be added to each file. +- Whether or not there are partially written realtime extents. + User programs must never be able to access a realtime file extent that maps + to different extents on the realtime volume, which could happen if the + operation fails to run to completion. + +The need for precise estimation increases the run time of the swap operation, +but it is very important to maintain correct accounting. +The filesystem must not run completely out of free space, nor can the extent +swap ever add more extent mappings to a fork than it can support. +Regular users are required to abide the quota limits, though metadata repairs +may exceed quota to resolve inconsistent metadata elsewhere. + +Special Features for Swapping Metadata File Extents +``````````````````````````````````````````````````` + +Extended attributes, symbolic links, and directories can set the fork format to +"local" and treat the fork as a literal area for data storage. +Metadata repairs must take extra steps to support these cases: + +- If both forks are in local format and the fork areas are large enough, the + swap is performed by copying the incore fork contents, logging both forks, + and committing. + The atomic extent swap mechanism is not necessary, since this can be done + with a single transaction. + +- If both forks map blocks, then the regular atomic extent swap is used. + +- Otherwise, only one fork is in local format. + The contents of the local format fork are converted to a block to perform the + swap. + The conversion to block format must be done in the same transaction that + logs the initial extent swap intent log item. + The regular atomic extent swap is used to exchange the mappings. + Special flags are set on the swap operation so that the transaction can be + rolled one more time to convert the second file's fork back to local format + if possible. + +Extended attributes and directories stamp the owning inode into every block, +but the buffer verifiers do not actually check the inode number! +Although there is no verification, it is still important to maintain +referential integrity, so prior to performing the extent swap, online repair +walks every block in the new data structure to update the owner field and flush +the buffer to disk. + +After a successful swap operation, the repair operation must reap the old fork +blocks by processing each fork mapping through the standard :ref:`file extent +reaping <reaping>` mechanism that is done post-repair. +If the filesystem should go down during the reap part of the repair, the +iunlink processing at the end of recovery will free both the temporary file and +whatever blocks were not reaped. +However, this iunlink processing omits the cross-link detection of online +repair, and is not completely foolproof. + +Swapping Temporary File Extents +``````````````````````````````` + +To repair a metadata file, online repair proceeds as follows: + +1. Create a temporary repair file. + +2. Use the staging data to write out new contents into the temporary repair + file. + The same fork must be written to as is being repaired. + +3. Commit the scrub transaction, since the swap estimation step must be + completed before transaction reservations are made. + +4. Call ``xrep_tempswap_trans_alloc`` to allocate a new scrub transaction with + the appropriate resource reservations, locks, and fill out a ``struct + xfs_swapext_req`` with the details of the swap operation. + +5. Call ``xrep_tempswap_contents`` to swap the contents. + +6. Commit the transaction to complete the repair. + +.. _rtsummary: + +Case Study: Repairing the Realtime Summary File +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In the "realtime" section of an XFS filesystem, free space is tracked via a +bitmap, similar to Unix FFS. +Each bit in the bitmap represents one realtime extent, which is a multiple of +the filesystem block size between 4KiB and 1GiB in size. +The realtime summary file indexes the number of free extents of a given size to +the offset of the block within the realtime free space bitmap where those free +extents begin. +In other words, the summary file helps the allocator find free extents by +length, similar to what the free space by count (cntbt) btree does for the data +section. + +The summary file itself is a flat file (with no block headers or checksums!) +partitioned into ``log2(total rt extents)`` sections containing enough 32-bit +counters to match the number of blocks in the rt bitmap. +Each counter records the number of free extents that start in that bitmap block +and can satisfy a power-of-two allocation request. + +To check the summary file against the bitmap: + +1. Take the ILOCK of both the realtime bitmap and summary files. + +2. For each free space extent recorded in the bitmap: + + a. Compute the position in the summary file that contains a counter that + represents this free extent. + + b. Read the counter from the xfile. + + c. Increment it, and write it back to the xfile. + +3. Compare the contents of the xfile against the ondisk file. + +To repair the summary file, write the xfile contents into the temporary file +and use atomic extent swap to commit the new contents. +The temporary file is then reaped. + +The proposed patchset is the +`realtime summary repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-rtsummary>`_ +series. + +Case Study: Salvaging Extended Attributes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In XFS, extended attributes are implemented as a namespaced name-value store. +Values are limited in size to 64KiB, but there is no limit in the number of +names. +The attribute fork is unpartitioned, which means that the root of the attribute +structure is always in logical block zero, but attribute leaf blocks, dabtree +index blocks, and remote value blocks are intermixed. +Attribute leaf blocks contain variable-sized records that associate +user-provided names with the user-provided values. +Values larger than a block are allocated separate extents and written there. +If the leaf information expands beyond a single block, a directory/attribute +btree (``dabtree``) is created to map hashes of attribute names to entries +for fast lookup. + +Salvaging extended attributes is done as follows: + +1. Walk the attr fork mappings of the file being repaired to find the attribute + leaf blocks. + When one is found, + + a. Walk the attr leaf block to find candidate keys. + When one is found, + + 1. Check the name for problems, and ignore the name if there are. + + 2. Retrieve the value. + If that succeeds, add the name and value to the staging xfarray and + xfblob. + +2. If the memory usage of the xfarray and xfblob exceed a certain amount of + memory or there are no more attr fork blocks to examine, unlock the file and + add the staged extended attributes to the temporary file. + +3. Use atomic extent swapping to exchange the new and old extended attribute + structures. + The old attribute blocks are now attached to the temporary file. + +4. Reap the temporary file. + +The proposed patchset is the +`extended attribute repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-xattrs>`_ +series.
PATCH 12/14 xfs: document directory tree repairs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Directory tree repairs are the least complete part of online fsck, due to the lack of directory parent pointers. However, even without that feature, we can still make some corrections to the directory tree -- we can salvage as many directory entries as we can from a damaged directory, and we can reattach orphaned inodes to the lost+found, just as xfs_repair does now.
--- .../filesystems/xfs-online-fsck-design.rst | 236 ++++++++++++++++++++ 1 file changed, 236 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +236 -0
@@ -4269,3 +4269,239 @@ The proposed patchset is the `extended attribute repair <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-xattrs>`_ series. + +Fixing Directories +------------------ + +Fixing directories is difficult with currently available filesystem features. +The offline repair tool scans all inodes to find files with nonzero link count, +and then it scans all directories to establish parentage of those linked files. +Damaged files and directories are zapped, and files with no parent are +moved to the ``/lost+found`` directory. +It does not try to salvage anything. + +The best that online repair can do at this time is to read directory data +blocks and salvage any dirents that look plausible, correct link counts, and +move orphans back into the directory tree. +The salvage process is discussed in the case study at the end of this section. +The second component to fixing the directory tree online is the :ref:`file link +count fsck <nlinks>`, since it can scan the entire filesystem to make sure that +files can neither be deleted while there are still parents nor forgotten after +all parents sever their links to the child. +The third part is discussed at the :ref:`end of this section<orphanage>`. +However, there may be a solution to these deficiencies soon! + +Parent Pointers +``````````````` + +The lack of secondary directory metadata hinders directory tree reconstruction +in much the same way that the historic lack of reverse space mapping +information once hindered reconstruction of filesystem space metadata. +Specifically, the lack of redundant metadata makes it nearly impossible to +construct a true replacement for a damaged directory; the best repair can do is +to salvage the dirents and use the file link count repair function to move +orphaned files to the lost and found. +The proposed parent pointer feature, however, will make total directory +reconstruction possible. + +Directory parent pointers were first proposed as an XFS feature more than a +decade ago by SGI. +In that implementation, each link from a parent directory to a child file was +augmented by an extended attribute in the child that could be used to identify +the parent directory. +Unfortunately, this early implementation had several major shortcomings: + +1. The XFS codebase of the late 2000s did not have the infrastructure to + enforce strong referential integrity in the directory tree, which is a fancy + way to say that it could not guarantee that a change in a forward link would + always be followed up by a corresponding change to the reverse links. + +2. Referential integrity was not integrated into either offline repair tool. + Checking had to be done online without taking any kernel or inode locks to + coordinate access. + It is not clear if this actually worked properly. + +3. The extended attribute did not record the name of the directory entry in the + parent, so the first parent pointer implementation cannot be used to + reconnect the directory tree. + +4. Extended attribute forks only support 65,536 extents, which means that + parent pointer attribute creation is likely to fail at some point before the + maximum file link count is achieved. + +In the second implementation (currently being developed by Allison Henderson +and Chandan Babu), the extended attribute code will be enhanced to use log +intent items to guarantee that an extended attribute update can always be +completed by log recovery. +The maximum extent counts of both the data and attribute forks have raised to +allow for creation of as many parent pointers as possible. +The parent pointer data will also include the entry name and location within +the parent. +In other words, child files will store parent pointer mappings of the form +``(parent_ino, parent_gen, dirent_pos) → (dirent_name)`` in their extended +attribute data. +With that in place, XFS can guarantee strong referential integrity of directory +tree operations -- forward links will always be complemented with reverse +links. + +When the parent pointer feature lands, the directory checking process can be +strengthened to ensure that the target of each dirent also contains a parent +pointer pointing back to the dirent. +The quality of directory repairs will improve because online fsck will be able +to reconstruct a directory in its entirety instead of skipping unsalvageable +areas. +This process is imagined to involve a :ref:`coordinated inode scan <iscan>` and +a :ref:`directory entry live update hook <liveupdate>`: +Scan every file in the entire filesystem, and every time the scan encounters a +file with a parent pointer to the directory that is being reconstructed, record +this entry in the temporary directory. +When the scan is complete, atomically swap the contents of the temporary +directory and the directory being repaired. +This code has not yet been constructed, so there is not yet a case study laying +out exactly how this process works. + +Parent pointers themselves can be checked by scanning each pointer and +verifying that the target of the pointer is a directory and that it contains a +dirent that corresponds to the information recorded in the parent pointer. +Reconstruction of the parent pointer information will work similarly to +directory reconstruction -- scan the filesystem, record the dirents pointing to +the file being repaired, and rebuild that part of the xattr namespace. + +**Question**: How will repair ensure that the ``dirent_pos`` fields match in +the reconstructed directory? + +*Answer*: The field could be designated advisory, since the other three values +are sufficient to find the entry in the parent. +However, this makes indexed key lookup impossible while repairs are ongoing. +A second option would be to allow creating directory entries at specified +offsets, which solves the referential integrity problem but runs the risk that +dirent creation will fail due to conflicts with the free space in the +directory. +These conflicts could be resolved by appending the directory entry and amending +the xattr code to support updating an xattr key and reindexing the dabtree, +though this would have to be performed with the parent directory still locked. +A fourth option would be to remove the parent pointer entry and re-add it +atomically. + +Case Study: Salvaging Directories +````````````````````````````````` + +Unlike extended attributes, directory blocks are all the same size, so +salvaging directories is straightforward: + +1. Find the parent of the directory. + If the dotdot entry is not unreadable, try to confirm that the alleged + parent has a child entry pointing back to the directory being repaired. + Otherwise, walk the filesystem to find it. + +2. Walk the first partition of data fork of the directory to find the directory + entry data blocks. + When one is found, + + a. Walk the directory data block to find candidate entries. + When an entry is found: + + i. Check the name for problems, and ignore the name if there are. + + ii. Retrieve the inumber and grab the inode. + If that succeeds, add the name, inode number, and file type to the + staging xfarray and xblob. + +3. If the memory usage of the xfarray and xfblob exceed a certain amount of + memory or there are no more directory data blocks to examine, unlock the + directory and add the staged dirents into the temporary directory. + Truncate the staging files. + +4. Use atomic extent swapping to exchange the new and old directory structures. + The old directory blocks are now attached to the temporary file. + +5. Reap the temporary file. + +**Question**: Should repair invalidate dentries when rebuilding a directory? + +**Question**: Can the dentry cache know about a directory entry that cannot be +salvaged? + +In theory, the dentry cache should be a subset of the directory entries on disk +because there's no way to load a dentry without having something to read in the +directory. +However, it is possible for a coherency problem to be introduced if the ondisk +structures becomes corrupt *after* the cache loads. +In theory it is necessary to scan all dentry cache entries for a directory to +ensure that one of the following apply: + +1. The cached dentry reflects an ondisk dirent in the new directory. + +2. The cached dentry no longer has a corresponding ondisk dirent in the new + directory and the dentry can be purged from the cache. + +3. The cached dentry no longer has an ondisk dirent but the dentry cannot be + purged. + This is bad. + +Unfortunately, the dentry cache does not have a means to walk all the dentries +with a particular directory as a parent. +This makes detecting situations #2 and #3 impossible, and remains an +interesting question for research. + +The proposed patchset is the +`directory repair +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-dirs>`_ +series. + +.. _orphanage: + +The Orphanage +------------- + +Filesystems present files as a directed, and hopefully acyclic, graph. +In other words, a tree. +The root of the filesystem is a directory, and each entry in a directory points +downwards either to more subdirectories or to non-directory files. +Unfortunately, a disruption in the directory graph pointers result in a +disconnected graph, which makes files impossible to access via regular path +resolution. +The directory parent pointer online scrub code can detect a dotdot entry +pointing to a parent directory that doesn't have a link back to the child +directory, and the file link count checker can detect a file that isn't pointed +to by any directory in the filesystem. +If the file in question has a positive link count, the file in question is an +orphan. + +When orphans are found, they should be reconnected to the directory tree. +Offline fsck solves the problem by creating a directory ``/lost+found`` to +serve as an orphanage, and linking orphan files into the orphanage by using the +inumber as the name. +Reparenting a file to the orphanage does not reset any of its permissions or +ACLs. + +This process is more involved in the kernel than it is in userspace. +The directory and file link count repair setup functions must use the regular +VFS mechanisms to create the orphanage directory with all the necessary +security attributes and dentry cache entries, just like a regular directory +tree modification. + +Orphaned files are adopted by the orphanage as follows: + +1. Call ``xrep_orphanage_try_create`` at the start of the scrub setup function + to try to ensure that the lost and found directory actually exists. + This also attaches the orphanage directory to the scrub context. + +2. If the decision is made to reconnect a file, take the IOLOCK of both the + orphanage and the file being reattached. + The ``xrep_orphanage_iolock_two`` function follows the inode locking + strategy discussed earlier. + +3. Call ``xrep_orphanage_compute_blkres`` and ``xrep_orphanage_compute_name`` + to compute the new name in the orphanage and the block reservation required. + +4. Use ``xrep_orphanage_adoption_prep`` to reserve resources to the repair + transaction. + +5. Call ``xrep_orphanage_adopt`` to reparent the orphaned file into the lost + and found, and update the kernel dentry cache. + +The proposed patches are in the +`orphanage adoption +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-orphanage>`_ +series.
PATCH 13/14 xfs: document the userspace fsck driver program
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add the sixth chapter of the online fsck design documentation, where we discuss the details of the data structures and algorithms used by the driver program xfs_scrub.
--- .../filesystems/xfs-online-fsck-design.rst | 313 ++++++++++++++++++++ 1 file changed, 313 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +313 -0
@@ -300,6 +300,9 @@ The seven phases are as follows: 7. Re-check the summary counters and presents the caller with a summary of space usage and file counts. +This allocation of responsibilities will be :ref:`revisited <scrubcheck>` +later in this document. + Steps for Each Scrub Item -------------------------
@@ -4505,3 +4508,313 @@ The proposed patches are in the `orphanage adoption <https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=repair-orphanage>`_ series. + +6. Userspace Algorithms and Data Structures +=========================================== + +This section discusses the key algorithms and data structures of the userspace +program, ``xfs_scrub``, that provide the ability to drive metadata checks and +repairs in the kernel, verify file data, and look for other potential problems. + +.. _scrubcheck: + +Checking Metadata +----------------- + +Recall the :ref:`phases of fsck work<scrubphases>` outlined earlier. +That structure follows naturally from the data dependencies designed into the +filesystem from its beginnings in 1993. +In XFS, there are several groups of metadata dependencies: + +a. Filesystem summary counts depend on consistency within the inode indices, + the allocation group space btrees, and the realtime volume space + information. + +b. Quota resource counts depend on consistency within the quota file data + forks, inode indices, inode records, and the forks of every file on the + system. + +c. The naming hierarchy depends on consistency within the directory and + extended attribute structures. + This includes file link counts. + +d. Directories, extended attributes, and file data depend on consistency within + the file forks that map directory and extended attribute data to physical + storage media. + +e. The file forks depends on consistency within inode records and the space + metadata indices of the allocation groups and the realtime volume. + This includes quota and realtime metadata files. + +f. Inode records depends on consistency within the inode metadata indices. + +g. Realtime space metadata depend on the inode records and data forks of the + realtime metadata inodes. + +h. The allocation group metadata indices (free space, inodes, reference count, + and reverse mapping btrees) depend on consistency within the AG headers and + between all the AG metadata btrees. + +i. ``xfs_scrub`` depends on the filesystem being mounted and kernel support + for online fsck functionality. + +Therefore, a metadata dependency graph is a convenient way to schedule checking +operations in the ``xfs_scrub`` program: + +- Phase 1 checks that the provided path maps to an XFS filesystem and detect + the kernel's scrubbing abilities, which validates group (i). + +- Phase 2 scrubs groups (g) and (h) in parallel using a threaded workqueue. + +- Phase 3 checks groups (f), (e), and (d), in that order. + These groups are all file metadata, which means that inodes are scanned in + parallel. + +- Phase 4 repairs everything in groups (i) through (d) so that phases 5 and 6 + may run reliably. + +- Phase 5 starts by checking groups (b) and (c) in parallel before moving on + to checking names. + +- Phase 6 depends on groups (i) through (b) to find file data blocks to verify, + to read them, and to report which blocks of which files are affected. + +- Phase 7 checks group (a), having validated everything else. + +Notice that the data dependencies between groups are enforced by the structure +of the program flow. + +Parallel Inode Scans +-------------------- + +An XFS filesystem can easily contain hundreds of millions of inodes. +Given that XFS targets installations with large high-performance storage, +it is desirable to scrub inodes in parallel to minimize runtime, particularly +if the program has been invoked manually from a command line. +This requires careful scheduling to keep the threads as evenly loaded as +possible. + +Early iterations of the ``xfs_scrub`` inode scanner naïvely created a single +workqueue and scheduled a single workqueue item per AG. +Each workqueue item walked the inode btree (with ``XFS_IOC_INUMBERS``) to find +inode chunks and then called bulkstat (``XFS_IOC_BULKSTAT``) to gather enough +information to construct file handles. +The file handle was then passed to a function to generate scrub items for each +metadata object of each inode. +This simple algorithm leads to thread balancing problems in phase 3 if the +filesystem contains one AG with a few large sparse files and the rest of the +AGs contain many smaller files. +The inode scan dispatch function was not sufficiently granular; it should have +been dispatching at the level of individual inodes, or, to constrain memory +consumption, inode btree records. + +Thanks to Dave Chinner, bounded workqueues in userspace enable ``xfs_scrub`` to +avoid this problem with ease by adding a second workqueue. +Just like before, the first workqueue is seeded with one workqueue item per AG, +and it uses INUMBERS to find inode btree chunks. +The second workqueue, however, is configured with an upper bound on the number +of items that can be waiting to be run. +Each inode btree chunk found by the first workqueue's workers are queued to the +second workqueue, and it is this second workqueue that queries BULKSTAT, +creates a file handle, and passes it to a function to generate scrub items for +each metadata object of each inode. +If the second workqueue is too full, the workqueue add function blocks the +first workqueue's workers until the backlog eases. +This doesn't completely solve the balancing problem, but reduces it enough to +move on to more pressing issues. + +The proposed patchsets are the scrub +`performance tweaks +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-performance-tweaks>`_ +and the +`inode scan rebalance +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-iscan-rebalance>`_ +series. + +.. _scrubrepair: + +Scheduling Repairs +------------------ + +During phase 2, corruptions and inconsistencies reported in any AGI header or +inode btree are repaired immediately, because phase 3 relies on proper +functioning of the inode indices to find inodes to scan. +Failed repairs are rescheduled to phase 4. +Problems reported in any other space metadata are deferred to phase 4. +Optimization opportunities are always deferred to phase 4, no matter their +origin. + +During phase 3, corruptions and inconsistencies reported in any part of a +file's metadata are repaired immediately if all space metadata were validated +during phase 2. +Repairs that fail or cannot be repaired immediately are scheduled for phase 4. + +In the original design of ``xfs_scrub``, it was thought that repairs would be +so infrequent that the ``struct xfs_scrub_metadata`` objects used to +communicate with the kernel could also be used as the primary object to +schedule repairs. +With recent increases in the number of optimizations possible for a given +filesystem object, it became much more memory-efficient to track all eligible +repairs for a given filesystem object with a single repair item. +Each repair item represents a single lockable object -- AGs, metadata files, +individual inodes, or a class of summary information. + +Phase 4 is responsible for scheduling a lot of repair work in as quick a +manner as is practical. +The :ref:`data dependencies <scrubcheck>` outlined earlier still apply, which +means that ``xfs_scrub`` must try to complete the repair work scheduled by +phase 2 before trying repair work scheduled by phase 3. +The repair process is as follows: + +1. Start a round of repair with a workqueue and enough workers to keep the CPUs + as busy as the user desires. + + a. For each repair item queued by phase 2, + + i. Ask the kernel to repair everything listed in the repair item for a + given filesystem object. + + ii. Make a note if the kernel made any progress in reducing the number + of repairs needed for this object. + + iii. If the object no longer requires repairs, revalidate all metadata + associated with this object. + If the revalidation succeeds, drop the repair item. + If not, requeue the item for more repairs. + + b. If any repairs were made, jump back to 1a to retry all the phase 2 items. + + c. For each repair item queued by phase 3, + + i. Ask the kernel to repair everything listed in the repair item for a + given filesystem object. + + ii. Make a note if the kernel made any progress in reducing the number + of repairs needed for this object. + + iii. If the object no longer requires repairs, revalidate all metadata + associated with this object. + If the revalidation succeeds, drop the repair item. + If not, requeue the item for more repairs. + + d. If any repairs were made, jump back to 1c to retry all the phase 3 items. + +2. If step 1 made any repair progress of any kind, jump back to step 1 to start + another round of repair. + +3. If there are items left to repair, run them all serially one more time. + Complain if the repairs were not successful, since this is the last chance + to repair anything. + +Corruptions and inconsistencies encountered during phases 5 and 7 are repaired +immediately. +Corrupt file data blocks reported by phase 6 cannot be recovered by the +filesystem. + +The proposed patchsets are the +`repair warning improvements +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-better-repair-warnings>`_, +refactoring of the +`repair data dependency +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-repair-data-deps>`_ +and +`object tracking +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-object-tracking>`_, +and the +`repair scheduling +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-repair-scheduling>`_ +improvement series. + +Checking Names for Confusable Unicode Sequences +----------------------------------------------- + +If ``xfs_scrub`` succeeds in validating the filesystem metadata by the end of +phase 4, it moves on to phase 5, which checks for suspicious looking names in +the filesystem. +These names consist of the filesystem label, names in directory entries, and +the names of extended attributes. +Like most Unix filesystems, XFS imposes the sparest of constraints on the +contents of a name -- slashes and null bytes are not allowed in directory +entries; and null bytes are not allowed in extended attributes and the +filesystem label. +Directory entries and attribute keys store the length of the name explicitly +ondisk, which means that nulls are not name terminators. +For this section, the term "naming domain" refers to any place where names are +presented together -- all the names in a directory, or all the attributes of a +file. + +Although the Unix naming constraints are very permissive, the reality of most +modern-day Linux systems is that programs work with Unicode character code +points to support international languages. +These programs typically encode those code points in UTF-8 when interfacing +with the C library because the kernel expects null-terminated names. +In the common case, therefore, names found in an XFS filesystem are actually +UTF-8 encoded Unicode data. + +To maximize its expressiveness, the Unicode standard defines separate control +points for various characters that render similarly or identically in writing +systems around the world. +For example, the character "Cyrillic Small Letter A" U+0430 "а" often renders +identically to "Latin Small Letter A" U+0061 "a". + +The standard also permits characters to be constructed in multiple ways -- +either by using a defined code point, or by combining one code point with +various combining marks. +For example, the character "Angstrom Sign U+212B "Å" can also be expressed +as "Latin Capital Letter A" U+0041 "A" followed by "Combining Ring Above" +U+030A "◌̊". +Both sequences render identically. + +Like the standards that preceded it, Unicode also defines various control +characters to alter the presentation of text. +For example, the character "Right-to-Left Override" U+202E can trick some +programs into rendering "moo\\xe2\\x80\\xaegnp.txt" as "mootxt.png". +A second category of rendering problems involves whitespace characters. +If the character "Zero Width Space" U+200B is encountered in a file name, the +name will render identically to a name that does not have the zero width +space. + +If two names within a naming domain have different byte sequences but render +identically, a user may be confused by it. +The kernel, in its indifference to upper level encoding schemes, permits this. +Most filesystem drivers persist the byte sequence names that are given to them +by the VFS. + +Techniques for detecting confusable names are explained in great detail in +sections 4 and 5 of the +`Unicode Security Mechanisms <https://unicode.org/reports/tr39/>`_ +document. +``xfs_scrub``, when it detects UTF-8 encoding in use on a system, uses the +Unicode normalization form NFD in conjunction with the confusable name +detection component of +`libicu <https://github.com/unicode-org/icu>`_ +to identify names with a directory or within a file's extended attributes that +could be confused for each other. +Names are also checked for control characters, non-rendering characters, and +mixing of bidirectional characters. +All of these potential issues are reported to the system administrator during +phase 5. + +Media Verification of File Data Extents +--------------------------------------- + +The system administrator can elect to initiate a media scan of all file data +blocks. +This scan after validation of all filesystem metadata (except for the summary +counters) as phase 6. +The scan starts by calling ``FS_IOC_GETFSMAP`` to scan the filesystem space map +to find areas that are allocated to file data fork extents. +Gaps betweeen data fork extents that are smaller than 64k are treated as if +they were data fork extents to reduce the command setup overhead. +When the space map scan accumulates a region larger than 32MB, a media +verification request is sent to the disk as a directio read of the raw block +device. + +If the verification read fails, ``xfs_scrub`` retries with single-block reads +to narrow down the failure to the specific region of the media and recorded. +When it has finished issuing verification requests, it again uses the space +mapping ioctl to map the recorded media errors back to metadata structures +and report what has been lost. +For media errors in blocks owned by files, the lack of parent pointers means +that the entire filesystem must be walked to report the file paths and offsets +corresponding to the media error.
PATCH 14/14 xfs: document future directions of online fsck
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add the seventh and final chapter of the online fsck documentation, where we talk about future functionality that can tie in with the functionality provided by the online fsck patchset.
--- .../filesystems/xfs-online-fsck-design.rst | 155 ++++++++++++++++++++ 1 file changed, 155 insertions(+)
Documentation/filesystems/xfs-online-fsck-design.rst +155 -0
@@ -4067,6 +4067,8 @@ The extra flexibility enables several new use cases: (``FIEXCHANGE_RANGE``) to exchange the file contents, thereby committing all of the updates to the original file, or none of them. +.. _swapext_if_unchanged: + - **Transactional file updates**: The same mechanism as above, but the caller only wants the commit to occur if the original file's contents have not changed.
@@ -4818,3 +4820,156 @@ and report what has been lost. For media errors in blocks owned by files, the lack of parent pointers means that the entire filesystem must be walked to report the file paths and offsets corresponding to the media error. + +7. Conclusion and Future Work +============================= + +It is hoped that the reader of this document has followed the designs laid out +in this document and now has some familiarity with how XFS performs online +rebuilding of its metadata indices, and how filesystem users can interact with +that functionality. +Although the scope of this work is daunting, it is hoped that this guide will +make it easier for code readers to understand what has been built, for whom it +has been built, and why. +Please feel free to contact the XFS mailing list with questions. + +FIEXCHANGE_RANGE +---------------- + +As discussed earlier, a second frontend to the atomic extent swap mechanism is +a new ioctl call that userspace programs can use to commit updates to files +atomically. +This frontend has been out for review for several years now, though the +necessary refinements to online repair and lack of customer demand mean that +the proposal has not been pushed very hard. + +Vectorized Scrub +---------------- + +As it turns out, the :ref:`refactoring <scrubrepair>` of repair items mentioned +earlier was a catalyst for enabling a vectorized scrub system call. +Since 2018, the cost of making a kernel call has increased considerably on some +systems to mitigate the effects of speculative execution attacks. +This incentivizes program authors to make as few system calls as possible to +reduce the number of times an execution path crosses a security boundary. + +With vectorized scrub, userspace pushes to the kernel the identity of a +filesystem object, a list of scrub types to run against that object, and a +simple representation of the data dependencies between the selected scrub +types. +The kernel executes as much of the caller's plan as it can until it hits a +dependency that cannot be satisfied due to a corruption, and tells userspace +how much was accomplished. +It is hoped that ``io_uring`` will pick up enough of this functionality that +online fsck can use that instead of adding a separate vectored scrub system +call to XFS. + +The relevant patchsets are the +`kernel vectorized scrub +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=vectorized-scrub>`_ +and +`userspace vectorized scrub +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=vectorized-scrub>`_ +series. + +Quality of Service Targets for Scrub +------------------------------------ + +One serious shortcoming of the online fsck code is that the amount of time that +it can spend in the kernel holding resource locks is basically unbounded. +Userspace is allowed to send a fatal signal to the process which will cause +``xfs_scrub`` to exit when it reaches a good stopping point, but there's no way +for userspace to provide a time budget to the kernel. +Given that the scrub codebase has helpers to detect fatal signals, it shouldn't +be too much work to allow userspace to specify a timeout for a scrub/repair +operation and abort the operation if it exceeds budget. +However, most repair functions have the property that once they begin to touch +ondisk metadata, the operation cannot be cancelled cleanly, after which a QoS +timeout is no longer useful. + +Defragmenting Free Space +------------------------ + +Over the years, many XFS users have requested the creation of a program to +clear a portion of the physical storage underlying a filesystem so that it +becomes a contiguous chunk of free space. +Call this free space defragmenter ``clearspace`` for short. + +The first piece the ``clearspace`` program needs is the ability to read the +reverse mapping index from userspace. +This already exists in the form of the ``FS_IOC_GETFSMAP`` ioctl. +The second piece it needs is a new fallocate mode +(``FALLOC_FL_MAP_FREE_SPACE``) that allocates the free space in a region and +maps it to a file. +Call this file the "space collector" file. +The third piece is the ability to force an online repair. + +To clear all the metadata out of a portion of physical storage, clearspace +uses the new fallocate map-freespace call to map any free space in that region +to the space collector file. +Next, clearspace finds all metadata blocks in that region by way of +``GETFSMAP`` and issues forced repair requests on the data structure. +This often results in the metadata being rebuilt somewhere that is not being +cleared. +After each relocation, clearspace calls the "map free space" function again to +collect any newly freed space in the region being cleared. + +To clear all the file data out of a portion of the physical storage, clearspace +uses the FSMAP information to find relevant file data blocks. +Having identified a good target, it uses the ``FICLONERANGE`` call on that part +of the file to try to share the physical space with a dummy file. +Cloning the extent means that the original owners cannot overwrite the +contents; any changes will be written somewhere else via copy-on-write. +Clearspace makes its own copy of the frozen extent in an area that is not being +cleared, and uses ``FIEDEUPRANGE`` (or the :ref:`atomic extent swap +<swapext_if_unchanged>` feature) to change the target file's data extent +mapping away from the area being cleared. +When all other mappings have been moved, clearspace reflinks the space into the +space collector file so that it becomes unavailable. + +There are further optimizations that could apply to the above algorithm. +To clear a piece of physical storage that has a high sharing factor, it is +strongly desirable to retain this sharing factor. +In fact, these extents should be moved first to maximize sharing factor after +the operation completes. +To make this work smoothly, clearspace needs a new ioctl +(``FS_IOC_GETREFCOUNTS``) to report reference count information to userspace. +With the refcount information exposed, clearspace can quickly find the longest, +most shared data extents in the filesystem, and target them first. + +**Question**: How might the filesystem move inode chunks? + +*Answer*: Dave Chinner has a prototype that creates a new file with the old +contents and then locklessly runs around the filesystem updating directory +entries. +The operation cannot complete if the filesystem goes down. +That problem isn't totally insurmountable: create an inode remapping table +hidden behind a jump label, and a log item that tracks the kernel walking the +filesystem to update directory entries. +The trouble is, the kernel can't do anything about open files, since it cannot +revoke them. + +**Question**: Can static keys be used to add a revoke bailout return to +*every* code path coming in from userspace? + +*Answer*: In principle, yes. +This would eliminate the overhead of the check until a revocation happens. +It's not clear what we do to a revoked file after all the callers are finished +with it, however. + +The relevant patchsets are the +`kernel freespace defrag +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git/log/?h=defrag-freespace>`_ +and +`userspace freespace defrag +<https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=defrag-freespace>`_ +series. + +Shrinking Filesystems +--------------------- + +Removing the end of the filesystem ought to be a simple matter of evacuating +the data and metadata at the end of the filesystem, and handing the freed space +to the shrink code. +That requires an evacuation of the space at end of the filesystem, which is a +use of free space defragmentation!
PATCH 1/8 xfs: pass the xfs_bmbt_irec directly through the log intent code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Instead of repeatedly boxing and unboxing the incore extent mapping structure as it passes through the BUI code, pass the pointer directly through.
--- fs/xfs/libxfs/xfs_bmap.c | 32 +++++++++--------- fs/xfs/libxfs/xfs_bmap.h | 5 +-- fs/xfs/xfs_bmap_item.c | 81 +++++++++++++++++----------------------------- 3 files changed, 46 insertions(+), 72 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +15 -17
@@ -6146,39 +6146,37 @@ xfs_bmap_unmap_extent(int xfs_bmap_finish_one (struct xfs_trans *tp, -struct xfs_inode *ip, -enum xfs_bmap_intent_type type, -int whichfork, -xfs_fileoff_t startoff, -xfs_fsblock_t startblock, -xfs_filblks_t *blockcount, -xfs_exntst_t state) +struct xfs_bmap_intent *bi) { +struct xfs_bmbt_irec *bmap = &bi->bi_bmap;int error =0 ;ASSERT (tp->t_firstblock ==NULLFSBLOCK );trace_xfs_bmap_deferred (tp->t_mountp, -XFS_FSB_TO_AGNO (tp->t_mountp, startblock), type, -XFS_FSB_TO_AGBNO (tp->t_mountp, startblock), - ip->i_ino, whichfork, startoff, *blockcount, state); +XFS_FSB_TO_AGNO (tp->t_mountp, bmap->br_startblock), + bi->bi_type, +XFS_FSB_TO_AGBNO (tp->t_mountp, bmap->br_startblock), + bi->bi_owner->i_ino, bi->bi_whichfork, + bmap->br_startoff, bmap->br_blockcount, + bmap->br_state); -if (WARN_ON_ONCE (whichfork !=XFS_DATA_FORK )) +if (WARN_ON_ONCE (bi->bi_whichfork !=XFS_DATA_FORK ))return -EFSCORRUPTED ;if (XFS_TEST_ERROR (false, tp->t_mountp,XFS_ERRTAG_BMAP_FINISH_ONE ))return -EIO ; -switch (type) { +switch (bi->bi_type) {case XFS_BMAP_MAP : - error =xfs_bmapi_remap (tp, ip, startoff, *blockcount, - startblock,0 ); - *blockcount =0 ; + error =xfs_bmapi_remap (tp, bi->bi_owner, bmap->br_startoff, + bmap->br_blockcount, bmap->br_startblock,0 ); + bmap->br_blockcount =0 ;break ;case XFS_BMAP_UNMAP : - error =__xfs_bunmapi (tp, ip, startoff, blockcount, -XFS_BMAPI_REMAP ,1 ); + error =__xfs_bunmapi (tp, bi->bi_owner, bmap->br_startoff, + &bmap->br_blockcount,XFS_BMAPI_REMAP ,1 );break ;default :ASSERT (0 );
fs/xfs/libxfs/xfs_bmap.h +1 -4
@@ -234,10 +234,7 @@ struct xfs_bmap_intent {struct xfs_bmbt_irec bi_bmap; }; -int xfs_bmap_finish_one (struct xfs_trans *tp,struct xfs_inode *ip, -enum xfs_bmap_intent_type type,int whichfork, -xfs_fileoff_t startoff,xfs_fsblock_t startblock, -xfs_filblks_t *blockcount,xfs_exntst_t state); +int xfs_bmap_finish_one (struct xfs_trans *tp,struct xfs_bmap_intent *bi);void xfs_bmap_map_extent (struct xfs_trans *tp,struct xfs_inode *ip,struct xfs_bmbt_irec *imap); void xfs_bmap_unmap_extent(struct xfs_trans *tp, struct xfs_inode *ip,
fs/xfs/xfs_bmap_item.c +30 -51
138 lines not on this page · raw message
PATCH 2/8 xfs: fix confusing variable names in xfs_bmap_item.c
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Variable names in this code module are inconsistent and confusing. xfs_map_extent describe file mappings, so rename them "map". xfs_bmap_intents describe block mapping intents, so rename them "bi".
--- fs/xfs/xfs_bmap_item.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-)
fs/xfs/xfs_bmap_item.c +28 -28
@@ -283,24 +283,24 @@ xfs_bmap_update_diff_items(/* Set the map extent flags for this mapping. */ static void xfs_trans_set_bmap_flags ( -struct xfs_map_extent *bmap, +struct xfs_map_extent *map,enum xfs_bmap_intent_type type,int whichfork,xfs_exntst_t state) { - bmap->me_flags =0 ; + map->me_flags =0 ;switch (type) {case XFS_BMAP_MAP :case XFS_BMAP_UNMAP : - bmap->me_flags = type; + map->me_flags = type;break ;default :ASSERT (0 ); }if (state ==XFS_EXT_UNWRITTEN ) - bmap->me_flags |=XFS_BMAP_EXTENT_UNWRITTEN ; + map->me_flags |=XFS_BMAP_EXTENT_UNWRITTEN ;if (whichfork ==XFS_ATTR_FORK ) - bmap->me_flags |=XFS_BMAP_EXTENT_ATTR_FORK ; + map->me_flags |=XFS_BMAP_EXTENT_ATTR_FORK ; }/* Log bmap updates in the intent item. */
@@ -308,7 +308,7 @@ STATIC voidxfs_bmap_update_log_item ( struct xfs_trans *tp, struct xfs_bui_log_item *buip, - struct xfs_bmap_intent *bmap) + struct xfs_bmap_intent *bi) { uint next_extent;struct xfs_map_extent *map;
@@ -324,12 +324,12 @@ xfs_bmap_update_log_item( next_extent =atomic_inc_return (&buip->bui_next_extent) -1 ;ASSERT (next_extent < buip->bui_format.bui_nextents); map = &buip->bui_format.bui_extents[next_extent]; - map->me_owner = bmap->bi_owner->i_ino; - map->me_startblock = bmap->bi_bmap.br_startblock; - map->me_startoff = bmap->bi_bmap.br_startoff; - map->me_len = bmap->bi_bmap.br_blockcount; -xfs_trans_set_bmap_flags (map, bmap->bi_type, bmap->bi_whichfork, - bmap->bi_bmap.br_state); + map->me_owner = bi->bi_owner->i_ino; + map->me_startblock = bi->bi_bmap.br_startblock; + map->me_startoff = bi->bi_bmap.br_startoff; + map->me_len = bi->bi_bmap.br_blockcount; +xfs_trans_set_bmap_flags (map, bi->bi_type, bi->bi_whichfork, + bi->bi_bmap.br_state); } static struct xfs_log_item *
@@ -341,15 +341,15 @@ xfs_bmap_update_create_intent( {struct xfs_mount *mp = tp->t_mountp;struct xfs_bui_log_item *buip =xfs_bui_init (mp); -struct xfs_bmap_intent *bmap; +struct xfs_bmap_intent *bi;ASSERT (count ==XFS_BUI_MAX_FAST_EXTENTS );xfs_trans_add_item (tp, &buip->bui_item);if (sort)list_sort (mp, items, xfs_bmap_update_diff_items); -list_for_each_entry (bmap, items, bi_list) -xfs_bmap_update_log_item (tp, buip, bmap); +list_for_each_entry (bi, items, bi_list) +xfs_bmap_update_log_item (tp, buip, bi);return &buip->bui_item; }
@@ -398,10 +398,10 @@ STATIC voidxfs_bmap_update_cancel_item ( struct list_head *item) { -struct xfs_bmap_intent *bmap; +struct xfs_bmap_intent *bi; - bmap = container_of(item, struct xfs_bmap_intent, bi_list); -kmem_cache_free (xfs_bmap_intent_cache, bmap); + bi = container_of(item, struct xfs_bmap_intent, bi_list); +kmem_cache_free (xfs_bmap_intent_cache, bi); }const struct xfs_defer_op_type xfs_bmap_update_defer_type = {
@@ -419,18 +419,18 @@ xfs_bui_validate(struct xfs_mount *mp, struct xfs_bui_log_item *buip) { - struct xfs_map_extent *bmap; + struct xfs_map_extent *map;/* Only one mapping operation per BUI... */ if (buip->bui_format.bui_nextents !=XFS_BUI_MAX_FAST_EXTENTS )return false; - bmap = &buip->bui_format.bui_extents[0 ]; + map = &buip->bui_format.bui_extents[0 ]; -if (bmap->me_flags & ~XFS_BMAP_EXTENT_FLAGS ) +if (map->me_flags & ~XFS_BMAP_EXTENT_FLAGS )return false; -switch (bmap->me_flags &XFS_BMAP_EXTENT_TYPE_MASK ) { +switch (map->me_flags &XFS_BMAP_EXTENT_TYPE_MASK ) {case XFS_BMAP_MAP :case XFS_BMAP_UNMAP :break ;
@@ -438,13 +438,13 @@ xfs_bui_validate(return false; } -if (!xfs_verify_ino (mp, bmap->me_owner)) +if (!xfs_verify_ino (mp, map->me_owner))return false; -if (!xfs_verify_fileext (mp, bmap->me_startoff, bmap->me_len)) +if (!xfs_verify_fileext (mp, map->me_startoff, map->me_len))return false; -return xfs_verify_fsbext (mp, bmap->me_startblock, bmap->me_len); +return xfs_verify_fsbext (mp, map->me_startblock, map->me_len); }/*
@@ -558,18 +558,18 @@ xfs_bui_item_relog( {struct xfs_bud_log_item *budp;struct xfs_bui_log_item *buip; -struct xfs_map_extent *extp; +struct xfs_map_extent *map;unsigned int count; count =BUI_ITEM (intent)->bui_format.bui_nextents; - extp =BUI_ITEM (intent)->bui_format.bui_extents; + map =BUI_ITEM (intent)->bui_format.bui_extents; tp->t_flags |=XFS_TRANS_DIRTY ; budp =xfs_trans_get_bud (tp,BUI_ITEM (intent));set_bit (XFS_LI_DIRTY , &budp->bud_item.li_flags); buip =xfs_bui_init (tp->t_mountp); -memcpy (buip->bui_format.bui_extents, extp, count *sizeof (*extp)); +memcpy (buip->bui_format.bui_extents, map, count *sizeof (*map));atomic_set (&buip->bui_next_extent, count);xfs_trans_add_item (tp, &buip->bui_item);set_bit (XFS_LI_DIRTY , &buip->bui_item.li_flags);
PATCH 3/8 xfs: pass xfs_extent_free_item directly through the log intent code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Pass the incore xfs_extent_free_item through the EFI logging code instead of repeatedly boxing and unboxing parameters.
--- fs/xfs/xfs_extfree_item.c | 55 +++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 25 deletions(-)
fs/xfs/xfs_extfree_item.c +30 -25
@@ -345,23 +345,30 @@ static intxfs_trans_free_extent ( struct xfs_trans *tp, struct xfs_efd_log_item *efdp, - xfs_fsblock_t start_block, - xfs_extlen_t ext_len, - const struct xfs_owner_info *oinfo, - bool skip_discard) + struct xfs_extent_free_item *free) { + struct xfs_owner_info oinfo = { };struct xfs_mount *mp = tp->t_mountp;struct xfs_extent *extp;uint next_extent; -xfs_agnumber_t agno =XFS_FSB_TO_AGNO (mp, start_block); +xfs_agnumber_t agno =XFS_FSB_TO_AGNO (mp, + free->xefi_startblock);xfs_agblock_t agbno =XFS_FSB_TO_AGBNO (mp, - start_block); + free->xefi_startblock);int error; -trace_xfs_bmap_free_deferred (tp->t_mountp, agno,0 , agbno, ext_len); + oinfo.oi_owner = free->xefi_owner; +if (free->xefi_flags &XFS_EFI_ATTR_FORK ) + oinfo.oi_flags |=XFS_OWNER_INFO_ATTR_FORK ; +if (free->xefi_flags &XFS_EFI_BMBT_BLOCK ) + oinfo.oi_flags |=XFS_OWNER_INFO_BMBT_BLOCK ; - error =__xfs_free_extent (tp, start_block, ext_len, - oinfo,XFS_AG_RESV_NONE , skip_discard); +trace_xfs_bmap_free_deferred (tp->t_mountp, agno,0 , agbno, + free->xefi_blockcount); + + error =__xfs_free_extent (tp, free->xefi_startblock, + free->xefi_blockcount, &oinfo,XFS_AG_RESV_NONE , + free->xefi_flags &XFS_EFI_SKIP_DISCARD );/* * Mark the transaction dirty, even on error. This ensures the * transaction is aborted, which:
@@ -375,8 +382,8 @@ xfs_trans_free_extent( next_extent = efdp->efd_next_extent;ASSERT (next_extent < efdp->efd_format.efd_nextents); extp = &(efdp->efd_format.efd_extents[next_extent]); - extp->ext_start = start_block; - extp->ext_len = ext_len; + extp->ext_start = free->xefi_startblock; + extp->ext_len = free->xefi_blockcount; efdp->efd_next_extent++;return error;
@@ -463,20 +470,12 @@ xfs_extent_free_finish_item(struct list_head *item, struct xfs_btree_cur **state) { - struct xfs_owner_info oinfo = { }; struct xfs_extent_free_item *free;int error; free = container_of(item, struct xfs_extent_free_item, xefi_list); - oinfo.oi_owner = free->xefi_owner; -if (free->xefi_flags &XFS_EFI_ATTR_FORK ) - oinfo.oi_flags |=XFS_OWNER_INFO_ATTR_FORK ; -if (free->xefi_flags &XFS_EFI_BMBT_BLOCK ) - oinfo.oi_flags |=XFS_OWNER_INFO_BMBT_BLOCK ; - error =xfs_trans_free_extent (tp,EFD_ITEM (done), - free->xefi_startblock, - free->xefi_blockcount, - &oinfo, free->xefi_flags &XFS_EFI_SKIP_DISCARD ); + + error =xfs_trans_free_extent (tp,EFD_ITEM (done), free);kmem_cache_free (xfs_extfree_item_cache, free);return error; }
@@ -599,7 +598,6 @@ xfs_efi_item_recover(struct xfs_mount *mp = lip->li_log->l_mp;struct xfs_efd_log_item *efdp;struct xfs_trans *tp; -struct xfs_extent *extp;int i;int error =0 ;
@@ -624,10 +622,17 @@ xfs_efi_item_recover( efdp =xfs_trans_get_efd (tp, efip, efip->efi_format.efi_nextents);for (i =0 ; i < efip->efi_format.efi_nextents; i++) { +struct xfs_extent_free_item fake = { + .xefi_owner =XFS_RMAP_OWN_UNKNOWN , + }; +struct xfs_extent *extp; + extp = &efip->efi_format.efi_extents[i]; - error =xfs_trans_free_extent (tp, efdp, extp->ext_start, - extp->ext_len, - &XFS_RMAP_OINFO_ANY_OWNER , false); + + fake.xefi_startblock = extp->ext_start; + fake.xefi_blockcount = extp->ext_len; + + error =xfs_trans_free_extent (tp, efdp, &fake);if (error == -EFSCORRUPTED )XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, extp,sizeof (*extp));
PATCH 4/8 xfs: fix confusing xfs_extent_item variable names
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Change the name of all pointers to xfs_extent_item structures to "xefi" to make the name consistent and because the current selections ("new" and "free") mean other things in C.
--- fs/xfs/libxfs/xfs_alloc.c | 32 ++++++++++----------- fs/xfs/xfs_extfree_item.c | 70 +++++++++++++++++++++++---------------------- 2 files changed, 51 insertions(+), 51 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +16 -16
@@ -2472,20 +2472,20 @@ xfs_defer_agfl_block( struct xfs_owner_info *oinfo) {struct xfs_mount *mp = tp->t_mountp; -struct xfs_extent_free_item *new;/* new element */ +struct xfs_extent_free_item *xefi;ASSERT (xfs_extfree_item_cache !=NULL );ASSERT (oinfo !=NULL ); - new =kmem_cache_zalloc (xfs_extfree_item_cache, + xefi =kmem_cache_zalloc (xfs_extfree_item_cache,GFP_KERNEL | __GFP_NOFAIL); - new->xefi_startblock =XFS_AGB_TO_FSB (mp, agno, agbno); - new->xefi_blockcount =1 ; - new->xefi_owner = oinfo->oi_owner; + xefi->xefi_startblock =XFS_AGB_TO_FSB (mp, agno, agbno); + xefi->xefi_blockcount =1 ; + xefi->xefi_owner = oinfo->oi_owner;trace_xfs_agfl_free_defer (mp, agno,0 , agbno,1 ); -xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_AGFL_FREE , &new->xefi_list); +xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_AGFL_FREE , &xefi->xefi_list); }/*
@@ -2500,7 +2500,7 @@ __xfs_free_extent_later( const struct xfs_owner_info *oinfo, bool skip_discard) { -struct xfs_extent_free_item *new;/* new element */ +struct xfs_extent_free_item *xefi;#ifdef DEBUG struct xfs_mount *mp = tp->t_mountp;xfs_agnumber_t agno;
@@ -2519,27 +2519,27 @@ __xfs_free_extent_later(#endif ASSERT (xfs_extfree_item_cache !=NULL ); - new =kmem_cache_zalloc (xfs_extfree_item_cache, + xefi =kmem_cache_zalloc (xfs_extfree_item_cache,GFP_KERNEL | __GFP_NOFAIL); - new->xefi_startblock = bno; - new->xefi_blockcount = (xfs_extlen_t )len; + xefi->xefi_startblock = bno; + xefi->xefi_blockcount = (xfs_extlen_t )len;if (skip_discard) - new->xefi_flags |=XFS_EFI_SKIP_DISCARD ; + xefi->xefi_flags |=XFS_EFI_SKIP_DISCARD ;if (oinfo) {ASSERT (oinfo->oi_offset ==0 );if (oinfo->oi_flags &XFS_OWNER_INFO_ATTR_FORK ) - new->xefi_flags |=XFS_EFI_ATTR_FORK ; + xefi->xefi_flags |=XFS_EFI_ATTR_FORK ;if (oinfo->oi_flags &XFS_OWNER_INFO_BMBT_BLOCK ) - new->xefi_flags |=XFS_EFI_BMBT_BLOCK ; - new->xefi_owner = oinfo->oi_owner; + xefi->xefi_flags |=XFS_EFI_BMBT_BLOCK ; + xefi->xefi_owner = oinfo->oi_owner; }else { - new->xefi_owner =XFS_RMAP_OWN_NULL ; + xefi->xefi_owner =XFS_RMAP_OWN_NULL ; }trace_xfs_bmap_free_defer (tp->t_mountp,XFS_FSB_TO_AGNO (tp->t_mountp, bno),0 ,XFS_FSB_TO_AGBNO (tp->t_mountp, bno), len); -xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_FREE , &new->xefi_list); +xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_FREE , &xefi->xefi_list); }#ifdef DEBUG
fs/xfs/xfs_extfree_item.c +35 -35
157 lines not on this page · raw message
PATCH 5/8 xfs: pass rmap space mapping directly through the log intent code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Pass the incore rmap space mapping through the RUI logging code instead of repeatedly boxing and unboxing parameters.
--- fs/xfs/libxfs/xfs_rmap.c | 52 ++++++++++++++++++------------------- fs/xfs/libxfs/xfs_rmap.h | 6 +--- fs/xfs/xfs_rmap_item.c | 65 +++++++++++++++++++++------------------------- 3 files changed, 56 insertions(+), 67 deletions(-)
fs/xfs/libxfs/xfs_rmap.c +25 -27
@@ -2390,13 +2390,7 @@ xfs_rmap_finish_one_cleanup(int xfs_rmap_finish_one (struct xfs_trans *tp, -enum xfs_rmap_intent_type type, -uint64_t owner, -int whichfork, -xfs_fileoff_t startoff, -xfs_fsblock_t startblock, -xfs_filblks_t blockcount, -xfs_exntst_t state, +struct xfs_rmap_intent *ri,struct xfs_btree_cur **pcur) {struct xfs_mount *mp = tp->t_mountp;
@@ -2408,11 +2402,13 @@ xfs_rmap_finish_one(xfs_agblock_t bno;bool unwritten; - pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, startblock)); - bno =XFS_FSB_TO_AGBNO (mp, startblock); + pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ri->ri_bmap.br_startblock)); + bno =XFS_FSB_TO_AGBNO (mp, ri->ri_bmap.br_startblock); -trace_xfs_rmap_deferred (mp, pag->pag_agno, type, bno, owner, whichfork, - startoff, blockcount, state); +trace_xfs_rmap_deferred (mp, pag->pag_agno, ri->ri_type, bno, + ri->ri_owner, ri->ri_whichfork, + ri->ri_bmap.br_startoff, ri->ri_bmap.br_blockcount, + ri->ri_bmap.br_state);if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_RMAP_FINISH_ONE )) { error = -EIO ;
@@ -2448,36 +2444,38 @@ xfs_rmap_finish_one( } *pcur = rcur; -xfs_rmap_ino_owner (&oinfo, owner, whichfork, startoff); - unwritten = state ==XFS_EXT_UNWRITTEN ; - bno =XFS_FSB_TO_AGBNO (rcur->bc_mp, startblock); +xfs_rmap_ino_owner (&oinfo, ri->ri_owner, ri->ri_whichfork, + ri->ri_bmap.br_startoff); + unwritten = ri->ri_bmap.br_state ==XFS_EXT_UNWRITTEN ; + bno =XFS_FSB_TO_AGBNO (rcur->bc_mp, ri->ri_bmap.br_startblock); -switch (type) { +switch (ri->ri_type) {case XFS_RMAP_ALLOC :case XFS_RMAP_MAP : - error =xfs_rmap_map (rcur, bno, blockcount, unwritten, &oinfo); + error =xfs_rmap_map (rcur, bno, ri->ri_bmap.br_blockcount, + unwritten, &oinfo);break ;case XFS_RMAP_MAP_SHARED : - error =xfs_rmap_map_shared (rcur, bno, blockcount, unwritten, - &oinfo); + error =xfs_rmap_map_shared (rcur, bno, + ri->ri_bmap.br_blockcount, unwritten, &oinfo);break ;case XFS_RMAP_FREE :case XFS_RMAP_UNMAP : - error =xfs_rmap_unmap (rcur, bno, blockcount, unwritten, - &oinfo); + error =xfs_rmap_unmap (rcur, bno, ri->ri_bmap.br_blockcount, + unwritten, &oinfo);break ;case XFS_RMAP_UNMAP_SHARED : - error =xfs_rmap_unmap_shared (rcur, bno, blockcount, unwritten, - &oinfo); + error =xfs_rmap_unmap_shared (rcur, bno, + ri->ri_bmap.br_blockcount, unwritten, &oinfo);break ;case XFS_RMAP_CONVERT : - error =xfs_rmap_convert (rcur, bno, blockcount, !unwritten, - &oinfo); -break ; -case XFS_RMAP_CONVERT_SHARED : - error =xfs_rmap_convert_shared (rcur, bno, blockcount, + error =xfs_rmap_convert (rcur, bno, ri->ri_bmap.br_blockcount, !unwritten, &oinfo);break ; +case XFS_RMAP_CONVERT_SHARED : + error =xfs_rmap_convert_shared (rcur, bno, + ri->ri_bmap.br_blockcount, !unwritten, &oinfo); +break ;default :ASSERT (0 ); error = -EFSCORRUPTED ;
fs/xfs/libxfs/xfs_rmap.h +2 -4
@@ -179,10 +179,8 @@ void xfs_rmap_free_extent(struct xfs_trans *tp, xfs_agnumber_t agno,void xfs_rmap_finish_one_cleanup (struct xfs_trans *tp,struct xfs_btree_cur *rcur,int error); -int xfs_rmap_finish_one (struct xfs_trans *tp,enum xfs_rmap_intent_type type, -uint64_t owner,int whichfork,xfs_fileoff_t startoff, -xfs_fsblock_t startblock,xfs_filblks_t blockcount, -xfs_exntst_t state,struct xfs_btree_cur **pcur); +int xfs_rmap_finish_one (struct xfs_trans *tp,struct xfs_rmap_intent *ri, +struct xfs_btree_cur **pcur); int xfs_rmap_lookup_le_range(struct xfs_btree_cur *cur, xfs_agblock_t bno, uint64_t owner, uint64_t offset, unsigned int flags,
fs/xfs/xfs_rmap_item.c +29 -36
121 lines not on this page · raw message
PATCH 6/8 xfs: fix confusing variable names in xfs_rmap_item.c
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Variable names in this code module are inconsistent and confusing. xfs_map_extent describe file mappings, so rename them "map". xfs_rmap_intents describe block mapping intents, so rename them "ri".
--- fs/xfs/xfs_rmap_item.c | 79 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 39 deletions(-)
fs/xfs/xfs_rmap_item.c +40 -39
@@ -244,40 +244,40 @@ xfs_trans_get_rud(/* Set the map extent flags for this reverse mapping. */ static void xfs_trans_set_rmap_flags ( -struct xfs_map_extent *rmap, +struct xfs_map_extent *map,enum xfs_rmap_intent_type type,int whichfork,xfs_exntst_t state) { - rmap->me_flags =0 ; + map->me_flags =0 ;if (state ==XFS_EXT_UNWRITTEN ) - rmap->me_flags |=XFS_RMAP_EXTENT_UNWRITTEN ; + map->me_flags |=XFS_RMAP_EXTENT_UNWRITTEN ;if (whichfork ==XFS_ATTR_FORK ) - rmap->me_flags |=XFS_RMAP_EXTENT_ATTR_FORK ; + map->me_flags |=XFS_RMAP_EXTENT_ATTR_FORK ;switch (type) {case XFS_RMAP_MAP : - rmap->me_flags |=XFS_RMAP_EXTENT_MAP ; + map->me_flags |=XFS_RMAP_EXTENT_MAP ;break ;case XFS_RMAP_MAP_SHARED : - rmap->me_flags |=XFS_RMAP_EXTENT_MAP_SHARED ; + map->me_flags |=XFS_RMAP_EXTENT_MAP_SHARED ;break ;case XFS_RMAP_UNMAP : - rmap->me_flags |=XFS_RMAP_EXTENT_UNMAP ; + map->me_flags |=XFS_RMAP_EXTENT_UNMAP ;break ;case XFS_RMAP_UNMAP_SHARED : - rmap->me_flags |=XFS_RMAP_EXTENT_UNMAP_SHARED ; + map->me_flags |=XFS_RMAP_EXTENT_UNMAP_SHARED ;break ;case XFS_RMAP_CONVERT : - rmap->me_flags |=XFS_RMAP_EXTENT_CONVERT ; + map->me_flags |=XFS_RMAP_EXTENT_CONVERT ;break ;case XFS_RMAP_CONVERT_SHARED : - rmap->me_flags |=XFS_RMAP_EXTENT_CONVERT_SHARED ; + map->me_flags |=XFS_RMAP_EXTENT_CONVERT_SHARED ;break ;case XFS_RMAP_ALLOC : - rmap->me_flags |=XFS_RMAP_EXTENT_ALLOC ; + map->me_flags |=XFS_RMAP_EXTENT_ALLOC ;break ;case XFS_RMAP_FREE : - rmap->me_flags |=XFS_RMAP_EXTENT_FREE ; + map->me_flags |=XFS_RMAP_EXTENT_FREE ;break ;default :ASSERT (0 );
@@ -335,7 +335,7 @@ STATIC voidxfs_rmap_update_log_item ( struct xfs_trans *tp, struct xfs_rui_log_item *ruip, - struct xfs_rmap_intent *rmap) + struct xfs_rmap_intent *ri) { uint next_extent;struct xfs_map_extent *map;
@@ -351,12 +351,12 @@ xfs_rmap_update_log_item( next_extent =atomic_inc_return (&ruip->rui_next_extent) -1 ;ASSERT (next_extent < ruip->rui_format.rui_nextents); map = &ruip->rui_format.rui_extents[next_extent]; - map->me_owner = rmap->ri_owner; - map->me_startblock = rmap->ri_bmap.br_startblock; - map->me_startoff = rmap->ri_bmap.br_startoff; - map->me_len = rmap->ri_bmap.br_blockcount; -xfs_trans_set_rmap_flags (map, rmap->ri_type, rmap->ri_whichfork, - rmap->ri_bmap.br_state); + map->me_owner = ri->ri_owner; + map->me_startblock = ri->ri_bmap.br_startblock; + map->me_startoff = ri->ri_bmap.br_startoff; + map->me_len = ri->ri_bmap.br_blockcount; +xfs_trans_set_rmap_flags (map, ri->ri_type, ri->ri_whichfork, + ri->ri_bmap.br_state); } static struct xfs_log_item *
@@ -368,15 +368,15 @@ xfs_rmap_update_create_intent( {struct xfs_mount *mp = tp->t_mountp;struct xfs_rui_log_item *ruip =xfs_rui_init (mp, count); -struct xfs_rmap_intent *rmap; +struct xfs_rmap_intent *ri;ASSERT (count >0 );xfs_trans_add_item (tp, &ruip->rui_item);if (sort)list_sort (mp, items, xfs_rmap_update_diff_items); -list_for_each_entry (rmap, items, ri_list) -xfs_rmap_update_log_item (tp, ruip, rmap); +list_for_each_entry (ri, items, ri_list) +xfs_rmap_update_log_item (tp, ruip, ri);return &ruip->rui_item; }
@@ -398,13 +398,14 @@ xfs_rmap_update_finish_item(struct list_head *item, struct xfs_btree_cur **state) { - struct xfs_rmap_intent *rmap; + struct xfs_rmap_intent *ri;int error; - rmap = container_of(item, struct xfs_rmap_intent, ri_list); - error =xfs_trans_log_finish_rmap_update (tp,RUD_ITEM (done), rmap, + ri = container_of(item, struct xfs_rmap_intent, ri_list); + + error =xfs_trans_log_finish_rmap_update (tp,RUD_ITEM (done), ri, state); -kmem_cache_free (xfs_rmap_intent_cache, rmap); +kmem_cache_free (xfs_rmap_intent_cache, ri);return error; }
@@ -421,10 +422,10 @@ STATIC voidxfs_rmap_update_cancel_item ( struct list_head *item) { -struct xfs_rmap_intent *rmap; +struct xfs_rmap_intent *ri; - rmap = container_of(item, struct xfs_rmap_intent, ri_list); -kmem_cache_free (xfs_rmap_intent_cache, rmap); + ri = container_of(item, struct xfs_rmap_intent, ri_list); +kmem_cache_free (xfs_rmap_intent_cache, ri); }const struct xfs_defer_op_type xfs_rmap_update_defer_type = {
@@ -441,15 +442,15 @@ const struct xfs_defer_op_type xfs_rmap_update_defer_type = {static inline bool xfs_rui_validate_map (struct xfs_mount *mp, -struct xfs_map_extent *rmap) +struct xfs_map_extent *map) {if (!xfs_has_rmapbt (mp))return false; -if (rmap->me_flags & ~XFS_RMAP_EXTENT_FLAGS ) +if (map->me_flags & ~XFS_RMAP_EXTENT_FLAGS )return false; -switch (rmap->me_flags &XFS_RMAP_EXTENT_TYPE_MASK ) { +switch (map->me_flags &XFS_RMAP_EXTENT_TYPE_MASK ) {case XFS_RMAP_EXTENT_MAP :case XFS_RMAP_EXTENT_MAP_SHARED :case XFS_RMAP_EXTENT_UNMAP :
@@ -463,14 +464,14 @@ xfs_rui_validate_map(return false; } -if (!XFS_RMAP_NON_INODE_OWNER (rmap->me_owner) && - !xfs_verify_ino (mp, rmap->me_owner)) +if (!XFS_RMAP_NON_INODE_OWNER (map->me_owner) && + !xfs_verify_ino (mp, map->me_owner))return false; -if (!xfs_verify_fileext (mp, rmap->me_startoff, rmap->me_len)) +if (!xfs_verify_fileext (mp, map->me_startoff, map->me_len))return false; -return xfs_verify_fsbext (mp, rmap->me_startblock, rmap->me_len); +return xfs_verify_fsbext (mp, map->me_startblock, map->me_len); }/*
@@ -593,18 +594,18 @@ xfs_rui_item_relog( {struct xfs_rud_log_item *rudp;struct xfs_rui_log_item *ruip; -struct xfs_map_extent *extp; +struct xfs_map_extent *map;unsigned int count; count =RUI_ITEM (intent)->rui_format.rui_nextents; - extp =RUI_ITEM (intent)->rui_format.rui_extents; + map =RUI_ITEM (intent)->rui_format.rui_extents; tp->t_flags |=XFS_TRANS_DIRTY ; rudp =xfs_trans_get_rud (tp,RUI_ITEM (intent));set_bit (XFS_LI_DIRTY , &rudp->rud_item.li_flags); ruip =xfs_rui_init (tp->t_mountp, count); -memcpy (ruip->rui_format.rui_extents, extp, count *sizeof (*extp)); +memcpy (ruip->rui_format.rui_extents, map, count *sizeof (*map));atomic_set (&ruip->rui_next_extent, count);xfs_trans_add_item (tp, &ruip->rui_item);set_bit (XFS_LI_DIRTY , &ruip->rui_item.li_flags);
PATCH 7/8 xfs: pass refcount intent directly through the log intent code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Pass the incore refcount intent through the CUI logging code instead of repeatedly boxing and unboxing parameters.
--- fs/xfs/libxfs/xfs_refcount.c | 96 +++++++++++++++++++----------------------- fs/xfs/libxfs/xfs_refcount.h | 4 -- fs/xfs/xfs_refcount_item.c | 62 +++++++++++---------------- fs/xfs/xfs_trace.h | 15 ++----- 4 files changed, 74 insertions(+), 103 deletions(-)
fs/xfs/libxfs/xfs_refcount.c +43 -53
@@ -1213,37 +1213,33 @@ xfs_refcount_adjust_extents( STATIC intxfs_refcount_adjust (struct xfs_btree_cur *cur, -xfs_agblock_t agbno, -xfs_extlen_t aglen, -xfs_agblock_t *new_agbno, -xfs_extlen_t *new_aglen, +xfs_agblock_t *agbno, +xfs_extlen_t *aglen,enum xfs_refc_adjust_op adj) {bool shape_changed;int shape_changes =0 ;int error; - *new_agbno = agbno; - *new_aglen = aglen;if (adj ==XFS_REFCOUNT_ADJUST_INCREASE ) -trace_xfs_refcount_increase (cur->bc_mp, cur->bc_ag.pag->pag_agno, - agbno, aglen); +trace_xfs_refcount_increase (cur->bc_mp, + cur->bc_ag.pag->pag_agno, *agbno, *aglen);else -trace_xfs_refcount_decrease (cur->bc_mp, cur->bc_ag.pag->pag_agno, - agbno, aglen); +trace_xfs_refcount_decrease (cur->bc_mp, + cur->bc_ag.pag->pag_agno, *agbno, *aglen);/* * Ensure that no rcextents cross the boundary of the adjustment range. */ error =xfs_refcount_split_extent (cur,XFS_REFC_DOMAIN_SHARED , - agbno, &shape_changed); + *agbno, &shape_changed);if (error) goto out_error;if (shape_changed) shape_changes++; error =xfs_refcount_split_extent (cur,XFS_REFC_DOMAIN_SHARED , - agbno + aglen, &shape_changed); + *agbno + *aglen, &shape_changed);if (error) goto out_error;if (shape_changed)
@@ -1253,7 +1249,7 @@ xfs_refcount_adjust(* Try to merge with the left or right extents of the range. */ error =xfs_refcount_merge_extents (cur,XFS_REFC_DOMAIN_SHARED , - new_agbno, new_aglen, adj, &shape_changed); + agbno, aglen, adj, &shape_changed);if (error) goto out_error;if (shape_changed)
@@ -1262,7 +1258,7 @@ xfs_refcount_adjust( cur->bc_ag.refc.shape_changes++;/* Now that we've taken care of the ends, adjust the middle extents */ - error =xfs_refcount_adjust_extents (cur, new_agbno, new_aglen, adj); + error =xfs_refcount_adjust_extents (cur, agbno, aglen, adj);if (error) goto out_error;
@@ -1298,21 +1294,20 @@ xfs_refcount_finish_one_cleanup(static inline int xfs_refcount_continue_op (struct xfs_btree_cur *cur, -xfs_fsblock_t startblock, -xfs_agblock_t new_agbno, -xfs_extlen_t new_len, -xfs_fsblock_t *new_fsbno) +struct xfs_refcount_intent *ri, +xfs_agblock_t new_agbno) {struct xfs_mount *mp = cur->bc_mp;struct xfs_perag *pag = cur->bc_ag.pag; -if (XFS_IS_CORRUPT (mp, !xfs_verify_agbext (pag, new_agbno, new_len))) +if (XFS_IS_CORRUPT (mp, !xfs_verify_agbext (pag, new_agbno, + ri->ri_blockcount)))return -EFSCORRUPTED ; - *new_fsbno =XFS_AGB_TO_FSB (mp, pag->pag_agno, new_agbno); + ri->ri_startblock =XFS_AGB_TO_FSB (mp, pag->pag_agno, new_agbno); -ASSERT (xfs_verify_fsbext (mp, *new_fsbno, new_len)); -ASSERT (pag->pag_agno ==XFS_FSB_TO_AGNO (mp, *new_fsbno)); +ASSERT (xfs_verify_fsbext (mp, ri->ri_startblock, ri->ri_blockcount)); +ASSERT (pag->pag_agno ==XFS_FSB_TO_AGNO (mp, ri->ri_startblock));return 0 ; }
@@ -1327,11 +1322,7 @@ xfs_refcount_continue_op(int xfs_refcount_finish_one (struct xfs_trans *tp, -enum xfs_refcount_intent_type type, -xfs_fsblock_t startblock, -xfs_extlen_t blockcount, -xfs_fsblock_t *new_fsb, -xfs_extlen_t *new_len, +struct xfs_refcount_intent *ri,struct xfs_btree_cur **pcur) {struct xfs_mount *mp = tp->t_mountp;
@@ -1339,17 +1330,16 @@ xfs_refcount_finish_one(struct xfs_buf *agbp =NULL ;int error =0 ;xfs_agblock_t bno; -xfs_agblock_t new_agbno;unsigned long nr_ops =0 ;int shape_changes =0 ;struct xfs_perag *pag; - pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, startblock)); - bno =XFS_FSB_TO_AGBNO (mp, startblock); + pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ri->ri_startblock)); + bno =XFS_FSB_TO_AGBNO (mp, ri->ri_startblock); -trace_xfs_refcount_deferred (mp,XFS_FSB_TO_AGNO (mp, startblock), - type,XFS_FSB_TO_AGBNO (mp, startblock), - blockcount); +trace_xfs_refcount_deferred (mp,XFS_FSB_TO_AGNO (mp, ri->ri_startblock), + ri->ri_type,XFS_FSB_TO_AGBNO (mp, ri->ri_startblock), + ri->ri_blockcount);if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_REFCOUNT_FINISH_ONE )) { error = -EIO ;
@@ -1380,42 +1370,42 @@ xfs_refcount_finish_one( } *pcur = rcur; -switch (type) { +switch (ri->ri_type) {case XFS_REFCOUNT_INCREASE : - error =xfs_refcount_adjust (rcur, bno, blockcount, &new_agbno, - new_len,XFS_REFCOUNT_ADJUST_INCREASE ); + error =xfs_refcount_adjust (rcur, &bno, &ri->ri_blockcount, +XFS_REFCOUNT_ADJUST_INCREASE );if (error) goto out_drop; -if (*new_len >0 ) - error =xfs_refcount_continue_op (rcur, startblock, - new_agbno, *new_len, new_fsb); +if (ri->ri_blockcount >0 ) + error =xfs_refcount_continue_op (rcur, ri, bno);break ;case XFS_REFCOUNT_DECREASE : - error =xfs_refcount_adjust (rcur, bno, blockcount, &new_agbno, - new_len,XFS_REFCOUNT_ADJUST_DECREASE ); + error =xfs_refcount_adjust (rcur, &bno, &ri->ri_blockcount, +XFS_REFCOUNT_ADJUST_DECREASE );if (error) goto out_drop; -if (*new_len >0 ) - error =xfs_refcount_continue_op (rcur, startblock, - new_agbno, *new_len, new_fsb); +if (ri->ri_blockcount >0 ) + error =xfs_refcount_continue_op (rcur, ri, bno);break ;case XFS_REFCOUNT_ALLOC_COW : - *new_fsb = startblock + blockcount; - *new_len =0 ; - error =__xfs_refcount_cow_alloc (rcur, bno, blockcount); + error =__xfs_refcount_cow_alloc (rcur, bno, ri->ri_blockcount); +if (error) + goto out_drop; + ri->ri_blockcount =0 ;break ;case XFS_REFCOUNT_FREE_COW : - *new_fsb = startblock + blockcount; - *new_len =0 ; - error =__xfs_refcount_cow_free (rcur, bno, blockcount); + error =__xfs_refcount_cow_free (rcur, bno, ri->ri_blockcount); +if (error) + goto out_drop; + ri->ri_blockcount =0 ;break ;default :ASSERT (0 ); error = -EFSCORRUPTED ; } -if (!error && *new_len >0 ) -trace_xfs_refcount_finish_one_leftover (mp, pag->pag_agno, type, - bno, blockcount, new_agbno, *new_len); +if (!error && ri->ri_blockcount >0 ) +trace_xfs_refcount_finish_one_leftover (mp, pag->pag_agno, + ri->ri_type, bno, ri->ri_blockcount); out_drop:xfs_perag_put (pag);return error;
fs/xfs/libxfs/xfs_refcount.h +1 -3
@@ -75,9 +75,7 @@ void xfs_refcount_decrease_extent(struct xfs_trans *tp,extern void xfs_refcount_finish_one_cleanup (struct xfs_trans *tp,struct xfs_btree_cur *rcur,int error);extern int xfs_refcount_finish_one (struct xfs_trans *tp, -enum xfs_refcount_intent_type type,xfs_fsblock_t startblock, -xfs_extlen_t blockcount,xfs_fsblock_t *new_fsb, -xfs_extlen_t *new_len,struct xfs_btree_cur **pcur); +struct xfs_refcount_intent *ri,struct xfs_btree_cur **pcur); extern int xfs_refcount_find_shared(struct xfs_btree_cur *cur, xfs_agblock_t agbno, xfs_extlen_t aglen, xfs_agblock_t *fbno,
fs/xfs/xfs_refcount_item.c +26 -36
122 lines not on this page · raw message
fs/xfs/xfs_trace.h +4 -11
@@ -3207,17 +3207,14 @@ DEFINE_REFCOUNT_DEFERRED_EVENT(xfs_refcount_deferred); TRACE_EVENT(xfs_refcount_finish_one_leftover, TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, - int type, xfs_agblock_t agbno, xfs_extlen_t len, - xfs_agblock_t new_agbno, xfs_extlen_t new_len), - TP_ARGS(mp, agno, type, agbno, len, new_agbno, new_len), + int type, xfs_agblock_t agbno, xfs_extlen_t len), + TP_ARGS(mp, agno, type, agbno, len), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_agnumber_t, agno) __field(int, type) __field(xfs_agblock_t, agbno) __field(xfs_extlen_t, len) - __field(xfs_agblock_t, new_agbno) - __field(xfs_extlen_t, new_len) ), TP_fast_assign( __entry->dev = mp->m_super->s_dev;
@@ -3225,17 +3222,13 @@ TRACE_EVENT(xfs_refcount_finish_one_leftover, __entry->type = type; __entry->agbno = agbno; __entry->len = len; - __entry->new_agbno = new_agbno; - __entry->new_len = new_len; ), -TP_printk ("dev %d:%d type %d agno 0x%x agbno 0x%x fsbcount 0x%x new_agbno 0x%x new_fsbcount 0x%x" , +TP_printk ("dev %d:%d type %d agno 0x%x agbno 0x%x fsbcount 0x%x" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->type, __entry->agno, __entry->agbno, - __entry->len, - __entry->new_agbno, - __entry->new_len) + __entry->len) );/* simple inode-based error/%ip tracepoint class */
PATCH 8/8 xfs: fix confusing variable names in xfs_refcount_item.c
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Variable names in this code module are inconsistent and confusing. xfs_phys_extent describe physical mappings, so rename them "pmap". xfs_refcount_intents describe refcount intents, so rename them "ri".
--- fs/xfs/xfs_refcount_item.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
fs/xfs/xfs_refcount_item.c +27 -27
@@ -292,16 +292,16 @@ xfs_refcount_update_diff_items(/* Set the phys extent flags for this reverse mapping. */ static void xfs_trans_set_refcount_flags ( -struct xfs_phys_extent *refc, +struct xfs_phys_extent *pmap,enum xfs_refcount_intent_type type) { - refc->pe_flags =0 ; + pmap->pe_flags =0 ;switch (type) {case XFS_REFCOUNT_INCREASE :case XFS_REFCOUNT_DECREASE :case XFS_REFCOUNT_ALLOC_COW :case XFS_REFCOUNT_FREE_COW : - refc->pe_flags |= type; + pmap->pe_flags |= type;break ;default :ASSERT (0 );
@@ -313,10 +313,10 @@ STATIC voidxfs_refcount_update_log_item ( struct xfs_trans *tp, struct xfs_cui_log_item *cuip, - struct xfs_refcount_intent *refc) + struct xfs_refcount_intent *ri) { uint next_extent; -struct xfs_phys_extent *ext; +struct xfs_phys_extent *pmap; tp->t_flags |=XFS_TRANS_DIRTY ;set_bit (XFS_LI_DIRTY , &cuip->cui_item.li_flags);
@@ -328,10 +328,10 @@ xfs_refcount_update_log_item(*/ next_extent =atomic_inc_return (&cuip->cui_next_extent) -1 ;ASSERT (next_extent < cuip->cui_format.cui_nextents); - ext = &cuip->cui_format.cui_extents[next_extent]; - ext->pe_startblock = refc->ri_startblock; - ext->pe_len = refc->ri_blockcount; -xfs_trans_set_refcount_flags (ext, refc->ri_type); + pmap = &cuip->cui_format.cui_extents[next_extent]; + pmap->pe_startblock = ri->ri_startblock; + pmap->pe_len = ri->ri_blockcount; +xfs_trans_set_refcount_flags (pmap, ri->ri_type); } static struct xfs_log_item *
@@ -343,15 +343,15 @@ xfs_refcount_update_create_intent( {struct xfs_mount *mp = tp->t_mountp;struct xfs_cui_log_item *cuip =xfs_cui_init (mp, count); -struct xfs_refcount_intent *refc; +struct xfs_refcount_intent *ri;ASSERT (count >0 );xfs_trans_add_item (tp, &cuip->cui_item);if (sort)list_sort (mp, items, xfs_refcount_update_diff_items); -list_for_each_entry (refc, items, ri_list) -xfs_refcount_update_log_item (tp, cuip, refc); +list_for_each_entry (ri, items, ri_list) +xfs_refcount_update_log_item (tp, cuip, ri);return &cuip->cui_item; }
@@ -403,10 +403,10 @@ STATIC voidxfs_refcount_update_cancel_item ( struct list_head *item) { -struct xfs_refcount_intent *refc; +struct xfs_refcount_intent *ri; - refc = container_of(item, struct xfs_refcount_intent, ri_list); -kmem_cache_free (xfs_refcount_intent_cache, refc); + ri = container_of(item, struct xfs_refcount_intent, ri_list); +kmem_cache_free (xfs_refcount_intent_cache, ri); }const struct xfs_defer_op_type xfs_refcount_update_defer_type = {
@@ -423,15 +423,15 @@ const struct xfs_defer_op_type xfs_refcount_update_defer_type = {static inline bool xfs_cui_validate_phys (struct xfs_mount *mp, -struct xfs_phys_extent *refc) +struct xfs_phys_extent *pmap) {if (!xfs_has_reflink (mp))return false; -if (refc->pe_flags & ~XFS_REFCOUNT_EXTENT_FLAGS ) +if (pmap->pe_flags & ~XFS_REFCOUNT_EXTENT_FLAGS )return false; -switch (refc->pe_flags &XFS_REFCOUNT_EXTENT_TYPE_MASK ) { +switch (pmap->pe_flags &XFS_REFCOUNT_EXTENT_TYPE_MASK ) {case XFS_REFCOUNT_INCREASE :case XFS_REFCOUNT_DECREASE :case XFS_REFCOUNT_ALLOC_COW :
@@ -441,7 +441,7 @@ xfs_cui_validate_phys(return false; } -return xfs_verify_fsbext (mp, refc->pe_startblock, refc->pe_len); +return xfs_verify_fsbext (mp, pmap->pe_startblock, pmap->pe_len); }/*
@@ -499,10 +499,10 @@ xfs_cui_item_recover(for (i =0 ; i < cuip->cui_format.cui_nextents; i++) {struct xfs_refcount_intent fake = { }; -struct xfs_phys_extent *refc; +struct xfs_phys_extent *pmap; - refc = &cuip->cui_format.cui_extents[i]; - refc_type = refc->pe_flags &XFS_REFCOUNT_EXTENT_TYPE_MASK ; + pmap = &cuip->cui_format.cui_extents[i]; + refc_type = pmap->pe_flags &XFS_REFCOUNT_EXTENT_TYPE_MASK ;switch (refc_type) {case XFS_REFCOUNT_INCREASE :case XFS_REFCOUNT_DECREASE :
@@ -518,8 +518,8 @@ xfs_cui_item_recover( goto abort_error; } - fake.ri_startblock = refc->pe_startblock; - fake.ri_blockcount = refc->pe_len; + fake.ri_startblock = pmap->pe_startblock; + fake.ri_blockcount = pmap->pe_len;if (!requeue_only) error =xfs_trans_log_finish_refcount_update (tp, cudp, &fake, &rcur);
@@ -586,18 +586,18 @@ xfs_cui_item_relog( {struct xfs_cud_log_item *cudp;struct xfs_cui_log_item *cuip; -struct xfs_phys_extent *extp; +struct xfs_phys_extent *pmap;unsigned int count; count =CUI_ITEM (intent)->cui_format.cui_nextents; - extp =CUI_ITEM (intent)->cui_format.cui_extents; + pmap =CUI_ITEM (intent)->cui_format.cui_extents; tp->t_flags |=XFS_TRANS_DIRTY ; cudp =xfs_trans_get_cud (tp,CUI_ITEM (intent));set_bit (XFS_LI_DIRTY , &cudp->cud_item.li_flags); cuip =xfs_cui_init (tp->t_mountp, count); -memcpy (cuip->cui_format.cui_extents, extp, count *sizeof (*extp)); +memcpy (cuip->cui_format.cui_extents, pmap, count *sizeof (*pmap));atomic_set (&cuip->cui_next_extent, count);xfs_trans_add_item (tp, &cuip->cui_item);set_bit (XFS_LI_DIRTY , &cuip->cui_item.li_flags);
PATCH 1/5 xfs: give xfs_bmap_intent its own perag reference
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Give the xfs_bmap_intent an active reference to the perag structure data. This reference will be used to enable scrub intent draining functionality in subsequent patches. Later, shrink will use these active references to know if an AG is quiesced or not.
The reason why we take an active ref for a file mapping operation is
simple: we're committing to some sort of action involving space in an AG, so we want to indicate our active interest in that AG.
--- fs/xfs/libxfs/xfs_bmap.c | 1 + fs/xfs/libxfs/xfs_bmap.h | 4 ++++ fs/xfs/xfs_bmap_item.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +1 -0
@@ -6109,6 +6109,7 @@ __xfs_bmap_add( bi->bi_whichfork = whichfork; bi->bi_bmap = *bmap; +xfs_bmap_update_get_group (tp->t_mountp, bi);xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_BMAP , &bi->bi_list);return 0 ; }
fs/xfs/libxfs/xfs_bmap.h +4 -0
@@ -231,9 +231,13 @@ struct xfs_bmap_intent {enum xfs_bmap_intent_type bi_type;int bi_whichfork;struct xfs_inode *bi_owner; +struct xfs_perag *bi_pag;struct xfs_bmbt_irec bi_bmap; }; +void xfs_bmap_update_get_group (struct xfs_mount *mp, +struct xfs_bmap_intent *bi); +int xfs_bmap_finish_one (struct xfs_trans *tp,struct xfs_bmap_intent *bi);void xfs_bmap_map_extent (struct xfs_trans *tp,struct xfs_inode *ip,struct xfs_bmbt_irec *imap);
fs/xfs/xfs_bmap_item.c +28 -1
@@ -24,6 +24,7 @@#include "xfs_error.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_ag.h" struct kmem_cache *xfs_bui_cache;struct kmem_cache *xfs_bud_cache;
@@ -363,6 +364,26 @@ xfs_bmap_update_create_done(return &xfs_trans_get_bud (tp,BUI_ITEM (intent))->bud_item; } +/* Take an active ref to the AG containing the space we're mapping. */ +void +xfs_bmap_update_get_group ( +struct xfs_mount *mp, +struct xfs_bmap_intent *bi) +{ +xfs_agnumber_t agno; + + agno =XFS_FSB_TO_AGNO (mp, bi->bi_bmap.br_startblock); + bi->bi_pag =xfs_perag_get (mp, agno); +} + +/* Release an active AG ref after finishing mapping work. */ +static inline void +xfs_bmap_update_put_group ( +struct xfs_bmap_intent *bi) +{ +xfs_perag_put (bi->bi_pag); +} +/* Process a deferred rmap update. */ STATIC int xfs_bmap_update_finish_item(
@@ -381,6 +402,8 @@ xfs_bmap_update_finish_item(ASSERT (bi->bi_type ==XFS_BMAP_UNMAP );return -EAGAIN ; } + +xfs_bmap_update_put_group (bi);kmem_cache_free (xfs_bmap_intent_cache, bi);return error; }
@@ -393,7 +416,7 @@ xfs_bmap_update_abort_intent(xfs_bui_release (BUI_ITEM (intent)); } -/* Cancel a deferred rmap update. */ +/* Cancel a deferred bmap update. */ STATIC voidxfs_bmap_update_cancel_item (struct list_head *item)
@@ -401,6 +424,8 @@ xfs_bmap_update_cancel_item(struct xfs_bmap_intent *bi; bi = container_of(item, struct xfs_bmap_intent, bi_list); + +xfs_bmap_update_put_group (bi);kmem_cache_free (xfs_bmap_intent_cache, bi); }
@@ -509,10 +534,12 @@ xfs_bui_item_recover( fake.bi_bmap.br_state = (map->me_flags &XFS_BMAP_EXTENT_UNWRITTEN ) ?XFS_EXT_UNWRITTEN :XFS_EXT_NORM ; +xfs_bmap_update_get_group (mp, &fake); error =xfs_trans_log_finish_bmap_update (tp, budp, &fake);if (error == -EFSCORRUPTED )XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, map,sizeof (*map)); +xfs_bmap_update_put_group (&fake);if (error) goto err_cancel;
PATCH 2/5 xfs: pass per-ag references to xfs_free_extent
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Pass a reference to the per-AG structure to xfs_free_extent. Most callers already have one, so we can eliminate unnecessary lookups. The one exception to this is the EFI code, which the next patch will fix.
--- fs/xfs/libxfs/xfs_ag.c | 6 ++---- fs/xfs/libxfs/xfs_alloc.c | 15 +++++---------- fs/xfs/libxfs/xfs_alloc.h | 8 +++++--- fs/xfs/libxfs/xfs_ialloc_btree.c | 7 +++++-- fs/xfs/libxfs/xfs_refcount_btree.c | 5 +++-- fs/xfs/scrub/repair.c | 3 ++- fs/xfs/xfs_extfree_item.c | 8 ++++++-- 7 files changed, 28 insertions(+), 24 deletions(-)
fs/xfs/libxfs/xfs_ag.c +2 -4
@@ -982,10 +982,8 @@ xfs_ag_extend_space(if (error)return error; - error =xfs_free_extent (tp,XFS_AGB_TO_FSB (pag->pag_mount, pag->pag_agno, -be32_to_cpu (agf->agf_length) - len), - len, &XFS_RMAP_OINFO_SKIP_UPDATE , -XFS_AG_RESV_NONE ); + error =xfs_free_extent (tp, pag,be32_to_cpu (agf->agf_length) - len, + len, &XFS_RMAP_OINFO_SKIP_UPDATE ,XFS_AG_RESV_NONE );if (error)return error;
fs/xfs/libxfs/xfs_alloc.c +5 -10
@@ -3381,7 +3381,8 @@ xfs_free_extent_fix_freelist( int __xfs_free_extent( struct xfs_trans *tp, - xfs_fsblock_t bno, + struct xfs_perag *pag, + xfs_agblock_t agbno, xfs_extlen_t len, const struct xfs_owner_info *oinfo, enum xfs_ag_resv_type type,
@@ -3389,12 +3390,9 @@ __xfs_free_extent( {struct xfs_mount *mp = tp->t_mountp;struct xfs_buf *agbp; -xfs_agnumber_t agno =XFS_FSB_TO_AGNO (mp, bno); -xfs_agblock_t agbno =XFS_FSB_TO_AGBNO (mp, bno);struct xfs_agf *agf;int error;unsigned int busy_flags =0 ; -struct xfs_perag *pag;ASSERT (len !=0 );ASSERT (type !=XFS_AG_RESV_AGFL );
@@ -3403,10 +3401,9 @@ __xfs_free_extent( XFS_ERRTAG_FREE_EXTENT))return -EIO ; - pag =xfs_perag_get (mp, agno); error =xfs_free_extent_fix_freelist (tp, pag, &agbp);if (error) - goto err; +return error; agf = agbp->b_addr;if (XFS_IS_CORRUPT (mp, agbno >= mp->m_sb.sb_agblocks)) {
@@ -3420,20 +3417,18 @@ __xfs_free_extent( goto err_release; } - error =xfs_free_ag_extent (tp, agbp, agno, agbno, len, oinfo, type); + error =xfs_free_ag_extent (tp, agbp, pag->pag_agno, agbno, len, oinfo, + type);if (error) goto err_release;if (skip_discard) busy_flags |=XFS_EXTENT_BUSY_SKIP_DISCARD ;xfs_extent_busy_insert (tp, pag, agbno, len, busy_flags); -xfs_perag_put (pag);return 0 ; err_release:xfs_trans_brelse (tp, agbp); -err: -xfs_perag_put (pag);return error; }
fs/xfs/libxfs/xfs_alloc.h +5 -3
@@ -130,7 +130,8 @@ xfs_alloc_vextent( int /* error */ __xfs_free_extent( struct xfs_trans *tp, /* transaction pointer */ - xfs_fsblock_t bno, /* starting block number of extent */ + struct xfs_perag *pag, + xfs_agblock_t agbno, xfs_extlen_t len, /* length of extent */ const struct xfs_owner_info *oinfo, /* extent owner */ enum xfs_ag_resv_type type, /* block reservation type */
@@ -139,12 +140,13 @@ __xfs_free_extent(static inline int xfs_free_extent (struct xfs_trans *tp, -xfs_fsblock_t bno, +struct xfs_perag *pag, +xfs_agblock_t agbno,xfs_extlen_t len,const struct xfs_owner_info *oinfo,enum xfs_ag_resv_type type) { -return __xfs_free_extent (tp, bno, len, oinfo, type, false); +return __xfs_free_extent (tp, pag, agbno, len, oinfo, type, false); }int /* error */
fs/xfs/libxfs/xfs_ialloc_btree.c +5 -2
@@ -156,9 +156,12 @@ __xfs_inobt_free_block( struct xfs_buf *bp, enum xfs_ag_resv_type resv) { +xfs_fsblock_t fsbno; +xfs_inobt_mod_blockcount (cur,-1 ); -return xfs_free_extent (cur->bc_tp, -XFS_DADDR_TO_FSB (cur->bc_mp,xfs_buf_daddr (bp)),1 , + fsbno =XFS_DADDR_TO_FSB (cur->bc_mp,xfs_buf_daddr (bp)); +return xfs_free_extent (cur->bc_tp, cur->bc_ag.pag, +XFS_FSB_TO_AGBNO (cur->bc_mp, fsbno),1 , &XFS_RMAP_OINFO_INOBT , resv); }
fs/xfs/libxfs/xfs_refcount_btree.c +3 -2
@@ -112,8 +112,9 @@ xfs_refcountbt_free_block( XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), 1);be32_add_cpu (&agf->agf_refcount_blocks,-1 );xfs_alloc_log_agf (cur->bc_tp, agbp,XFS_AGF_REFCOUNT_BLOCKS ); - error =xfs_free_extent (cur->bc_tp, fsbno,1 , &XFS_RMAP_OINFO_REFC , -XFS_AG_RESV_METADATA ); + error =xfs_free_extent (cur->bc_tp, cur->bc_ag.pag, +XFS_FSB_TO_AGBNO (cur->bc_mp, fsbno),1 , + &XFS_RMAP_OINFO_REFC ,XFS_AG_RESV_METADATA );if (error)return error;
fs/xfs/scrub/repair.c +2 -1
@@ -599,7 +599,8 @@ xrep_reap_block(else if (resv ==XFS_AG_RESV_AGFL ) error =xrep_put_freelist (sc, agbno);else - error =xfs_free_extent (sc->tp, fsbno,1 , oinfo, resv); + error =xfs_free_extent (sc->tp, sc->sa.pag, agbno,1 , oinfo, + resv);if (agf_bp != sc->sa.agf_bp)xfs_trans_brelse (sc->tp, agf_bp);if (error)
fs/xfs/xfs_extfree_item.c +6 -2
@@ -350,6 +350,7 @@ xfs_trans_free_extent(struct xfs_owner_info oinfo = { };struct xfs_mount *mp = tp->t_mountp;struct xfs_extent *extp; +struct xfs_perag *pag;uint next_extent;xfs_agnumber_t agno =XFS_FSB_TO_AGNO (mp, xefi->xefi_startblock);
@@ -366,9 +367,12 @@ xfs_trans_free_extent(trace_xfs_bmap_free_deferred (tp->t_mountp, agno,0 , agbno, xefi->xefi_blockcount); - error =__xfs_free_extent (tp, xefi->xefi_startblock, - xefi->xefi_blockcount, &oinfo,XFS_AG_RESV_NONE , + pag =xfs_perag_get (mp, agno); + error =__xfs_free_extent (tp, pag, agbno, xefi->xefi_blockcount, + &oinfo,XFS_AG_RESV_NONE , xefi->xefi_flags &XFS_EFI_SKIP_DISCARD ); +xfs_perag_put (pag); +/* * Mark the transaction dirty, even on error. This ensures the * transaction is aborted, which:
PATCH 3/5 xfs: give xfs_extfree_intent its own perag reference
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Give the xfs_extfree_intent an active reference to the perag structure data. This reference will be used to enable scrub intent draining functionality in subsequent patches. Later, shrink will use these active references to know if an AG is quiesced or not.
--- fs/xfs/libxfs/xfs_alloc.c | 7 ++++- fs/xfs/libxfs/xfs_alloc.h | 4 +++ fs/xfs/xfs_extfree_item.c | 58 +++++++++++++++++++++++++++++---------------- 3 files changed, 47 insertions(+), 22 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +5 -2
@@ -2485,6 +2485,7 @@ xfs_defer_agfl_block(trace_xfs_agfl_free_defer (mp, agno,0 , agbno,1 ); +xfs_extent_free_get_group (mp, xefi);xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_AGFL_FREE , &xefi->xefi_list); }
@@ -2501,8 +2502,8 @@ __xfs_free_extent_later( bool skip_discard) {struct xfs_extent_free_item *xefi; -#ifdef DEBUG struct xfs_mount *mp = tp->t_mountp; +#ifdef DEBUG xfs_agnumber_t agno;xfs_agblock_t agbno;
@@ -2536,9 +2537,11 @@ __xfs_free_extent_later( }else { xefi->xefi_owner =XFS_RMAP_OWN_NULL ; } -trace_xfs_bmap_free_defer (tp->t_mountp, +trace_xfs_bmap_free_defer (mp,XFS_FSB_TO_AGNO (tp->t_mountp, bno),0 ,XFS_FSB_TO_AGBNO (tp->t_mountp, bno), len); + +xfs_extent_free_get_group (mp, xefi);xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_FREE , &xefi->xefi_list); }
fs/xfs/libxfs/xfs_alloc.h +4 -0
@@ -226,9 +226,13 @@ struct xfs_extent_free_item {uint64_t xefi_owner;xfs_fsblock_t xefi_startblock;/* starting fs block number */ xfs_extlen_t xefi_blockcount;/* number of blocks in extent */ +struct xfs_perag *xefi_pag;unsigned int xefi_flags; }; +void xfs_extent_free_get_group (struct xfs_mount *mp, +struct xfs_extent_free_item *xefi); +#define XFS_EFI_SKIP_DISCARD (1U << 0)/* don't issue discard */ #define XFS_EFI_ATTR_FORK (1U << 1)/* freeing attr fork block */ #define XFS_EFI_BMBT_BLOCK (1U << 2)/* freeing bmap btree block */
fs/xfs/xfs_extfree_item.c +38 -20
131 lines not on this page · raw message
PATCH 4/5 xfs: give xfs_rmap_intent its own perag reference
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Give the xfs_rmap_intent an active reference to the perag structure data. This reference will be used to enable scrub intent draining functionality in subsequent patches. Later, shrink will use these active references to know if an AG is quiesced or not.
--- fs/xfs/libxfs/xfs_rmap.c | 29 +++++++++++------------------ fs/xfs/libxfs/xfs_rmap.h | 4 ++++ fs/xfs/xfs_rmap_item.c | 32 +++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 21 deletions(-)
fs/xfs/libxfs/xfs_rmap.c +11 -18
@@ -2394,7 +2394,6 @@ xfs_rmap_finish_one( struct xfs_btree_cur **pcur) {struct xfs_mount *mp = tp->t_mountp; -struct xfs_perag *pag;struct xfs_btree_cur *rcur;struct xfs_buf *agbp =NULL ;int error =0 ;
@@ -2402,26 +2401,22 @@ xfs_rmap_finish_one(xfs_agblock_t bno;bool unwritten; - pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ri->ri_bmap.br_startblock)); bno =XFS_FSB_TO_AGBNO (mp, ri->ri_bmap.br_startblock); -trace_xfs_rmap_deferred (mp, pag->pag_agno, ri->ri_type, bno, +trace_xfs_rmap_deferred (mp, ri->ri_pag->pag_agno, ri->ri_type, bno, ri->ri_owner, ri->ri_whichfork, ri->ri_bmap.br_startoff, ri->ri_bmap.br_blockcount, ri->ri_bmap.br_state); -if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_RMAP_FINISH_ONE )) { - error = -EIO ; - goto out_drop; - } - +if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_RMAP_FINISH_ONE )) +return -EIO ;/* * If we haven't gotten a cursor or the cursor AG doesn't match * the startblock, get one now. */ rcur = *pcur; -if (rcur !=NULL && rcur->bc_ag.pag != pag) { +if (rcur !=NULL && rcur->bc_ag.pag != ri->ri_pag) {xfs_rmap_finish_one_cleanup (tp, rcur,0 ); rcur =NULL ; *pcur =NULL ;
@@ -2432,15 +2427,13 @@ xfs_rmap_finish_one(* rmapbt, because a shape change could cause us to * allocate blocks. */ - error =xfs_free_extent_fix_freelist (tp, pag, &agbp); + error =xfs_free_extent_fix_freelist (tp, ri->ri_pag, &agbp);if (error) - goto out_drop; -if (XFS_IS_CORRUPT (tp->t_mountp, !agbp)) { - error = -EFSCORRUPTED ; - goto out_drop; - } +return error; +if (XFS_IS_CORRUPT (tp->t_mountp, !agbp)) +return -EFSCORRUPTED ; - rcur =xfs_rmapbt_init_cursor (mp, tp, agbp, pag); + rcur =xfs_rmapbt_init_cursor (mp, tp, agbp, ri->ri_pag); } *pcur = rcur;
@@ -2480,8 +2473,7 @@ xfs_rmap_finish_one(ASSERT (0 ); error = -EFSCORRUPTED ; } -out_drop: -xfs_perag_put (pag); +return error; }
@@ -2526,6 +2518,7 @@ __xfs_rmap_add( ri->ri_whichfork = whichfork; ri->ri_bmap = *bmap; +xfs_rmap_update_get_group (tp->t_mountp, ri);xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_RMAP , &ri->ri_list); }
fs/xfs/libxfs/xfs_rmap.h +4 -0
@@ -162,8 +162,12 @@ struct xfs_rmap_intent {int ri_whichfork;uint64_t ri_owner;struct xfs_bmbt_irec ri_bmap; +struct xfs_perag *ri_pag; }; +void xfs_rmap_update_get_group (struct xfs_mount *mp, +struct xfs_rmap_intent *ri); +/* functions for updating the rmapbt based on bmbt map/unmap operations */ void xfs_rmap_map_extent (struct xfs_trans *tp,struct xfs_inode *ip,int whichfork,struct xfs_bmbt_irec *imap);
fs/xfs/xfs_rmap_item.c +29 -3
@@ -20,6 +20,7 @@#include "xfs_error.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_ag.h" struct kmem_cache *xfs_rui_cache;struct kmem_cache *xfs_rud_cache;
@@ -320,14 +321,13 @@ xfs_rmap_update_diff_items(const struct list_head *a, const struct list_head *b) { - struct xfs_mount *mp = priv; struct xfs_rmap_intent *ra;struct xfs_rmap_intent *rb; ra = container_of(a, struct xfs_rmap_intent, ri_list); rb = container_of(b, struct xfs_rmap_intent, ri_list); -return XFS_FSB_TO_AGNO (mp, ra->ri_bmap.br_startblock) - -XFS_FSB_TO_AGNO (mp, rb->ri_bmap.br_startblock); + +return ra->ri_pag->pag_agno - rb->ri_pag->pag_agno; }/* Log rmap updates in the intent item. */
@@ -390,6 +390,26 @@ xfs_rmap_update_create_done(return &xfs_trans_get_rud (tp,RUI_ITEM (intent))->rud_item; } +/* Take an active ref to the AG containing the space we're rmapping. */ +void +xfs_rmap_update_get_group ( +struct xfs_mount *mp, +struct xfs_rmap_intent *ri) +{ +xfs_agnumber_t agno; + + agno =XFS_FSB_TO_AGNO (mp, ri->ri_bmap.br_startblock); + ri->ri_pag =xfs_perag_get (mp, agno); +} + +/* Release an active AG ref after finishing rmapping work. */ +static inline void +xfs_rmap_update_put_group ( +struct xfs_rmap_intent *ri) +{ +xfs_perag_put (ri->ri_pag); +} +/* Process a deferred rmap update. */ STATIC int xfs_rmap_update_finish_item(
@@ -405,6 +425,8 @@ xfs_rmap_update_finish_item( error =xfs_trans_log_finish_rmap_update (tp,RUD_ITEM (done), ri, state); + +xfs_rmap_update_put_group (ri);kmem_cache_free (xfs_rmap_intent_cache, ri);return error; }
@@ -425,6 +447,8 @@ xfs_rmap_update_cancel_item(struct xfs_rmap_intent *ri; ri = container_of(item, struct xfs_rmap_intent, ri_list); + +xfs_rmap_update_put_group (ri);kmem_cache_free (xfs_rmap_intent_cache, ri); }
@@ -559,11 +583,13 @@ xfs_rui_item_recover( fake.ri_bmap.br_state = (map->me_flags &XFS_RMAP_EXTENT_UNWRITTEN ) ?XFS_EXT_UNWRITTEN :XFS_EXT_NORM ; +xfs_rmap_update_get_group (mp, &fake); error =xfs_trans_log_finish_rmap_update (tp, rudp, &fake, &rcur);if (error == -EFSCORRUPTED )XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, map,sizeof (*map)); +xfs_rmap_update_put_group (&fake);if (error) goto abort_error;
PATCH 5/5 xfs: give xfs_refcount_intent its own perag reference
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Give the xfs_refcount_intent an active reference to the perag structure data. This reference will be used to enable scrub intent draining functionality in subsequent patches. Later, shrink will use these active references to know if an AG is quiesced or not.
--- fs/xfs/libxfs/xfs_refcount.c | 33 ++++++++++++++------------------- fs/xfs/libxfs/xfs_refcount.h | 4 ++++ fs/xfs/xfs_refcount_item.c | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 50 insertions(+), 23 deletions(-)
fs/xfs/libxfs/xfs_refcount.c +14 -19
@@ -1332,26 +1332,22 @@ xfs_refcount_finish_one(xfs_agblock_t bno;unsigned long nr_ops =0 ;int shape_changes =0 ; -struct xfs_perag *pag; - pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ri->ri_startblock)); bno =XFS_FSB_TO_AGBNO (mp, ri->ri_startblock);trace_xfs_refcount_deferred (mp,XFS_FSB_TO_AGNO (mp, ri->ri_startblock), ri->ri_type,XFS_FSB_TO_AGBNO (mp, ri->ri_startblock), ri->ri_blockcount); -if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_REFCOUNT_FINISH_ONE )) { - error = -EIO ; - goto out_drop; - } +if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_REFCOUNT_FINISH_ONE )) +return -EIO ;/* * If we haven't gotten a cursor or the cursor AG doesn't match * the startblock, get one now. */ rcur = *pcur; -if (rcur !=NULL && rcur->bc_ag.pag != pag) { +if (rcur !=NULL && rcur->bc_ag.pag != ri->ri_pag) { nr_ops = rcur->bc_ag.refc.nr_ops; shape_changes = rcur->bc_ag.refc.shape_changes;xfs_refcount_finish_one_cleanup (tp, rcur,0 );
@@ -1359,12 +1355,12 @@ xfs_refcount_finish_one( *pcur =NULL ; }if (rcur ==NULL ) { - error =xfs_alloc_read_agf (pag, tp,XFS_ALLOC_FLAG_FREEING , - &agbp); + error =xfs_alloc_read_agf (ri->ri_pag, tp, +XFS_ALLOC_FLAG_FREEING , &agbp);if (error) - goto out_drop; +return error; - rcur =xfs_refcountbt_init_cursor (mp, tp, agbp, pag); + rcur =xfs_refcountbt_init_cursor (mp, tp, agbp, ri->ri_pag); rcur->bc_ag.refc.nr_ops = nr_ops; rcur->bc_ag.refc.shape_changes = shape_changes; }
@@ -1375,7 +1371,7 @@ xfs_refcount_finish_one( error =xfs_refcount_adjust (rcur, &bno, &ri->ri_blockcount,XFS_REFCOUNT_ADJUST_INCREASE );if (error) - goto out_drop; +return error;if (ri->ri_blockcount >0 ) error =xfs_refcount_continue_op (rcur, ri, bno);break ;
@@ -1383,31 +1379,29 @@ xfs_refcount_finish_one( error =xfs_refcount_adjust (rcur, &bno, &ri->ri_blockcount,XFS_REFCOUNT_ADJUST_DECREASE );if (error) - goto out_drop; +return error;if (ri->ri_blockcount >0 ) error =xfs_refcount_continue_op (rcur, ri, bno);break ;case XFS_REFCOUNT_ALLOC_COW : error =__xfs_refcount_cow_alloc (rcur, bno, ri->ri_blockcount);if (error) - goto out_drop; +return error; ri->ri_blockcount =0 ;break ;case XFS_REFCOUNT_FREE_COW : error =__xfs_refcount_cow_free (rcur, bno, ri->ri_blockcount);if (error) - goto out_drop; +return error; ri->ri_blockcount =0 ;break ;default :ASSERT (0 ); - error = -EFSCORRUPTED ; +return -EFSCORRUPTED ; }if (!error && ri->ri_blockcount >0 ) -trace_xfs_refcount_finish_one_leftover (mp, pag->pag_agno, +trace_xfs_refcount_finish_one_leftover (mp, ri->ri_pag->pag_agno, ri->ri_type, bno, ri->ri_blockcount); -out_drop: -xfs_perag_put (pag);return error; }
@@ -1435,6 +1429,7 @@ __xfs_refcount_add( ri->ri_startblock = startblock; ri->ri_blockcount = blockcount; +xfs_refcount_update_get_group (tp->t_mountp, ri);xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_REFCOUNT , &ri->ri_list); }
fs/xfs/libxfs/xfs_refcount.h +4 -0
@@ -50,6 +50,7 @@ enum xfs_refcount_intent_type {struct xfs_refcount_intent {struct list_head ri_list; +struct xfs_perag *ri_pag;enum xfs_refcount_intent_type ri_type;xfs_extlen_t ri_blockcount;xfs_fsblock_t ri_startblock;
@@ -67,6 +68,9 @@ xfs_refcount_check_domain(return true; } +void xfs_refcount_update_get_group (struct xfs_mount *mp, +struct xfs_refcount_intent *ri); +void xfs_refcount_increase_extent (struct xfs_trans *tp,struct xfs_bmbt_irec *irec); void xfs_refcount_decrease_extent(struct xfs_trans *tp,
fs/xfs/xfs_refcount_item.c +32 -4
@@ -20,6 +20,7 @@#include "xfs_error.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_ag.h" struct kmem_cache *xfs_cui_cache;struct kmem_cache *xfs_cud_cache;
@@ -279,14 +280,13 @@ xfs_refcount_update_diff_items(const struct list_head *a, const struct list_head *b) { - struct xfs_mount *mp = priv; struct xfs_refcount_intent *ra;struct xfs_refcount_intent *rb; ra = container_of(a, struct xfs_refcount_intent, ri_list); rb = container_of(b, struct xfs_refcount_intent, ri_list); -return XFS_FSB_TO_AGNO (mp, ra->ri_startblock) - -XFS_FSB_TO_AGNO (mp, rb->ri_startblock); + +return ra->ri_pag->pag_agno - rb->ri_pag->pag_agno; }/* Set the phys extent flags for this reverse mapping. */
@@ -365,6 +365,26 @@ xfs_refcount_update_create_done(return &xfs_trans_get_cud (tp,CUI_ITEM (intent))->cud_item; } +/* Take an active ref to the AG containing the space we're refcounting. */ +void +xfs_refcount_update_get_group ( +struct xfs_mount *mp, +struct xfs_refcount_intent *ri) +{ +xfs_agnumber_t agno; + + agno =XFS_FSB_TO_AGNO (mp, ri->ri_startblock); + ri->ri_pag =xfs_perag_get (mp, agno); +} + +/* Release an active AG ref after finishing refcounting work. */ +static inline void +xfs_refcount_update_put_group ( +struct xfs_refcount_intent *ri) +{ +xfs_perag_put (ri->ri_pag); +} +/* Process a deferred refcount update. */ STATIC int xfs_refcount_update_finish_item(
@@ -386,6 +406,8 @@ xfs_refcount_update_finish_item( ri->ri_type == XFS_REFCOUNT_DECREASE);return -EAGAIN ; } + +xfs_refcount_update_put_group (ri);kmem_cache_free (xfs_refcount_intent_cache, ri);return error; }
@@ -406,6 +428,8 @@ xfs_refcount_update_cancel_item(struct xfs_refcount_intent *ri; ri = container_of(item, struct xfs_refcount_intent, ri_list); + +xfs_refcount_update_put_group (ri);kmem_cache_free (xfs_refcount_intent_cache, ri); }
@@ -520,9 +544,13 @@ xfs_cui_item_recover( fake.ri_startblock = pmap->pe_startblock; fake.ri_blockcount = pmap->pe_len; -if (!requeue_only) + +if (!requeue_only) { +xfs_refcount_update_get_group (mp, &fake); error =xfs_trans_log_finish_refcount_update (tp, cudp, &fake, &rcur); +xfs_refcount_update_put_group (&fake); + }if (error == -EFSCORRUPTED ) XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, &cuip->cui_format,
PATCH 1/1 xfs: create a function to duplicate an active perag reference
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
There a few object constructor functions throughout XFS where a caller provides an active perag reference and the constructor wants to give the new object its own active reference. Replace the open-coded logic with a common function to do this instead of open-coding atomic_inc logic.
This new function adds a few safeguards -- it checks that there's at least one active reference to the perag structure passed in, and it records the refcount bump in the ftrace information. This makes it much easier to debug refcounting problems.
--- fs/xfs/libxfs/xfs_ag.c | 15 +++++++++++++++ fs/xfs/libxfs/xfs_ag.h | 1 + fs/xfs/libxfs/xfs_alloc_btree.c | 4 +--- fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +--- fs/xfs/libxfs/xfs_refcount_btree.c | 5 +---- fs/xfs/libxfs/xfs_rmap_btree.c | 5 +---- fs/xfs/xfs_iunlink_item.c | 4 +--- fs/xfs/xfs_iwalk.c | 3 +-- fs/xfs/xfs_trace.h | 1 + 9 files changed, 23 insertions(+), 19 deletions(-)
fs/xfs/libxfs/xfs_ag.c +15 -0
@@ -57,6 +57,21 @@ xfs_perag_get(return pag; } +/* Get our own reference to a perag, given an existing active reference. */ +struct xfs_perag * +xfs_perag_bump ( +struct xfs_perag *pag) +{ +if (!atomic_inc_not_zero (&pag->pag_ref)) { +ASSERT (0 ); +return NULL ; + } + +trace_xfs_perag_bump (pag->pag_mount, pag->pag_agno, +atomic_read (&pag->pag_ref), _RET_IP_); +return pag; +} +/* * search from @first to find the next perag with the given tag set. */
fs/xfs/libxfs/xfs_ag.h +1 -0
@@ -112,6 +112,7 @@ int xfs_initialize_perag_data(struct xfs_mount *mp, xfs_agnumber_t agno);void xfs_free_perag (struct xfs_mount *mp);struct xfs_perag *xfs_perag_get (struct xfs_mount *mp,xfs_agnumber_t agno); +struct xfs_perag *xfs_perag_bump (struct xfs_perag *pag);struct xfs_perag *xfs_perag_get_tag (struct xfs_mount *mp,xfs_agnumber_t agno,unsigned int tag);void xfs_perag_put (struct xfs_perag *pag);
fs/xfs/libxfs/xfs_alloc_btree.c +1 -3
@@ -492,9 +492,7 @@ xfs_allocbt_init_common( cur->bc_statoff =XFS_STATS_CALC_INDEX (xs_abtb_2); } -/* take a reference for the cursor */ -atomic_inc (&pag->pag_ref); - cur->bc_ag.pag = pag; + cur->bc_ag.pag =xfs_perag_bump (pag);if (xfs_has_crc (mp)) cur->bc_flags |=XFS_BTREE_CRC_BLOCKS ;
fs/xfs/libxfs/xfs_ialloc_btree.c +1 -3
@@ -450,9 +450,7 @@ xfs_inobt_init_common(if (xfs_has_crc (mp)) cur->bc_flags |=XFS_BTREE_CRC_BLOCKS ; -/* take a reference for the cursor */ -atomic_inc (&pag->pag_ref); - cur->bc_ag.pag = pag; + cur->bc_ag.pag =xfs_perag_bump (pag);return cur; }
fs/xfs/libxfs/xfs_refcount_btree.c +1 -4
@@ -340,10 +340,7 @@ xfs_refcountbt_init_common( cur->bc_flags |=XFS_BTREE_CRC_BLOCKS ; -/* take a reference for the cursor */ -atomic_inc (&pag->pag_ref); - cur->bc_ag.pag = pag; - + cur->bc_ag.pag =xfs_perag_bump (pag); cur->bc_ag.refc.nr_ops =0 ; cur->bc_ag.refc.shape_changes =0 ; cur->bc_ops = &xfs_refcountbt_ops;
fs/xfs/libxfs/xfs_rmap_btree.c +1 -4
@@ -460,10 +460,7 @@ xfs_rmapbt_init_common( cur->bc_statoff =XFS_STATS_CALC_INDEX (xs_rmap_2); cur->bc_ops = &xfs_rmapbt_ops; -/* take a reference for the cursor */ -atomic_inc (&pag->pag_ref); - cur->bc_ag.pag = pag; - + cur->bc_ag.pag =xfs_perag_bump (pag);return cur; }
fs/xfs/xfs_iunlink_item.c +1 -3
@@ -168,9 +168,7 @@ xfs_iunlink_log_inode( iup->ip = ip; iup->next_agino = next_agino; iup->old_agino = ip->i_next_unlinked; - -atomic_inc (&pag->pag_ref); - iup->pag = pag; + iup->pag =xfs_perag_bump (pag);xfs_trans_add_item (tp, &iup->item); tp->t_flags |=XFS_TRANS_DIRTY ;
fs/xfs/xfs_iwalk.c +1 -2
@@ -670,8 +670,7 @@ xfs_iwalk_threaded(* perag is being handed off to async work, so take another * reference for the async work to release. */ -atomic_inc (&pag->pag_ref); - iwag->pag = pag; + iwag->pag =xfs_perag_bump (pag); iwag->iwalk_fn = iwalk_fn; iwag->data = data; iwag->startino = startino;
fs/xfs/xfs_trace.h +1 -0
@@ -187,6 +187,7 @@ DEFINE_EVENT(xfs_perag_class, name, \ unsigned long caller_ip), \ TP_ARGS(mp, agno, refcount, caller_ip)) DEFINE_PERAG_REF_EVENT(xfs_perag_get); +DEFINE_PERAG_REF_EVENT (xfs_perag_bump);DEFINE_PERAG_REF_EVENT (xfs_perag_get_tag);DEFINE_PERAG_REF_EVENT (xfs_perag_put);DEFINE_PERAG_REF_EVENT (xfs_perag_set_inode_tag);
PATCH 1/5 xfs: add a tracepoint to report incorrect extent refcounts
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new tracepoint so that I can see exactly what and where we failed the refcount check.
--- fs/xfs/scrub/refcount.c | 5 ++++- fs/xfs/scrub/trace.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-)
fs/xfs/scrub/refcount.c +4 -1
@@ -13,6 +13,7 @@#include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/btree.h" +#include "scrub/trace.h" #include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_ag.h"
@@ -300,8 +301,10 @@ xchk_refcountbt_xref_rmap( goto out_free;xchk_refcountbt_process_rmap_fragments (&refchk); -if (irec->rc_refcount != refchk.seen) +if (irec->rc_refcount != refchk.seen) { +trace_xchk_refcount_incorrect (sc->sa.pag, irec, refchk.seen);xchk_btree_xref_set_corrupt (sc, sc->sa.rmap_cur,0 ); + } out_free:list_for_each_entry_safe (frag, n, &refchk.fragments, list) {
fs/xfs/scrub/trace.h +35 -0
@@ -30,6 +30,9 @@ TRACE_DEFINE_ENUM(XFS_BTNUM_FINOi);TRACE_DEFINE_ENUM (XFS_BTNUM_RMAPi);TRACE_DEFINE_ENUM (XFS_BTNUM_REFCi); +TRACE_DEFINE_ENUM (XFS_REFC_DOMAIN_SHARED ); +TRACE_DEFINE_ENUM (XFS_REFC_DOMAIN_COW ); +TRACE_DEFINE_ENUM (XFS_SCRUB_TYPE_PROBE );TRACE_DEFINE_ENUM (XFS_SCRUB_TYPE_SB );TRACE_DEFINE_ENUM (XFS_SCRUB_TYPE_AGF );
@@ -657,6 +660,38 @@ TRACE_EVENT(xchk_fscounters_within_range, __entry->old_value) ) +TRACE_EVENT (xchk_refcount_incorrect, + TP_PROTO(struct xfs_perag *pag, const struct xfs_refcount_irec *irec, + xfs_nlink_t seen), +TP_ARGS (pag, irec, seen), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(xfs_agnumber_t, agno) + __field(enum xfs_refc_domain, domain) + __field(xfs_agblock_t, startblock) + __field(xfs_extlen_t, blockcount) + __field(xfs_nlink_t, refcount) +__field (xfs_nlink_t, seen) + ), +TP_fast_assign ( + __entry->dev = pag->pag_mount->m_super->s_dev; + __entry->agno = pag->pag_agno; + __entry->domain = irec->rc_domain; + __entry->startblock = irec->rc_startblock; + __entry->blockcount = irec->rc_blockcount; + __entry->refcount = irec->rc_refcount; + __entry->seen = seen; + ), +TP_printk ("dev %d:%d agno 0x%x dom %s agbno 0x%x fsbcount 0x%x refcount %u seen %u" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->agno, +__print_symbolic (__entry->domain,XFS_REFC_DOMAIN_STRINGS ), + __entry->startblock, + __entry->blockcount, + __entry->refcount, + __entry->seen) +) + /* repair tracepoints */#if IS_ENABLED (CONFIG_XFS_ONLINE_REPAIR )
PATCH 2/5 xfs: allow queued AG intents to drain before scrubbing
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
When a writer thread executes a chain of log intent items, the AG header buffer locks will cycle during a transaction roll to get from one intent item to the next in a chain. Although scrub takes all AG header buffer locks, this isn't sufficient to guard against scrub checking an AG while that writer thread is in the middle of finishing a chain because there's no higher level locking primitive guarding allocation groups.
When there's a collision, cross-referencing between data structures (e.g. rmapbt and refcountbt) yields false corruption events; if repair is running, this results in incorrect repairs, which is catastrophic.
Fix this by adding to the perag structure the count of active intents and make scrub wait until it has both AG header buffer locks and the intent counter reaches zero.
One quirk of the drain code is that deferred bmap updates also bump and drop the intent counter. A fundamental decision made during the design phase of the reverse mapping feature is that updates to the rmapbt records are always made by the same code that updates the primary metadata. In other words, callers of bmapi functions expect that the bmapi functions will queue deferred rmap updates.
Some parts of the reflink code queue deferred refcount (CUI) and bmap (BUI) updates in the same head transaction, but the deferred work manager completely finishes the CUI before the BUI work is started. As a result, the CUI drops the intent count long before the deferred rmap (RUI) update even has a chance to bump the intent count. The only way to keep the intent count elevated between the CUI and RUI is for the BUI to bump the counter until the RUI has been created.
A second quirk of the intent drain code is that deferred work items must increment the intent counter as soon as the work item is added to the transaction. When a BUI completes and queues an RUI, the RUI must increment the counter before the BUI decrements it. The only way to accomplish this is to require that the counter be bumped as soon as the deferred work item is created in memory.
In the next patches we'll improve on this facility, but this patch provides the basic functionality.
--- fs/xfs/Kconfig | 4 ++ fs/xfs/Makefile | 2 + fs/xfs/libxfs/xfs_ag.c | 4 ++ fs/xfs/libxfs/xfs_ag.h | 8 +++ fs/xfs/libxfs/xfs_defer.c | 6 ++- fs/xfs/scrub/common.c | 103 +++++++++++++++++++++++++++++++++++++++----- fs/xfs/scrub/health.c | 2 + fs/xfs/scrub/refcount.c | 2 + fs/xfs/xfs_bmap_item.c | 10 ++++ fs/xfs/xfs_drain.c | 96 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_drain.h | 77 +++++++++++++++++++++++++++++++++ fs/xfs/xfs_extfree_item.c | 2 + fs/xfs/xfs_linux.h | 1 fs/xfs/xfs_refcount_item.c | 2 + fs/xfs/xfs_rmap_item.c | 2 + fs/xfs/xfs_trace.h | 71 ++++++++++++++++++++++++++++++ 16 files changed, 379 insertions(+), 13 deletions(-) create mode 100644 fs/xfs/xfs_drain.c create mode 100644 fs/xfs/xfs_drain.h
fs/xfs/Kconfig +4 -0
@@ -93,10 +93,14 @@ config XFS_RT If unsure, say N. +config XFS_DRAIN_INTENTS + bool + config XFS_ONLINE_SCRUB bool "XFS online metadata check support" default n depends on XFS_FS + select XFS_DRAIN_INTENTS help If you say Y here you will be able to check metadata on a mounted XFS filesystem. This feature is intended to reduce
fs/xfs/Makefile +2 -0
@@ -135,6 +135,8 @@ ifeq ($(CONFIG_MEMORY_FAILURE),y) xfs-$(CONFIG_FS_DAX) += xfs_notify_failure.o endif +xfs-$(CONFIG_XFS_DRAIN_INTENTS) += xfs_drain.o + # online scrub/repair ifeq ($(CONFIG_XFS_ONLINE_SCRUB),y)
fs/xfs/libxfs/xfs_ag.c +4 -0
@@ -207,6 +207,7 @@ xfs_free_perag(spin_unlock (&mp->m_perag_lock);ASSERT (pag);XFS_IS_CORRUPT (pag->pag_mount,atomic_read (&pag->pag_ref) !=0 ); +xfs_drain_free (&pag->pag_intents);cancel_delayed_work_sync (&pag->pag_blockgc_work);xfs_buf_hash_destroy (pag);
@@ -328,6 +329,7 @@ xfs_initialize_perag(spin_lock_init (&pag->pag_state_lock);INIT_DELAYED_WORK (&pag->pag_blockgc_work, xfs_blockgc_worker);INIT_RADIX_TREE (&pag->pag_ici_root,GFP_ATOMIC ); +xfs_drain_init (&pag->pag_intents);init_waitqueue_head (&pag->pagb_wait); pag->pagb_count =0 ; pag->pagb_tree =RB_ROOT ;
@@ -360,6 +362,7 @@ xfs_initialize_perag(return 0 ; out_remove_pag: +xfs_drain_free (&pag->pag_intents);radix_tree_delete (&mp->m_perag_tree, index); out_free_pag:kmem_free (pag);
@@ -370,6 +373,7 @@ xfs_initialize_perag(if (!pag)break ;xfs_buf_hash_destroy (pag); +xfs_drain_free (&pag->pag_intents);kmem_free (pag); }return error;
fs/xfs/libxfs/xfs_ag.h +8 -0
@@ -103,6 +103,14 @@ struct xfs_perag {/* background prealloc block trimming */ struct delayed_work pag_blockgc_work; +/* +* We use xfs_drain to track the number of deferred log intent items +* that have been queued (but not yet processed) so that waiters (e.g. +* scrub) will not lock resources when other threads are in the middle +* of processing a chain of intent items only to find momentary +* inconsistencies. +*/ +struct xfs_drain pag_intents;#endif /* __KERNEL__ */ };
fs/xfs/libxfs/xfs_defer.c +4 -2
@@ -397,6 +397,7 @@ xfs_defer_cancel_list(list_for_each_safe (pwi, n, &dfp->dfp_work) {list_del (pwi); dfp->dfp_count--; +trace_xfs_defer_cancel_item (mp, dfp, pwi); ops->cancel_item (pwi); }ASSERT (dfp->dfp_count ==0 );
@@ -476,6 +477,7 @@ xfs_defer_finish_one(list_for_each_safe (li, n, &dfp->dfp_work) {list_del (li); dfp->dfp_count--; +trace_xfs_defer_finish_item (tp->t_mountp, dfp, li); error = ops->finish_item (tp, dfp->dfp_done, li, &state);if (error == -EAGAIN ) {int ret;
@@ -623,7 +625,7 @@ xfs_defer_add( struct list_head *li) {struct xfs_defer_pending *dfp =NULL ; -const struct xfs_defer_op_type *ops; +const struct xfs_defer_op_type *ops = defer_op_types[type];ASSERT (tp->t_flags &XFS_TRANS_PERM_LOG_RES );BUILD_BUG_ON (ARRAY_SIZE (defer_op_types) !=XFS_DEFER_OPS_TYPE_MAX );
@@ -636,7 +638,6 @@ xfs_defer_add(if (!list_empty (&tp->t_dfops)) { dfp =list_last_entry (&tp->t_dfops, struct xfs_defer_pending, dfp_list); - ops = defer_op_types[dfp->dfp_type];if (dfp->dfp_type != type || (ops->max_items && dfp->dfp_count >= ops->max_items)) dfp =NULL ;
@@ -653,6 +654,7 @@ xfs_defer_add( }list_add_tail (li, &dfp->dfp_work); +trace_xfs_defer_add_item (tp->t_mountp, dfp, li); dfp->dfp_count++; }
fs/xfs/scrub/common.c +92 -11
124 lines not on this page · raw message
fs/xfs/scrub/health.c +2 -0
@@ -7,6 +7,8 @@#include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" #include "xfs_btree.h" #include "xfs_trans_resv.h" #include "xfs_mount.h"
fs/xfs/scrub/refcount.c +2 -0
@@ -7,6 +7,8 @@#include "xfs_fs.h" #include "xfs_shared.h" #include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" #include "xfs_btree.h" #include "xfs_rmap.h" #include "xfs_refcount.h"
fs/xfs/xfs_bmap_item.c +10 -0
@@ -374,6 +374,15 @@ xfs_bmap_update_get_group( agno =XFS_FSB_TO_AGNO (mp, bi->bi_bmap.br_startblock); bi->bi_pag =xfs_perag_get (mp, agno); + +/* +* Bump the intent count on behalf of the deferred rmap intent item +* that we will queue when we finish this bmap work. This rmap item +* will bump the intent count before the bmap intent drops the intent +* count, ensuring that the intent count remains nonzero across the +* transaction roll. +*/ +xfs_perag_bump_intents (bi->bi_pag); }/* Release an active AG ref after finishing mapping work. */
@@ -381,6 +390,7 @@ static inline voidxfs_bmap_update_put_group ( struct xfs_bmap_intent *bi) { +xfs_perag_drop_intents (bi->bi_pag);xfs_perag_put (bi->bi_pag); }
fs/xfs/xfs_drain.c new file +96 -0
96 lines not on this page · raw message
fs/xfs/xfs_drain.h new file +77 -0
77 lines not on this page · raw message
fs/xfs/xfs_extfree_item.c +2 -0
@@ -470,6 +470,7 @@ xfs_extent_free_get_group( agno =XFS_FSB_TO_AGNO (mp, xefi->xefi_startblock); xefi->xefi_pag =xfs_perag_get (mp, agno); +xfs_perag_bump_intents (xefi->xefi_pag); }/* Release an active AG ref after some freeing work. */
@@ -477,6 +478,7 @@ static inline voidxfs_extent_free_put_group ( struct xfs_extent_free_item *xefi) { +xfs_perag_drop_intents (xefi->xefi_pag);xfs_perag_put (xefi->xefi_pag); }
fs/xfs/xfs_linux.h +1 -0
@@ -79,6 +79,7 @@ typedef __u32 xfs_nlink_t;#include "xfs_cksum.h" #include "xfs_buf.h" #include "xfs_message.h" +#include "xfs_drain.h" #ifdef __BIG_ENDIAN#define XFS_NATIVE_HOST 1
fs/xfs/xfs_refcount_item.c +2 -0
@@ -375,6 +375,7 @@ xfs_refcount_update_get_group( agno =XFS_FSB_TO_AGNO (mp, ri->ri_startblock); ri->ri_pag =xfs_perag_get (mp, agno); +xfs_perag_bump_intents (ri->ri_pag); }/* Release an active AG ref after finishing refcounting work. */
@@ -382,6 +383,7 @@ static inline voidxfs_refcount_update_put_group ( struct xfs_refcount_intent *ri) { +xfs_perag_drop_intents (ri->ri_pag);xfs_perag_put (ri->ri_pag); }
fs/xfs/xfs_rmap_item.c +2 -0
@@ -400,6 +400,7 @@ xfs_rmap_update_get_group( agno =XFS_FSB_TO_AGNO (mp, ri->ri_bmap.br_startblock); ri->ri_pag =xfs_perag_get (mp, agno); +xfs_perag_bump_intents (ri->ri_pag); }/* Release an active AG ref after finishing rmapping work. */
@@ -407,6 +408,7 @@ static inline voidxfs_rmap_update_put_group ( struct xfs_rmap_intent *ri) { +xfs_perag_drop_intents (ri->ri_pag);xfs_perag_put (ri->ri_pag); }
fs/xfs/xfs_trace.h +71 -0
83 lines not on this page · raw message
PATCH 3/5 xfs: clean up scrub context if scrub setup returns -EDEADLOCK
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
It has been a longstanding convention that online scrub and repair functions can return -EDEADLOCK to signal that they weren't able to obtain some necessary resource. When this happens, the scrub framework is supposed to release all resources attached to the scrub context, set the TRY_HARDER flag in the scrub context flags, and try again. In this context, individual scrub functions are supposed to take all the resources they (incorrectly) speculated were not necessary.
We're about to make it so that the functions that lock and wait for a filesystem AG can also return EDEADLOCK to signal that we need to try again with the drain waiters enabled. Therefore, refactor xfs_scrub_metadata to support this behavior for ->setup() functions.
--- fs/xfs/scrub/scrub.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
fs/xfs/scrub/scrub.c +16 -12
@@ -491,23 +491,16 @@ xfs_scrub_metadata(/* Set up for the operation. */ error = sc->ops->setup (sc); +if (error == -EDEADLOCK && !(sc->flags &XCHK_TRY_HARDER )) + goto try_harder;if (error) goto out_teardown;/* Scrub for errors. */ error = sc->ops->scrub (sc); -if (!(sc->flags &XCHK_TRY_HARDER ) && error == -EDEADLOCK ) { -/* -* Scrubbers return -EDEADLOCK to mean 'try harder'. -* Tear down everything we hold, then set up again with -* preparation for worst-case scenarios. -*/ - error =xchk_teardown (sc,0 ); -if (error) - goto out_sc; - sc->flags |=XCHK_TRY_HARDER ; - goto retry_op; - }else if (error || (sm->sm_flags &XFS_SCRUB_OFLAG_INCOMPLETE )) +if (error == -EDEADLOCK && !(sc->flags &XCHK_TRY_HARDER )) + goto try_harder; +if (error || (sm->sm_flags &XFS_SCRUB_OFLAG_INCOMPLETE )) goto out_teardown;xchk_update_health (sc);
@@ -565,4 +558,15 @@ xfs_scrub_metadata( error =0 ; }return error; +try_harder: +/* +* Scrubbers return -EDEADLOCK to mean 'try harder'. Tear down +* everything we hold, then set up again with preparation for +* worst-case scenarios. +*/ + error =xchk_teardown (sc,0 ); +if (error) + goto out_sc; + sc->flags |=XCHK_TRY_HARDER ; + goto retry_op; }
PATCH 4/5 xfs: minimize overhead of drain wakeups by using jump labels
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
To reduce the runtime overhead even further when online fsck isn't running, use a static branch key to decide if we call wake_up on the drain. For compilers that support jump labels, the call to wake_up is replaced by a nop sled when nobody is waiting for intents to drain.
From my initial microbenchmarking, every transition of the static key between the on and off states takes about 22000ns to complete; this is paid entirely by the xfs_scrub process. When the static key is off (which it should be when fsck isn't running), the nop sled adds an overhead of approximately 0.36ns to runtime code.
For the few compilers that don't support jump labels, runtime code pays the cost of calling wake_up on an empty waitqueue, which was observed to be about 30ns. However, most architectures that have sufficient memory and CPU capacity to run XFS also support jump labels, so this is not much of a worry.
--- fs/xfs/Kconfig | 1 + fs/xfs/scrub/agheader.c | 9 +++++++++ fs/xfs/scrub/alloc.c | 3 +++ fs/xfs/scrub/bmap.c | 3 +++ fs/xfs/scrub/common.c | 24 ++++++++++++++++++++++++ fs/xfs/scrub/common.h | 15 +++++++++++++++ fs/xfs/scrub/fscounters.c | 7 +++++++ fs/xfs/scrub/ialloc.c | 2 ++ fs/xfs/scrub/inode.c | 3 +++ fs/xfs/scrub/quota.c | 3 +++ fs/xfs/scrub/refcount.c | 2 ++ fs/xfs/scrub/rmap.c | 3 +++ fs/xfs/scrub/scrub.c | 25 +++++++++++++++++++++---- fs/xfs/scrub/scrub.h | 5 ++++- fs/xfs/scrub/trace.h | 33 +++++++++++++++++++++++++++++++++ fs/xfs/xfs_drain.c | 27 ++++++++++++++++++++++++++- fs/xfs/xfs_drain.h | 3 +++ 17 files changed, 162 insertions(+), 6 deletions(-)
fs/xfs/Kconfig +1 -0
@@ -95,6 +95,7 @@ config XFS_RT config XFS_DRAIN_INTENTS bool + select JUMP_LABEL if HAVE_ARCH_JUMP_LABEL config XFS_ONLINE_SCRUB bool "XFS online metadata check support"
fs/xfs/scrub/agheader.c +9 -0
@@ -18,6 +18,15 @@#include "scrub/scrub.h" #include "scrub/common.h" +int +xchk_setup_agheader ( +struct xfs_scrub *sc) +{ +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); +return xchk_setup_fs (sc); +} +/* Superblock */ /* Cross-reference with the other btrees. */
fs/xfs/scrub/alloc.c +3 -0
@@ -24,6 +24,9 @@ intxchk_setup_ag_allocbt ( struct xfs_scrub *sc) { +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); +return xchk_setup_ag_btree (sc, false); }
fs/xfs/scrub/bmap.c +3 -0
@@ -31,6 +31,9 @@ xchk_setup_inode_bmap( {int error; +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); + error =xchk_get_inode (sc);if (error) goto out;
fs/xfs/scrub/common.c +24 -0
@@ -479,6 +479,8 @@ xchk_perag_lock( sa->agi_bp =NULL ; } +if (!(sc->flags &XCHK_FSHOOKS_DRAIN )) +return -EDEADLOCK ; error =xfs_perag_drain_intents (sa->pag);if (error == -ERESTARTSYS ) error = -EINTR ;
@@ -992,3 +994,25 @@ xchk_start_reaping( } sc->flags &= ~XCHK_REAPING_DISABLED ; } + +/* +* Enable filesystem hooks (i.e. runtime code patching) before starting a scrub +* operation. Callers must not hold any locks that intersect with the CPU +* hotplug lock (e.g. writeback locks) because code patching must halt the CPUs +* to change kernel code. +*/ +void +xchk_fshooks_enable ( +struct xfs_scrub *sc, +unsigned int scrub_fshooks) +{ +ASSERT (!(scrub_fshooks & ~XCHK_FSHOOKS_ALL )); +ASSERT (!(sc->flags & scrub_fshooks)); + +trace_xchk_fshooks_enable (sc, scrub_fshooks); + +if (scrub_fshooks &XCHK_FSHOOKS_DRAIN ) +xfs_drain_wait_enable (); + + sc->flags |= scrub_fshooks; +}
fs/xfs/scrub/common.h +15 -0
@@ -72,6 +72,7 @@ bool xchk_should_check_xref(struct xfs_scrub *sc, int *error, struct xfs_btree_cur **curpp);/* Setup functions */ +int xchk_setup_agheader (struct xfs_scrub *sc);int xchk_setup_fs (struct xfs_scrub *sc);int xchk_setup_ag_allocbt (struct xfs_scrub *sc);int xchk_setup_ag_iallocbt (struct xfs_scrub *sc);
@@ -151,4 +152,18 @@ int xchk_ilock_inverted(struct xfs_inode *ip, uint lock_mode);void xchk_stop_reaping (struct xfs_scrub *sc);void xchk_start_reaping (struct xfs_scrub *sc); +/* +* Setting up a hook to wait for intents to drain is costly -- we have to take +* the CPU hotplug lock and force an i-cache flush on all CPUs once to set it +* up, and again to tear it down. These costs add up quickly, so we only want +* to enable the drain waiter if the drain actually detected a conflict with +* running intent chains. +*/ +static inline bool xchk_need_fshook_drain (struct xfs_scrub *sc) +{ +return sc->flags &XCHK_TRY_HARDER ; +} + +void xchk_fshooks_enable (struct xfs_scrub *sc,unsigned int scrub_fshooks); +#endif /* __XFS_SCRUB_COMMON_H__ */
fs/xfs/scrub/fscounters.c +7 -0
@@ -128,6 +128,13 @@ xchk_setup_fscounters(struct xchk_fscounters *fsc;int error; +/* +* If the AGF doesn't track btreeblks, we have to lock the AGF to count +* btree block usage by walking the actual btrees. +*/ +if (!xfs_has_lazysbcount (sc->mp)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); + sc->buf =kzalloc (sizeof (struct xchk_fscounters ),XCHK_GFP_FLAGS );if (!sc->buf)return -ENOMEM ;
fs/xfs/scrub/ialloc.c +2 -0
@@ -32,6 +32,8 @@ intxchk_setup_ag_iallocbt ( struct xfs_scrub *sc) { +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN );return xchk_setup_ag_btree (sc, sc->flags &XCHK_TRY_HARDER ); }
fs/xfs/scrub/inode.c +3 -0
@@ -32,6 +32,9 @@ xchk_setup_inode( {int error; +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); +/* * Try to get the inode. If the verifiers fail, we try again * in raw mode.
fs/xfs/scrub/quota.c +3 -0
@@ -53,6 +53,9 @@ xchk_setup_quota(if (!xfs_this_quota_on (sc->mp, dqtype))return -ENOENT ; +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); + error =xchk_setup_fs (sc);if (error)return error;
fs/xfs/scrub/refcount.c +2 -0
@@ -27,6 +27,8 @@ intxchk_setup_ag_refcountbt ( struct xfs_scrub *sc) { +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN );return xchk_setup_ag_btree (sc, false); }
fs/xfs/scrub/rmap.c +3 -0
@@ -24,6 +24,9 @@ intxchk_setup_ag_rmapbt ( struct xfs_scrub *sc) { +if (xchk_need_fshook_drain (sc)) +xchk_fshooks_enable (sc,XCHK_FSHOOKS_DRAIN ); +return xchk_setup_ag_btree (sc, false); }
fs/xfs/scrub/scrub.c +21 -4
@@ -145,6 +145,21 @@ xchk_probe(/* Scrub setup and teardown */ +static inline void +xchk_fshooks_disable ( +struct xfs_scrub *sc) +{ +if (!(sc->flags &XCHK_FSHOOKS_ALL )) +return ; + +trace_xchk_fshooks_disable (sc, sc->flags &XCHK_FSHOOKS_ALL ); + +if (sc->flags &XCHK_FSHOOKS_DRAIN ) +xfs_drain_wait_disable (); + + sc->flags &= ~XCHK_FSHOOKS_ALL ; +} +/* Free all the resources and finish the transactions. */ STATIC int xchk_teardown(
@@ -177,6 +192,8 @@ xchk_teardown(kvfree (sc->buf); sc->buf =NULL ; } + +xchk_fshooks_disable (sc);return error; }
@@ -191,25 +208,25 @@ static const struct xchk_meta_ops meta_scrub_ops[] = { }, [XFS_SCRUB_TYPE_SB] = { /* superblock */ .type = ST_PERAG, - .setup = xchk_setup_fs, + .setup = xchk_setup_agheader, .scrub = xchk_superblock, .repair = xrep_superblock, }, [XFS_SCRUB_TYPE_AGF] = { /* agf */ .type = ST_PERAG, - .setup = xchk_setup_fs, + .setup = xchk_setup_agheader, .scrub = xchk_agf, .repair = xrep_agf, }, [XFS_SCRUB_TYPE_AGFL]= { /* agfl */ .type = ST_PERAG, - .setup = xchk_setup_fs, + .setup = xchk_setup_agheader, .scrub = xchk_agfl, .repair = xrep_agfl, }, [XFS_SCRUB_TYPE_AGI] = { /* agi */ .type = ST_PERAG, - .setup = xchk_setup_fs, + .setup = xchk_setup_agheader, .scrub = xchk_agi, .repair = xrep_agi, },
fs/xfs/scrub/scrub.h +4 -1
@@ -96,9 +96,12 @@ struct xfs_scrub {/* XCHK state flags grow up from zero, XREP state flags grown down from 2^31 */ #define XCHK_TRY_HARDER (1 << 0)/* can't get resources, try again */ -#define XCHK_REAPING_DISABLED (1 << 2)/* background block reaping paused */ +#define XCHK_REAPING_DISABLED (1 << 1)/* background block reaping paused */ +#define XCHK_FSHOOKS_DRAIN (1 << 2)/* defer ops draining enabled */ #define XREP_ALREADY_FIXED (1 << 31)/* checking our repair work */ +#define XCHK_FSHOOKS_ALL (XCHK_FSHOOKS_DRAIN) +/* Metadata scrubbers */ int xchk_tester (struct xfs_scrub *sc);int xchk_superblock (struct xfs_scrub *sc);
fs/xfs/scrub/trace.h +33 -0
@@ -96,6 +96,12 @@ TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_FSCOUNTERS); { XFS_SCRUB_OFLAG_WARNING, "warning" }, \ { XFS_SCRUB_OFLAG_NO_REPAIR_NEEDED, "norepair" } +#define XFS_SCRUB_STATE_STRINGS \ + { XCHK_TRY_HARDER, "try_harder" }, \ + { XCHK_REAPING_DISABLED, "reaping_disabled" }, \ + { XCHK_FSHOOKS_DRAIN, "fshooks_drain" }, \ + { XREP_ALREADY_FIXED, "already_fixed" } + DECLARE_EVENT_CLASS(xchk_class, TP_PROTO(struct xfs_inode *ip, struct xfs_scrub_metadata *sm, int error),
@@ -142,6 +148,33 @@ DEFINE_SCRUB_EVENT(xchk_deadlock_retry);DEFINE_SCRUB_EVENT (xrep_attempt);DEFINE_SCRUB_EVENT (xrep_done); +DECLARE_EVENT_CLASS (xchk_fshook_class, + TP_PROTO(struct xfs_scrub *sc, unsigned int fshooks), +TP_ARGS (sc, fshooks), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(unsigned int, type) + __field(unsigned int, fshooks) + ), +TP_fast_assign ( + __entry->dev = sc->mp->m_super->s_dev; + __entry->type = sc->sm->sm_type; + __entry->fshooks = fshooks; + ), +TP_printk ("dev %d:%d type %s fshooks '%s'" , +MAJOR (__entry->dev),MINOR (__entry->dev), +__print_symbolic (__entry->type,XFS_SCRUB_TYPE_STRINGS ), +__print_flags (__entry->fshooks,"|" ,XFS_SCRUB_STATE_STRINGS )) +) + +#define DEFINE_SCRUB_FSHOOK_EVENT (name) \ +DEFINE_EVENT(xchk_fshook_class, name, \ + TP_PROTO(struct xfs_scrub *sc, unsigned int fshooks), \ + TP_ARGS(sc, fshooks)) + +DEFINE_SCRUB_FSHOOK_EVENT (xchk_fshooks_enable); +DEFINE_SCRUB_FSHOOK_EVENT (xchk_fshooks_disable); + TRACE_EVENT(xchk_op_error, TP_PROTO(struct xfs_scrub *sc, xfs_agnumber_t agno, xfs_agblock_t bno, int error, void *ret_ip),
fs/xfs/xfs_drain.c +26 -1
@@ -12,6 +12,31 @@#include "xfs_ag.h" #include "xfs_trace.h" +/* +* Use a static key here to reduce the overhead of xfs_drain_drop. If the +* compiler supports jump labels, the static branch will be replaced by a nop +* sled when there are no xfs_drain_wait callers. Online fsck is currently +* the only caller, so this is a reasonable tradeoff. +* +* Note: Patching the kernel code requires taking the cpu hotplug lock. Other +* parts of the kernel allocate memory with that lock held, which means that +* XFS callers cannot hold any locks that might be used by memory reclaim or +* writeback when calling the static_branch_{inc,dec} functions. +*/ +static DEFINE_STATIC_KEY_FALSE (xfs_drain_waiter_hook); + +void +xfs_drain_wait_disable (void ) +{ +static_branch_dec (&xfs_drain_waiter_hook); +} + +void +xfs_drain_wait_enable (void ) +{ +static_branch_inc (&xfs_drain_waiter_hook); +} +void xfs_drain_init (struct xfs_drain *dr)
@@ -36,7 +61,7 @@ static inline void xfs_drain_bump(struct xfs_drain *dr)static inline void xfs_drain_drop (struct xfs_drain *dr) {if (atomic_dec_and_test (&dr->dr_count) && -wq_has_sleeper (&dr->dr_waiters)) +static_branch_unlikely (&xfs_drain_waiter_hook))wake_up (&dr->dr_waiters); }
fs/xfs/xfs_drain.h +3 -0
@@ -25,6 +25,9 @@ struct xfs_drain {void xfs_drain_init (struct xfs_drain *dr);void xfs_drain_free (struct xfs_drain *dr); +void xfs_drain_wait_disable (void ); +void xfs_drain_wait_enable (void ); +/* * Deferred Work Intent Drains * ===========================
PATCH 5/5 xfs: scrub should use ECHRNG to signal that the drain is needed
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
In the previous patch, we added jump labels to the intent drain code so that regular filesystem operations need not pay the price of checking for someone (scrub) waiting on intents to drain from some part of the filesystem when that someone isn't running.
However, I observed that xfs/285 now spends a lot more time pushing the AIL from the inode btree scrubber than it used to. This is because the inobt scrubber will try push the AIL to try to get logged inode cores written to the filesystem when it sees a weird discrepancy between the ondisk inode and the inobt records. This AIL push is triggered when the setup function sees TRY_HARDER is set; and the requisite EDEADLOCK return is initiated when the discrepancy is seen.
The solution to this performance slow down is to use a different result code (ECHRNG) for scrub code to signal that it needs to wait for deferred intent work items to drain out of some part of the filesystem. When this happens, set a new scrub state flag (XCHK_NEED_DRAIN) so that setup functions will activate the jump label.
--- fs/xfs/scrub/btree.c | 1 + fs/xfs/scrub/common.c | 4 +++- fs/xfs/scrub/common.h | 2 +- fs/xfs/scrub/dabtree.c | 1 + fs/xfs/scrub/repair.c | 3 +++ fs/xfs/scrub/scrub.c | 10 ++++++++++ fs/xfs/scrub/scrub.h | 1 + fs/xfs/scrub/trace.h | 1 + 8 files changed, 21 insertions(+), 2 deletions(-)
fs/xfs/scrub/btree.c +1 -0
@@ -36,6 +36,7 @@ __xchk_btree_process_error(switch (*error) {case -EDEADLOCK : +case -ECHRNG :/* Used to restart an op with deadlock avoidance. */ trace_xchk_deadlock_retry (sc->ip, sc->sm, *error);break ;
fs/xfs/scrub/common.c +3 -1
@@ -75,6 +75,7 @@ __xchk_process_error(case 0 :return true;case -EDEADLOCK : +case -ECHRNG :/* Used to restart an op with deadlock avoidance. */ trace_xchk_deadlock_retry( sc->ip ? sc->ip : XFS_I(file_inode(sc->file)),
@@ -130,6 +131,7 @@ __xchk_fblock_process_error(case 0 :return true;case -EDEADLOCK : +case -ECHRNG :/* Used to restart an op with deadlock avoidance. */ trace_xchk_deadlock_retry (sc->ip, sc->sm, *error);break ;
@@ -480,7 +482,7 @@ xchk_perag_lock( }if (!(sc->flags &XCHK_FSHOOKS_DRAIN )) -return -EDEADLOCK ; +return -ECHRNG ; error =xfs_perag_drain_intents (sa->pag);if (error == -ERESTARTSYS ) error = -EINTR ;
fs/xfs/scrub/common.h +1 -1
@@ -161,7 +161,7 @@ void xchk_start_reaping(struct xfs_scrub *sc);*/ static inline bool xchk_need_fshook_drain (struct xfs_scrub *sc) { -return sc->flags &XCHK_TRY_HARDER ; +return sc->flags &XCHK_NEED_DRAIN ; }void xchk_fshooks_enable (struct xfs_scrub *sc,unsigned int scrub_fshooks);
fs/xfs/scrub/dabtree.c +1 -0
@@ -39,6 +39,7 @@ xchk_da_process_error(switch (*error) {case -EDEADLOCK : +case -ECHRNG :/* Used to restart an op with deadlock avoidance. */ trace_xchk_deadlock_retry (sc->ip, sc->sm, *error);break ;
fs/xfs/scrub/repair.c +3 -0
@@ -60,6 +60,9 @@ xrep_attempt( sc->sm->sm_flags &= ~XFS_SCRUB_FLAGS_OUT ; sc->flags |=XREP_ALREADY_FIXED ;return -EAGAIN ; +case -ECHRNG : + sc->flags |=XCHK_NEED_DRAIN ; +return -EAGAIN ;case -EDEADLOCK :/* Tell the caller to try again having grabbed all the locks. */ if (!(sc->flags &XCHK_TRY_HARDER )) {
fs/xfs/scrub/scrub.c +10 -0
@@ -510,6 +510,8 @@ xfs_scrub_metadata( error = sc->ops->setup (sc);if (error == -EDEADLOCK && !(sc->flags &XCHK_TRY_HARDER )) goto try_harder; +if (error == -ECHRNG && !(sc->flags &XCHK_NEED_DRAIN )) + goto need_drain;if (error) goto out_teardown;
@@ -517,6 +519,8 @@ xfs_scrub_metadata( error = sc->ops->scrub (sc);if (error == -EDEADLOCK && !(sc->flags &XCHK_TRY_HARDER )) goto try_harder; +if (error == -ECHRNG && !(sc->flags &XCHK_NEED_DRAIN )) + goto need_drain;if (error || (sm->sm_flags &XFS_SCRUB_OFLAG_INCOMPLETE )) goto out_teardown;
@@ -575,6 +579,12 @@ xfs_scrub_metadata( error =0 ; }return error; +need_drain: + error =xchk_teardown (sc,0 ); +if (error) + goto out_sc; + sc->flags |=XCHK_NEED_DRAIN ; + goto retry_op; try_harder:/* * Scrubbers return -EDEADLOCK to mean 'try harder'. Tear down
fs/xfs/scrub/scrub.h +1 -0
@@ -98,6 +98,7 @@ struct xfs_scrub {#define XCHK_TRY_HARDER (1 << 0)/* can't get resources, try again */ #define XCHK_REAPING_DISABLED (1 << 1)/* background block reaping paused */ #define XCHK_FSHOOKS_DRAIN (1 << 2)/* defer ops draining enabled */ +#define XCHK_NEED_DRAIN (1 << 3)/* scrub needs to use intent drain */ #define XREP_ALREADY_FIXED (1 << 31)/* checking our repair work */ #define XCHK_FSHOOKS_ALL (XCHK_FSHOOKS_DRAIN)
fs/xfs/scrub/trace.h +1 -0
@@ -100,6 +100,7 @@ TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_FSCOUNTERS); { XCHK_TRY_HARDER, "try_harder" }, \ { XCHK_REAPING_DISABLED, "reaping_disabled" }, \ { XCHK_FSHOOKS_DRAIN, "fshooks_drain" }, \ + { XCHK_NEED_DRAIN, "need_drain" }, \ { XREP_ALREADY_FIXED, "already_fixed" } DECLARE_EVENT_CLASS(xchk_class,
PATCH 1/8 xfs: standardize ondisk to incore conversion for free space btrees
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a xfs_alloc_btrec_to_irec function to convert an ondisk record to an incore record, and a xfs_alloc_check_irec function to detect corruption. Replace all the open-coded logic with calls to the new helpers and bubble up corruption reports.
--- fs/xfs/libxfs/xfs_alloc.c | 56 +++++++++++++++++++++++++++++++++++---------- fs/xfs/libxfs/xfs_alloc.h | 6 +++++ fs/xfs/scrub/alloc.c | 24 ++++++++++--------- 3 files changed, 61 insertions(+), 25 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +43 -13
@@ -237,6 +237,34 @@ xfs_alloc_update(return xfs_btree_update (cur, &rec); } +/* Convert the ondisk btree record to its incore representation. */ +void +xfs_alloc_btrec_to_irec ( +const union xfs_btree_rec *rec, +struct xfs_alloc_rec_incore *irec) +{ + irec->ar_startblock =be32_to_cpu (rec->alloc.ar_startblock); + irec->ar_blockcount =be32_to_cpu (rec->alloc.ar_blockcount); +} + +/* Simple checks for free space records. */ +xfs_failaddr_t +xfs_alloc_check_irec ( +struct xfs_btree_cur *cur, +const struct xfs_alloc_rec_incore *irec) +{ +struct xfs_perag *pag = cur->bc_ag.pag; + +if (irec->ar_blockcount ==0 ) +return __this_address; + +/* check for valid extent range, including overflow */ +if (!xfs_verify_agbext (pag, irec->ar_startblock, irec->ar_blockcount)) +return __this_address; + +return NULL ; +} +/* * Get the data from the pointed-to record. */
@@ -247,34 +275,34 @@ xfs_alloc_get_rec( xfs_extlen_t *len, /* output: length of extent */ int *stat) /* output: success/failure */ { +struct xfs_alloc_rec_incore irec;struct xfs_mount *mp = cur->bc_mp;struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec; +xfs_failaddr_t fa;int error; error =xfs_btree_get_rec (cur, &rec, stat);if (error || !(*stat))return error; - *bno =be32_to_cpu (rec->alloc.ar_startblock); - *len =be32_to_cpu (rec->alloc.ar_blockcount); - -if (*len ==0 ) - goto out_bad_rec; - -/* check for valid extent range, including overflow */ -if (!xfs_verify_agbext (pag, *bno, *len)) +xfs_alloc_btrec_to_irec (rec, &irec); + fa =xfs_alloc_check_irec (cur, &irec); +if (fa) goto out_bad_rec; + *bno = irec.ar_startblock; + *len = irec.ar_blockcount;return 0 ; out_bad_rec:xfs_warn (mp, -"%s Freespace BTree record corruption in AG %d detected!" , +"%s Freespace BTree record corruption in AG %d detected at %pS!" , cur->bc_btnum ==XFS_BTNUM_BNO ?"Block" :"Size" , - pag->pag_agno); + pag->pag_agno, fa);xfs_warn (mp, -"start block 0x%x block count 0x%x" , *bno, *len); +"start block 0x%x block count 0x%x" , irec.ar_startblock, + irec.ar_blockcount);return -EFSCORRUPTED ; }
@@ -3450,8 +3478,10 @@ xfs_alloc_query_range_helper(struct xfs_alloc_query_range_info *query = priv;struct xfs_alloc_rec_incore irec; - irec.ar_startblock =be32_to_cpu (rec->alloc.ar_startblock); - irec.ar_blockcount =be32_to_cpu (rec->alloc.ar_blockcount); +xfs_alloc_btrec_to_irec (rec, &irec); +if (xfs_alloc_check_irec (cur, &irec) !=NULL ) +return -EFSCORRUPTED ; +return query->fn (cur, &irec, query->priv); }
fs/xfs/libxfs/xfs_alloc.h +6 -0
@@ -170,6 +170,12 @@ xfs_alloc_get_rec( xfs_extlen_t *len,/* output: length of extent */ int *stat); /* output: success/failure */ +union xfs_btree_rec ; +void xfs_alloc_btrec_to_irec (const union xfs_btree_rec *rec, +struct xfs_alloc_rec_incore *irec); +xfs_failaddr_t xfs_alloc_check_irec (struct xfs_btree_cur *cur, +const struct xfs_alloc_rec_incore *irec); +int xfs_read_agf (struct xfs_perag *pag,struct xfs_trans *tp,int flags,struct xfs_buf **agfbpp); int xfs_alloc_read_agf(struct xfs_perag *pag, struct xfs_trans *tp, int flags,
fs/xfs/scrub/alloc.c +12 -12
@@ -78,9 +78,11 @@ xchk_allocbt_xref_other( STATIC voidxchk_allocbt_xref (struct xfs_scrub *sc, -xfs_agblock_t agbno, -xfs_extlen_t len) +const struct xfs_alloc_rec_incore *irec) { +xfs_agblock_t agbno = irec->ar_startblock; +xfs_extlen_t len = irec->ar_blockcount; +if (sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT )return ;
@@ -93,20 +95,18 @@ xchk_allocbt_xref(/* Scrub a bnobt/cntbt record. */ STATIC intxchk_allocbt_rec ( -struct xchk_btree *bs, -const union xfs_btree_rec *rec) +struct xchk_btree *bs, +const union xfs_btree_rec *rec) { -struct xfs_perag *pag = bs->cur->bc_ag.pag; -xfs_agblock_t bno; -xfs_extlen_t len; +struct xfs_alloc_rec_incore irec; - bno =be32_to_cpu (rec->alloc.ar_startblock); - len =be32_to_cpu (rec->alloc.ar_blockcount); - -if (!xfs_verify_agbext (pag, bno, len)) +xfs_alloc_btrec_to_irec (rec, &irec); +if (xfs_alloc_check_irec (bs->cur, &irec) !=NULL ) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); +return 0 ; + } -xchk_allocbt_xref (bs->sc, bno, len); +xchk_allocbt_xref (bs->sc, &irec);return 0 ; }
PATCH 2/8 xfs: standardize ondisk to incore conversion for inode btrees
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a xfs_inobt_check_irec function to detect corruption in btree records. Fix all xfs_inobt_btrec_to_irec callsites to call the new helper and bubble up corruption reports.
--- fs/xfs/libxfs/xfs_ialloc.c | 61 ++++++++++++++++++++++++-------------- fs/xfs/libxfs/xfs_ialloc.h | 2 + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 + fs/xfs/libxfs/xfs_ialloc_btree.h | 2 + fs/xfs/scrub/ialloc.c | 24 ++------------- 5 files changed, 47 insertions(+), 44 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +39 -22
@@ -95,33 +95,21 @@ xfs_inobt_btrec_to_irec( irec->ir_free =be64_to_cpu (rec->inobt.ir_free); } -/* -* Get the data from the pointed-to record. -*/ -int -xfs_inobt_get_rec ( -struct xfs_btree_cur *cur, -struct xfs_inobt_rec_incore *irec, -int *stat) +/* Simple checks for inode records. */ +xfs_failaddr_t +xfs_inobt_check_irec ( +struct xfs_btree_cur *cur, +const struct xfs_inobt_rec_incore *irec) { -struct xfs_mount *mp = cur->bc_mp; -union xfs_btree_rec *rec; -int error;uint64_t realfree; - error =xfs_btree_get_rec (cur, &rec, stat); -if (error || *stat ==0 ) -return error; - -xfs_inobt_btrec_to_irec (mp, rec, irec); -if (!xfs_verify_agino (cur->bc_ag.pag, irec->ir_startino)) - goto out_bad_rec; +return __this_address;if (irec->ir_count <XFS_INODES_PER_HOLEMASK_BIT || irec->ir_count >XFS_INODES_PER_CHUNK ) - goto out_bad_rec; +return __this_address;if (irec->ir_freecount >XFS_INODES_PER_CHUNK ) - goto out_bad_rec; +return __this_address;/* if there are no holes, return the first available offset */ if (!xfs_inobt_issparse (irec->ir_holemask))
@@ -129,15 +117,41 @@ xfs_inobt_get_rec(else realfree = irec->ir_free &xfs_inobt_irec_to_allocmask (irec);if (hweight64 (realfree) != irec->ir_freecount) +return __this_address; + +return NULL ; +} + +/* +* Get the data from the pointed-to record. +*/ +int +xfs_inobt_get_rec ( +struct xfs_btree_cur *cur, +struct xfs_inobt_rec_incore *irec, +int *stat) +{ +struct xfs_mount *mp = cur->bc_mp; +union xfs_btree_rec *rec; +xfs_failaddr_t fa; +int error; + + error =xfs_btree_get_rec (cur, &rec, stat); +if (error || *stat ==0 ) +return error; + +xfs_inobt_btrec_to_irec (mp, rec, irec); + fa =xfs_inobt_check_irec (cur, irec); +if (fa) goto out_bad_rec;return 0 ; out_bad_rec:xfs_warn (mp, -"%s Inode BTree record corruption in AG %d detected!" , +"%s Inode BTree record corruption in AG %d detected at %pS!" , cur->bc_btnum ==XFS_BTNUM_INO ?"Used" :"Free" , - cur->bc_ag.pag->pag_agno); + cur->bc_ag.pag->pag_agno, fa); xfs_warn(mp, "start inode 0x%x, count 0x%x, free 0x%x freemask 0x%llx, holemask 0x%x", irec->ir_startino, irec->ir_count, irec->ir_freecount,
@@ -2705,6 +2719,9 @@ xfs_ialloc_count_inodes_rec(struct xfs_ialloc_count_inodes *ci = priv;xfs_inobt_btrec_to_irec (cur->bc_mp, rec, &irec); +if (xfs_inobt_check_irec (cur, &irec) !=NULL ) +return -EFSCORRUPTED ; + ci->count += irec.ir_count; ci->freecount += irec.ir_freecount;
fs/xfs/libxfs/xfs_ialloc.h +2 -0
@@ -92,6 +92,8 @@ union xfs_btree_rec;void xfs_inobt_btrec_to_irec (struct xfs_mount *mp,const union xfs_btree_rec *rec,struct xfs_inobt_rec_incore *irec); +xfs_failaddr_t xfs_inobt_check_irec (struct xfs_btree_cur *cur, +const struct xfs_inobt_rec_incore *irec);int xfs_ialloc_has_inodes_at_extent (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len,bool *exists); int xfs_ialloc_has_inode_record(struct xfs_btree_cur *cur, xfs_agino_t low,
fs/xfs/libxfs/xfs_ialloc_btree.c +1 -1
@@ -610,7 +610,7 @@ xfs_iallocbt_maxlevels_ondisk(void)*/ uint64_t xfs_inobt_irec_to_allocmask ( -struct xfs_inobt_rec_incore *rec) +const struct xfs_inobt_rec_incore *rec) {uint64_t bitmap =0 ;uint64_t inodespbit;
fs/xfs/libxfs/xfs_ialloc_btree.h +1 -1
@@ -55,7 +55,7 @@ struct xfs_btree_cur *xfs_inobt_stage_cursor(struct xfs_mount *mp,extern int xfs_inobt_maxrecs (struct xfs_mount *,int ,int );/* ir_holemask to inode allocation bitmap conversion */ -uint64_t xfs_inobt_irec_to_allocmask (struct xfs_inobt_rec_incore *); +uint64_t xfs_inobt_irec_to_allocmask (const struct xfs_inobt_rec_incore *irec);#if defined(DEBUG ) || defined(XFS_WARN ) int xfs_inobt_rec_check_count(struct xfs_mount *,
fs/xfs/scrub/ialloc.c +4 -20
@@ -119,15 +119,6 @@ xchk_iallocbt_chunk(return true; } -/* Count the number of free inodes. */ -static unsigned int -xchk_iallocbt_freecount ( -xfs_inofree_t freemask) -{ -BUILD_BUG_ON (sizeof (freemask) !=sizeof (__u64)); -return hweight64 (freemask); -} -/* * Check that an inode's allocation status matches ir_free in the inobt * record. First we try querying the in-core inode state, and if the inode
@@ -431,24 +422,17 @@ xchk_iallocbt_rec(int holecount;int i;int error =0 ; -unsigned int real_freecount;uint16_t holemask;xfs_inobt_btrec_to_irec (mp, rec, &irec); - -if (irec.ir_count >XFS_INODES_PER_CHUNK || - irec.ir_freecount >XFS_INODES_PER_CHUNK ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - - real_freecount = irec.ir_freecount + - (XFS_INODES_PER_CHUNK - irec.ir_count); -if (real_freecount !=xchk_iallocbt_freecount (irec.ir_free)) +if (xfs_inobt_check_irec (bs->cur, &irec) !=NULL ) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); +return 0 ; + } agino = irec.ir_startino;/* Record has to be properly aligned within the AG. */ -if (!xfs_verify_agino (pag, agino) || - !xfs_verify_agino (pag, agino +XFS_INODES_PER_CHUNK -1 )) { +if (!xfs_verify_agino (pag, agino +XFS_INODES_PER_CHUNK -1 )) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); goto out; }
PATCH 3/8 xfs: standardize ondisk to incore conversion for refcount btrees
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a xfs_refcount_check_irec function to detect corruption in btree records. Fix all xfs_refcount_btrec_to_irec callsites to call the new helper and bubble up corruption reports.
--- fs/xfs/libxfs/xfs_refcount.c | 45 +++++++++++++++++++++++++++++------------- fs/xfs/libxfs/xfs_refcount.h | 2 ++ fs/xfs/scrub/refcount.c | 14 +++---------- 3 files changed, 36 insertions(+), 25 deletions(-)
fs/xfs/libxfs/xfs_refcount.c +31 -14
@@ -120,6 +120,30 @@ xfs_refcount_btrec_to_irec( irec->rc_refcount =be32_to_cpu (rec->refc.rc_refcount); } +/* Simple checks for refcount records. */ +xfs_failaddr_t +xfs_refcount_check_irec ( +struct xfs_btree_cur *cur, +const struct xfs_refcount_irec *irec) +{ +struct xfs_perag *pag = cur->bc_ag.pag; + +if (irec->rc_blockcount ==0 || irec->rc_blockcount >MAXREFCEXTLEN ) +return __this_address; + +if (!xfs_refcount_check_domain (irec)) +return __this_address; + +/* check for valid extent range, including overflow */ +if (!xfs_verify_agbext (pag, irec->rc_startblock, irec->rc_blockcount)) +return __this_address; + +if (irec->rc_refcount ==0 || irec->rc_refcount >MAXREFCOUNT ) +return __this_address; + +return NULL ; +} +/* * Get the data from the pointed-to record. */
@@ -132,6 +156,7 @@ xfs_refcount_get_rec(struct xfs_mount *mp = cur->bc_mp;struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec; +xfs_failaddr_t fa;int error; error =xfs_btree_get_rec (cur, &rec, stat);
@@ -139,17 +164,8 @@ xfs_refcount_get_rec(return error;xfs_refcount_btrec_to_irec (rec, irec); -if (irec->rc_blockcount ==0 || irec->rc_blockcount >MAXREFCEXTLEN ) - goto out_bad_rec; - -if (!xfs_refcount_check_domain (irec)) - goto out_bad_rec; - -/* check for valid extent range, including overflow */ -if (!xfs_verify_agbext (pag, irec->rc_startblock, irec->rc_blockcount)) - goto out_bad_rec; - -if (irec->rc_refcount ==0 || irec->rc_refcount >MAXREFCOUNT ) + fa =xfs_refcount_check_irec (cur, irec); +if (fa) goto out_bad_rec;trace_xfs_refcount_get (cur->bc_mp, pag->pag_agno, irec);
@@ -157,8 +173,8 @@ xfs_refcount_get_rec( out_bad_rec:xfs_warn (mp, -"Refcount BTree record corruption in AG %d detected!" , - pag->pag_agno); +"Refcount BTree record corruption in AG %d detected at %pS!" , + pag->pag_agno, fa);xfs_warn (mp,"Start block 0x%x, block count 0x%x, references 0x%x" , irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount);
@@ -1871,7 +1887,8 @@ xfs_refcount_recover_extent(INIT_LIST_HEAD (&rr->rr_list);xfs_refcount_btrec_to_irec (rec, &rr->rr_rrec); -if (XFS_IS_CORRUPT (cur->bc_mp, +if (xfs_refcount_check_irec (cur, &rr->rr_rrec) !=NULL || +XFS_IS_CORRUPT (cur->bc_mp, rr->rr_rrec.rc_domain !=XFS_REFC_DOMAIN_COW )) {kfree (rr);return -EFSCORRUPTED ;
fs/xfs/libxfs/xfs_refcount.h +2 -0
@@ -117,6 +117,8 @@ extern int xfs_refcount_has_record(struct xfs_btree_cur *cur,union xfs_btree_rec ;extern void xfs_refcount_btrec_to_irec (const union xfs_btree_rec *rec,struct xfs_refcount_irec *irec); +xfs_failaddr_t xfs_refcount_check_irec (struct xfs_btree_cur *cur, +const struct xfs_refcount_irec *irec);extern int xfs_refcount_insert (struct xfs_btree_cur *cur,struct xfs_refcount_irec *irec,int *stat);
fs/xfs/scrub/refcount.c +3 -11
@@ -340,24 +340,16 @@ xchk_refcountbt_rec( {struct xfs_refcount_irec irec;xfs_agblock_t *cow_blocks = bs->private; -struct xfs_perag *pag = bs->cur->bc_ag.pag;xfs_refcount_btrec_to_irec (rec, &irec); - -/* Check the domain and refcount are not incompatible. */ -if (!xfs_refcount_check_domain (&irec)) +if (xfs_refcount_check_irec (bs->cur, &irec) !=NULL ) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); +return 0 ; + }if (irec.rc_domain ==XFS_REFC_DOMAIN_COW ) (*cow_blocks) += irec.rc_blockcount; -/* Check the extent. */ -if (!xfs_verify_agbext (pag, irec.rc_startblock, irec.rc_blockcount)) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -if (irec.rc_refcount ==0 ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); -xchk_refcountbt_xref (bs->sc, &irec);return 0 ;
PATCH 4/8 xfs: return a failure address from xfs_rmap_irec_offset_unpack
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Currently, xfs_rmap_irec_offset_unpack returns only 0 or -EFSCORRUPTED. Change this function to return the code address of a failed conversion in preparation for the next patch, which standardizes localized record checking and reporting code.
--- fs/xfs/libxfs/xfs_rmap.c | 9 ++++----- fs/xfs/libxfs/xfs_rmap.h | 9 +++++---- fs/xfs/scrub/rmap.c | 11 +++++------ 3 files changed, 14 insertions(+), 15 deletions(-)
fs/xfs/libxfs/xfs_rmap.c +4 -5
@@ -193,7 +193,7 @@ xfs_rmap_delete( }/* Convert an internal btree record to an rmap record. */ -int +xfs_failaddr_t xfs_rmap_btrec_to_irec (const union xfs_btree_rec *rec,struct xfs_rmap_irec *irec)
@@ -2320,11 +2320,10 @@ xfs_rmap_query_range_helper( {struct xfs_rmap_query_range_info *query = priv;struct xfs_rmap_irec irec; -int error; - error =xfs_rmap_btrec_to_irec (rec, &irec); -if (error) -return error; +if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL ) +return -EFSCORRUPTED ; +return query->fn (cur, &irec, query->priv); }
fs/xfs/libxfs/xfs_rmap.h +5 -4
@@ -62,13 +62,14 @@ xfs_rmap_irec_offset_pack(return x; } -static inline int +static inline xfs_failaddr_t xfs_rmap_irec_offset_unpack (__u64 offset,struct xfs_rmap_irec *irec) {if (offset & ~(XFS_RMAP_OFF_MASK |XFS_RMAP_OFF_FLAGS )) -return -EFSCORRUPTED ; +return __this_address; + irec->rm_offset =XFS_RMAP_OFF (offset); irec->rm_flags =0 ;if (offset &XFS_RMAP_OFF_ATTR_FORK )
@@ -77,7 +78,7 @@ xfs_rmap_irec_offset_unpack( irec->rm_flags |=XFS_RMAP_BMBT_BLOCK ;if (offset &XFS_RMAP_OFF_UNWRITTEN ) irec->rm_flags |=XFS_RMAP_UNWRITTEN ; -return 0 ; +return NULL ; } static inline void
@@ -192,7 +193,7 @@ int xfs_rmap_lookup_le_range(struct xfs_btree_cur *cur, xfs_agblock_t bno,int xfs_rmap_compare (const struct xfs_rmap_irec *a,const struct xfs_rmap_irec *b);union xfs_btree_rec ; -int xfs_rmap_btrec_to_irec (const union xfs_btree_rec *rec, +xfs_failaddr_t xfs_rmap_btrec_to_irec (const union xfs_btree_rec *rec,struct xfs_rmap_irec *irec);int xfs_rmap_has_record (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len,bool *exists);
fs/xfs/scrub/rmap.c +5 -6
@@ -100,11 +100,11 @@ xchk_rmapbt_rec(bool is_unwritten;bool is_bmbt;bool is_attr; -int error; - error =xfs_rmap_btrec_to_irec (rec, &irec); -if (!xchk_btree_process_error (bs->sc, bs->cur,0 , &error)) - goto out; +if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL ) { +xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); +return 0 ; + }/* Check extent. */ if (irec.rm_startblock + irec.rm_blockcount <= irec.rm_startblock)
@@ -159,8 +159,7 @@ xchk_rmapbt_rec( }xchk_rmapbt_xref (bs->sc, &irec); -out: -return error; +return 0 ; }/* Scrub the rmap btree for some AG. */
PATCH 5/8 xfs: standardize ondisk to incore conversion for rmap btrees
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a xfs_rmap_check_irec function to detect corruption in btree records. Fix all xfs_rmap_btrec_to_irec callsites to call the new helper and bubble up corruption reports.
--- fs/xfs/libxfs/xfs_rmap.c | 72 ++++++++++++++++++++++++++++------------------ fs/xfs/libxfs/xfs_rmap.h | 3 ++ fs/xfs/scrub/rmap.c | 39 +------------------------ 3 files changed, 49 insertions(+), 65 deletions(-)
fs/xfs/libxfs/xfs_rmap.c +44 -28
@@ -205,51 +205,66 @@ xfs_rmap_btrec_to_irec( irec); } -/* -* Get the data from the pointed-to record. -*/ -int -xfs_rmap_get_rec ( -struct xfs_btree_cur *cur, -struct xfs_rmap_irec *irec, -int *stat) +/* Simple checks for rmap records. */ +xfs_failaddr_t +xfs_rmap_check_irec ( +struct xfs_btree_cur *cur, +const struct xfs_rmap_irec *irec) { -struct xfs_mount *mp = cur->bc_mp; -struct xfs_perag *pag = cur->bc_ag.pag; -union xfs_btree_rec *rec; -int error; - - error =xfs_btree_get_rec (cur, &rec, stat); -if (error || !*stat) -return error; - -if (xfs_rmap_btrec_to_irec (rec, irec)) - goto out_bad_rec; +struct xfs_mount *mp = cur->bc_mp;if (irec->rm_blockcount ==0 ) - goto out_bad_rec; +return __this_address;if (irec->rm_startblock <=XFS_AGFL_BLOCK (mp)) {if (irec->rm_owner !=XFS_RMAP_OWN_FS ) - goto out_bad_rec; +return __this_address;if (irec->rm_blockcount !=XFS_AGFL_BLOCK (mp) +1 ) - goto out_bad_rec; +return __this_address; }else {/* check for valid extent range, including overflow */ -if (!xfs_verify_agbext (pag, irec->rm_startblock, - irec->rm_blockcount)) - goto out_bad_rec; +if (!xfs_verify_agbext (cur->bc_ag.pag, irec->rm_startblock, + irec->rm_blockcount)) +return __this_address; }if (!(xfs_verify_ino (mp, irec->rm_owner) || (irec->rm_owner <=XFS_RMAP_OWN_FS && irec->rm_owner >=XFS_RMAP_OWN_MIN ))) +return __this_address; + +return NULL ; +} + +/* +* Get the data from the pointed-to record. +*/ +int +xfs_rmap_get_rec ( +struct xfs_btree_cur *cur, +struct xfs_rmap_irec *irec, +int *stat) +{ +struct xfs_mount *mp = cur->bc_mp; +struct xfs_perag *pag = cur->bc_ag.pag; +union xfs_btree_rec *rec; +xfs_failaddr_t fa; +int error; + + error =xfs_btree_get_rec (cur, &rec, stat); +if (error || !*stat) +return error; + + fa =xfs_rmap_btrec_to_irec (rec, irec); +if (!fa) + fa =xfs_rmap_check_irec (cur, irec); +if (fa) goto out_bad_rec;return 0 ; out_bad_rec:xfs_warn (mp, -"Reverse Mapping BTree record corruption in AG %d detected!" , - pag->pag_agno); +"Reverse Mapping BTree record corruption in AG %d detected at %pS!" , + pag->pag_agno, fa); xfs_warn(mp, "Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x", irec->rm_owner, irec->rm_flags, irec->rm_startblock,
@@ -2321,7 +2336,8 @@ xfs_rmap_query_range_helper(struct xfs_rmap_query_range_info *query = priv;struct xfs_rmap_irec irec; -if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL ) +if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL || +xfs_rmap_check_irec (cur, &irec) !=NULL )return -EFSCORRUPTED ;return query->fn (cur, &irec, query->priv);
fs/xfs/libxfs/xfs_rmap.h +3 -0
@@ -195,6 +195,9 @@ int xfs_rmap_compare(const struct xfs_rmap_irec *a,union xfs_btree_rec ;xfs_failaddr_t xfs_rmap_btrec_to_irec (const union xfs_btree_rec *rec,struct xfs_rmap_irec *irec); +xfs_failaddr_t xfs_rmap_check_irec (struct xfs_btree_cur *cur, +const struct xfs_rmap_irec *irec); +int xfs_rmap_has_record (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len,bool *exists); int xfs_rmap_record_exists(struct xfs_btree_cur *cur, xfs_agblock_t bno,
fs/xfs/scrub/rmap.c +2 -37
@@ -93,43 +93,18 @@ xchk_rmapbt_rec(struct xchk_btree *bs, const union xfs_btree_rec *rec) { - struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_rmap_irec irec; -struct xfs_perag *pag = bs->cur->bc_ag.pag;bool non_inode;bool is_unwritten;bool is_bmbt;bool is_attr; -if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL ) { +if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL || +xfs_rmap_check_irec (bs->cur, &irec) !=NULL ) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 );return 0 ; } -/* Check extent. */ -if (irec.rm_startblock + irec.rm_blockcount <= irec.rm_startblock) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -if (irec.rm_owner ==XFS_RMAP_OWN_FS ) { -/* -* xfs_verify_agbno returns false for static fs metadata. -* Since that only exists at the start of the AG, validate -* that by hand. -*/ -if (irec.rm_startblock !=0 || - irec.rm_blockcount !=XFS_AGFL_BLOCK (mp) +1 ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - }else { -/* -* Otherwise we must point somewhere past the static metadata -* but before the end of the FS. Run the regular check. -*/ -if (!xfs_verify_agbno (pag, irec.rm_startblock) || - !xfs_verify_agbno (pag, irec.rm_startblock + - irec.rm_blockcount -1 )) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - } -/* Check flags. */ non_inode =XFS_RMAP_NON_INODE_OWNER (irec.rm_owner); is_bmbt = irec.rm_flags &XFS_RMAP_BMBT_BLOCK ;
@@ -148,16 +123,6 @@ xchk_rmapbt_rec(if (non_inode && (is_bmbt || is_unwritten || is_attr))xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); -if (!non_inode) { -if (!xfs_verify_ino (mp, irec.rm_owner)) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - }else { -/* Non-inode owner within the magic values? */ -if (irec.rm_owner <=XFS_RMAP_OWN_MIN || - irec.rm_owner >XFS_RMAP_OWN_FS ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - } -xchk_rmapbt_xref (bs->sc, &irec);return 0 ; }
PATCH 6/8 xfs: standardize ondisk to incore conversion for bmap btrees
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Fix all xfs_bmbt_disk_get_all callsites to call xfs_bmap_validate_extent and bubble up corruption reports.
--- fs/xfs/scrub/bmap.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/xfs/scrub/bmap.c +6 -0
@@ -471,6 +471,12 @@ xchk_bmapbt_rec(return 0 ;xfs_bmbt_disk_get_all (&rec->bmbt, &irec); +if (xfs_bmap_validate_extent (ip, info->whichfork, &irec) !=NULL ) { +xchk_fblock_set_corrupt (bs->sc, info->whichfork, + irec.br_startoff); +return 0 ; + } + if (!xfs_iext_lookup_extent(ip, ifp, irec.br_startoff, &icur, &iext_irec) || irec.br_startoff != iext_irec.br_startoff ||
PATCH 7/8 xfs: complain about bad records in query_range helpers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
For every btree type except for the bmbt, refactor the code that complains about bad records into a helper and make the ->query_range helpers call it so that corruptions found via that avenue are logged.
--- fs/xfs/libxfs/xfs_alloc.c | 38 +++++++++++++++++++++++--------------- fs/xfs/libxfs/xfs_ialloc.c | 38 ++++++++++++++++++++++++-------------- fs/xfs/libxfs/xfs_refcount.c | 32 +++++++++++++++++++------------- fs/xfs/libxfs/xfs_rmap.c | 40 +++++++++++++++++++++++++--------------- 4 files changed, 91 insertions(+), 57 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +23 -15
@@ -265,6 +265,24 @@ xfs_alloc_check_irec(return NULL ; } +static inline int +xfs_alloc_complain_bad_rec ( +struct xfs_btree_cur *cur, +xfs_failaddr_t fa, +const struct xfs_alloc_rec_incore *irec) +{ +struct xfs_mount *mp = cur->bc_mp; + +xfs_warn (mp, +"%s Freespace BTree record corruption in AG %d detected at %pS!" , + cur->bc_btnum ==XFS_BTNUM_BNO ?"Block" :"Size" , + cur->bc_ag.pag->pag_agno, fa); +xfs_warn (mp, +"start block 0x%x block count 0x%x" , irec->ar_startblock, + irec->ar_blockcount); +return -EFSCORRUPTED ; +} +/* * Get the data from the pointed-to record. */
@@ -276,8 +294,6 @@ xfs_alloc_get_rec( int *stat) /* output: success/failure */ {struct xfs_alloc_rec_incore irec; -struct xfs_mount *mp = cur->bc_mp; -struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec;xfs_failaddr_t fa;int error;
@@ -289,21 +305,11 @@ xfs_alloc_get_rec(xfs_alloc_btrec_to_irec (rec, &irec); fa =xfs_alloc_check_irec (cur, &irec);if (fa) - goto out_bad_rec; +return xfs_alloc_complain_bad_rec (cur, fa, &irec); *bno = irec.ar_startblock; *len = irec.ar_blockcount;return 0 ; - -out_bad_rec: -xfs_warn (mp, -"%s Freespace BTree record corruption in AG %d detected at %pS!" , - cur->bc_btnum ==XFS_BTNUM_BNO ?"Block" :"Size" , - pag->pag_agno, fa); -xfs_warn (mp, -"start block 0x%x block count 0x%x" , irec.ar_startblock, - irec.ar_blockcount); -return -EFSCORRUPTED ; }/*
@@ -3477,10 +3483,12 @@ xfs_alloc_query_range_helper( {struct xfs_alloc_query_range_info *query = priv;struct xfs_alloc_rec_incore irec; +xfs_failaddr_t fa;xfs_alloc_btrec_to_irec (rec, &irec); -if (xfs_alloc_check_irec (cur, &irec) !=NULL ) -return -EFSCORRUPTED ; + fa =xfs_alloc_check_irec (cur, &irec); +if (fa) +return xfs_alloc_complain_bad_rec (cur, fa, &irec);return query->fn (cur, &irec, query->priv); }
fs/xfs/libxfs/xfs_ialloc.c +24 -14
@@ -122,6 +122,25 @@ xfs_inobt_check_irec(return NULL ; } +static inline int +xfs_inobt_complain_bad_rec ( +struct xfs_btree_cur *cur, +xfs_failaddr_t fa, +const struct xfs_inobt_rec_incore *irec) +{ +struct xfs_mount *mp = cur->bc_mp; + +xfs_warn (mp, +"%s Inode BTree record corruption in AG %d detected at %pS!" , + cur->bc_btnum ==XFS_BTNUM_INO ?"Used" :"Free" , + cur->bc_ag.pag->pag_agno, fa); +xfs_warn (mp, +"start inode 0x%x, count 0x%x, free 0x%x freemask 0x%llx, holemask 0x%x" , + irec->ir_startino, irec->ir_count, irec->ir_freecount, + irec->ir_free, irec->ir_holemask); +return -EFSCORRUPTED ; +} +/* * Get the data from the pointed-to record. */
@@ -143,20 +162,9 @@ xfs_inobt_get_rec(xfs_inobt_btrec_to_irec (mp, rec, irec); fa =xfs_inobt_check_irec (cur, irec);if (fa) - goto out_bad_rec; +return xfs_inobt_complain_bad_rec (cur, fa, irec);return 0 ; - -out_bad_rec: -xfs_warn (mp, -"%s Inode BTree record corruption in AG %d detected at %pS!" , - cur->bc_btnum ==XFS_BTNUM_INO ?"Used" :"Free" , - cur->bc_ag.pag->pag_agno, fa); -xfs_warn (mp, -"start inode 0x%x, count 0x%x, free 0x%x freemask 0x%llx, holemask 0x%x" , - irec->ir_startino, irec->ir_count, irec->ir_freecount, - irec->ir_free, irec->ir_holemask); -return -EFSCORRUPTED ; }/*
@@ -2717,10 +2725,12 @@ xfs_ialloc_count_inodes_rec( {struct xfs_inobt_rec_incore irec;struct xfs_ialloc_count_inodes *ci = priv; +xfs_failaddr_t fa;xfs_inobt_btrec_to_irec (cur->bc_mp, rec, &irec); -if (xfs_inobt_check_irec (cur, &irec) !=NULL ) -return -EFSCORRUPTED ; + fa =xfs_inobt_check_irec (cur, &irec); +if (fa) +return xfs_inobt_complain_bad_rec (cur, fa, &irec); ci->count += irec.ir_count; ci->freecount += irec.ir_freecount;
fs/xfs/libxfs/xfs_refcount.c +19 -13
@@ -144,6 +144,23 @@ xfs_refcount_check_irec(return NULL ; } +static inline int +xfs_refcount_complain_bad_rec ( +struct xfs_btree_cur *cur, +xfs_failaddr_t fa, +const struct xfs_refcount_irec *irec) +{ +struct xfs_mount *mp = cur->bc_mp; + +xfs_warn (mp, +"Refcount BTree record corruption in AG %d detected at %pS!" , + cur->bc_ag.pag->pag_agno, fa); +xfs_warn (mp, +"Start block 0x%x, block count 0x%x, references 0x%x" , + irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount); +return -EFSCORRUPTED ; +} +/* * Get the data from the pointed-to record. */
@@ -153,8 +170,6 @@ xfs_refcount_get_rec(struct xfs_refcount_irec *irec, int *stat) { - struct xfs_mount *mp = cur->bc_mp; -struct xfs_perag *pag = cur->bc_ag.pag; union xfs_btree_rec *rec;xfs_failaddr_t fa;int error;
@@ -166,19 +181,10 @@ xfs_refcount_get_rec(xfs_refcount_btrec_to_irec (rec, irec); fa =xfs_refcount_check_irec (cur, irec);if (fa) - goto out_bad_rec; +return xfs_refcount_complain_bad_rec (cur, fa, irec); -trace_xfs_refcount_get (cur->bc_mp, pag->pag_agno, irec); +trace_xfs_refcount_get (cur->bc_mp, cur->bc_ag.pag->pag_agno, irec);return 0 ; - -out_bad_rec: -xfs_warn (mp, -"Refcount BTree record corruption in AG %d detected at %pS!" , - pag->pag_agno, fa); -xfs_warn (mp, -"Start block 0x%x, block count 0x%x, references 0x%x" , - irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount); -return -EFSCORRUPTED ; }/*
fs/xfs/libxfs/xfs_rmap.c +25 -15
@@ -235,6 +235,24 @@ xfs_rmap_check_irec(return NULL ; } +static inline int +xfs_rmap_complain_bad_rec ( +struct xfs_btree_cur *cur, +xfs_failaddr_t fa, +const struct xfs_rmap_irec *irec) +{ +struct xfs_mount *mp = cur->bc_mp; + +xfs_warn (mp, +"Reverse Mapping BTree record corruption in AG %d detected at %pS!" , + cur->bc_ag.pag->pag_agno, fa); +xfs_warn (mp, +"Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x" , + irec->rm_owner, irec->rm_flags, irec->rm_startblock, + irec->rm_blockcount); +return -EFSCORRUPTED ; +} +/* * Get the data from the pointed-to record. */
@@ -244,8 +262,6 @@ xfs_rmap_get_rec(struct xfs_rmap_irec *irec, int *stat) { - struct xfs_mount *mp = cur->bc_mp; -struct xfs_perag *pag = cur->bc_ag.pag; union xfs_btree_rec *rec;xfs_failaddr_t fa;int error;
@@ -258,18 +274,9 @@ xfs_rmap_get_rec(if (!fa) fa =xfs_rmap_check_irec (cur, irec);if (fa) - goto out_bad_rec; +return xfs_rmap_complain_bad_rec (cur, fa, irec);return 0 ; -out_bad_rec: -xfs_warn (mp, -"Reverse Mapping BTree record corruption in AG %d detected at %pS!" , - pag->pag_agno, fa); -xfs_warn (mp, -"Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x" , - irec->rm_owner, irec->rm_flags, irec->rm_startblock, - irec->rm_blockcount); -return -EFSCORRUPTED ; }struct xfs_find_left_neighbor_info {
@@ -2335,10 +2342,13 @@ xfs_rmap_query_range_helper( {struct xfs_rmap_query_range_info *query = priv;struct xfs_rmap_irec irec; +xfs_failaddr_t fa; -if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL || -xfs_rmap_check_irec (cur, &irec) !=NULL ) -return -EFSCORRUPTED ; + fa =xfs_rmap_btrec_to_irec (rec, &irec); +if (!fa) + fa =xfs_rmap_check_irec (cur, &irec); +if (fa) +return xfs_rmap_complain_bad_rec (cur, fa, &irec);return query->fn (cur, &irec, query->priv); }
PATCH 8/8 xfs: complain about bad file mapping records in the ondisk bmbt
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Similar to what we've just done for the other btrees, create a function to log corrupt bmbt records and call it whenever we encounter a bad record in the ondisk btree.
--- fs/xfs/libxfs/xfs_bmap.c | 31 ++++++++++++++++++++++++++++++- fs/xfs/libxfs/xfs_bmap.h | 2 ++ fs/xfs/libxfs/xfs_inode_fork.c | 3 ++- 3 files changed, 34 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +30 -1
@@ -1099,6 +1099,34 @@ struct xfs_iread_state {xfs_extnum_t loaded; }; +int +xfs_bmap_complain_bad_rec ( +struct xfs_inode *ip, +int whichfork, +xfs_failaddr_t fa, +const struct xfs_bmbt_irec *irec) +{ +struct xfs_mount *mp = ip->i_mount; +const char *forkname; + +switch (whichfork) { +case XFS_DATA_FORK : forkname ="data" ;break ; +case XFS_ATTR_FORK : forkname ="attr" ;break ; +case XFS_COW_FORK : forkname ="CoW" ;break ; +default : forkname ="???" ;break ; + } + +xfs_warn (mp, +"Bmap BTree record corruption in inode 0x%llx %s fork detected at %pS!" , + ip->i_ino, forkname, fa); +xfs_warn (mp, +"Offset 0x%llx, start block 0x%llx, block count 0x%llx state 0x%x" , + irec->br_startoff, irec->br_startblock, irec->br_blockcount, + irec->br_state); + +return -EFSCORRUPTED ; +} +/* Stuff every bmbt record from this block into the incore extent map. */ static int xfs_iread_bmbt_block(
@@ -1141,7 +1169,8 @@ xfs_iread_bmbt_block(xfs_inode_verifier_error (ip, -EFSCORRUPTED ,"xfs_iread_extents(2)" , frp,sizeof (*frp), fa); -return -EFSCORRUPTED ; +return xfs_bmap_complain_bad_rec (ip, whichfork, fa, + &new); }xfs_iext_insert (ip, &ir->icur, &new,xfs_bmap_fork_to_state (whichfork));
fs/xfs/libxfs/xfs_bmap.h +2 -0
@@ -258,6 +258,8 @@ static inline uint32_t xfs_bmap_fork_to_state(int whichfork)xfs_failaddr_t xfs_bmap_validate_extent (struct xfs_inode *ip,int whichfork,struct xfs_bmbt_irec *irec); +int xfs_bmap_complain_bad_rec (struct xfs_inode *ip,int whichfork, +xfs_failaddr_t fa,const struct xfs_bmbt_irec *irec); int xfs_bmapi_remap(struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t bno, xfs_filblks_t len, xfs_fsblock_t startblock,
fs/xfs/libxfs/xfs_inode_fork.c +2 -1
@@ -140,7 +140,8 @@ xfs_iformat_extents(xfs_inode_verifier_error (ip, -EFSCORRUPTED ,"xfs_iformat_extents(2)" , dp,sizeof (*dp), fa); -return -EFSCORRUPTED ; +return xfs_bmap_complain_bad_rec (ip, whichfork, + fa, &new); }xfs_iext_insert (ip, &icur, &new, state);
PATCH 1/3 xfs: hoist rmap record flag checks from scrub
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Move the rmap record flag checks from xchk_rmapbt_rec into xfs_rmap_check_irec so that they are applied everywhere.
--- fs/xfs/libxfs/xfs_rmap.c | 22 ++++++++++++++++++++++ fs/xfs/scrub/rmap.c | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-)
fs/xfs/libxfs/xfs_rmap.c +22 -0
@@ -212,6 +212,10 @@ xfs_rmap_check_irec( const struct xfs_rmap_irec *irec) {struct xfs_mount *mp = cur->bc_mp; +bool is_inode; +bool is_unwritten; +bool is_bmbt; +bool is_attr;if (irec->rm_blockcount ==0 )return __this_address;
@@ -232,6 +236,24 @@ xfs_rmap_check_irec( irec->rm_owner >= XFS_RMAP_OWN_MIN)))return __this_address; +/* Check flags. */ + is_inode = !XFS_RMAP_NON_INODE_OWNER (irec->rm_owner); + is_bmbt = irec->rm_flags &XFS_RMAP_BMBT_BLOCK ; + is_attr = irec->rm_flags &XFS_RMAP_ATTR_FORK ; + is_unwritten = irec->rm_flags &XFS_RMAP_UNWRITTEN ; + +if (is_bmbt && irec->rm_offset !=0 ) +return __this_address; + +if (!is_inode && irec->rm_offset !=0 ) +return __this_address; + +if (is_unwritten && (is_bmbt || !is_inode || is_attr)) +return __this_address; + +if (!is_inode && (is_bmbt || is_unwritten || is_attr)) +return __this_address; +return NULL ; }
fs/xfs/scrub/rmap.c +0 -22
@@ -94,10 +94,6 @@ xchk_rmapbt_rec( const union xfs_btree_rec *rec) {struct xfs_rmap_irec irec; -bool non_inode; -bool is_unwritten; -bool is_bmbt; -bool is_attr;if (xfs_rmap_btrec_to_irec (rec, &irec) !=NULL ||xfs_rmap_check_irec (bs->cur, &irec) !=NULL ) {
@@ -105,24 +101,6 @@ xchk_rmapbt_rec(return 0 ; } -/* Check flags. */ - non_inode =XFS_RMAP_NON_INODE_OWNER (irec.rm_owner); - is_bmbt = irec.rm_flags &XFS_RMAP_BMBT_BLOCK ; - is_attr = irec.rm_flags &XFS_RMAP_ATTR_FORK ; - is_unwritten = irec.rm_flags &XFS_RMAP_UNWRITTEN ; - -if (is_bmbt && irec.rm_offset !=0 ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -if (non_inode && irec.rm_offset !=0 ) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -if (is_unwritten && (is_bmbt || non_inode || is_attr)) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -if (non_inode && (is_bmbt || is_unwritten || is_attr)) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); -xchk_rmapbt_xref (bs->sc, &irec);return 0 ; }
PATCH 2/3 xfs: hoist rmap record flag checks from scrub
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Move the rmap record flag checks from xchk_rmapbt_rec into xfs_rmap_check_irec so that they are applied everywhere.
--- fs/xfs/libxfs/xfs_rmap.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/xfs/libxfs/xfs_rmap.c +5 -0
@@ -254,6 +254,11 @@ xfs_rmap_check_irec(if (!is_inode && (is_bmbt || is_unwritten || is_attr))return __this_address; +/* Check for a valid fork offset, if applicable. */ +if (is_inode && !is_bmbt && + !xfs_verify_fileext (mp, irec->rm_offset, irec->rm_blockcount)) +return __this_address; +return NULL ; }
PATCH 3/3 xfs: hoist inode record alignment checks from scrub
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Move the inobt record alignment checks from xchk_iallocbt_rec into xfs_inobt_check_irec so that they are applied everywhere.
--- fs/xfs/libxfs/xfs_ialloc.c | 4 ++++ fs/xfs/scrub/ialloc.c | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +4 -0
@@ -103,8 +103,12 @@ xfs_inobt_check_irec( {uint64_t realfree; +/* Record has to be properly aligned within the AG. */ if (!xfs_verify_agino (cur->bc_ag.pag, irec->ir_startino))return __this_address; +if (!xfs_verify_agino (cur->bc_ag.pag, + irec->ir_startino +XFS_INODES_PER_CHUNK -1 )) +return __this_address;if (irec->ir_count <XFS_INODES_PER_HOLEMASK_BIT || irec->ir_count >XFS_INODES_PER_CHUNK )return __this_address;
fs/xfs/scrub/ialloc.c +0 -6
@@ -413,7 +413,6 @@ xchk_iallocbt_rec( const union xfs_btree_rec *rec) {struct xfs_mount *mp = bs->cur->bc_mp; -struct xfs_perag *pag = bs->cur->bc_ag.pag;struct xchk_iallocbt *iabt = bs->private;struct xfs_inobt_rec_incore irec;uint64_t holes;
@@ -431,11 +430,6 @@ xchk_iallocbt_rec( } agino = irec.ir_startino; -/* Record has to be properly aligned within the AG. */ -if (!xfs_verify_agino (pag, agino +XFS_INODES_PER_CHUNK -1 )) { -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - goto out; - }xchk_iallocbt_rec_alignment (bs, &irec);if (bs->sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT )
PATCH 1/2 xfs: fix rm_offset flag handling in rmap keys
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Keys for extent interval records in the reverse mapping btree are supposed to be computed as follows:
(physical block, owner, fork, is_btree, offset)
This provides users the ability to look up a reverse mapping from a file block mapping record -- start with the physical block; then if there are multiple records for the same block, move on to the owner; then the inode fork type; and so on to the file offset.
Unfortunately, the code that creates rmap lookup keys from rmap records forgot to mask off the record attribute flags, leading to ondisk keys that look like this:
(physical block, owner, fork, is_btree, unwritten state, offset)
Fortunately, this has all worked ok for the past six years because the key comparison functions incorrectly ignore the fork/bmbt/unwritten information that's encoded in the on-disk offset. This means that lookup comparisons are only done with:
(physical block, owner, offset)
Queries can (theoretically) return incorrect results because of this omission. On consistent filesystems this isn't an issue because xattr and bmbt blocks cannot be shared and hence the comparisons succeed purely on the contents of the rm_startblock field. For the one case where we support sharing (written data fork blocks) all flag bits are zero, so the omission in the comparison has no ill effects.
Unfortunately, this bug prevents scrub from detecting incorrect fork and bmbt flag bits in the rmap btree, so we really do need to fix the compare code. Old filesystems with the unwritten bit erroneously set in the rmap key struct will work fine on new kernels since we still ignore the unwritten bit. New filesystems on older kernels will work fine since the old kernels never paid attention to the unwritten bit.
A previous version of this patch forgot to keep the (un)written state flag masked during the comparison and caused a major regression in 5.9.x since unwritten extent conversion can update an rmap record without requiring key updates.
Note that blocks cannot go directly from data fork to attr fork without being deallocated and reallocated, nor can they be added to or removed from a bmbt without a free/alloc cycle, so this should not cause any regressions.
Found by fuzzing keys[1].attrfork = ones on xfs/371.
--- fs/xfs/libxfs/xfs_rmap_btree.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-)
fs/xfs/libxfs/xfs_rmap_btree.c +30 -10
@@ -156,6 +156,16 @@ xfs_rmapbt_get_maxrecs(return cur->bc_mp->m_rmap_mxr[level !=0 ]; } +/* +* Convert the ondisk record's offset field into the ondisk key's offset field. +* Fork and bmbt are significant parts of the rmap record key, but written +* status is merely a record attribute. +*/ +static inline __be64 ondisk_rec_offset_to_key (const union xfs_btree_rec *rec) +{ +return rec->rmap.rm_offset & ~cpu_to_be64 (XFS_RMAP_OFF_UNWRITTEN ); +} + STATIC void xfs_rmapbt_init_key_from_rec( union xfs_btree_key *key,
@@ -163,7 +173,7 @@ xfs_rmapbt_init_key_from_rec( { key->rmap.rm_startblock = rec->rmap.rm_startblock; key->rmap.rm_owner = rec->rmap.rm_owner; - key->rmap.rm_offset = rec->rmap.rm_offset; + key->rmap.rm_offset =ondisk_rec_offset_to_key (rec); }/*
@@ -186,7 +196,7 @@ xfs_rmapbt_init_high_key_from_rec( key->rmap.rm_startblock = rec->rmap.rm_startblock;be32_add_cpu (&key->rmap.rm_startblock, adj); key->rmap.rm_owner = rec->rmap.rm_owner; - key->rmap.rm_offset = rec->rmap.rm_offset; + key->rmap.rm_offset =ondisk_rec_offset_to_key (rec);if (XFS_RMAP_NON_INODE_OWNER (be64_to_cpu (rec->rmap.rm_owner)) ||XFS_RMAP_IS_BMBT_BLOCK (be64_to_cpu (rec->rmap.rm_offset)))return ;
@@ -219,6 +229,16 @@ xfs_rmapbt_init_ptr_from_cur( ptr->s = agf->agf_roots[cur->bc_btnum]; } +/* +* Mask the appropriate parts of the ondisk key field for a key comparison. +* Fork and bmbt are significant parts of the rmap record key, but written +* status is merely a record attribute. +*/ +static inline uint64_t offset_keymask (uint64_t offset) +{ +return offset & ~XFS_RMAP_OFF_UNWRITTEN ; +} + STATIC int64_t xfs_rmapbt_key_diff( struct xfs_btree_cur *cur,
@@ -240,8 +260,8 @@ xfs_rmapbt_key_diff(else if (y > x)return -1 ; - x =XFS_RMAP_OFF (be64_to_cpu (kp->rm_offset)); - y = rec->rm_offset; + x =offset_keymask (be64_to_cpu (kp->rm_offset)); + y =offset_keymask (xfs_rmap_irec_offset_pack (rec));if (x > y)return 1 ;else if (y > x)
@@ -272,8 +292,8 @@ xfs_rmapbt_diff_two_keys(else if (y > x)return -1 ; - x =XFS_RMAP_OFF (be64_to_cpu (kp1->rm_offset)); - y =XFS_RMAP_OFF (be64_to_cpu (kp2->rm_offset)); + x =offset_keymask (be64_to_cpu (kp1->rm_offset)); + y =offset_keymask (be64_to_cpu (kp2->rm_offset));if (x > y)return 1 ;else if (y > x)
@@ -387,8 +407,8 @@ xfs_rmapbt_keys_inorder(return 1 ; else if (a > b) return 0; - a =XFS_RMAP_OFF (be64_to_cpu (k1->rmap.rm_offset)); - b =XFS_RMAP_OFF (be64_to_cpu (k2->rmap.rm_offset)); + a =offset_keymask (be64_to_cpu (k1->rmap.rm_offset)); + b =offset_keymask (be64_to_cpu (k2->rmap.rm_offset));if (a <= b)return 1 ;return 0 ;
@@ -417,8 +437,8 @@ xfs_rmapbt_recs_inorder(return 1 ; else if (a > b) return 0; - a =XFS_RMAP_OFF (be64_to_cpu (r1->rmap.rm_offset)); - b =XFS_RMAP_OFF (be64_to_cpu (r2->rmap.rm_offset)); + a =offset_keymask (be64_to_cpu (r1->rmap.rm_offset)); + b =offset_keymask (be64_to_cpu (r2->rmap.rm_offset));if (a <= b)return 1 ;return 0 ;
PATCH 2/2 xfs: detect unwritten bit set in rmapbt node block keys
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
In the last patch, we changed the rmapbt code to remove the UNWRITTEN bit when creating an rmapbt key from an rmapbt record, and we changed the rmapbt key comparison code to start considering the ATTR and BMBT flags during lookup. This brought the behavior of the rmapbt implementation in line with its specification.
However, there may exist filesystems that have the unwritten bit still set in the rmapbt keys. We should detect these situations and flag the rmapbt as one that would benefit from optimization. Eventually, online repair will be able to do something in response to this.
--- fs/xfs/scrub/btree.c | 10 +++++++++ fs/xfs/scrub/btree.h | 2 ++ fs/xfs/scrub/rmap.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+)
fs/xfs/scrub/btree.c +10 -0
@@ -119,6 +119,16 @@ xchk_btree_xref_set_corrupt( __return_address); } +void +xchk_btree_set_preen ( +struct xfs_scrub *sc, +struct xfs_btree_cur *cur, +int level) +{ +__xchk_btree_set_corrupt (sc, cur, level,XFS_SCRUB_OFLAG_PREEN , + __return_address); +} +/* * Make sure this record is in order and doesn't stray outside of the parent * keys.
fs/xfs/scrub/btree.h +2 -0
@@ -19,6 +19,8 @@ bool xchk_btree_xref_process_error(struct xfs_scrub *sc,/* Check for btree corruption. */ void xchk_btree_set_corrupt (struct xfs_scrub *sc,struct xfs_btree_cur *cur,int level); +void xchk_btree_set_preen (struct xfs_scrub *sc,struct xfs_btree_cur *cur, +int level);/* Check for btree xref discrepancies. */ void xchk_btree_xref_set_corrupt(struct xfs_scrub *sc,
fs/xfs/scrub/rmap.c +53 -0
65 lines not on this page · raw message
PATCH 1/2 xfs: check btree keys reflect the child block
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
When scrub is checking a non-root btree block, it should make sure that the keys in the parent btree block accurately capture the keyspace that the child block stores.
--- fs/xfs/scrub/btree.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
fs/xfs/scrub/btree.c +48 -1
@@ -529,6 +529,48 @@ xchk_btree_check_minrecs(xchk_btree_set_corrupt (bs->sc, cur, level); } +/* +* If this btree block has a parent, make sure that the parent's keys capture +* the keyspace contained in this block. +*/ +STATIC void +xchk_btree_block_check_keys ( +struct xchk_btree *bs, +int level, +struct xfs_btree_block *block) +{ +union xfs_btree_key block_key; +union xfs_btree_key *block_high_key; +union xfs_btree_key *parent_low_key, *parent_high_key; +struct xfs_btree_cur *cur = bs->cur; +struct xfs_btree_block *parent_block; +struct xfs_buf *bp; + +if (level == cur->bc_nlevels -1 ) +return ; + +xfs_btree_get_keys (cur, block, &block_key); + +/* Make sure the low key of this block matches the parent. */ + parent_block =xfs_btree_get_block (cur, level +1 , &bp); + parent_low_key =xfs_btree_key_addr (cur, cur->bc_levels[level +1 ].ptr, + parent_block); +if (cur->bc_ops->diff_two_keys (cur, &block_key, parent_low_key)) { +xchk_btree_set_corrupt (bs->sc, bs->cur, level); +return ; + } + +if (!(cur->bc_flags &XFS_BTREE_OVERLAPPING )) +return ; + +/* Make sure the high key of this block matches the parent. */ + parent_high_key =xfs_btree_high_key_addr (cur, + cur->bc_levels[level +1 ].ptr, parent_block); + block_high_key =xfs_btree_high_key_from_key (cur, &block_key); +if (cur->bc_ops->diff_two_keys (cur, block_high_key, parent_high_key)) +xchk_btree_set_corrupt (bs->sc, bs->cur, level); +} +/* * Grab and scrub a btree block given a btree pointer. Returns block * and buffer pointers (if applicable) if they're ok to use.
@@ -580,7 +622,12 @@ xchk_btree_get_block(* Check the block's siblings; this function absorbs error codes * for us. */ -return xchk_btree_block_check_siblings (bs, *pblock); + error =xchk_btree_block_check_siblings (bs, *pblock); +if (error) +return error; + +xchk_btree_block_check_keys (bs, level, *pblock); +return 0 ; }/*
PATCH 2/2 xfs: always scrub record/key order of interior records
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
In commit d47fef9342d0, we removed the firstrec and firstkey fields of struct xchk_btree because Christoph thought they were unnecessary because we could use the record index in the btree cursor. This is incorrect because bc_ptrs (now bc_levels[].ptr) tracks the cursor position within a specific btree block, not within the entire level.
The end result is that scrub no longer detects situations where the rightmost record of a block is identical to the leftmost record of that block's right sibling. Fix this regression by reintroducing record validity booleans so that order checking skips *only* the leftmost record/key in each level.
--- fs/xfs/scrub/btree.c | 14 ++++++++------ fs/xfs/scrub/btree.h | 8 +++++++- 2 files changed, 15 insertions(+), 7 deletions(-)
fs/xfs/scrub/btree.c +8 -6
@@ -151,11 +151,12 @@ xchk_btree_rec(trace_xchk_btree_rec (bs->sc, cur,0 ); -/* If this isn't the first record, are they in order? */ -if (cur->bc_levels[0 ].ptr >1 && +/* Are all records across all record blocks in order? */ +if (bs->lastrec_valid && !cur->bc_ops->recs_inorder (cur, &bs->lastrec, rec))xchk_btree_set_corrupt (bs->sc, cur,0 );memcpy (&bs->lastrec, rec, cur->bc_ops->rec_len); + bs->lastrec_valid = true;if (cur->bc_nlevels ==1 )return ;
@@ -198,11 +199,12 @@ xchk_btree_key(trace_xchk_btree_key (bs->sc, cur, level); -/* If this isn't the first key, are they in order? */ -if (cur->bc_levels[level].ptr >1 && - !cur->bc_ops->keys_inorder (cur, &bs->lastkey[level -1 ], key)) +/* Are all low keys across all node blocks in order? */ +if (bs->lastkey[level -1 ].valid && + !cur->bc_ops->keys_inorder (cur, &bs->lastkey[level -1 ].key, key))xchk_btree_set_corrupt (bs->sc, cur, level); -memcpy (&bs->lastkey[level -1 ], key, cur->bc_ops->key_len); +memcpy (&bs->lastkey[level -1 ].key, key, cur->bc_ops->key_len); + bs->lastkey[level -1 ].valid = true;if (level +1 >= cur->bc_nlevels)return ;
fs/xfs/scrub/btree.h +7 -1
@@ -31,6 +31,11 @@ typedef int (*xchk_btree_rec_fn)(struct xchk_btree *bs, const union xfs_btree_rec *rec); +struct xchk_btree_key { +union xfs_btree_key key; +bool valid; +}; +struct xchk_btree {/* caller-provided scrub state */ struct xfs_scrub *sc;
@@ -40,11 +45,12 @@ struct xchk_btree {void *private;/* internal scrub state */ +bool lastrec_valid;union xfs_btree_rec lastrec;struct list_head to_check;/* this element must come last! */ -union xfs_btree_key lastkey[]; +struct xchk_btree_key lastkey[]; };/*
PATCH 1/6 xfs: refactor converting btree irec to btree key
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
We keep doing these conversions to support btree queries, so refactor this into a helper.
--- fs/xfs/libxfs/xfs_btree.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_btree.c +15 -8
@@ -4923,6 +4923,19 @@ xfs_btree_overlapped_query_range(return error; } +static inline void +xfs_btree_key_from_irec ( +struct xfs_btree_cur *cur, +union xfs_btree_key *key, +const union xfs_btree_irec *irec) +{ +union xfs_btree_rec rec; + + cur->bc_rec = *irec; + cur->bc_ops->init_rec_from_cur (cur, &rec); + cur->bc_ops->init_key_from_rec (key, &rec); +} +/* * Query a btree for all records overlapping a given interval of keys. The * supplied function will be called with each record found; return one of the
@@ -4937,18 +4950,12 @@ xfs_btree_query_range(xfs_btree_query_range_fn fn, void *priv) { - union xfs_btree_rec rec; union xfs_btree_key low_key;union xfs_btree_key high_key;/* Find the keys of both ends of the interval. */ - cur->bc_rec = *high_rec; - cur->bc_ops->init_rec_from_cur (cur, &rec); - cur->bc_ops->init_key_from_rec (&high_key, &rec); - - cur->bc_rec = *low_rec; - cur->bc_ops->init_rec_from_cur (cur, &rec); - cur->bc_ops->init_key_from_rec (&low_key, &rec); +xfs_btree_key_from_irec (cur, &high_key, high_rec); +xfs_btree_key_from_irec (cur, &low_key, low_rec);/* Enforce low key < high key. */ if (cur->bc_ops->diff_two_keys (cur, &low_key, &high_key) >0 )
PATCH 2/6 xfs: refactor ->diff_two_keys callsites
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create wrapper functions around ->diff_two_keys so that we don't have to remember what the return values mean, and adjust some of the code comments to reflect the longtime code behavior. We're going to introduce more uses of ->diff_two_keys in the next patch, so reduce the cognitive load for readers by doing this refactoring now.
--- fs/xfs/libxfs/xfs_btree.c | 61 +++++++++++++++++++-------------------------- fs/xfs/libxfs/xfs_btree.h | 55 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/btree.c | 24 +++++++++--------- 3 files changed, 93 insertions(+), 47 deletions(-)
fs/xfs/libxfs/xfs_btree.c +26 -35
@@ -2067,8 +2067,7 @@ xfs_btree_get_leaf_keys(for (n =2 ; n <=xfs_btree_get_numrecs (block); n++) { rec =xfs_btree_rec_addr (cur, n, block); cur->bc_ops->init_high_key_from_rec (&hkey, rec); -if (cur->bc_ops->diff_two_keys (cur, &hkey, &max_hkey) - >0 ) +if (xfs_btree_keycmp_gt (cur, &hkey, &max_hkey)) max_hkey = hkey; }
@@ -2096,7 +2095,7 @@ xfs_btree_get_node_keys( max_hkey =xfs_btree_high_key_addr (cur,1 , block);for (n =2 ; n <=xfs_btree_get_numrecs (block); n++) { hkey =xfs_btree_high_key_addr (cur, n, block); -if (cur->bc_ops->diff_two_keys (cur, hkey, max_hkey) >0 ) +if (xfs_btree_keycmp_gt (cur, hkey, max_hkey)) max_hkey = hkey; }
@@ -2183,8 +2182,8 @@ __xfs_btree_updkeys( nlkey =xfs_btree_key_addr (cur, ptr, block); nhkey =xfs_btree_high_key_addr (cur, ptr, block);if (!force_all && - !(cur->bc_ops->diff_two_keys (cur, nlkey, lkey) !=0 || - cur->bc_ops->diff_two_keys (cur, nhkey, hkey) !=0 )) +xfs_btree_keycmp_eq (cur, nlkey, lkey) && +xfs_btree_keycmp_eq (cur, nhkey, hkey))break ;xfs_btree_copy_keys (cur, nlkey, lkey,1 );xfs_btree_log_keys (cur, bp, ptr, ptr);
@@ -4702,7 +4701,6 @@ xfs_btree_simple_query_range( {union xfs_btree_rec *recp;union xfs_btree_key rec_key; -int64_t diff;int stat;bool firstrec = true;int error;
@@ -4732,20 +4730,17 @@ xfs_btree_simple_query_range(if (error || !stat)break ; -/* Skip if high_key(rec) < low_key. */ +/* Skip if low_key > high_key(rec). */ if (firstrec) { cur->bc_ops->init_high_key_from_rec (&rec_key, recp); firstrec = false; - diff = cur->bc_ops->diff_two_keys (cur, low_key, - &rec_key); -if (diff >0 ) +if (xfs_btree_keycmp_gt (cur, low_key, &rec_key)) goto advloop; } -/* Stop if high_key < low_key(rec). */ +/* Stop if low_key(rec) > high_key. */ cur->bc_ops->init_key_from_rec (&rec_key, recp); - diff = cur->bc_ops->diff_two_keys (cur, &rec_key, high_key); -if (diff >0 ) +if (xfs_btree_keycmp_gt (cur, &rec_key, high_key))break ;/* Callback */
@@ -4799,8 +4794,6 @@ xfs_btree_overlapped_query_range(union xfs_btree_key *hkp;union xfs_btree_rec *recp;struct xfs_btree_block *block; -int64_t ldiff; -int64_t hdiff;int level;struct xfs_buf *bp;int i;
@@ -4840,25 +4833,23 @@ xfs_btree_overlapped_query_range( block); cur->bc_ops->init_high_key_from_rec (&rec_hkey, recp); - ldiff = cur->bc_ops->diff_two_keys (cur, &rec_hkey, - low_key); - cur->bc_ops->init_key_from_rec (&rec_key, recp); - hdiff = cur->bc_ops->diff_two_keys (cur, high_key, - &rec_key);/* +* If (query's high key < record's low key), then there +* are no more interesting records in this block. Pop +* up to the leaf level to find more record blocks. +* * If (record's high key >= query's low key) and * (query's high key >= record's low key), then * this record overlaps the query range; callback. */ -if (ldiff >=0 && hdiff >=0 ) { - error =fn (cur, recp, priv); -if (error) -break ; - }else if (hdiff <0 ) { -/* Record is larger than high key; pop. */ +if (xfs_btree_keycmp_lt (cur, high_key, &rec_key)) goto pop_up; +if (xfs_btree_keycmp_ge (cur, &rec_hkey, low_key)) { + error =fn (cur, recp, priv); +if (error) +break ; } cur->bc_levels[level].ptr++;continue ;
@@ -4870,15 +4861,18 @@ xfs_btree_overlapped_query_range( block); pp =xfs_btree_ptr_addr (cur, cur->bc_levels[level].ptr, block); - ldiff = cur->bc_ops->diff_two_keys (cur, hkp, low_key); - hdiff = cur->bc_ops->diff_two_keys (cur, high_key, lkp); -/* +* If (query's high key < pointer's low key), then there are no +* more interesting keys in this block. Pop up one leaf level +* to continue looking for records. +* * If (pointer's high key >= query's low key) and * (query's high key >= pointer's low key), then * this record overlaps the query range; follow pointer. */ -if (ldiff >=0 && hdiff >=0 ) { +if (xfs_btree_keycmp_lt (cur, high_key, lkp)) + goto pop_up; +if (xfs_btree_keycmp_ge (cur, hkp, low_key)) { level--; error =xfs_btree_lookup_get_block (cur, level, pp, &block);
@@ -4893,9 +4887,6 @@ xfs_btree_overlapped_query_range(#endif cur->bc_levels[level].ptr =1 ;continue ; - }else if (hdiff <0 ) { -/* The low key is larger than the upper range; pop. */ - goto pop_up; } cur->bc_levels[level].ptr++; }
@@ -4957,8 +4948,8 @@ xfs_btree_query_range(xfs_btree_key_from_irec (cur, &high_key, high_rec);xfs_btree_key_from_irec (cur, &low_key, low_rec); -/* Enforce low key < high key. */ -if (cur->bc_ops->diff_two_keys (cur, &low_key, &high_key) >0 ) +/* Enforce low key <= high key. */ +if (!xfs_btree_keycmp_le (cur, &low_key, &high_key))return -EINVAL ;if (!(cur->bc_flags &XFS_BTREE_OVERLAPPING ))
fs/xfs/libxfs/xfs_btree.h +55 -0
61 lines not on this page · raw message
fs/xfs/scrub/btree.c +12 -12
@@ -161,20 +161,20 @@ xchk_btree_rec(if (cur->bc_nlevels ==1 )return ; -/* Is this at least as large as the parent low key? */ +/* Is low_key(rec) at least as large as the parent low key? */ cur->bc_ops->init_key_from_rec (&key, rec); keyblock =xfs_btree_get_block (cur,1 , &bp); keyp =xfs_btree_key_addr (cur, cur->bc_levels[1 ].ptr, keyblock); -if (cur->bc_ops->diff_two_keys (cur, &key, keyp) <0 ) +if (xfs_btree_keycmp_lt (cur, &key, keyp))xchk_btree_set_corrupt (bs->sc, cur,1 );if (!(cur->bc_flags &XFS_BTREE_OVERLAPPING ))return ; -/* Is this no larger than the parent high key? */ +/* Is high_key(rec) no larger than the parent high key? */ cur->bc_ops->init_high_key_from_rec (&hkey, rec); keyp =xfs_btree_high_key_addr (cur, cur->bc_levels[1 ].ptr, keyblock); -if (cur->bc_ops->diff_two_keys (cur, keyp, &hkey) <0 ) +if (xfs_btree_keycmp_lt (cur, keyp, &hkey))xchk_btree_set_corrupt (bs->sc, cur,1 ); }
@@ -209,20 +209,20 @@ xchk_btree_key(if (level +1 >= cur->bc_nlevels)return ; -/* Is this at least as large as the parent low key? */ +/* Is this block's low key at least as large as the parent low key? */ keyblock =xfs_btree_get_block (cur, level +1 , &bp); keyp =xfs_btree_key_addr (cur, cur->bc_levels[level +1 ].ptr, keyblock); -if (cur->bc_ops->diff_two_keys (cur, key, keyp) <0 ) +if (xfs_btree_keycmp_lt (cur, key, keyp))xchk_btree_set_corrupt (bs->sc, cur, level);if (!(cur->bc_flags &XFS_BTREE_OVERLAPPING ))return ; -/* Is this no larger than the parent high key? */ +/* Is this block's high key no larger than the parent high key? */ key =xfs_btree_high_key_addr (cur, cur->bc_levels[level].ptr, block); keyp =xfs_btree_high_key_addr (cur, cur->bc_levels[level +1 ].ptr, keyblock); -if (cur->bc_ops->diff_two_keys (cur, keyp, key) <0 ) +if (xfs_btree_keycmp_lt (cur, keyp, key))xchk_btree_set_corrupt (bs->sc, cur, level); }
@@ -557,7 +557,7 @@ xchk_btree_block_check_keys( parent_block =xfs_btree_get_block (cur, level +1 , &bp); parent_low_key =xfs_btree_key_addr (cur, cur->bc_levels[level +1 ].ptr, parent_block); -if (cur->bc_ops->diff_two_keys (cur, &block_key, parent_low_key)) { +if (xfs_btree_keycmp_ne (cur, &block_key, parent_low_key)) {xchk_btree_set_corrupt (bs->sc, bs->cur, level);return ; }
@@ -569,7 +569,7 @@ xchk_btree_block_check_keys( parent_high_key =xfs_btree_high_key_addr (cur, cur->bc_levels[level +1 ].ptr, parent_block); block_high_key =xfs_btree_high_key_from_key (cur, &block_key); -if (cur->bc_ops->diff_two_keys (cur, block_high_key, parent_high_key)) +if (xfs_btree_keycmp_ne (cur, block_high_key, parent_high_key))xchk_btree_set_corrupt (bs->sc, bs->cur, level); }
@@ -661,7 +661,7 @@ xchk_btree_block_keys( parent_keys =xfs_btree_key_addr (cur, cur->bc_levels[level +1 ].ptr, parent_block); -if (cur->bc_ops->diff_two_keys (cur, &block_keys, parent_keys) !=0 ) +if (xfs_btree_keycmp_ne (cur, &block_keys, parent_keys))xchk_btree_set_corrupt (bs->sc, cur,1 );if (!(cur->bc_flags &XFS_BTREE_OVERLAPPING ))
@@ -672,7 +672,7 @@ xchk_btree_block_keys( high_pk =xfs_btree_high_key_addr (cur, cur->bc_levels[level +1 ].ptr, parent_block); -if (cur->bc_ops->diff_two_keys (cur, high_bk, high_pk) !=0 ) +if (xfs_btree_keycmp_ne (cur, high_bk, high_pk))xchk_btree_set_corrupt (bs->sc, cur,1 ); }
PATCH 3/6 xfs: replace xfs_btree_has_record with a general keyspace scanner
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
The current implementation of xfs_btree_has_record returns true if it finds /any/ record within the given range. Unfortunately, that's not sufficient for scrub. We want to be able to tell if a range of keyspace for a btree is devoid of records, is totally mapped to records, or is somewhere in between. By forcing this to be a boolean, we conflated sparseness and fullness, which caused scrub to return incorrect results. Fix the API so that we can tell the caller which of those three is the current state.
--- fs/xfs/libxfs/xfs_alloc.c | 11 ++-- fs/xfs/libxfs/xfs_alloc.h | 4 + fs/xfs/libxfs/xfs_alloc_btree.c | 12 ++++ fs/xfs/libxfs/xfs_bmap_btree.c | 11 ++++ fs/xfs/libxfs/xfs_btree.c | 108 ++++++++++++++++++++++++++++++++---- fs/xfs/libxfs/xfs_btree.h | 44 ++++++++++++++- fs/xfs/libxfs/xfs_ialloc_btree.c | 12 ++++ fs/xfs/libxfs/xfs_refcount.c | 11 ++-- fs/xfs/libxfs/xfs_refcount.h | 4 + fs/xfs/libxfs/xfs_refcount_btree.c | 11 ++++ fs/xfs/libxfs/xfs_rmap.c | 12 +++- fs/xfs/libxfs/xfs_rmap.h | 4 + fs/xfs/libxfs/xfs_rmap_btree.c | 16 +++++ fs/xfs/libxfs/xfs_types.h | 12 ++++ fs/xfs/scrub/alloc.c | 6 +- fs/xfs/scrub/refcount.c | 8 +-- fs/xfs/scrub/rmap.c | 6 +- 17 files changed, 249 insertions(+), 43 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +7 -4
@@ -3530,13 +3530,16 @@ xfs_alloc_query_all(return xfs_btree_query_all (cur, xfs_alloc_query_range_helper, &query); } -/* Is there a record covering a given extent? */ +/* +* Scan part of the keyspace of the free space and tell us if the area has no +* records, is fully mapped by records, or is partially filled. +*/ int -xfs_alloc_has_record ( +xfs_alloc_has_records (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len, -bool *exists) +enum xbtree_recpacking *outcome) {union xfs_btree_irec low;union xfs_btree_irec high;
@@ -3546,7 +3549,7 @@ xfs_alloc_has_record(memset (&high,0xFF ,sizeof (high)); high.a.ar_startblock = bno + len -1 ; -return xfs_btree_has_record (cur, &low, &high, exists); +return xfs_btree_has_records (cur, &low, &high, outcome); }/*
fs/xfs/libxfs/xfs_alloc.h +2 -2
@@ -202,8 +202,8 @@ int xfs_alloc_query_range(struct xfs_btree_cur *cur,int xfs_alloc_query_all (struct xfs_btree_cur *cur,xfs_alloc_query_range_fn fn,void *priv); -int xfs_alloc_has_record (struct xfs_btree_cur *cur,xfs_agblock_t bno, -xfs_extlen_t len,bool *exist); +int xfs_alloc_has_records (struct xfs_btree_cur *cur,xfs_agblock_t bno, +xfs_extlen_t len,enum xbtree_recpacking *outcome);typedef int (*xfs_agfl_walk_fn )(struct xfs_mount *mp,xfs_agblock_t bno,void *priv);
fs/xfs/libxfs/xfs_alloc_btree.c +12 -0
@@ -423,6 +423,16 @@ xfs_cntbt_recs_inorder( be32_to_cpu(r2->alloc.ar_startblock)); } +STATIC enum xbtree_key_contig +xfs_allocbt_keys_contiguous ( +struct xfs_btree_cur *cur, +const union xfs_btree_key *key1, +const union xfs_btree_key *key2) +{ +return xbtree_key_contig (be32_to_cpu (key1->alloc.ar_startblock), +be32_to_cpu (key2->alloc.ar_startblock)); +} +static const struct xfs_btree_ops xfs_bnobt_ops = { .rec_len =sizeof (xfs_alloc_rec_t), .key_len =sizeof (xfs_alloc_key_t),
@@ -443,6 +453,7 @@ static const struct xfs_btree_ops xfs_bnobt_ops = { .diff_two_keys = xfs_bnobt_diff_two_keys, .keys_inorder = xfs_bnobt_keys_inorder, .recs_inorder = xfs_bnobt_recs_inorder, + .keys_contiguous = xfs_allocbt_keys_contiguous, };static const struct xfs_btree_ops xfs_cntbt_ops = {
@@ -465,6 +476,7 @@ static const struct xfs_btree_ops xfs_cntbt_ops = { .diff_two_keys = xfs_cntbt_diff_two_keys, .keys_inorder = xfs_cntbt_keys_inorder, .recs_inorder = xfs_cntbt_recs_inorder, + .keys_contiguous = NULL, /* not needed right now */ };/* Allocate most of a new allocation btree cursor. */
fs/xfs/libxfs/xfs_bmap_btree.c +11 -0
@@ -518,6 +518,16 @@ xfs_bmbt_recs_inorder(xfs_bmbt_disk_get_startoff (&r2->bmbt); } +STATIC enum xbtree_key_contig +xfs_bmbt_keys_contiguous ( +struct xfs_btree_cur *cur, +const union xfs_btree_key *key1, +const union xfs_btree_key *key2) +{ +return xbtree_key_contig (be64_to_cpu (key1->bmbt.br_startoff), +be64_to_cpu (key2->bmbt.br_startoff)); +} +static const struct xfs_btree_ops xfs_bmbt_ops = { .rec_len =sizeof (xfs_bmbt_rec_t), .key_len =sizeof (xfs_bmbt_key_t),
@@ -538,6 +548,7 @@ static const struct xfs_btree_ops xfs_bmbt_ops = { .buf_ops = &xfs_bmbt_buf_ops, .keys_inorder = xfs_bmbt_keys_inorder, .recs_inorder = xfs_bmbt_recs_inorder, + .keys_contiguous = xfs_bmbt_keys_contiguous, };/*
fs/xfs/libxfs/xfs_btree.c +95 -13
129 lines not on this page · raw message
fs/xfs/libxfs/xfs_btree.h +42 -2
63 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc_btree.c +12 -0
@@ -383,6 +383,16 @@ xfs_inobt_recs_inorder(be32_to_cpu (r2->inobt.ir_startino); } +STATIC enum xbtree_key_contig +xfs_inobt_keys_contiguous ( +struct xfs_btree_cur *cur, +const union xfs_btree_key *key1, +const union xfs_btree_key *key2) +{ +return xbtree_key_contig (be32_to_cpu (key1->inobt.ir_startino), +be32_to_cpu (key2->inobt.ir_startino)); +} +static const struct xfs_btree_ops xfs_inobt_ops = { .rec_len =sizeof (xfs_inobt_rec_t), .key_len =sizeof (xfs_inobt_key_t),
@@ -402,6 +412,7 @@ static const struct xfs_btree_ops xfs_inobt_ops = { .diff_two_keys = xfs_inobt_diff_two_keys, .keys_inorder = xfs_inobt_keys_inorder, .recs_inorder = xfs_inobt_recs_inorder, + .keys_contiguous = xfs_inobt_keys_contiguous, };static const struct xfs_btree_ops xfs_finobt_ops = {
@@ -423,6 +434,7 @@ static const struct xfs_btree_ops xfs_finobt_ops = { .diff_two_keys = xfs_inobt_diff_two_keys, .keys_inorder = xfs_inobt_keys_inorder, .recs_inorder = xfs_inobt_recs_inorder, + .keys_contiguous = xfs_inobt_keys_contiguous, };/*
fs/xfs/libxfs/xfs_refcount.c +7 -4
@@ -1998,14 +1998,17 @@ xfs_refcount_recover_cow_leftovers(return error; } -/* Is there a record covering a given extent? */ +/* +* Scan part of the keyspace of the refcount records and tell us if the area +* has no records, is fully mapped by records, or is partially filled. +*/ int -xfs_refcount_has_record ( +xfs_refcount_has_records (struct xfs_btree_cur *cur,enum xfs_refc_domain domain,xfs_agblock_t bno,xfs_extlen_t len, -bool *exists) +enum xbtree_recpacking *outcome) {union xfs_btree_irec low;union xfs_btree_irec high;
@@ -2016,7 +2019,7 @@ xfs_refcount_has_record( high.rc.rc_startblock = bno + len -1 ; low.rc.rc_domain = high.rc.rc_domain = domain; -return xfs_btree_has_record (cur, &low, &high, exists); +return xfs_btree_has_records (cur, &low, &high, outcome); }int __init
fs/xfs/libxfs/xfs_refcount.h +2 -2
@@ -111,9 +111,9 @@ extern int xfs_refcount_recover_cow_leftovers(struct xfs_mount *mp,*/ #define XFS_REFCOUNT_ITEM_OVERHEAD 32 -extern int xfs_refcount_has_record (struct xfs_btree_cur *cur, +extern int xfs_refcount_has_records (struct xfs_btree_cur *cur,enum xfs_refc_domain domain,xfs_agblock_t bno, -xfs_extlen_t len,bool *exists); +xfs_extlen_t len,enum xbtree_recpacking *outcome);union xfs_btree_rec ;extern void xfs_refcount_btrec_to_irec (const union xfs_btree_rec *rec,struct xfs_refcount_irec *irec);
fs/xfs/libxfs/xfs_refcount_btree.c +11 -0
@@ -300,6 +300,16 @@ xfs_refcountbt_recs_inorder(be32_to_cpu (r2->refc.rc_startblock); } +STATIC enum xbtree_key_contig +xfs_refcountbt_keys_contiguous ( +struct xfs_btree_cur *cur, +const union xfs_btree_key *key1, +const union xfs_btree_key *key2) +{ +return xbtree_key_contig (be32_to_cpu (key1->refc.rc_startblock), +be32_to_cpu (key2->refc.rc_startblock)); +} +static const struct xfs_btree_ops xfs_refcountbt_ops = { .rec_len =sizeof (struct xfs_refcount_rec ), .key_len =sizeof (struct xfs_refcount_key ),
@@ -319,6 +329,7 @@ static const struct xfs_btree_ops xfs_refcountbt_ops = { .diff_two_keys = xfs_refcountbt_diff_two_keys, .keys_inorder = xfs_refcountbt_keys_inorder, .recs_inorder = xfs_refcountbt_recs_inorder, + .keys_contiguous = xfs_refcountbt_keys_contiguous, };/*
fs/xfs/libxfs/xfs_rmap.c +8 -4
@@ -2709,13 +2709,17 @@ xfs_rmap_compare(return 0 ; } -/* Is there a record covering a given extent? */ +/* +* Scan the physical storage part of the keyspace of the reverse mapping index +* and tell us if the area has no records, is fully mapped by records, or is +* partially filled. +*/ int -xfs_rmap_has_record ( +xfs_rmap_has_records (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len, -bool *exists) +enum xbtree_recpacking *outcome) {union xfs_btree_irec low;union xfs_btree_irec high;
@@ -2725,7 +2729,7 @@ xfs_rmap_has_record(memset (&high,0xFF ,sizeof (high)); high.r.rm_startblock = bno + len -1 ; -return xfs_btree_has_record (cur, &low, &high, exists); +return xfs_btree_has_records (cur, &low, &high, outcome); }/*
fs/xfs/libxfs/xfs_rmap.h +2 -2
@@ -198,8 +198,8 @@ xfs_failaddr_t xfs_rmap_btrec_to_irec(const union xfs_btree_rec *rec,xfs_failaddr_t xfs_rmap_check_irec (struct xfs_btree_cur *cur,const struct xfs_rmap_irec *irec); -int xfs_rmap_has_record (struct xfs_btree_cur *cur,xfs_agblock_t bno, -xfs_extlen_t len,bool *exists); +int xfs_rmap_has_records (struct xfs_btree_cur *cur,xfs_agblock_t bno, +xfs_extlen_t len,enum xbtree_recpacking *outcome);int xfs_rmap_record_exists (struct xfs_btree_cur *cur,xfs_agblock_t bno,xfs_extlen_t len,const struct xfs_owner_info *oinfo,bool *has_rmap);
fs/xfs/libxfs/xfs_rmap_btree.c +16 -0
@@ -444,6 +444,21 @@ xfs_rmapbt_recs_inorder(return 0 ; } +STATIC enum xbtree_key_contig +xfs_rmapbt_keys_contiguous ( +struct xfs_btree_cur *cur, +const union xfs_btree_key *key1, +const union xfs_btree_key *key2) +{ +/* +* We only support checking contiguity of the physical space component. +* If any callers ever need more specificity than that, they'll have to +* implement it here. +*/ +return xbtree_key_contig (be32_to_cpu (key1->rmap.rm_startblock), +be32_to_cpu (key2->rmap.rm_startblock)); +} +static const struct xfs_btree_ops xfs_rmapbt_ops = { .rec_len =sizeof (struct xfs_rmap_rec ), .key_len =2 *sizeof (struct xfs_rmap_key ),
@@ -463,6 +478,7 @@ static const struct xfs_btree_ops xfs_rmapbt_ops = { .diff_two_keys = xfs_rmapbt_diff_two_keys, .keys_inorder = xfs_rmapbt_keys_inorder, .recs_inorder = xfs_rmapbt_recs_inorder, + .keys_contiguous = xfs_rmapbt_keys_contiguous, }; static struct xfs_btree_cur *
fs/xfs/libxfs/xfs_types.h +12 -0
@@ -204,6 +204,18 @@ enum xfs_ag_resv_type { XFS_AG_RESV_RMAPBT, }; +/* Results of scanning a btree keyspace to check occupancy. */ +enum xbtree_recpacking { +/* None of the keyspace maps to records. */ +XBTREE_RECPACKING_EMPTY =0 , + +/* Some, but not all, of the keyspace maps to records. */ +XBTREE_RECPACKING_SPARSE , + +/* The entire keyspace maps to records. */ +XBTREE_RECPACKING_FULL , +}; +/* * Type verifier functions */
fs/xfs/scrub/alloc.c +3 -3
@@ -144,15 +144,15 @@ xchk_xref_is_used_space( xfs_agblock_t agbno, xfs_extlen_t len) { - bool is_freesp; +enum xbtree_recpacking outcome;int error;if (!sc->sa.bno_cur ||xchk_skip_xref (sc->sm))return ; - error =xfs_alloc_has_record (sc->sa.bno_cur, agbno, len, &is_freesp); + error =xfs_alloc_has_records (sc->sa.bno_cur, agbno, len, &outcome);if (!xchk_should_check_xref (sc, &error, &sc->sa.bno_cur))return ; -if (is_freesp) +if (outcome !=XBTREE_RECPACKING_EMPTY )xchk_btree_xref_set_corrupt (sc, sc->sa.bno_cur,0 ); }
fs/xfs/scrub/refcount.c +4 -4
@@ -457,16 +457,16 @@ xchk_xref_is_not_shared( xfs_agblock_t agbno, xfs_extlen_t len) { - bool shared; +enum xbtree_recpacking outcome;int error;if (!sc->sa.refc_cur ||xchk_skip_xref (sc->sm))return ; - error =xfs_refcount_has_record (sc->sa.refc_cur,XFS_REFC_DOMAIN_SHARED , - agbno, len, &shared); + error =xfs_refcount_has_records (sc->sa.refc_cur, +XFS_REFC_DOMAIN_SHARED , agbno, len, &outcome);if (!xchk_should_check_xref (sc, &error, &sc->sa.refc_cur))return ; -if (shared) +if (outcome !=XBTREE_RECPACKING_EMPTY )xchk_btree_xref_set_corrupt (sc, sc->sa.refc_cur,0 ); }
fs/xfs/scrub/rmap.c +3 -3
@@ -219,15 +219,15 @@ xchk_xref_has_no_owner( xfs_agblock_t bno, xfs_extlen_t len) { - bool has_rmap; +enum xbtree_recpacking outcome;int error;if (!sc->sa.rmap_cur ||xchk_skip_xref (sc->sm))return ; - error =xfs_rmap_has_record (sc->sa.rmap_cur, bno, len, &has_rmap); + error =xfs_rmap_has_records (sc->sa.rmap_cur, bno, len, &outcome);if (!xchk_should_check_xref (sc, &error, &sc->sa.rmap_cur))return ; -if (has_rmap) +if (outcome !=XBTREE_RECPACKING_EMPTY )xchk_btree_xref_set_corrupt (sc, sc->sa.rmap_cur,0 ); }
PATCH 4/6 xfs: implement masked btree key comparisons for _has_records scans
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
For keyspace fullness scans, we want to be able to mask off the parts of the key that we don't care about. For most btree types we /do/ want the full keyspace, but for checking that a given space usage also has a full complement of rmapbt records (even if different/multiple owners) we need this masking so that we only track sparseness of rm_startblock, not the whole keyspace (which is extremely sparse).
Augment the ->diff_two_keys and ->keys_contiguous helpers to take a third union xfs_btree_key argument, and wire up xfs_rmap_has_records to pass this through. This third "mask" argument should contain a nonzero value in each structure field that should be used in the key comparisons done during the scan.
--- fs/xfs/libxfs/xfs_alloc.c | 2 + fs/xfs/libxfs/xfs_alloc_btree.c | 18 ++++++++++--- fs/xfs/libxfs/xfs_bmap_btree.c | 10 ++++++- fs/xfs/libxfs/xfs_btree.c | 24 ++++++++++++++--- fs/xfs/libxfs/xfs_btree.h | 50 ++++++++++++++++++++++++++++++++---- fs/xfs/libxfs/xfs_ialloc_btree.c | 12 ++++++--- fs/xfs/libxfs/xfs_refcount.c | 2 + fs/xfs/libxfs/xfs_refcount_btree.c | 12 ++++++--- fs/xfs/libxfs/xfs_rmap.c | 5 +++- fs/xfs/libxfs/xfs_rmap_btree.c | 47 +++++++++++++++++++++++----------- 10 files changed, 142 insertions(+), 40 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +1 -1
@@ -3549,7 +3549,7 @@ xfs_alloc_has_records(memset (&high,0xFF ,sizeof (high)); high.a.ar_startblock = bno + len -1 ; -return xfs_btree_has_records (cur, &low, &high, outcome); +return xfs_btree_has_records (cur, &low, &high,NULL , outcome); }/*
fs/xfs/libxfs/xfs_alloc_btree.c +14 -4
@@ -260,20 +260,27 @@ STATIC int64_txfs_bnobt_diff_two_keys ( struct xfs_btree_cur *cur, const union xfs_btree_key *k1, - const union xfs_btree_key *k2) + const union xfs_btree_key *k2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->alloc.ar_startblock); +return (int64_t )be32_to_cpu (k1->alloc.ar_startblock) - - be32_to_cpu(k2->alloc.ar_startblock); +be32_to_cpu (k2->alloc.ar_startblock); } STATIC int64_txfs_cntbt_diff_two_keys (struct xfs_btree_cur *cur,const union xfs_btree_key *k1, -const union xfs_btree_key *k2) +const union xfs_btree_key *k2, +const union xfs_btree_key *mask) {int64_t diff; +ASSERT (!mask || (mask->alloc.ar_blockcount && + mask->alloc.ar_startblock)); + diff =be32_to_cpu (k1->alloc.ar_blockcount) -be32_to_cpu (k2->alloc.ar_blockcount);if (diff)
@@ -427,8 +434,11 @@ STATIC enum xbtree_key_contigxfs_allocbt_keys_contiguous ( struct xfs_btree_cur *cur, const union xfs_btree_key *key1, - const union xfs_btree_key *key2) + const union xfs_btree_key *key2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->alloc.ar_startblock); +return xbtree_key_contig (be32_to_cpu (key1->alloc.ar_startblock),be32_to_cpu (key2->alloc.ar_startblock)); }
fs/xfs/libxfs/xfs_bmap_btree.c +8 -2
@@ -400,11 +400,14 @@ STATIC int64_txfs_bmbt_diff_two_keys ( struct xfs_btree_cur *cur, const union xfs_btree_key *k1, - const union xfs_btree_key *k2) + const union xfs_btree_key *k2, + const union xfs_btree_key *mask) { uint64_t a = be64_to_cpu(k1->bmbt.br_startoff);uint64_t b =be64_to_cpu (k2->bmbt.br_startoff); +ASSERT (!mask || mask->bmbt.br_startoff); +/* * Note: This routine previously casted a and b to int64 and subtracted * them to generate a result. This lead to problems if b was the
@@ -522,8 +525,11 @@ STATIC enum xbtree_key_contigxfs_bmbt_keys_contiguous ( struct xfs_btree_cur *cur, const union xfs_btree_key *key1, - const union xfs_btree_key *key2) + const union xfs_btree_key *key2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->bmbt.br_startoff); +return xbtree_key_contig (be64_to_cpu (key1->bmbt.br_startoff),be64_to_cpu (key2->bmbt.br_startoff)); }
fs/xfs/libxfs/xfs_btree.c +20 -4
@@ -5016,6 +5016,9 @@ struct xfs_btree_has_records {union xfs_btree_key start_key;union xfs_btree_key end_key; +/* Mask for key comparisons, if desired. */ +const union xfs_btree_key *key_mask; +/* Highest record key we've seen so far. */ union xfs_btree_key high_key;
@@ -5043,7 +5046,8 @@ xfs_btree_has_records_helper(* then there is a hole at the start of the search range. * Classify this as sparse and stop immediately. */ -if (xfs_btree_keycmp_lt (cur, &info->start_key, &rec_key)) +if (xfs_btree_masked_keycmp_lt (cur, &info->start_key, &rec_key, + info->key_mask))return -ECANCELED ; }else {/*
@@ -5054,7 +5058,7 @@ xfs_btree_has_records_helper(* signal corruption. */ key_contig = cur->bc_ops->keys_contiguous (cur, &info->high_key, - &rec_key); + &rec_key, info->key_mask);if (key_contig ==XBTREE_KEY_OVERLAP && !(cur->bc_flags &XFS_BTREE_OVERLAPPING ))return -EFSCORRUPTED ;
@@ -5067,7 +5071,8 @@ xfs_btree_has_records_helper(* remember it for later. */ cur->bc_ops->init_high_key_from_rec (&rec_high_key, rec); -if (xfs_btree_keycmp_gt (cur, &rec_high_key, &info->high_key)) +if (xfs_btree_masked_keycmp_gt (cur, &rec_high_key, &info->high_key, + info->key_mask)) info->high_key = rec_high_key;/* struct copy */ return 0 ;
@@ -5078,16 +5083,26 @@ xfs_btree_has_records_helper(* map to any records; is fully mapped to records; or is partially mapped to * records. This is the btree record equivalent to determining if a file is * sparse. +* +* For most btree types, the record scan should use all available btree key +* fields to compare the keys encountered. These callers should pass NULL for +* @mask. However, some callers (e.g. scanning physical space in the rmapbt) +* want to ignore some part of the btree record keyspace when performing the +* comparison. These callers should pass in a union xfs_btree_key object with +* the fields that *should* be a part of the comparison set to any nonzero +* value, and the rest zeroed. */ int xfs_btree_has_records (struct xfs_btree_cur *cur,const union xfs_btree_irec *low,const union xfs_btree_irec *high, +const union xfs_btree_key *mask,enum xbtree_recpacking *outcome) {struct xfs_btree_has_records info = { .outcome =XBTREE_RECPACKING_EMPTY , + .key_mask = mask, };int error;
@@ -5115,7 +5130,8 @@ xfs_btree_has_records(* the end of the search range, classify this as full. Otherwise, * there is a hole at the end of the search range. */ -if (xfs_btree_keycmp_ge (cur, &info.high_key, &info.end_key)) +if (xfs_btree_masked_keycmp_ge (cur, &info.high_key, &info.end_key, + mask)) info.outcome =XBTREE_RECPACKING_FULL ; out:
fs/xfs/libxfs/xfs_btree.h +44 -6
98 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc_btree.c +9 -3
@@ -269,10 +269,13 @@ STATIC int64_txfs_inobt_diff_two_keys ( struct xfs_btree_cur *cur, const union xfs_btree_key *k1, - const union xfs_btree_key *k2) + const union xfs_btree_key *k2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->inobt.ir_startino); +return (int64_t )be32_to_cpu (k1->inobt.ir_startino) - - be32_to_cpu(k2->inobt.ir_startino); +be32_to_cpu (k2->inobt.ir_startino); } static xfs_failaddr_t
@@ -387,8 +390,11 @@ STATIC enum xbtree_key_contigxfs_inobt_keys_contiguous ( struct xfs_btree_cur *cur, const union xfs_btree_key *key1, - const union xfs_btree_key *key2) + const union xfs_btree_key *key2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->inobt.ir_startino); +return xbtree_key_contig (be32_to_cpu (key1->inobt.ir_startino),be32_to_cpu (key2->inobt.ir_startino)); }
fs/xfs/libxfs/xfs_refcount.c +1 -1
@@ -2019,7 +2019,7 @@ xfs_refcount_has_records( high.rc.rc_startblock = bno + len -1 ; low.rc.rc_domain = high.rc.rc_domain = domain; -return xfs_btree_has_records (cur, &low, &high, outcome); +return xfs_btree_has_records (cur, &low, &high,NULL , outcome); }int __init
fs/xfs/libxfs/xfs_refcount_btree.c +9 -3
@@ -202,10 +202,13 @@ STATIC int64_txfs_refcountbt_diff_two_keys ( struct xfs_btree_cur *cur, const union xfs_btree_key *k1, - const union xfs_btree_key *k2) + const union xfs_btree_key *k2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->refc.rc_startblock); +return (int64_t )be32_to_cpu (k1->refc.rc_startblock) - - be32_to_cpu(k2->refc.rc_startblock); +be32_to_cpu (k2->refc.rc_startblock); }STATIC xfs_failaddr_t
@@ -304,8 +307,11 @@ STATIC enum xbtree_key_contigxfs_refcountbt_keys_contiguous ( struct xfs_btree_cur *cur, const union xfs_btree_key *key1, - const union xfs_btree_key *key2) + const union xfs_btree_key *key2, + const union xfs_btree_key *mask) { + ASSERT(!mask || mask->refc.rc_startblock); +return xbtree_key_contig (be32_to_cpu (key1->refc.rc_startblock),be32_to_cpu (key2->refc.rc_startblock)); }
fs/xfs/libxfs/xfs_rmap.c +4 -1
@@ -2721,6 +2721,9 @@ xfs_rmap_has_records(xfs_extlen_t len, enum xbtree_recpacking *outcome) { + union xfs_btree_key mask = { + .rmap.rm_startblock =cpu_to_be32 (-1U ), + };union xfs_btree_irec low;union xfs_btree_irec high;
@@ -2729,7 +2732,7 @@ xfs_rmap_has_records(memset (&high,0xFF ,sizeof (high)); high.r.rm_startblock = bno + len -1 ; -return xfs_btree_has_records (cur, &low, &high, outcome); +return xfs_btree_has_records (cur, &low, &high, &mask, outcome); }/*
fs/xfs/libxfs/xfs_rmap_btree.c +32 -15
76 lines not on this page · raw message
PATCH 5/6 xfs: check the reference counts of gaps in the refcount btree
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Gaps in the reference count btree are also significant -- for these regions, there must not be any overlapping reverse mappings. We don't currently check this, so make the refcount scrubber more complete.
--- fs/xfs/scrub/refcount.c | 95 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 5 deletions(-)
fs/xfs/scrub/refcount.c +90 -5
@@ -332,6 +332,64 @@ xchk_refcountbt_xref(xchk_refcountbt_xref_rmap (sc, irec); } +struct xchk_refcbt_records { +/* The next AG block where we aren't expecting shared extents. */ +xfs_agblock_t next_unshared_agbno; + +/* Number of CoW blocks we expect. */ +xfs_agblock_t cow_blocks; + +/* Was the last record a shared or CoW staging extent? */ +enum xfs_refc_domain prev_domain; +}; + +STATIC int +xchk_refcountbt_rmap_check_gap ( +struct xfs_btree_cur *cur, +const struct xfs_rmap_irec *rec, +void *priv) +{ +xfs_agblock_t *next_bno = priv; + +if (*next_bno !=NULLAGBLOCK && rec->rm_startblock < *next_bno) +return -ECANCELED ; + + *next_bno = rec->rm_startblock + rec->rm_blockcount; +return 0 ; +} + +/* +* Make sure that a gap in the reference count records does not correspond to +* overlapping records (i.e. shared extents) in the reverse mappings. +*/ +static inline void +xchk_refcountbt_xref_gaps ( +struct xfs_scrub *sc, +struct xchk_refcbt_records *rrc, +xfs_agblock_t bno) +{ +struct xfs_rmap_irec low; +struct xfs_rmap_irec high; +xfs_agblock_t next_bno =NULLAGBLOCK ; +int error; + +if (bno <= rrc->next_unshared_agbno || !sc->sa.rmap_cur || +xchk_skip_xref (sc->sm)) +return ; + +memset (&low,0 ,sizeof (low)); + low.rm_startblock = rrc->next_unshared_agbno; +memset (&high,0xFF ,sizeof (high)); + high.rm_startblock = bno -1 ; + + error =xfs_rmap_query_range (sc->sa.rmap_cur, &low, &high, + xchk_refcountbt_rmap_check_gap, &next_bno); +if (error == -ECANCELED ) +xchk_btree_xref_set_corrupt (sc, sc->sa.rmap_cur,0 ); +else +xchk_should_check_xref (sc, &error, &sc->sa.rmap_cur); +} +/* Scrub a refcountbt record. */ STATIC int xchk_refcountbt_rec(
@@ -339,7 +397,7 @@ xchk_refcountbt_rec( const union xfs_btree_rec *rec) {struct xfs_refcount_irec irec; -xfs_agblock_t *cow_blocks = bs->private; +struct xchk_refcbt_records *rrc = bs->private;xfs_refcount_btrec_to_irec (rec, &irec);if (xfs_refcount_check_irec (bs->cur, &irec) !=NULL ) {
@@ -348,10 +406,27 @@ xchk_refcountbt_rec( }if (irec.rc_domain ==XFS_REFC_DOMAIN_COW ) - (*cow_blocks) += irec.rc_blockcount; + rrc->cow_blocks += irec.rc_blockcount; + +/* Shared records always come before CoW records. */ +if (irec.rc_domain ==XFS_REFC_DOMAIN_SHARED && + rrc->prev_domain ==XFS_REFC_DOMAIN_COW ) +xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); + rrc->prev_domain = irec.rc_domain;xchk_refcountbt_xref (bs->sc, &irec); +/* +* If this is a record for a shared extent, check that all blocks +* between the previous record and this one have at most one reverse +* mapping. +*/ +if (irec.rc_domain ==XFS_REFC_DOMAIN_SHARED ) { +xchk_refcountbt_xref_gaps (bs->sc, rrc, irec.rc_startblock); + rrc->next_unshared_agbno = irec.rc_startblock + + irec.rc_blockcount; + } +return 0 ; }
@@ -393,15 +468,25 @@ intxchk_refcountbt ( struct xfs_scrub *sc) { -xfs_agblock_t cow_blocks =0 ; +struct xchk_refcbt_records rrc = { + .cow_blocks =0 , + .next_unshared_agbno =0 , + .prev_domain =XFS_REFC_DOMAIN_SHARED , + };int error; error =xchk_btree (sc, sc->sa.refc_cur, xchk_refcountbt_rec, - &XFS_RMAP_OINFO_REFC , &cow_blocks); + &XFS_RMAP_OINFO_REFC , &rrc);if (error)return error; -xchk_refcount_xref_rmap (sc, cow_blocks); +/* +* Check that all blocks between the last refcount > 1 record and the +* end of the AG have at most one reverse mapping. +*/ +xchk_refcountbt_xref_gaps (sc, &rrc, sc->mp->m_sb.sb_agblocks); + +xchk_refcount_xref_rmap (sc, rrc.cow_blocks);return 0 ; }
PATCH 6/6 xfs: ensure that all metadata and data blocks are not cow staging extents
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Make sure that all filesystem metadata blocks and file data blocks are not also marked as CoW staging extents. The extra checking added here was inspired by an actual VM host filesystem corruption incident due to bugs in the CoW handling of 4.x kernels.
--- fs/xfs/scrub/agheader.c | 5 +++++ fs/xfs/scrub/alloc.c | 1 + fs/xfs/scrub/bmap.c | 11 ++++++++--- fs/xfs/scrub/ialloc.c | 2 +- fs/xfs/scrub/inode.c | 1 + fs/xfs/scrub/refcount.c | 21 +++++++++++++++++++++ fs/xfs/scrub/scrub.h | 2 ++ 7 files changed, 39 insertions(+), 4 deletions(-)
fs/xfs/scrub/agheader.c +5 -0
@@ -53,6 +53,7 @@ xchk_superblock_xref(xchk_xref_is_not_inode_chunk (sc, agbno,1 );xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_FS );xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 );/* scrub teardown will take care of sc->sa for us */ }
@@ -517,6 +518,7 @@ xchk_agf_xref(xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_FS );xchk_agf_xref_btreeblks (sc);xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 );xchk_agf_xref_refcblks (sc);/* scrub teardown will take care of sc->sa for us */
@@ -644,6 +646,7 @@ xchk_agfl_block_xref(xchk_xref_is_not_inode_chunk (sc, agbno,1 );xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_AG );xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 ); }/* Scrub an AGFL block. */
@@ -700,6 +703,7 @@ xchk_agfl_xref(xchk_xref_is_not_inode_chunk (sc, agbno,1 );xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_FS );xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 );/* * Scrub teardown will take care of sc->sa for us. Leave sc->sa
@@ -855,6 +859,7 @@ xchk_agi_xref(xchk_agi_xref_icounts (sc);xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_FS );xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 );xchk_agi_xref_fiblocks (sc);/* scrub teardown will take care of sc->sa for us */
fs/xfs/scrub/alloc.c +1 -0
@@ -90,6 +90,7 @@ xchk_allocbt_xref(xchk_xref_is_not_inode_chunk (sc, agbno, len);xchk_xref_has_no_owner (sc, agbno, len);xchk_xref_is_not_shared (sc, agbno, len); +xchk_xref_is_not_cow_staging (sc, agbno, len); }/* Scrub a bnobt/cntbt record. */
fs/xfs/scrub/bmap.c +8 -3
@@ -328,12 +328,17 @@ xchk_bmap_iextent_xref(xchk_bmap_xref_rmap (info, irec, agbno);switch (info->whichfork) {case XFS_DATA_FORK : -if (xfs_is_reflink_inode (info->sc->ip)) -break ; - fallthrough; +if (!xfs_is_reflink_inode (info->sc->ip)) +xchk_xref_is_not_shared (info->sc, agbno, + irec->br_blockcount); +xchk_xref_is_not_cow_staging (info->sc, agbno, + irec->br_blockcount); +break ;case XFS_ATTR_FORK :xchk_xref_is_not_shared (info->sc, agbno, irec->br_blockcount); +xchk_xref_is_not_cow_staging (info->sc, agbno, + irec->br_blockcount);break ;case XFS_COW_FORK : xchk_xref_is_cow_staging(info->sc, agbno,
fs/xfs/scrub/ialloc.c +1 -1
@@ -115,7 +115,7 @@ xchk_iallocbt_chunk(xchk_btree_set_corrupt (bs->sc, bs->cur,0 );xchk_iallocbt_chunk_xref (bs->sc, irec, agino, bno, len); - +xchk_xref_is_not_cow_staging (bs->sc, bno, len);return true; }
fs/xfs/scrub/inode.c +1 -0
@@ -558,6 +558,7 @@ xchk_inode_xref(xchk_inode_xref_finobt (sc, ino);xchk_xref_is_owned_by (sc, agbno,1 , &XFS_RMAP_OINFO_INODES );xchk_xref_is_not_shared (sc, agbno,1 ); +xchk_xref_is_not_cow_staging (sc, agbno,1 );xchk_inode_xref_bmap (sc, dip); out_free:
fs/xfs/scrub/refcount.c +21 -0
@@ -555,3 +555,24 @@ xchk_xref_is_not_shared(if (outcome !=XBTREE_RECPACKING_EMPTY )xchk_btree_xref_set_corrupt (sc, sc->sa.refc_cur,0 ); } + +/* xref check that the extent is not being used for CoW staging. */ +void +xchk_xref_is_not_cow_staging ( +struct xfs_scrub *sc, +xfs_agblock_t agbno, +xfs_extlen_t len) +{ +enum xbtree_recpacking outcome; +int error; + +if (!sc->sa.refc_cur ||xchk_skip_xref (sc->sm)) +return ; + + error =xfs_refcount_has_records (sc->sa.refc_cur,XFS_REFC_DOMAIN_COW , + agbno, len, &outcome); +if (!xchk_should_check_xref (sc, &error, &sc->sa.refc_cur)) +return ; +if (outcome !=XBTREE_RECPACKING_EMPTY ) +xchk_btree_xref_set_corrupt (sc, sc->sa.refc_cur,0 ); +}
fs/xfs/scrub/scrub.h +2 -0
@@ -166,6 +166,8 @@ void xchk_xref_is_cow_staging(struct xfs_scrub *sc, xfs_agblock_t bno, xfs_extlen_t len);void xchk_xref_is_not_shared (struct xfs_scrub *sc,xfs_agblock_t bno,xfs_extlen_t len); +void xchk_xref_is_not_cow_staging (struct xfs_scrub *sc,xfs_agblock_t bno, +xfs_extlen_t len);#ifdef CONFIG_XFS_RT void xchk_xref_is_used_rt_space (struct xfs_scrub *sc,xfs_rtblock_t rtbno,xfs_extlen_t len);
PATCH 1/4 xfs: remove pointless shadow variable from xfs_difree_inobt
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
In xfs_difree_inobt, the pag passed in was previously used to look up the AGI buffer. There's no need to extract it again, so remove the shadow variable and shut up -Wshadow.
--- fs/xfs/libxfs/xfs_ialloc.c | 2 -- 1 file changed, 2 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +0 -2
@@ -1980,8 +1980,6 @@ xfs_difree_inobt(*/ if (!xfs_has_ikeep (mp) && rec.ir_free ==XFS_INOBT_ALL_FREE && mp->m_sb.sb_inopblock <=XFS_INODES_PER_CHUNK ) { -struct xfs_perag *pag = agbp->b_pag; - xic->deleted = true; xic->first_ino =XFS_AGINO_TO_INO (mp, pag->pag_agno, rec.ir_startino);
PATCH 2/4 xfs: clean up broken eearly-exit code in the inode btree scrubber
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Corrupt inode chunks should cause us to exit early after setting the CORRUPT flag on the scrub state. While we're at it, collapse trivial helpers.
--- fs/xfs/scrub/ialloc.c | 50 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 29 deletions(-)
fs/xfs/scrub/ialloc.c +21 -29
@@ -79,43 +79,32 @@ xchk_iallocbt_chunk_xref_other(xchk_btree_xref_set_corrupt (sc, *pcur,0 ); } -/* Cross-reference with the other btrees. */ -STATIC void -xchk_iallocbt_chunk_xref ( -struct xfs_scrub *sc, +/* Is this chunk worth checking and cross-referencing? */ +STATIC bool +xchk_iallocbt_chunk ( +struct xchk_btree *bs,struct xfs_inobt_rec_incore *irec,xfs_agino_t agino, -xfs_agblock_t agbno,xfs_extlen_t len) { -if (sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ) -return ; +struct xfs_scrub *sc = bs->sc; +struct xfs_mount *mp = bs->cur->bc_mp; +struct xfs_perag *pag = bs->cur->bc_ag.pag; +xfs_agblock_t agbno; + + agbno =XFS_AGINO_TO_AGBNO (mp, agino); + +if (!xfs_verify_agbext (pag, agbno, len)) +xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); + +if (bs->sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ) +return false;xchk_xref_is_used_space (sc, agbno, len);xchk_iallocbt_chunk_xref_other (sc, irec, agino);xchk_xref_is_owned_by (sc, agbno, len, &XFS_RMAP_OINFO_INODES );xchk_xref_is_not_shared (sc, agbno, len); -} - -/* Is this chunk worth checking? */ -STATIC bool -xchk_iallocbt_chunk ( -struct xchk_btree *bs, -struct xfs_inobt_rec_incore *irec, -xfs_agino_t agino, -xfs_extlen_t len) -{ -struct xfs_mount *mp = bs->cur->bc_mp; -struct xfs_perag *pag = bs->cur->bc_ag.pag; -xfs_agblock_t bno; - - bno =XFS_AGINO_TO_AGBNO (mp, agino); - -if (!xfs_verify_agbext (pag, bno, len)) -xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); - -xchk_iallocbt_chunk_xref (bs->sc, irec, agino, bno, len); -xchk_xref_is_not_cow_staging (bs->sc, bno, len); +xchk_xref_is_not_cow_staging (sc, agbno, len);return true; }
@@ -463,7 +452,7 @@ xchk_iallocbt_rec(if (holemask &1 ) holecount +=XFS_INODES_PER_HOLEMASK_BIT ;else if (!xchk_iallocbt_chunk (bs, &irec, agino, len)) -break ; + goto out; holemask >>=1 ; agino +=XFS_INODES_PER_HOLEMASK_BIT ; }
@@ -473,6 +462,9 @@ xchk_iallocbt_rec(xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); check_clusters: +if (bs->sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ) + goto out; + error =xchk_iallocbt_check_clusters (bs, &irec);if (error) goto out;