Skip to contentSkip to conversation

xfs: check da node block pad field during scrub

PATCH Applied Yuto Ohnuki 3 participants 4 messages Apr 10 – Apr 27 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 xfs: check da node block pad field during scrub

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing.

Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.

---
Changes in v3:
- Drop unnecessary be32_to_cpu() on comparison to zero.
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Use xchk_da_set_preen instead of xchk_da_set_corrupt since
old kernels may have written non-zero padding without issues.
- Link to v1: https://lore.kernel.org/all/[email protected]/

---
 fs/xfs/scrub/dabtree.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/xfs/scrub/dabtree.c +6 -1
index 1a71d36898b1..c2d6ad59d03e 100644
@@ -454,7 +454,12 @@ xchk_da_btree_block(
 			}
 		}
 
-		/* XXX: Check hdr3.pad32 once we know how to fix it. */
+		if (xfs_has_crc(ip->i_mount)) {
+			struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr;
+
+			if (nodehdr3->__pad32)
+				xchk_da_set_preen(ds, level);
+		}
 		break;
 	default:
 		xchk_da_set_corrupt(ds, level);
Signature · 8 lines
2.50.1




Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
Reviewed-by on v3 1/1
#1 lore raw
Quoted 8 lines · Yuto Ohnuki

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing.

Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.

Should the dabtree write verifier also set __pad32 to zero, in case the kernel encounters a dabtree block writen out before the memset was added to xfs_da3_node_create in commit a45086e27dfa21 ("xfs: validate metadata LSNs against log on v5 superblocks")?

This change on its own is correct though, so

--D

Quoted 43 lines

---
Changes in v3:
- Drop unnecessary be32_to_cpu() on comparison to zero.
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Use xchk_da_set_preen instead of xchk_da_set_corrupt since
old kernels may have written non-zero padding without issues.
- Link to v1: https://lore.kernel.org/all/[email protected]/

---
 fs/xfs/scrub/dabtree.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/xfs/scrub/dabtree.c +6 -1
index 1a71d36898b1..c2d6ad59d03e 100644
@@ -454,7 +454,12 @@ xchk_da_btree_block(
 			}
 		}
 
-		/* XXX: Check hdr3.pad32 once we know how to fix it. */
+		if (xfs_has_crc(ip->i_mount)) {
+			struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr;
+
+			if (nodehdr3->__pad32)
+				xchk_da_set_preen(ds, level);
+		}
 		break;
 	default:
 		xchk_da_set_corrupt(ds, level);
Signature · 8 lines
2.50.1




Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
#2 lore raw
Quoted 15 lines · Darrick J. Wong
Quoted 8 lines · Yuto Ohnuki

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing.

Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.

Should the dabtree write verifier also set __pad32 to zero, in case the kernel encounters a dabtree block writen out before the memset was added to xfs_da3_node_create in commit a45086e27dfa21 ("xfs: validate metadata LSNs against log on v5 superblocks")?

Quoted 4 lines

This change on its own is correct though, so

--D

Thank you for the suggestion and review. I'll investigate and send a follow-up patch to zero __pad32 in xfs_da3_node_write_verify().

Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284

Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705

maintainer Applied
#3 lore raw
In reply to Yuto Ohnuki
Quoted 8 lines · Yuto Ohnuki

The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing.

Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.

[...]

Applied to for-next, thanks!

[1/1] xfs: check da node block pad field during scrub

      commit: fca20fcb76a20655daf18738f4a88c638a6bb64c

Best regards,

Signature · 1 line
Carlos Maiolino <[email protected]>