xfs: remote attribute overwrite causes transaction overrun
PATCH 1/1 xfs: remote attribute overwrite causes transaction overrun
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the xfs_da_args structure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing the args->valuelen parameter in cases where it shouldn't.
That is, when we replace a remote attribute, the incoming replacement stores the value and length in args->value and args->valuelen, but then the lookup which finds the existing remote attribute overwrites args->valuelen with the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and an ASSERT() failure on a debug kernel:
XFS: Assertion failed: tp->t_blk_res_used <= tp->t_blk_res, file: fs/xfs/xfs_trans.c, line: 331
Fix this by keeping the remote attribute value length separate to the attribute value length in the xfs_da_args structure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.
--- fs/xfs/xfs_attr.c | 7 ++++++- fs/xfs/xfs_attr_leaf.c | 21 +++++++++++---------- fs/xfs/xfs_attr_remote.c | 11 ++++++++--- fs/xfs/xfs_da_btree.h | 2 ++ 4 files changed, 27 insertions(+), 14 deletions(-)
fs/xfs/xfs_attr.c +6 -1
@@ -213,7 +213,7 @@ xfs_attr_calc_size(* Out of line attribute, cannot double split, but * make room for the attribute value itself. */ -uint dblocks =XFS_B_TO_FSB (mp, valuelen); +uint dblocks =xfs_attr3_rmt_blocks (mp, valuelen); nblks += dblocks; nblks +=XFS_NEXTENTADD_SPACE_RES (mp, dblocks,XFS_ATTR_FORK ); }
@@ -703,6 +703,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; }/*
@@ -794,6 +795,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)
@@ -1004,8 +1006,10 @@ restart: args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; args->rmtblkno =0 ; args->rmtblkcnt =0 ; + args->rmtvaluelen =0 ; } retval =xfs_attr3_leaf_add (blk->bp, state->args);
@@ -1133,6 +1137,7 @@ restart: args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)
fs/xfs/xfs_attr_leaf.c +11 -10
@@ -1229,6 +1229,7 @@ xfs_attr3_leaf_add_work( name_rmt->valueblk =0 ; args->rmtblkno =1 ; args->rmtblkcnt =xfs_attr3_rmt_blocks (mp, args->valuelen); + args->rmtvaluelen = args->valuelen; } xfs_trans_log_buf(args->trans, bp, XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index),
@@ -2167,11 +2168,11 @@ xfs_attr3_leaf_lookup_int(if (!xfs_attr_namesp_match (args->flags, entry->flags))continue ; args->index = probe; - args->valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks ( args->dp->i_mount, - args->valuelen); + args->rmtvaluelen);return XFS_ERROR (EEXIST ); } }
@@ -2220,19 +2221,19 @@ xfs_attr3_leaf_getvalue( name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index);ASSERT (name_rmt->namelen == args->namelen);ASSERT (memcmp (args->name, name_rmt->name, args->namelen) ==0 ); - valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks (args->dp->i_mount, - valuelen); + args->rmtvaluelen);if (args->flags &ATTR_KERNOVAL ) { - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen;return 0 ; } -if (args->valuelen < valuelen) { - args->valuelen = valuelen; +if (args->valuelen < args->rmtvaluelen) { + args->valuelen = args->rmtvaluelen;return XFS_ERROR (ERANGE ); } - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen; }return 0 ; }
@@ -2519,7 +2520,7 @@ xfs_attr3_leaf_clearflag(ASSERT ((entry->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp,XFS_DA_LOGRANGE (leaf, name_rmt,sizeof (*name_rmt))); }
@@ -2677,7 +2678,7 @@ xfs_attr3_leaf_flipflags(ASSERT ((entry1->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf1, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp1,XFS_DA_LOGRANGE (leaf1, name_rmt,sizeof (*name_rmt))); }
fs/xfs/xfs_attr_remote.c +8 -3
@@ -337,7 +337,7 @@ xfs_attr_rmtval_get(struct xfs_buf *bp;xfs_dablk_t lblkno = args->rmtblkno;__uint8_t *dst = args->value; -int valuelen = args->valuelen; +int valuelen;int nmap;int error;int blkcnt = args->rmtblkcnt;
@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen) + args->valuelen = args->rmtvaluelen; + valuelen = args->valuelen; +while (valuelen >0 ) { nmap =ATTR_RMTVALUE_MAPSIZE ; error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno,
@@ -415,7 +420,7 @@ xfs_attr_rmtval_set(* attributes have headers, we can't just do a straight byte to FSB * conversion and have to take the header space into account. */ - blkcnt =xfs_attr3_rmt_blocks (mp, args->valuelen); + blkcnt =xfs_attr3_rmt_blocks (mp, args->rmtvaluelen); error =xfs_bmap_first_unused (args->trans, args->dp, blkcnt, &lfileoff,XFS_ATTR_FORK );if (error)
@@ -480,7 +485,7 @@ xfs_attr_rmtval_set(*/ lblkno = args->rmtblkno; blkcnt = args->rmtblkcnt; - valuelen = args->valuelen; + valuelen = args->rmtvaluelen;while (valuelen >0 ) {struct xfs_buf *bp;xfs_daddr_t dblkno;
fs/xfs/xfs_da_btree.h +2 -0
@@ -60,10 +60,12 @@ typedef struct xfs_da_args {int index;/* index of attr of interest in blk */ xfs_dablk_t rmtblkno;/* remote attr value starting blkno */ int rmtblkcnt;/* remote attr value block count */ +int rmtvaluelen;/* remote attr value length in bytes */ xfs_dablk_t blkno2;/* blkno of 2nd attr leaf of interest */ int index2;/* index of 2nd attr in blk */ xfs_dablk_t rmtblkno2;/* remote attr value starting blkno */ int rmtblkcnt2;/* remote attr value block count */ +int rmtvaluelen2;/* remote attr value length in bytes */ int op_flags;/* operation flags */ enum xfs_dacmp cmpresult;/* name compare result for lookups */ } xfs_da_args_t;
Signature · 6 lines
1.9.0 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 166 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/xfs_attr.c | 7 ++++++- fs/xfs/xfs_attr_leaf.c | 21 +++++++++++---------- fs/xfs/xfs_attr_remote.c | 11 ++++++++--- fs/xfs/xfs_da_btree.h | 2 ++ 4 files changed, 27 insertions(+), 14 deletions(-)fs/xfs/xfs_attr.c +6
-1@@ -213,7 +213,7 @@ xfs_attr_calc_size(* Out of line attribute, cannot double split, but * make room for the attribute value itself. */ -uint dblocks =XFS_B_TO_FSB (mp, valuelen); +uint dblocks =xfs_attr3_rmt_blocks (mp, valuelen); nblks += dblocks; nblks +=XFS_NEXTENTADD_SPACE_RES (mp, dblocks,XFS_ATTR_FORK ); }@@ -703,6 +703,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; }/* @@ -794,6 +795,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)@@ -1004,8 +1006,10 @@ restart: args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; args->rmtblkno =0 ; args->rmtblkcnt =0 ; + args->rmtvaluelen =0 ; } retval =xfs_attr3_leaf_add (blk->bp, state->args);@@ -1133,6 +1137,7 @@ restart: args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)fs/xfs/xfs_attr_leaf.c +11
-10@@ -1229,6 +1229,7 @@ xfs_attr3_leaf_add_work( name_rmt->valueblk =0 ; args->rmtblkno =1 ; args->rmtblkcnt =xfs_attr3_rmt_blocks (mp, args->valuelen); + args->rmtvaluelen = args->valuelen; } xfs_trans_log_buf(args->trans, bp, XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index),@@ -2167,11 +2168,11 @@ xfs_attr3_leaf_lookup_int(if (!xfs_attr_namesp_match (args->flags, entry->flags))continue ; args->index = probe; - args->valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks ( args->dp->i_mount, - args->valuelen); + args->rmtvaluelen);return XFS_ERROR (EEXIST ); } }@@ -2220,19 +2221,19 @@ xfs_attr3_leaf_getvalue( name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index);ASSERT (name_rmt->namelen == args->namelen);ASSERT (memcmp (args->name, name_rmt->name, args->namelen) ==0 ); - valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks (args->dp->i_mount, - valuelen); + args->rmtvaluelen);if (args->flags &ATTR_KERNOVAL ) { - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen;return 0 ; } -if (args->valuelen < valuelen) { - args->valuelen = valuelen; +if (args->valuelen < args->rmtvaluelen) { + args->valuelen = args->rmtvaluelen;return XFS_ERROR (ERANGE ); } - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen; }return 0 ; }@@ -2519,7 +2520,7 @@ xfs_attr3_leaf_clearflag(ASSERT ((entry->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp,XFS_DA_LOGRANGE (leaf, name_rmt,sizeof (*name_rmt))); }@@ -2677,7 +2678,7 @@ xfs_attr3_leaf_flipflags(ASSERT ((entry1->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf1, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp1,XFS_DA_LOGRANGE (leaf1, name_rmt,sizeof (*name_rmt))); }fs/xfs/xfs_attr_remote.c +1
-1@@ -337,7 +337,7 @@ xfs_attr_rmtval_get(struct xfs_buf *bp;xfs_dablk_t lblkno = args->rmtblkno;__uint8_t *dst = args->value; -int valuelen = args->valuelen; +int valuelen;int nmap;int error;int blkcnt = args->rmtblkcnt;
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 5 lines
fs/xfs/xfs_attr_remote.c +2
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)
^^^
Here is a typo...
Thanks,
-Jeff
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 29 lines · Jeff Liu
Quoted 27 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>
....
Quoted 8 lines
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 6 lines
fs/xfs/xfs_attr_remote.c +2
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)^^^Here is a typo...
Oh, well spotted.
But, hold on a minute, shouldn't gcc be catching those sorts of typos?
/me groans
$ gcc t.c $ gcc -Wall t.c t.c: In function ¿main¿: t.c:10:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] if (foo = bar) ^ $
Only if -Wparentheses is specified.
Why the hell are we suppressing useful warnings on the kernel build?
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 55 lines · Dave Chinner
Quoted 29 lines · Jeff Liu
Quoted 27 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>....
Quoted 8 lines
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 6 lines
fs/xfs/xfs_attr_remote.c +2
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)^^^Here is a typo...
Oh, well spotted.
But, hold on a minute, shouldn't gcc be catching those sorts of typos?
/me groans
$ gcc t.c $ gcc -Wall t.c t.c: In function ¿main¿: t.c:10:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] if (foo = bar) ^ $
Quoted 3 lines
Only if -Wparentheses is specified.
Why the hell are we suppressing useful warnings on the kernel build?
Hmmm - looks like I missed the output of the warning when I built against 3.15-rc2 because it was a rebuild the world and there's tons of output when that happens...
<sigh>
Time to add ccflags-y += -Werror to the makefile....
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 4 lines · Dave Chinner
Quoted 3 lines · Dave Chinner
Quoted 2 lines · Jeff Liu
On 04/22 2014 14:59 PM, Dave Chinner wrote:
...
Quoted 24 lines
Quoted 20 lines
Quoted 4 lines
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 2 lines
fs/xfs/xfs_attr_remote.c +2
-0+/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)^^^Here is a typo...
Oh, well spotted.
But, hold on a minute, shouldn't gcc be catching those sorts of typos?
/me groans
$ gcc t.c $ gcc -Wall t.c t.c: In function ¿main¿: t.c:10:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] if (foo = bar) ^ $Quoted 3 lines
Only if -Wparentheses is specified.
Why the hell are we suppressing useful warnings on the kernel build?
Quoted 7 lines
Hmmm - looks like I missed the output of the warning when I built against 3.15-rc2 because it was a rebuild the world and there's tons of output when that happens...
<sigh>
Time to add ccflags-y += -Werror to the makefile....
Probably only under a couple specific arches...? How are we for i.e. stupid printf format warnings about long vs. longlong on 32/64 arches...?
Or maybe you can -Werror, -Wno$FOO?
-Eric
Quoted 4 lines
Cheers,
Dave.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Eric Sandeen
Quoted 4 lines · Dave Chinner
Quoted 3 lines · Dave Chinner
Quoted 2 lines · Jeff Liu
On 04/22 2014 14:59 PM, Dave Chinner wrote:
....
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 2 lines
fs/xfs/xfs_attr_remote.c +2
-0+/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)^^^Here is a typo...
Oh, well spotted.
But, hold on a minute, shouldn't gcc be catching those sorts of typos?
....
Quoted 6 lines
Quoted 1 line
Time to add ccflags-y += -Werror to the makefile....
Probably only under a couple specific arches...? How are we for i.e. stupid printf format warnings about long vs. longlong on 32/64 arches...?
Or maybe you can -Werror, -Wno$FOO?
Personally, if other arches are throwing warnings that we don't know about, they need to be fixed. The only way I'll get to know about them is to have somebody else's build break, because nobody is reporting warnings to us right now....
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 55 lines · Dave Chinner
Quoted 29 lines · Jeff Liu
Quoted 27 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>....
Quoted 8 lines
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 352
Quoted 6 lines
fs/xfs/xfs_attr_remote.c +2
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen)^^^Here is a typo...
Oh, well spotted.
But, hold on a minute, shouldn't gcc be catching those sorts of typos?
/me groans
$ gcc t.c $ gcc -Wall t.c t.c: In function ¿main¿: t.c:10:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] if (foo = bar) ^ $
Quoted 4 lines
Only if -Wparentheses is specified.
Why the hell are we suppressing useful warnings on the kernel build?
Well, maybe it's due to the different gcc release? I can hit this warning via gcc-4.8.1 which is the default version on Ubuntu 13.10 as below:
# make SUBDIRS=fs/xfs -j4 ... fs/xfs/xfs_attr_remote.c: In function ‘xfs_attr_rmtval_get’: fs/xfs/xfs_attr_remote.c:352:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] if (args->rmtvaluelen = args->valuelen) ^ CC [M] fs/xfs/xfs_bmap_btree.o CC [M] fs/xfs/xfs_btree.o ...
Thanks,
-Jeff
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 48 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/xfs_attr.c | 7 ++++++- fs/xfs/xfs_attr_leaf.c | 21 +++++++++++---------- fs/xfs/xfs_attr_remote.c | 11 ++++++++--- fs/xfs/xfs_da_btree.h | 2 ++ 4 files changed, 27 insertions(+), 14 deletions(-)fs/xfs/xfs_attr.c +1
-1@@ -213,7 +213,7 @@ xfs_attr_calc_size(* Out of line attribute, cannot double split, but * make room for the attribute value itself. */ -uint dblocks =XFS_B_TO_FSB (mp, valuelen); +uint dblocks =xfs_attr3_rmt_blocks (mp, valuelen); nblks += dblocks; nblks +=XFS_NEXTENTADD_SPACE_RES (mp, dblocks,XFS_ATTR_FORK ); }
fs/xfs/xfs_attr.c xfs_attr_leaf_addname(xfs_da_args_t *args) · line 707
Quoted 5 lines
fs/xfs/xfs_attr.c +1
-0@@ -703,6 +703,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; }
Why don't we zero out the first set of values here similar to the node case?
Quoted 113 lines
fs/xfs/xfs_attr.c +4
-0/* @@ -794,6 +795,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)@@ -1004,8 +1006,10 @@ restart: args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; args->rmtblkno =0 ; args->rmtblkcnt =0 ; + args->rmtvaluelen =0 ; } retval =xfs_attr3_leaf_add (blk->bp, state->args);@@ -1133,6 +1137,7 @@ restart: args->blkno = args->blkno2; args->rmtblkno = args->rmtblkno2; args->rmtblkcnt = args->rmtblkcnt2; + args->rmtvaluelen = args->rmtvaluelen2;if (args->rmtblkno) { error =xfs_attr_rmtval_remove (args);if (error)fs/xfs/xfs_attr_leaf.c +11
-10@@ -1229,6 +1229,7 @@ xfs_attr3_leaf_add_work( name_rmt->valueblk =0 ; args->rmtblkno =1 ; args->rmtblkcnt =xfs_attr3_rmt_blocks (mp, args->valuelen); + args->rmtvaluelen = args->valuelen; } xfs_trans_log_buf(args->trans, bp, XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index),@@ -2167,11 +2168,11 @@ xfs_attr3_leaf_lookup_int(if (!xfs_attr_namesp_match (args->flags, entry->flags))continue ; args->index = probe; - args->valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks ( args->dp->i_mount, - args->valuelen); + args->rmtvaluelen);return XFS_ERROR (EEXIST ); } }@@ -2220,19 +2221,19 @@ xfs_attr3_leaf_getvalue( name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index);ASSERT (name_rmt->namelen == args->namelen);ASSERT (memcmp (args->name, name_rmt->name, args->namelen) ==0 ); - valuelen =be32_to_cpu (name_rmt->valuelen); + args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen); args->rmtblkno =be32_to_cpu (name_rmt->valueblk); args->rmtblkcnt =xfs_attr3_rmt_blocks (args->dp->i_mount, - valuelen); + args->rmtvaluelen);if (args->flags &ATTR_KERNOVAL ) { - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen;return 0 ; } -if (args->valuelen < valuelen) { - args->valuelen = valuelen; +if (args->valuelen < args->rmtvaluelen) { + args->valuelen = args->rmtvaluelen;return XFS_ERROR (ERANGE ); } - args->valuelen = valuelen; + args->valuelen = args->rmtvaluelen; }return 0 ; }@@ -2519,7 +2520,7 @@ xfs_attr3_leaf_clearflag(ASSERT ((entry->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp,XFS_DA_LOGRANGE (leaf, name_rmt,sizeof (*name_rmt))); }@@ -2677,7 +2678,7 @@ xfs_attr3_leaf_flipflags(ASSERT ((entry1->flags &XFS_ATTR_LOCAL ) ==0 ); name_rmt =xfs_attr3_leaf_name_remote (leaf1, args->index); name_rmt->valueblk =cpu_to_be32 (args->rmtblkno); - name_rmt->valuelen =cpu_to_be32 (args->valuelen); + name_rmt->valuelen =cpu_to_be32 (args->rmtvaluelen);xfs_trans_log_buf (args->trans, bp1,XFS_DA_LOGRANGE (leaf1, name_rmt,sizeof (*name_rmt))); }fs/xfs/xfs_attr_remote.c +1
-1@@ -337,7 +337,7 @@ xfs_attr_rmtval_get(struct xfs_buf *bp;xfs_dablk_t lblkno = args->rmtblkno;__uint8_t *dst = args->value; -int valuelen = args->valuelen; +int valuelen;int nmap;int error;int blkcnt = args->rmtblkcnt;
fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 355
Quoted 8 lines
fs/xfs/xfs_attr_remote.c +5
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen) + args->valuelen = args->rmtvaluelen; + valuelen = args->valuelen; +
Jeff already called this out as a potential typo...
I'm guessing the intent is to handle the case where we call from xfs_attr3_leaf_list_int(). The other callers call xfs_attr3_leaf_getvalue() first, which sets rmtvaluelen and fixes up valuelen or returns an error (if short). The list_int() case looks like it queries the remote length just the same, but only sets valuelen... Why not just set both valuelen and rmtvaluelen there?
Brian
Quoted 45 lines
fs/xfs/xfs_attr_remote.c +2
-2while (valuelen >0 ) { nmap =ATTR_RMTVALUE_MAPSIZE ; error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno,@@ -415,7 +420,7 @@ xfs_attr_rmtval_set(* attributes have headers, we can't just do a straight byte to FSB * conversion and have to take the header space into account. */ - blkcnt =xfs_attr3_rmt_blocks (mp, args->valuelen); + blkcnt =xfs_attr3_rmt_blocks (mp, args->rmtvaluelen); error =xfs_bmap_first_unused (args->trans, args->dp, blkcnt, &lfileoff,XFS_ATTR_FORK );if (error)@@ -480,7 +485,7 @@ xfs_attr_rmtval_set(*/ lblkno = args->rmtblkno; blkcnt = args->rmtblkcnt; - valuelen = args->valuelen; + valuelen = args->rmtvaluelen;while (valuelen >0 ) {struct xfs_buf *bp;xfs_daddr_t dblkno;fs/xfs/xfs_da_btree.h +2
-0@@ -60,10 +60,12 @@ typedef struct xfs_da_args {int index;/* index of attr of interest in blk */ xfs_dablk_t rmtblkno;/* remote attr value starting blkno */ int rmtblkcnt;/* remote attr value block count */ +int rmtvaluelen;/* remote attr value length in bytes */ xfs_dablk_t blkno2;/* blkno of 2nd attr leaf of interest */ int index2;/* index of 2nd attr in blk */ xfs_dablk_t rmtblkno2;/* remote attr value starting blkno */ int rmtblkcnt2;/* remote attr value block count */ +int rmtvaluelen2;/* remote attr value length in bytes */ int op_flags;/* operation flags */ enum xfs_dacmp cmpresult;/* name compare result for lookups */ } xfs_da_args_t;Signature · 6 lines
1.9.0 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 49 lines · Brian Foster
Quoted 48 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Commit e461fcb ("xfs: remote attribute lookups require the value length") passes the remote attribute length in the
xfs_da_argsstructure on lookup so that CRC calculations and validity checking can be performed correctly by related code. This, unfortunately has the side effect of changing theargs->valuelenparameter in cases where it shouldn't.That is, when we replace a remote attribute, the incoming replacement stores the value and length in
args->valueandargs->valuelen, but then the lookup which finds the existing remote attribute overwritesargs->valuelenwith the length of the remote attribute being replaced. Hence when we go to create the new attribute, we create it of the size of the existing remote attribute, not the size it is supposed to be. When the new attribute is much smaller than the old attribute, this results in a transaction overrun and anASSERT()failure on a debug kernel:XFS: Assertion failed:
tp->t_blk_res_used<=tp->t_blk_res, file:fs/xfs/xfs_trans.c, line: 331Fix this by keeping the remote attribute value length separate to the attribute value length in the
xfs_da_argsstructure. The enables us to pass the length of the remote attribute to be removed without overwriting the new attribute's length.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/xfs_attr.c | 7 ++++++- fs/xfs/xfs_attr_leaf.c | 21 +++++++++++---------- fs/xfs/xfs_attr_remote.c | 11 ++++++++--- fs/xfs/xfs_da_btree.h | 2 ++ 4 files changed, 27 insertions(+), 14 deletions(-)fs/xfs/xfs_attr.c +1
-1@@ -213,7 +213,7 @@ xfs_attr_calc_size(* Out of line attribute, cannot double split, but * make room for the attribute value itself. */ -uint dblocks =XFS_B_TO_FSB (mp, valuelen); +uint dblocks =xfs_attr3_rmt_blocks (mp, valuelen); nblks += dblocks; nblks +=XFS_NEXTENTADD_SPACE_RES (mp, dblocks,XFS_ATTR_FORK ); }@@ -703,6 +703,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
Quoted 8 lines
fs/xfs/xfs_attr.c xfs_attr_leaf_addname(xfs_da_args_t *args) · line 707
Quoted 5 lines
fs/xfs/xfs_attr.c +1
-0args->index2 = args->index; args->rmtblkno2 = args->rmtblkno; args->rmtblkcnt2 = args->rmtblkcnt; + args->rmtvaluelen2 = args->rmtvaluelen; }Why don't we zero out the first set of values here similar to the node case?
I hadn't looked. I was just doing what was consistent with the current code.
/me looks.
xfs_attr3_leaf_add -> xfs_attr3_leaf_add_work overwrites the rmt* variables with new values if the newly added attribute needs to be made remote. But, if it is local, it doesn't zero them.
So, yes, there is potential for the wrong thing to be done later in this same function as it checks args->rmtblkno assuming that it is only set when the new attribute is remote.
Different bug, well spotted. :/
I'll add zeroing here.
[FWIW, I've always disliked and been confused by the set of rmtblkno/rmtblkno2 variables in the xfs_da_args. Mainly their naming is horrible. Some day I'll write a patch to make it clear what the two sets of variables are actually for, and maybe write helper functions for switching between the two sets... ]
Quoted 25 lines
Quoted 14 lines
fs/xfs/xfs_attr_remote.c +1
-1@@ -337,7 +337,7 @@ xfs_attr_rmtval_get(struct xfs_buf *bp;xfs_dablk_t lblkno = args->rmtblkno;__uint8_t *dst = args->value; -int valuelen = args->valuelen; +int valuelen;int nmap;int error;int blkcnt = args->rmtblkcnt;fs/xfs/xfs_attr_remote.c xfs_attr_rmtval_get( · line 355
Quoted 8 lines
fs/xfs/xfs_attr_remote.c +5
-0@@ -348,6 +348,11 @@ xfs_attr_rmtval_get(ASSERT (!(args->flags &ATTR_KERNOVAL )); +/* remote value might be different size to the buffer supplied. */ +if (args->rmtvaluelen = args->valuelen) + args->valuelen = args->rmtvaluelen; + valuelen = args->valuelen; +Jeff already called this out as a potential typo...
Quoted 2 lines
I'm guessing the intent is to handle the case where we call from
xfs_attr3_leaf_list_int().
Not really, it was just defensive to ensure that if args->valuelen and args->rmtvaluelen are different we don't overrun the buffer supplied by the caller, which is only args->valuelen in size...
Quoted 5 lines
The other callers call
xfs_attr3_leaf_getvalue()first, which sets rmtvaluelen and fixes up valuelen or returns an error (if short). Thelist_int()case looks like it queries the remote length just the same, but only sets valuelen... Why not just set both valuelen and rmtvaluelen there?
Seems reasonable. I'll replace the above check with an ASSERT so that we catch any future mismatches....
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs