xfs: Use struct xfs_bmdr_block instead of struct xfs_btree_block to calculate root node size
PATCH 1/1 xfs: Use struct xfs_bmdr_block instead of struct xfs_btree_block to calculate root node size
The incore data fork of an inode stores the bmap btree root node as 'struct xfs_btree_block'. However, the ondisk version of the inode stores the bmap btree root node as a 'struct xfs_bmdr_block'.
xfs_bmap_add_attrfork_btree() checks if the btree root node fits inside the data fork of the inode. However, it incorrectly uses 'struct xfs_btree_block' to compute the size of the bmap btree root node. Since size of 'struct xfs_btree_block' is larger than that of 'struct xfs_bmdr_block', xfs_bmap_add_attrfork_btree() could end up unnecessarily demoting the current root node as the child of newly allocated root node.
This commit optimizes space usage by modifying xfs_bmap_add_attrfork_btree() to use 'struct xfs_bmdr_block' to check if the bmap btree root node fits inside the data fork of the inode.
--- fs/xfs/libxfs/xfs_bmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +4 -1
@@ -927,13 +927,16 @@ xfs_bmap_add_attrfork_btree( xfs_inode_t *ip, /* incore inode pointer */ int *flags) /* inode logging flags */ { +struct xfs_btree_block *block;xfs_btree_cur_t *cur;/* btree cursor */ int error;/* error return value */ xfs_mount_t *mp;/* file system mount struct */ int stat;/* newroot status */ mp = ip->i_mount; -if (ip->i_df.if_broot_bytes <=XFS_IFORK_DSIZE (ip)) + block = ip->i_df.if_broot; + +if (XFS_BMAP_BMDR_SPACE (block) <=XFS_IFORK_DSIZE (ip)) *flags |=XFS_ILOG_DBROOT ;else { cur =xfs_bmbt_init_cursor (mp, tp, ip,XFS_DATA_FORK );
Signature · 1 line
2.29.2
fs/xfs/libxfs/xfs_bmap.c xfs_bmap_add_attrfork_btree( · line 937
Quoted 13 lines · Chandan Babu R
fs/xfs/libxfs/xfs_bmap.c +2
-1@@ -927,13 +927,16 @@ xfs_bmap_add_attrfork_btree( xfs_inode_t *ip, /* incore inode pointer */ int *flags) /* inode logging flags */ { +struct xfs_btree_block *block;xfs_btree_cur_t *cur;/* btree cursor */ int error;/* error return value */ xfs_mount_t *mp;/* file system mount struct */ int stat;/* newroot status */ mp = ip->i_mount; -if (ip->i_df.if_broot_bytes <=XFS_IFORK_DSIZE (ip)) + block = ip->i_df.if_broot;
Just initializing block o nthe line it is declared would read a little easier. Other than that this looks good:
PATCH 1/1 xfs: Use struct xfs_bmdr_block instead of struct xfs_btree_block to calculate root node size
In reply to Chandan Babu RThe incore data fork of an inode stores the bmap btree root node as 'struct xfs_btree_block'. However, the ondisk version of the inode stores the bmap btree root node as a 'struct xfs_bmdr_block'.
xfs_bmap_add_attrfork_btree() checks if the btree root node fits inside the data fork of the inode. However, it incorrectly uses 'struct xfs_btree_block' to compute the size of the bmap btree root node. Since size of 'struct xfs_btree_block' is larger than that of 'struct xfs_bmdr_block', xfs_bmap_add_attrfork_btree() could end up unnecessarily demoting the current root node as the child of newly allocated root node.
This commit optimizes space usage by modifying xfs_bmap_add_attrfork_btree() to use 'struct xfs_bmdr_block' to check if the bmap btree root node fits inside the data fork of the inode.
---
V1 -> V1.1
1. Initialize "block" variable during declaration.
fs/xfs/libxfs/xfs_bmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +3 -1
@@ -927,13 +927,15 @@ xfs_bmap_add_attrfork_btree( xfs_inode_t *ip, /* incore inode pointer */ int *flags) /* inode logging flags */ { +struct xfs_btree_block *block = ip->i_df.if_broot;xfs_btree_cur_t *cur;/* btree cursor */ int error;/* error return value */ xfs_mount_t *mp;/* file system mount struct */ int stat;/* newroot status */ mp = ip->i_mount; -if (ip->i_df.if_broot_bytes <=XFS_IFORK_DSIZE (ip)) + +if (XFS_BMAP_BMDR_SPACE (block) <=XFS_IFORK_DSIZE (ip)) *flags |=XFS_ILOG_DBROOT ;else { cur =xfs_bmbt_init_cursor (mp, tp, ip,XFS_DATA_FORK );
Signature · 1 line
2.29.2
Quoted 11 lines · Chandan Babu R
The incore data fork of an inode stores the bmap btree root node as 'struct
xfs_btree_block'. However, the ondisk version of the inode stores the bmap btree root node as a 'structxfs_bmdr_block'.
xfs_bmap_add_attrfork_btree()checks if the btree root node fits inside the data fork of the inode. However, it incorrectly uses 'structxfs_btree_block' to compute the size of the bmap btree root node. Since size of 'structxfs_btree_block' is larger than that of 'structxfs_bmdr_block',xfs_bmap_add_attrfork_btree()could end up unnecessarily demoting the current root node as the child of newly allocated root node.
Quoted 3 lines
This commit optimizes space usage by modifying
xfs_bmap_add_attrfork_btree()to use 'structxfs_bmdr_block' to check if the bmap btree root node fits inside the data fork of the inode.
Hmm. This introduces a (compatible) change in the ondisk format, since we no longer promote the data fork btree root block unnecessarily, right?
We've been writing out filesystems in that state for years, so I think scrub is going to need patching to disable the "could the root block contents fit in the inode root?" check on the data fork if there's an attr fork.
Meanwhile, this fix looks decent.
By the way, have you tried running xfs/{529-538} on a realtime filesystem formatted with -d rtinherit=1 ? There's something odd causing them to fail, but it's realtime so who knows what that's about. :)
I really like how these extent counter overflow checks are finding longstanding bugs!
--D
Quoted 34 lines
Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Chandan Babu R <[email protected]>---
V1 -> V1.1
1. Initialize "block" variable during declaration.fs/xfs/libxfs/xfs_bmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_bmap.c +3
-1@@ -927,13 +927,15 @@ xfs_bmap_add_attrfork_btree( xfs_inode_t *ip, /* incore inode pointer */ int *flags) /* inode logging flags */ { +struct xfs_btree_block *block = ip->i_df.if_broot;xfs_btree_cur_t *cur;/* btree cursor */ int error;/* error return value */ xfs_mount_t *mp;/* file system mount struct */ int stat;/* newroot status */ mp = ip->i_mount; -if (ip->i_df.if_broot_bytes <=XFS_IFORK_DSIZE (ip)) + +if (XFS_BMAP_BMDR_SPACE (block) <=XFS_IFORK_DSIZE (ip)) *flags |=XFS_ILOG_DBROOT ;else { cur =xfs_bmbt_init_cursor (mp, tp, ip,XFS_DATA_FORK );Signature · 1 line
2.29.2
Quoted 12 lines · Darrick J. Wong
Quoted 11 lines · Chandan Babu R
The incore data fork of an inode stores the bmap btree root node as 'struct
xfs_btree_block'. However, the ondisk version of the inode stores the bmap btree root node as a 'structxfs_bmdr_block'.
xfs_bmap_add_attrfork_btree()checks if the btree root node fits inside the data fork of the inode. However, it incorrectly uses 'structxfs_btree_block' to compute the size of the bmap btree root node. Since size of 'structxfs_btree_block' is larger than that of 'structxfs_bmdr_block',xfs_bmap_add_attrfork_btree()could end up unnecessarily demoting the current root node as the child of newly allocated root node.
Quoted 6 lines
Quoted 3 lines
This commit optimizes space usage by modifying
xfs_bmap_add_attrfork_btree()to use 'structxfs_bmdr_block' to check if the bmap btree root node fits inside the data fork of the inode.Hmm. This introduces a (compatible) change in the ondisk format, since we no longer promote the data fork btree root block unnecessarily, right?
Yes, that is correct.
Quoted 5 lines
We've been writing out filesystems in that state for years, so I think scrub is going to need patching to disable the "could the root block contents fit in the inode root?" check on the data fork if there's an attr fork.
You are right. I will post the corresponding patch soon.
Quoted 9 lines
Meanwhile, this fix looks decent.
Reviewed-by Darrick J. Wong <[email protected]>By the way, have you tried running xfs/{529-538} on a realtime filesystem formatted with -d rtinherit=1 ? There's something odd causing them to fail, but it's realtime so who knows what that's about. :)
Thanks for reporting the bug. I will see what is going on there.
Signature · 1 line
chandan