xfs: set buffer ops when repair probes for btree type
PATCH 1/1 xfs: set buffer ops when repair probes for btree type
From: Darrick J. Wong <[email protected]>
In xrep_findroot_block, we work out the btree type and correctness of a given block by calling different btree verifiers on root block candidates. However, we leave the NULL b_ops while ->verify_read validates the block, which means that if the verifier calls xfs_buf_verifier_error it'll crash on the null b_ops. Fix it to set b_ops before calling the verifier and unsetting it if the verifier fails.
Furthermore, improve the documentation around xfs_buf_ensure_ops, which is the function that is responsible for cleaning up the b_ops state of buffers that go through xrep_findroot_block but don't match anything.
--- fs/xfs/scrub/repair.c | 11 ++++++++--- fs/xfs/xfs_buf.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)
fs/xfs/scrub/repair.c +8 -3
@@ -768,18 +768,23 @@ xrep_findroot_block(if (!uuid_equal (&btblock->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid)) goto out; +/* +* Read verifiers can reference b_ops, so we set the pointer +* here. If the verifier fails we'll reset the buffer state +* to what it was before we touched the buffer. +*/ + bp->b_ops = fab->buf_ops; fab->buf_ops->verify_read (bp);if (bp->b_error) { + bp->b_ops =NULL ; bp->b_error =0 ; goto out; }/* * Some read verifiers will (re)set b_ops, so we must be -* careful not to blow away any such assignment. +* careful not to change b_ops after running the verifier. */ -if (!bp->b_ops) - bp->b_ops = fab->buf_ops; }/*
fs/xfs/xfs_buf.c +16 -0
@@ -776,10 +776,26 @@ _xfs_buf_read( }/* +* Set buffer ops on an unchecked buffer and validate it, if possible. +* * If the caller passed in an ops structure and the buffer doesn't have ops * assigned, set the ops and use them to verify the contents. If the contents * cannot be verified, we'll clear XBF_DONE. We assume the buffer has no * recorded errors and is already in XBF_DONE state. +* +* Under normal operations, every in-core buffer must have buffer ops assigned +* to them when the buffer is read in from disk so that we can validate the +* metadata. +* +* However, there are two scenarios where one can encounter in-core buffers +* that don't have buffer ops. The first is during log recovery of buffers on +* a V4 filesystem, though these buffers are purged at the end of recovery. +* +* The other is online repair, which tries to match arbitrary metadata blocks +* with btree types in order to find the root. If online repair doesn't match +* the buffer with /any/ btree type, the buffer remains in memory in DONE state +* with no ops, and a subsequent read_buf call from elsewhere will not set the +* ops. This function helps us fix this situation. */ int xfs_buf_ensure_ops(
Quoted 10 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
In
xrep_findroot_block, we work out the btree type and correctness of a given block by calling different btree verifiers on root block candidates. However, we leave the NULLb_opswhile ->verify_read validates the block, which means that if the verifier callsxfs_buf_verifier_errorit'll crash on the nullb_ops. Fix it to setb_opsbefore calling the verifier and unsetting it if the verifier fails.
Quoted 6 lines
Furthermore, improve the documentation around
xfs_buf_ensure_ops, which is the function that is responsible for cleaning up theb_opsstate of buffers that go throughxrep_findroot_blockbut don't match anything.Signed-off-by Darrick J. Wong <[email protected]>---
Quoted 66 lines
fs/xfs/scrub/repair.c | 11 ++++++++--- fs/xfs/xfs_buf.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)fs/xfs/scrub/repair.c +8
-3@@ -768,18 +768,23 @@ xrep_findroot_block(if (!uuid_equal (&btblock->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid)) goto out; +/* +* Read verifiers can reference b_ops, so we set the pointer +* here. If the verifier fails we'll reset the buffer state +* to what it was before we touched the buffer. +*/ + bp->b_ops = fab->buf_ops; fab->buf_ops->verify_read (bp);if (bp->b_error) { + bp->b_ops =NULL ; bp->b_error =0 ; goto out; }/* * Some read verifiers will (re)set b_ops, so we must be -* careful not to blow away any such assignment. +* careful not to change b_ops after running the verifier. */ -if (!bp->b_ops) - bp->b_ops = fab->buf_ops; }/* fs/xfs/xfs_buf.c +16
-0@@ -776,10 +776,26 @@ _xfs_buf_read( }/* +* Set buffer ops on an unchecked buffer and validate it, if possible. +* * If the caller passed in an ops structure and the buffer doesn't have ops * assigned, set the ops and use them to verify the contents. If the contents * cannot be verified, we'll clear XBF_DONE. We assume the buffer has no * recorded errors and is already in XBF_DONE state. +* +* Under normal operations, every in-core buffer must have buffer ops assigned +* to them when the buffer is read in from disk so that we can validate the +* metadata. +* +* However, there are two scenarios where one can encounter in-core buffers +* that don't have buffer ops. The first is during log recovery of buffers on +* a V4 filesystem, though these buffers are purged at the end of recovery. +* +* The other is online repair, which tries to match arbitrary metadata blocks +* with btree types in order to find the root. If online repair doesn't match +* the buffer with /any/ btree type, the buffer remains in memory in DONE state +* with no ops, and a subsequent read_buf call from elsewhere will not set the +* ops. This function helps us fix this situation. */ int xfs_buf_ensure_ops(