[PATCH 00/17 V3] XFS: LARP state machine and recovery rework
This patchset aims to simplify the state machine that the new logged attributes require to do their stuff. It also reworks the attribute logging and recovery algorithms to simplify them and to avoid leaving incomplete attributes around after recovery.
When I first dug into this code, I modified the state machine to try to simplify the set and replace operations as there was a lot of duplicate code in them. I also wasn't completely happy with the different transistions for replace operations when larp mode was enabled. I simplified the state machien and renumbered the states so that we can iterate through the same state progression for different attr formats just by having different inital leaf and node states.
Once I'd largely done this and started testing it, I realised that recovery wasn't setting the initial state properly, so I started digging into the recovery code. At this point, I realised the recovery code didn't work correctly in all cases and could often leave unremovable incomplete attrs sitting around. The issues are larger documented in the last patch in the series, so I won't go over them here, just read that patch.
However, to get, the whole replace operation for LARP=1 needed to change. Luckily, that turned out to be pretty simple because it was largely already broken down into component operations in the state machine. hence I just needed to add new "remove" initial states to the set_iter state machine, and that allowed the new algorithm to function.
Then I realised that I'd just implemented the remove_iter algorithm in the set_iter state machine, so I removed the remove_iter code and it's states altogether and just pointed remove ops at the set-iter remove initial states. The code now uses the XFS_DA_OP_RENAME flag to determine if it should follow up an add or remove with a remove or add, and it all largely just works. All runtime algorithms run throught he same state machine just with different initial states and state progressions.
And with the last patch in the series, attr item log recovery uses that same state machine, too. It has a few quirks that need to be handled, so I added the XFS_DA_OP_RECOVERY flag to allow the right thing to be done with the INCOMPLETE flag deep in the guts of the attr lookup code. And so recovery with LARP=1 now seems to mostly work.
This version passes fstests, several recoveryloop passes and the targeted error injection based attr recovery test that Catherine wrote. There's a fair bit of re-org in the patch series since V2, but most of that is pulling stuff from the last patch and putting it in the right place in the series. hence the only real logic iand bug fixes changes occurred in the last patch that changes the logging and recovery algorithm.
Comments, reviews and, most especially, testing welcome.
A compose of the patchset I've been testing based on the current for-next tree can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git xfs-5.19-compose
Version 3:
- rebased on 5.18-rc2 + for-next + rebased larp v29
- added state asserts to xfs_attr_dela_state_set_replace()
- only roll the transactions in ALLOC_RMT when we need to do more extent allocation for the remote attr value container.
- removed unnecessary attr->xattri_blkcnt check in ALLOC_RMT
- added comments to commit message to explain why we are combining the set and remove paths.
- preserved and isolated the state path save/restore code for avoiding repeated name entry path lookups when rolling transactins across remove operations. Left a big comment for Future Dave to re-enable the optimisation.
- fixed a transient attr fork removal bug in xfs_attr3_leaf_to_shortform() in the new removal algorithm which can result in the attr fork being removed between the remove and set ops in a REPLACE operation.
- moved defer operation setup changes ("split replace from set op") to early on in the series and combined it with the refactoring done immediately afterwards in the last patch of the series. This allows for cleanly fixing the log recovery state initialisation problem the patchset had.
- pulled the state initialisation for log recovery up into the patches that introduce the state machine changes for the given operations.
- Lots of changes to log recovery algorithm change in last patch.
Version 2:
https://lore.kernel.org/linux-xfs/[email protected]/
- fixed attrd initialisation for LARP=1 mode
- fixed REPLACE->REMOVE_OLD state transition for LARP=1 mode
- added more comments to describe the assumptions that allow xfs_attr_remove_leaf_attr() to work for both modes
PATCH v3 1/17 xfs: avoid empty xattr transaction when attrs are inline
From: Dave Chinner <[email protected]>
generic/642 triggered a reproducable assert failure in xlog_cil_commit() that resulted from a xfs_attr_set() committing an empty but dirty transaction. When the CIL is empty and this occurs, xlog_cil_commit() tries a background push and this triggers a "pushing an empty CIL" assert.
XFS: Assertion failed: !list_empty(&cil->xc_cil), file: fs/xfs/xfs_log_cil.c, line: 1274
Call Trace: <TASK> xlog_cil_commit+0xa5a/0xad0 __xfs_trans_commit+0xb8/0x330 xfs_trans_commit+0x10/0x20 xfs_attr_set+0x3e2/0x4c0 xfs_xattr_set+0x8d/0xe0 __vfs_setxattr+0x6b/0x90 __vfs_setxattr_noperm+0x76/0x220 __vfs_setxattr_locked+0xdf/0x100 vfs_setxattr+0x94/0x170 setxattr+0x110/0x200 path_setxattr+0xbf/0xe0 __x64_sys_setxattr+0x2b/0x30 do_syscall_64+0x35/0x80
The problem is related to the breakdown of attribute addition in xfs_attr_set_iter() and how it is called from deferred operations. When we have a pure leaf xattr insert, we add the xattr to the leaf and set the next state to XFS_DAS_FOUND_LBLK and return -EAGAIN. This requeues the xattr defered work, rolls the transaction and runs xfs_attr_set_iter() again. This then checks the xattr for being remote (it's not) and whether a replace op is being done (this is a create op) and if neither are true it returns without having done anything.
xfs_xattri_finish_update() then unconditionally sets the transaction dirty, and the deferops finishes and returns to __xfs_trans_commit() which sees the transaction dirty and tries to commit it by calling xlog_cil_commit(). The transaction is empty, and then the assert fires if this happens when the CIL is empty.
This patch addresses the structure of xfs_attr_set_iter() that requires re-entry on leaf add even when nothing will be done. This gets rid of the trailing empty transaction and so doesn't trigger the XFS_TRANS_DIRTY assignment in xfs_xattri_finish_update() incorrectly. Addressing that is for a different patch.
--- fs/xfs/libxfs/xfs_attr.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
fs/xfs/libxfs/xfs_attr.c +19 -20
@@ -315,6 +315,7 @@ xfs_attr_leaf_addname( {struct xfs_da_args *args = attr->xattri_da_args;struct xfs_inode *dp = args->dp; +enum xfs_delattr_state next_state =XFS_DAS_UNINIT ;int error;if (xfs_attr_is_leaf (dp)) {
@@ -335,37 +336,35 @@ xfs_attr_leaf_addname(* when we come back, we'll be a node, so we'll fall * down into the node handling code below */ -trace_xfs_attr_set_iter_return ( - attr->xattri_dela_state, args->dp); -return -EAGAIN ; + error = -EAGAIN ; + goto out; } - -if (error) -return error; - - attr->xattri_dela_state =XFS_DAS_FOUND_LBLK ; + next_state =XFS_DAS_FOUND_LBLK ; }else { error =xfs_attr_node_addname_find_attr (attr);if (error)return error; + next_state =XFS_DAS_FOUND_NBLK ; error =xfs_attr_node_addname (attr); -if (error) -return error; - -/* -* If addname was successful, and we dont need to alloc or -* remove anymore blks, we're done. -*/ -if (!args->rmtblkno && - !(args->op_flags &XFS_DA_OP_RENAME )) -return 0 ; + } +if (error) +return error; - attr->xattri_dela_state =XFS_DAS_FOUND_NBLK ; +/* +* We need to commit and roll if we need to allocate remote xattr blocks +* or perform more xattr manipulations. Otherwise there is nothing more +* to do and we can return success. +*/ +if (args->rmtblkno || + (args->op_flags &XFS_DA_OP_RENAME )) { + attr->xattri_dela_state = next_state; + error = -EAGAIN ; } +out:trace_xfs_attr_leaf_addname_return (attr->xattri_dela_state, args->dp); -return -EAGAIN ; +return error; }/*
Signature · 1 line
2.35.1
PATCH v3 2/17 xfs: initialise attrd item to zero
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
On the first allocation of a attrd item, xfs_trans_add_item() fires an assert like so:
XFS (pmem0): EXPERIMENTAL logged extended attributes feature added. Use at your own risk!
XFS: Assertion failed: !test_bit(XFS_LI_DIRTY, &lip->li_flags), file: fs/xfs/xfs_trans.c, line: 683
------------[ cut here ]------------ kernel BUG at fs/xfs/xfs_message.c:102! Call Trace: <TASK> xfs_trans_add_item+0x17e/0x190 xfs_trans_get_attrd+0x67/0x90 xfs_attr_create_done+0x13/0x20 xfs_defer_finish_noroll+0x100/0x690 __xfs_trans_commit+0x144/0x330 xfs_trans_commit+0x10/0x20 xfs_attr_set+0x3e2/0x4c0 xfs_initxattrs+0xaa/0xe0 security_inode_init_security+0xb0/0x130 xfs_init_security+0x18/0x20 xfs_generic_create+0x13a/0x340 xfs_vn_create+0x17/0x20 path_openat+0xff3/0x12f0 do_filp_open+0xb2/0x150
The attrd log item is allocated via kmem_cache_alloc, and xfs_log_item_init() does not zero the entire log item structure - it assumes that the structure is already all zeros as it only initialises non-zero fields. Fix the attr items to be allocated via the *zalloc methods.
--- fs/xfs/xfs_attr_item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_attr_item.c +1 -1
@@ -721,7 +721,7 @@ xfs_trans_get_attrd(struct xfs_trans *tp,ASSERT (tp !=NULL ); - attrdp =kmem_cache_alloc (xfs_attrd_cache,GFP_NOFS | __GFP_NOFAIL); + attrdp =kmem_cache_zalloc (xfs_attrd_cache,GFP_NOFS | __GFP_NOFAIL);xfs_log_item_init (tp->t_mountp, &attrdp->attrd_item,XFS_LI_ATTRD , &xfs_attrd_item_ops);
Signature · 1 line
2.35.1
PATCH v3 3/17 xfs: make xattri_leaf_bp more useful
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We currently set it and hold it when converting from short to leaf form, then release it only to immediately look it back up again to do the leaf insert.
Do a bit of refactoring to xfs_attr_leaf_try_add() to avoid this messy handling of the newly allocated leaf buffer.
--- fs/xfs/libxfs/xfs_attr.c | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-)
fs/xfs/libxfs/xfs_attr.c +32 -18
@@ -319,7 +319,15 @@ xfs_attr_leaf_addname(int error;if (xfs_attr_is_leaf (dp)) { + +/* +* Use the leaf buffer we may already hold locked as a result of +* a sf-to-leaf conversion. The held buffer is no longer valid +* after this call, regardless of the result. +*/ error =xfs_attr_leaf_try_add (args, attr->xattri_leaf_bp); + attr->xattri_leaf_bp =NULL ; +if (error == -ENOSPC ) { error =xfs_attr3_leaf_to_node (args);if (error)
@@ -341,6 +349,8 @@ xfs_attr_leaf_addname( } next_state =XFS_DAS_FOUND_LBLK ; }else { +ASSERT (!attr->xattri_leaf_bp); + error =xfs_attr_node_addname_find_attr (attr);if (error)return error;
@@ -396,12 +406,6 @@ xfs_attr_set_iter(*/ if (xfs_attr_is_shortform (dp))return xfs_attr_sf_addname (attr); -if (attr->xattri_leaf_bp !=NULL ) { -xfs_trans_bhold_release (args->trans, - attr->xattri_leaf_bp); - attr->xattri_leaf_bp =NULL ; - } -return xfs_attr_leaf_addname (attr);case XFS_DAS_FOUND_LBLK :
@@ -992,18 +996,31 @@ xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp) { - int retval; + int error;/* -* Look up the given attribute in the leaf block. Figure out if -* the given flags produce an error or call for an atomic rename. +* If the caller provided a buffer to us, it is locked and held in +* the transaction because it just did a shortform to leaf conversion. +* Hence we don't need to read it again. Otherwise read in the leaf +* buffer. */ - retval =xfs_attr_leaf_hasname (args, &bp); -if (retval != -ENOATTR && retval != -EEXIST ) -return retval; -if (retval == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) +if (bp) { +xfs_trans_bhold_release (args->trans, bp); + }else { + error =xfs_attr3_leaf_read (args->trans, args->dp,0 , &bp); +if (error) +return error; + } + +/* +* Look up the xattr name to set the insertion point for the new xattr. +*/ + error =xfs_attr3_leaf_lookup_int (bp, args); +if (error != -ENOATTR && error != -EEXIST ) goto out_brelse; -if (retval == -EEXIST ) { +if (error == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) + goto out_brelse; +if (error == -EEXIST ) {if (args->attr_flags &XATTR_CREATE ) goto out_brelse;
@@ -1023,14 +1040,11 @@ xfs_attr_leaf_try_add( args->rmtvaluelen =0 ; } -/* -* Add the attribute to the leaf block -*/ return xfs_attr3_leaf_add (bp, args); out_brelse:xfs_trans_brelse (args->trans, bp); -return retval; +return error; }/*
Signature · 1 line
2.35.1
PATCH v3 4/17 xfs: rework deferred attribute operation setup
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Logged attribute intents only have set and remove types - there is no type of the replace operation. We should ahve a separate type for a replace operation, as it needs to perform operations that neither SET or REMOVE can perform.
Add this type to the intent items and rearrange the deferred operation setup to reflect the different operations we are performing.
--- fs/xfs/libxfs/xfs_attr.c | 165 +++++++++++++++++++-------------- fs/xfs/libxfs/xfs_attr.h | 2 - fs/xfs/libxfs/xfs_log_format.h | 1 + fs/xfs/xfs_attr_item.c | 9 +- fs/xfs/xfs_trace.h | 4 + 5 files changed, 110 insertions(+), 71 deletions(-)
fs/xfs/libxfs/xfs_attr.c +97 -68
@@ -671,6 +671,81 @@ xfs_attr_lookup(return xfs_attr_node_hasname (args,NULL ); } +static int +xfs_attr_item_init ( +struct xfs_da_args *args, +unsigned int op_flags,/* op flag (set or remove) */ +struct xfs_attr_item **attr)/* new xfs_attr_item */ +{ + +struct xfs_attr_item *new; + + new =kmem_zalloc (sizeof (struct xfs_attr_item ),KM_NOFS ); + new->xattri_op_flags = op_flags; + new->xattri_da_args = args; + + *attr = new; +return 0 ; +} + +/* Sets an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_add ( +struct xfs_da_args *args) +{ +struct xfs_attr_item *new; +int error =0 ; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_SET , &new); +if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; +xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); +trace_xfs_attr_defer_add (new->xattri_dela_state, args->dp); + +return 0 ; +} + +/* Sets an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_replace ( +struct xfs_da_args *args) +{ +struct xfs_attr_item *new; +int error =0 ; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_REPLACE , &new); +if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; +xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); +trace_xfs_attr_defer_replace (new->xattri_dela_state, args->dp); + +return 0 ; +} + +/* Removes an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_remove ( +struct xfs_da_args *args) +{ + +struct xfs_attr_item *new; +int error; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_REMOVE , &new); +if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; +xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); +trace_xfs_attr_defer_remove (new->xattri_dela_state, args->dp); + +return 0 ; +} +/* * Note: If args->value is NULL the attribute will be removed, just like the * Linux ->setattr API.
@@ -759,29 +834,35 @@ xfs_attr_set( } error =xfs_attr_lookup (args); -if (args->value) { -if (error == -EEXIST && (args->attr_flags &XATTR_CREATE )) - goto out_trans_cancel; -if (error == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) - goto out_trans_cancel; -if (error != -ENOATTR && error != -EEXIST ) +switch (error) { +case -EEXIST : +/* if no value, we are performing a remove operation */ +if (!args->value) { + error =xfs_attr_defer_remove (args); +break ; + } +/* Pure create fails if the attr already exists */ +if (args->attr_flags &XATTR_CREATE ) goto out_trans_cancel; - error =xfs_attr_set_deferred (args); -if (error) + error =xfs_attr_defer_replace (args); +break ; +case -ENOATTR : +/* Can't remove what isn't there. */ +if (!args->value) goto out_trans_cancel; -/* shortform attribute has already been committed */ -if (!args->trans) - goto out_unlock; - }else { -if (error != -EEXIST ) +/* Pure replace fails if no existing attr to replace. */ +if (args->attr_flags &XATTR_REPLACE ) goto out_trans_cancel; - error =xfs_attr_remove_deferred (args); -if (error) - goto out_trans_cancel; + error =xfs_attr_defer_add (args); +break ; +default : + goto out_trans_cancel; } +if (error) + goto out_trans_cancel;/* * If this is a synchronous mount, make sure that the
@@ -845,58 +926,6 @@ xfs_attrd_destroy_cache(void) xfs_attrd_cache =NULL ; } -STATIC int -xfs_attr_item_init ( -struct xfs_da_args *args, -unsigned int op_flags,/* op flag (set or remove) */ -struct xfs_attr_item **attr)/* new xfs_attr_item */ -{ - -struct xfs_attr_item *new; - - new =kmem_zalloc (sizeof (struct xfs_attr_item ),KM_NOFS ); - new->xattri_op_flags = op_flags; - new->xattri_da_args = args; - - *attr = new; -return 0 ; -} - -/* Sets an attribute for an inode as a deferred operation */ -int -xfs_attr_set_deferred ( -struct xfs_da_args *args) -{ -struct xfs_attr_item *new; -int error =0 ; - - error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_SET , &new); -if (error) -return error; - -xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); - -return 0 ; -} - -/* Removes an attribute for an inode as a deferred operation */ -int -xfs_attr_remove_deferred ( -struct xfs_da_args *args) -{ - -struct xfs_attr_item *new; -int error; - - error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_REMOVE , &new); -if (error) -return error; - -xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); - -return 0 ; -} -/*======================================================================== * External routines when attribute list is inside the inode *========================================================================*/
fs/xfs/libxfs/xfs_attr.h +0 -2
@@ -521,8 +521,6 @@ bool xfs_attr_namecheck(const void *name, size_t length);int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total); -int xfs_attr_set_deferred (struct xfs_da_args *args); -int xfs_attr_remove_deferred (struct xfs_da_args *args);extern struct kmem_cache *xfs_attri_cache;extern struct kmem_cache *xfs_attrd_cache;
fs/xfs/libxfs/xfs_log_format.h +1 -0
@@ -908,6 +908,7 @@ struct xfs_icreate_log {*/ #define XFS_ATTR_OP_FLAGS_SET 1/* Set the attribute */ #define XFS_ATTR_OP_FLAGS_REMOVE 2/* Remove the attribute */ +#define XFS_ATTR_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTR_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
fs/xfs/xfs_attr_item.c +8 -1
@@ -311,6 +311,7 @@ xfs_xattri_finish_update(switch (op) {case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : error =xfs_attr_set_iter (attr);break ;case XFS_ATTR_OP_FLAGS_REMOVE :
@@ -500,8 +501,14 @@ xfs_attri_validate(return false;/* alfi_op_flags should be either a set or remove */ -if (op !=XFS_ATTR_OP_FLAGS_SET && op !=XFS_ATTR_OP_FLAGS_REMOVE ) +switch (op) { +case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : +case XFS_ATTR_OP_FLAGS_REMOVE : +break ; +default :return false; + }if (attrp->alfi_value_len >XATTR_SIZE_MAX )return false;
fs/xfs/xfs_trace.h +4 -0
@@ -4154,6 +4154,10 @@ DEFINE_DAS_STATE_EVENT(xfs_attr_leaf_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_node_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_remove_iter_return);DEFINE_DAS_STATE_EVENT (xfs_attr_rmtval_remove_return); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_add); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_replace); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_remove); + TRACE_EVENT(xfs_force_shutdown, TP_PROTO(struct xfs_mount *mp, int ptag, int flags, const char *fname,
Signature · 1 line
2.35.1
Re: [PATCH 04/17] xfs: rework deferred attribute operation setup
Quoted 7 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Logged attribute intents only have set and remove types - there is no type of the replace operation. We should ahve a separate type for a replace operation, as it needs to perform operations that neither SET or REMOVE can perform.
Quoted 5 lines
Add this type to the intent items and rearrange the deferred operation setup to reflect the different operations we are performing.
Signed-off-by Dave Chinner <[email protected]>
Ok, makes sense
Quoted 300 lines
--- fs/xfs/libxfs/xfs_attr.c | 165 +++++++++++++++++++---------- ---- fs/xfs/libxfs/xfs_attr.h | 2 - fs/xfs/libxfs/xfs_log_format.h | 1 + fs/xfs/xfs_attr_item.c | 9 +- fs/xfs/xfs_trace.h | 4 + 5 files changed, 110 insertions(+), 71 deletions(-)fs/xfs/libxfs/xfs_attr.c +4
-0@@ -671,6 +671,81 @@ xfs_attr_lookup(return xfs_attr_node_hasname (args,NULL ); } +static int +xfs_attr_item_init( + struct xfs_da_args *args, + unsigned int op_flags, /* op flag (set orremove) */
fs/xfs/libxfs/xfs_attr.c +1
-0+ struct xfs_attr_item **attr) /* new xfs_attr_item*/
fs/xfs/libxfs/xfs_attr.c +26
-0+{ + +struct xfs_attr_item *new; + + new =kmem_zalloc (sizeof (struct xfs_attr_item ),KM_NOFS ); + new->xattri_op_flags = op_flags; + new->xattri_da_args = args; + + *attr = new; +return 0 ; +} + +/* Sets an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_add ( +struct xfs_da_args *args) +{ +struct xfs_attr_item *new; +int error =0 ; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_SET , &new); +if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; + xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new-Quoted 1 line
xattri_list);fs/xfs/libxfs/xfs_attr.c +14
-0+trace_xfs_attr_defer_add (new->xattri_dela_state, args->dp); + +return 0 ; +} + +/* Sets an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_replace ( +struct xfs_da_args *args) +{ +struct xfs_attr_item *new; +int error =0 ; + + error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_REPLACE,&new);
fs/xfs/libxfs/xfs_attr.c +5
-0+if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; + xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new-Quoted 1 line
xattri_list);fs/xfs/libxfs/xfs_attr.c +15
-0+trace_xfs_attr_defer_replace (new->xattri_dela_state, args->dp); + +return 0 ; +} + +/* Removes an attribute for an inode as a deferred operation */ +static int +xfs_attr_defer_remove ( +struct xfs_da_args *args) +{ + +struct xfs_attr_item *new; +int error; + + error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_REMOVE,&new);
fs/xfs/libxfs/xfs_attr.c +5
-0+if (error) +return error; + + new->xattri_dela_state =XFS_DAS_UNINIT ; + xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new-Quoted 1 line
xattri_list);fs/xfs/libxfs/xfs_attr.c +5
-0+trace_xfs_attr_defer_remove (new->xattri_dela_state, args->dp); + +return 0 ; +} +/* * Note: If args->value is NULL the attribute will be removed, just like the
* Linux ->setattr API.fs/xfs/libxfs/xfs_attr.c +22
-16@@ -759,29 +834,35 @@ xfs_attr_set( } error =xfs_attr_lookup (args); -if (args->value) { -if (error == -EEXIST && (args->attr_flags & XATTR_CREATE)) -goto out_trans_cancel; -if (error == -ENOATTR && (args->attr_flags & XATTR_REPLACE)) -goto out_trans_cancel; -if (error != -ENOATTR && error != -EEXIST) + switch (error) { +case -EEXIST : +/* if no value, we are performing a remove operation */ +if (!args->value) { + error =xfs_attr_defer_remove (args); +break ; + } +/* Pure create fails if the attr already exists */ +if (args->attr_flags &XATTR_CREATE ) goto out_trans_cancel; -error = xfs_attr_set_deferred(args); -if (error) + error =xfs_attr_defer_replace (args); +break ; +case -ENOATTR : +/* Can't remove what isn't there. */ +if (!args->value) goto out_trans_cancel; -/* shortform attribute has already been committed */ -if (!args->trans) - goto out_unlock; - }else { -if (error != -EEXIST ) +/* Pure replace fails if no existing attr to replace. */ +if (args->attr_flags &XATTR_REPLACE ) goto out_trans_cancel; - error =xfs_attr_remove_deferred (args); -if (error) - goto out_trans_cancel; + error =xfs_attr_defer_add (args); +break ; +default : + goto out_trans_cancel; } +if (error) + goto out_trans_cancel;fs/xfs/libxfs/xfs_attr.c +0
-4/* * If this is a synchronous mount, make sure that the @@ -845,58 +926,6 @@ xfs_attrd_destroy_cache(void) xfs_attrd_cache =NULL ; } -STATIC int -xfs_attr_item_init( - struct xfs_da_args *args, - unsigned int op_flags, /* op flag (set orremove) */
fs/xfs/libxfs/xfs_attr.c +0
-1- struct xfs_attr_item **attr) /* new xfs_attr_item*/
fs/xfs/libxfs/xfs_attr.c +0
-25-{ - -struct xfs_attr_item *new; - - new =kmem_zalloc (sizeof (struct xfs_attr_item ),KM_NOFS ); - new->xattri_op_flags = op_flags; - new->xattri_da_args = args; - - *attr = new; -return 0 ; -} - -/* Sets an attribute for an inode as a deferred operation */ -int -xfs_attr_set_deferred ( -struct xfs_da_args *args) -{ -struct xfs_attr_item *new; -int error =0 ; - - error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_SET , &new); -if (error) -return error; - - xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new-Quoted 1 line
xattri_list);fs/xfs/libxfs/xfs_attr.c +0
-14- -return 0 ; -} - -/* Removes an attribute for an inode as a deferred operation */ -int -xfs_attr_remove_deferred ( -struct xfs_da_args *args) -{ - -struct xfs_attr_item *new; -int error; - - error = xfs_attr_item_init(args, XFS_ATTR_OP_FLAGS_REMOVE,&new);
fs/xfs/libxfs/xfs_attr.c +0
-4-if (error) -return error; - - xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new-Quoted 1 line
xattri_list);fs/xfs/libxfs/xfs_attr.c +0
-4- -return 0 ; -} -/*================================================================== ======
* External routines when attribute list is inside the inode*====================================================================
====*/fs/xfs/libxfs/xfs_attr.h +0
-2@@ -521,8 +521,6 @@ bool xfs_attr_namecheck(const void *name, size_t length);int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total); -int xfs_attr_set_deferred (struct xfs_da_args *args); -int xfs_attr_remove_deferred (struct xfs_da_args *args);extern struct
kmem_cache*xfs_attri_cache;
extern structkmem_cache*xfs_attrd_cache;fs/xfs/libxfs/xfs_log_format.h +1
-0@@ -908,6 +908,7 @@ struct xfs_icreate_log {*/ #define XFS_ATTR_OP_FLAGS_SET 1/* Set the attribute */ #define XFS_ATTR_OP_FLAGS_REMOVE 2/* Remove the attribute */ +#define XFS_ATTR_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTR_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
fs/xfs/xfs_attr_item.c +8
-1@@ -311,6 +311,7 @@ xfs_xattri_finish_update(switch (op) {case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : error =xfs_attr_set_iter (attr);break ;case XFS_ATTR_OP_FLAGS_REMOVE :@@ -500,8 +501,14 @@ xfs_attri_validate(return false;/* alfi_op_flags should be either a set or remove */ -if (op !=XFS_ATTR_OP_FLAGS_SET && op != XFS_ATTR_OP_FLAGS_REMOVE) +switch (op) { +case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : +case XFS_ATTR_OP_FLAGS_REMOVE : +break ; +default :return false; + }if (attrp->alfi_value_len >XATTR_SIZE_MAX )fs/xfs/xfs_attr_item.c +0
-0return false;fs/xfs/xfs_trace.h +4
-0@@ -4154,6 +4154,10 @@DEFINE_DAS_STATE_EVENT (xfs_attr_leaf_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_node_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_remove_iter_return);DEFINE_DAS_STATE_EVENT (xfs_attr_rmtval_remove_return); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_add); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_replace); +DEFINE_DAS_STATE_EVENT (xfs_attr_defer_remove); + TRACE_EVENT(xfs_force_shutdown,TP_PROTO(struct
xfs_mount*mp, int ptag, int flags, const char
*fname,
PATCH v3 5/17 xfs: separate out initial attr_set states
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We current use XFS_DAS_UNINIT for several steps in the attr_set state machine. We use it for setting shortform xattrs, converting from shortform to leaf, leaf add, leaf-to-node and leaf add. All of these things are essentially known before we start the state machine iterating, so we really should separate them out:
XFS_DAS_SF_ADD:
- tries to do a shortform add
- on success -> done
- on ENOSPC converts to leaf, -> XFS_DAS_LEAF_ADD
- on error, dies.
XFS_DAS_LEAF_ADD:
- tries to do leaf add
- on success:
- inline attr -> done
- remote xattr || REPLACE -> XFS_DAS_FOUND_LBLK
- on ENOSPC converts to node, -> XFS_DAS_NODE_ADD
- on error, dies
XFS_DAS_NODE_ADD:
- tries to do node add
- on success:
- inline attr -> done
- remote xattr || REPLACE -> XFS_DAS_FOUND_NBLK
- on error, dies
This makes it easier to understand how the state machine starts up and sets us up on the path to further state machine simplifications.
This also converts the DAS state tracepoints to use strings rather than numbers, as converting between enums and numbers requires manual counting rather than just reading the name.
This also introduces a XFS_DAS_DONE state so that we can trace successful operation completions easily.
--- fs/xfs/libxfs/xfs_attr.c | 161 +++++++++++++++++++------------------- fs/xfs/libxfs/xfs_attr.h | 80 ++++++++++++++++--- fs/xfs/libxfs/xfs_defer.c | 2 + fs/xfs/xfs_acl.c | 4 +- fs/xfs/xfs_attr_item.c | 13 ++- fs/xfs/xfs_ioctl.c | 4 +- fs/xfs/xfs_trace.h | 22 +++++- fs/xfs/xfs_xattr.c | 2 +- 8 files changed, 185 insertions(+), 103 deletions(-)
fs/xfs/libxfs/xfs_attr.c +79 -82
@@ -59,7 +59,7 @@ STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp);*/ STATIC int xfs_attr_node_get(xfs_da_args_t *args); STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args); -STATIC int xfs_attr_node_addname(struct xfs_attr_item *attr); +static int xfs_attr_node_try_addname (struct xfs_attr_item *attr); STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr); STATIC int xfs_attr_node_addname_clear_incomplete(struct xfs_attr_item *attr); STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,
@@ -224,6 +224,11 @@ xfs_init_attr_trans( } } +/* +* Add an attr to a shortform fork. If there is no space, +* xfs_attr_shortform_addname() will convert to leaf format and return -ENOSPC. +* to use. +*/ STATIC int xfs_attr_try_sf_addname( struct xfs_inode *dp,
@@ -255,20 +260,7 @@ xfs_attr_try_sf_addname(return error; } -/* -* Check to see if the attr should be upgraded from non-existent or shortform to -* single-leaf-block attribute list. -*/ -static inline bool -xfs_attr_is_shortform ( -struct xfs_inode *ip) -{ -return ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL || - (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && - ip->i_afp->if_nextents ==0 ); -} - -STATIC int +static int xfs_attr_sf_addname (struct xfs_attr_item *attr) {
@@ -276,14 +268,12 @@ xfs_attr_sf_addname(struct xfs_inode *dp = args->dp;int error =0 ; -/* -* Try to add the attr to the attribute list in the inode. -*/ error =xfs_attr_try_sf_addname (dp, args); - -/* Should only be 0, -EEXIST or -ENOSPC */ -if (error != -ENOSPC ) -return error; +if (error != -ENOSPC ) { +ASSERT (!error || error == -EEXIST ); + attr->xattri_dela_state =XFS_DAS_DONE ; + goto out; + }/* * It won't fit in the shortform, transform to a leaf block. GROT:
@@ -299,64 +289,42 @@ xfs_attr_sf_addname(* with the write verifier. */ xfs_trans_bhold (args->trans, attr->xattri_leaf_bp); - -/* -* We're still in XFS_DAS_UNINIT state here. We've converted -* the attr fork to leaf format and will restart with the leaf -* add. -*/ -trace_xfs_attr_sf_addname_return (XFS_DAS_UNINIT , args->dp); -return -EAGAIN ; + attr->xattri_dela_state =XFS_DAS_LEAF_ADD ; + error = -EAGAIN ; +out: +trace_xfs_attr_sf_addname_return (attr->xattri_dela_state, args->dp); +return error; } -STATIC int +static int xfs_attr_leaf_addname (struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args; -struct xfs_inode *dp = args->dp; -enum xfs_delattr_state next_state =XFS_DAS_UNINIT ;int error; -if (xfs_attr_is_leaf (dp)) { - -/* -* Use the leaf buffer we may already hold locked as a result of -* a sf-to-leaf conversion. The held buffer is no longer valid -* after this call, regardless of the result. -*/ - error =xfs_attr_leaf_try_add (args, attr->xattri_leaf_bp); - attr->xattri_leaf_bp =NULL ; +ASSERT (xfs_attr_is_leaf (args->dp)); -if (error == -ENOSPC ) { - error =xfs_attr3_leaf_to_node (args); -if (error) -return error; - -/* -* Finish any deferred work items and roll the -* transaction once more. The goal here is to call -* node_addname with the inode and transaction in the -* same state (inode locked and joined, transaction -* clean) no matter how we got to this step. -* -* At this point, we are still in XFS_DAS_UNINIT, but -* when we come back, we'll be a node, so we'll fall -* down into the node handling code below -*/ - error = -EAGAIN ; - goto out; - } - next_state =XFS_DAS_FOUND_LBLK ; - }else { -ASSERT (!attr->xattri_leaf_bp); +/* +* Use the leaf buffer we may already hold locked as a result of +* a sf-to-leaf conversion. The held buffer is no longer valid +* after this call, regardless of the result. +*/ + error =xfs_attr_leaf_try_add (args, attr->xattri_leaf_bp); + attr->xattri_leaf_bp =NULL ; - error =xfs_attr_node_addname_find_attr (attr); +if (error == -ENOSPC ) { + error =xfs_attr3_leaf_to_node (args);if (error)return error; - next_state =XFS_DAS_FOUND_NBLK ; - error =xfs_attr_node_addname (attr); +/* +* We're not in leaf format anymore, so roll the transaction and +* retry the add to the newly allocated node block. +*/ + attr->xattri_dela_state =XFS_DAS_NODE_ADD ; + error = -EAGAIN ; + goto out; }if (error)return error;
@@ -368,15 +336,46 @@ xfs_attr_leaf_addname(*/ if (args->rmtblkno || (args->op_flags &XFS_DA_OP_RENAME )) { - attr->xattri_dela_state = next_state; + attr->xattri_dela_state =XFS_DAS_FOUND_LBLK ; error = -EAGAIN ; + }else { + attr->xattri_dela_state =XFS_DAS_DONE ; } - out:trace_xfs_attr_leaf_addname_return (attr->xattri_dela_state, args->dp);return error; } +static int +xfs_attr_node_addname ( +struct xfs_attr_item *attr) +{ +struct xfs_da_args *args = attr->xattri_da_args; +int error; + +ASSERT (!attr->xattri_leaf_bp); + + error =xfs_attr_node_addname_find_attr (attr); +if (error) +return error; + + error =xfs_attr_node_try_addname (attr); +if (error) +return error; + +if (args->rmtblkno || + (args->op_flags &XFS_DA_OP_RENAME )) { + attr->xattri_dela_state =XFS_DAS_FOUND_NBLK ; + error = -EAGAIN ; + }else { + attr->xattri_dela_state =XFS_DAS_DONE ; + } + +trace_xfs_attr_node_addname_return (attr->xattri_dela_state, args->dp); +return error; +} + +/* * Set the attribute specified in @args. * This routine is meant to function as a delayed operation, and may return
@@ -397,16 +396,14 @@ xfs_attr_set_iter(/* State machine switch */ switch (attr->xattri_dela_state) {case XFS_DAS_UNINIT : -/* -* If the fork is shortform, attempt to add the attr. If there -* is no space, this converts to leaf format and returns -* -EAGAIN with the leaf buffer held across the roll. The caller -* will deal with a transaction roll error, but otherwise -* release the hold once we return with a clean transaction. -*/ -if (xfs_attr_is_shortform (dp)) -return xfs_attr_sf_addname (attr); +ASSERT (0 ); +return -EFSCORRUPTED ; +case XFS_DAS_SF_ADD : +return xfs_attr_sf_addname (attr); +case XFS_DAS_LEAF_ADD :return xfs_attr_leaf_addname (attr); +case XFS_DAS_NODE_ADD : +return xfs_attr_node_addname (attr);case XFS_DAS_FOUND_LBLK :/*
@@ -700,7 +697,7 @@ xfs_attr_defer_add(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_add_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list);trace_xfs_attr_defer_add (new->xattri_dela_state, args->dp);
@@ -719,7 +716,7 @@ xfs_attr_defer_replace(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_replace_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list);trace_xfs_attr_defer_replace (new->xattri_dela_state, args->dp);
@@ -1262,8 +1259,8 @@ xfs_attr_node_addname_find_attr(* to handle this, and recall the function until a successful error code is *returned. */ -STATIC int -xfs_attr_node_addname ( +static int +xfs_attr_node_try_addname (struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args;
fs/xfs/libxfs/xfs_attr.h +67 -13
92 lines not on this page · raw message
fs/xfs/libxfs/xfs_defer.c +2 -0
@@ -23,6 +23,8 @@#include "xfs_bmap.h" #include "xfs_alloc.h" #include "xfs_buf.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" static struct kmem_cache *xfs_defer_pending_cache;
fs/xfs/xfs_acl.c +2 -2
@@ -10,12 +10,12 @@#include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_inode.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_trace.h" #include "xfs_error.h" #include "xfs_acl.h" -#include "xfs_da_format.h" -#include "xfs_da_btree.h" #include "xfs_trans.h" #include <linux/posix_acl_xattr.h>
fs/xfs/xfs_attr_item.c +12 -1
@@ -570,10 +570,21 @@ xfs_attri_item_recover( args->hashval =xfs_da_hashname (args->name, args->namelen); args->attr_filter = attrp->alfi_attr_flags; -if (attrp->alfi_op_flags ==XFS_ATTR_OP_FLAGS_SET ) { +switch (attrp->alfi_op_flags &XFS_ATTR_OP_FLAGS_TYPE_MASK ) { +case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : args->value = attrip->attri_value; args->valuelen = attrp->alfi_value_len; args->total =xfs_attr_calc_size (args, &local); + attr->xattri_dela_state =xfs_attr_init_add_state (args); +break ; +case XFS_ATTR_OP_FLAGS_REMOVE : + attr->xattri_dela_state =XFS_DAS_UNINIT ; +break ; +default : +ASSERT (0 ); + error = -EFSCORRUPTED ; + goto out; }xfs_init_attr_trans (args, &tres, &total);
fs/xfs/xfs_ioctl.c +2 -2
@@ -15,6 +15,8 @@#include "xfs_iwalk.h" #include "xfs_itable.h" #include "xfs_error.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_bmap.h" #include "xfs_bmap_util.h"
@@ -35,8 +37,6 @@#include "xfs_health.h" #include "xfs_reflink.h" #include "xfs_ioctl.h" -#include "xfs_da_format.h" -#include "xfs_da_btree.h" #include <linux/mount.h> #include <linux/namei.h>
fs/xfs/xfs_trace.h +20 -2
@@ -4129,6 +4129,23 @@ DEFINE_ICLOG_EVENT(xlog_iclog_want_sync);DEFINE_ICLOG_EVENT (xlog_iclog_wait_on);DEFINE_ICLOG_EVENT (xlog_iclog_write); +TRACE_DEFINE_ENUM (XFS_DAS_UNINIT ); +TRACE_DEFINE_ENUM (XFS_DAS_SF_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK ); +TRACE_DEFINE_ENUM (XFS_DAS_FOUND_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_FOUND_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF ); +TRACE_DEFINE_ENUM (XFS_DAS_ALLOC_NODE ); +TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG ); + DECLARE_EVENT_CLASS(xfs_das_state_class, TP_PROTO(int das, struct xfs_inode *ip), TP_ARGS(das, ip),
@@ -4140,8 +4157,9 @@ DECLARE_EVENT_CLASS(xfs_das_state_class, __entry->das = das; __entry->ino = ip->i_ino; ), - TP_printk("state change %d ino 0x%llx", - __entry->das, __entry->ino) + TP_printk("state change %s ino 0x%llx", + __print_symbolic(__entry->das, XFS_DAS_STRINGS), + __entry->ino) )#define DEFINE_DAS_STATE_EVENT (name) \
fs/xfs/xfs_xattr.c +1 -1
@@ -12,9 +12,9 @@#include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_inode.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_acl.h" -#include "xfs_da_btree.h" #include <linux/posix_acl_xattr.h>
Signature · 1 line
2.35.1
Re: [PATCH 05/17] xfs: separate out initial attr_set states
Quoted 33 lines · Dave Chinner
From: Dave Chinner <[email protected]>
We current use
XFS_DAS_UNINITfor several steps in theattr_setstate machine. We use it for setting shortform xattrs, converting from shortform to leaf, leaf add, leaf-to-node and leaf add. All of these things are essentially known before we start the state machine iterating, so we really should separate them out:
XFS_DAS_SF_ADD:
- tries to do a shortform add
- on success -> done
- on ENOSPC converts to leaf, ->XFS_DAS_LEAF_ADD
- on error, dies.
XFS_DAS_LEAF_ADD:
- tries to do leaf add
- on success:
- inline attr -> done
- remote xattr || REPLACE ->XFS_DAS_FOUND_LBLK
- on ENOSPC converts to node, ->XFS_DAS_NODE_ADD
- on error, dies
XFS_DAS_NODE_ADD:
- tries to do node add
- on success:
- inline attr -> done
- remote xattr || REPLACE ->XFS_DAS_FOUND_NBLK
- on error, diesThis makes it easier to understand how the state machine starts up and sets us up on the path to further state machine simplifications.
Quoted 8 lines
This also converts the DAS state tracepoints to use strings rather than numbers, as converting between enums and numbers requires manual counting rather than just reading the name.
This also introduces a
XFS_DAS_DONEstate so that we can trace successful operation completions easily.Signed-off-by Dave Chinner <[email protected]>
Looks good, I see we set the new states in the recovery path now
Quoted 550 lines
--- fs/xfs/libxfs/xfs_attr.c | 161 +++++++++++++++++++----------------- -- fs/xfs/libxfs/xfs_attr.h | 80 ++++++++++++++++--- fs/xfs/libxfs/xfs_defer.c | 2 + fs/xfs/xfs_acl.c | 4 +- fs/xfs/xfs_attr_item.c | 13 ++- fs/xfs/xfs_ioctl.c | 4 +- fs/xfs/xfs_trace.h | 22 +++++- fs/xfs/xfs_xattr.c | 2 +- 8 files changed, 185 insertions(+), 103 deletions(-)fs/xfs/libxfs/xfs_attr.c +1
-1@@ -59,7 +59,7 @@ STATIC int xfs_attr_leaf_try_add(struct xfs_da_args*args, struct xfs_buf *bp); */ STATIC int xfs_attr_node_get(xfs_da_args_t *args); STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args); -STATIC int xfs_attr_node_addname(struct xfs_attr_item *attr); +static int xfs_attr_node_try_addname (struct xfs_attr_item *attr); STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr);STATIC int xfs_attr_node_addname_clear_incomplete(struct
xfs_attr_item*attr);
STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,fs/xfs/libxfs/xfs_attr.c +3
-0@@ -224,6 +224,11 @@ xfs_init_attr_trans( } } +/* +* Add an attr to a shortform fork. If there is no space, +* xfs_attr_shortform_addname() will convert to leaf format and return
-ENOSPC.
+ * to use.
+ */
STATIC int
xfs_attr_try_sf_addname(fs/xfs/libxfs/xfs_attr.c +0
-2struct xfs_inode *dp,@@ -255,20 +260,7 @@ xfs_attr_try_sf_addname(return error; } -/* -* Check to see if the attr should be upgraded from non-existent or shortform to
- * single-leaf-block attribute list.
- */fs/xfs/libxfs/xfs_attr.c +6
-17-static inline bool -xfs_attr_is_shortform ( -struct xfs_inode *ip) -{ -return ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL || - (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && - ip->i_afp->if_nextents ==0 ); -} - -STATIC int +static int xfs_attr_sf_addname (struct xfs_attr_item *attr) {@@ -276,14 +268,12 @@ xfs_attr_sf_addname(struct xfs_inode *dp = args->dp;int error =0 ; -/* -* Try to add the attr to the attribute list in the inode. -*/ error =xfs_attr_try_sf_addname (dp, args); - -/* Should only be 0, -EEXIST or -ENOSPC */ -if (error != -ENOSPC ) -return error; +if (error != -ENOSPC ) { +ASSERT (!error || error == -EEXIST ); + attr->xattri_dela_state =XFS_DAS_DONE ; + goto out; + }/* * It won't fit in the shortform, transform to a leaf block. GROT:
fs/xfs/libxfs/xfs_attr.c +6
-15@@ -299,64 +289,42 @@ xfs_attr_sf_addname(* with the write verifier. */ xfs_trans_bhold (args->trans, attr->xattri_leaf_bp); - -/* -* We're still in XFS_DAS_UNINIT state here. We've converted -* the attr fork to leaf format and will restart with the leaf -* add. -*/ -trace_xfs_attr_sf_addname_return (XFS_DAS_UNINIT , args->dp); -return -EAGAIN ; + attr->xattri_dela_state =XFS_DAS_LEAF_ADD ; + error = -EAGAIN ; +out: +trace_xfs_attr_sf_addname_return (attr->xattri_dela_state, args- >dp); +return error; } -STATIC int +static int xfs_attr_leaf_addname (struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args; -struct xfs_inode *dp = args->dp; -enum xfs_delattr_state next_state =XFS_DAS_UNINIT ;int error; -if (xfs_attr_is_leaf (dp)) { - -/* -* Use the leaf buffer we may already hold locked as a result of
fs/xfs/libxfs/xfs_attr.c +0
-1-* a sf-to-leaf conversion. The held buffer is no longer valid
fs/xfs/libxfs/xfs_attr.c +0
-3-* after this call, regardless of the result. -*/ - error = xfs_attr_leaf_try_add(args, attr-Quoted 1 line
xattri_leaf_bp);fs/xfs/libxfs/xfs_attr.c +1
-9- attr->xattri_leaf_bp =NULL ; +ASSERT (xfs_attr_is_leaf (args->dp)); -if (error == -ENOSPC ) { - error =xfs_attr3_leaf_to_node (args); -if (error) -return error; - -/* -* Finish any deferred work items and roll the -* transaction once more. The goal here is to call
fs/xfs/libxfs/xfs_attr.c +0
-1-* node_addname with the inode and transaction in the
fs/xfs/libxfs/xfs_attr.c +0
-1-* same state (inode locked and joined, transaction
fs/xfs/libxfs/xfs_attr.c +0
-3-* clean) no matter how we got to this step. -* -* At this point, we are still in
XFS_DAS_UNINIT, butfs/xfs/libxfs/xfs_attr.c +0
-1-* when we come back, we'll be a node, so we'll fall
fs/xfs/libxfs/xfs_attr.c +2
-8-* down into the node handling code below -*/ - error = -EAGAIN ; - goto out; - } - next_state =XFS_DAS_FOUND_LBLK ; - }else { -ASSERT (!attr->xattri_leaf_bp); +/* +* Use the leaf buffer we may already hold locked as a result of
fs/xfs/libxfs/xfs_attr.c +9
-3+* a sf-to-leaf conversion. The held buffer is no longer valid +* after this call, regardless of the result. +*/ + error =xfs_attr_leaf_try_add (args, attr->xattri_leaf_bp); + attr->xattri_leaf_bp =NULL ; - error =xfs_attr_node_addname_find_attr (attr); +if (error == -ENOSPC ) { + error =xfs_attr3_leaf_to_node (args);if (error)return error; - next_state =XFS_DAS_FOUND_NBLK ; - error =xfs_attr_node_addname (attr); +/* +* We're not in leaf format anymore, so roll the transaction and
fs/xfs/libxfs/xfs_attr.c +38
-2+* retry the add to the newly allocated node block. +*/ + attr->xattri_dela_state =XFS_DAS_NODE_ADD ; + error = -EAGAIN ; + goto out; }if (error)return error;@@ -368,15 +336,46 @@ xfs_attr_leaf_addname(*/ if (args->rmtblkno || (args->op_flags &XFS_DA_OP_RENAME )) { - attr->xattri_dela_state = next_state; + attr->xattri_dela_state =XFS_DAS_FOUND_LBLK ; error = -EAGAIN ; + }else { + attr->xattri_dela_state =XFS_DAS_DONE ; } - out:trace_xfs_attr_leaf_addname_return (attr->xattri_dela_state, args->dp);return error; } +static int +xfs_attr_node_addname ( +struct xfs_attr_item *attr) +{ +struct xfs_da_args *args = attr->xattri_da_args; +int error; + +ASSERT (!attr->xattri_leaf_bp); + + error =xfs_attr_node_addname_find_attr (attr); +if (error) +return error; + + error =xfs_attr_node_try_addname (attr); +if (error) +return error; + +if (args->rmtblkno || + (args->op_flags &XFS_DA_OP_RENAME )) { + attr->xattri_dela_state =XFS_DAS_FOUND_NBLK ; + error = -EAGAIN ; + }else { + attr->xattri_dela_state =XFS_DAS_DONE ; + } + +trace_xfs_attr_node_addname_return (attr->xattri_dela_state, args->dp); +return error; +} + +/* * Set the attribute specified in @args.
* This routine is meant to function as a delayed operation, and may
returnfs/xfs/libxfs/xfs_attr.c +0
-2@@ -397,16 +396,14 @@ xfs_attr_set_iter(/* State machine switch */ switch (attr->xattri_dela_state) {case XFS_DAS_UNINIT : -/* -* If the fork is shortform, attempt to add the attr. If there
fs/xfs/libxfs/xfs_attr.c +0
-1-* is no space, this converts to leaf format and returns
fs/xfs/libxfs/xfs_attr.c +0
-1-* -EAGAIN with the leaf buffer held across the roll. The caller
fs/xfs/libxfs/xfs_attr.c +0
-1-* will deal with a transaction roll error, but otherwise
fs/xfs/libxfs/xfs_attr.c +0
-1-* release the hold once we return with a clean transaction.
fs/xfs/libxfs/xfs_attr.c +9
-5-*/ -if (xfs_attr_is_shortform (dp)) -return xfs_attr_sf_addname (attr); +ASSERT (0 ); +return -EFSCORRUPTED ; +case XFS_DAS_SF_ADD : +return xfs_attr_sf_addname (attr); +case XFS_DAS_LEAF_ADD :return xfs_attr_leaf_addname (attr); +case XFS_DAS_NODE_ADD : +return xfs_attr_node_addname (attr);case XFS_DAS_FOUND_LBLK :/* @@ -700,7 +697,7 @@ xfs_attr_defer_add(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_add_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new- >xattri_list);trace_xfs_attr_defer_add (new->xattri_dela_state, args->dp);@@ -719,7 +716,7 @@ xfs_attr_defer_replace(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_replace_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new- >xattri_list);trace_xfs_attr_defer_replace (new->xattri_dela_state, args->dp);@@ -1262,8 +1259,8 @@ xfs_attr_node_addname_find_attr(* to handle this, and recall the function until a successful error code is
*returned.
*/fs/xfs/libxfs/xfs_attr.c +2
-2-STATIC int -xfs_attr_node_addname ( +static int +xfs_attr_node_try_addname (struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args;fs/xfs/libxfs/xfs_attr.h +0
-7@@ -443,21 +443,44 @@ struct xfs_attr_list_context {* to where it was and resume executing where it left off. */ enum xfs_delattr_state { -XFS_DAS_UNINIT =0 ,/* No state has been set yet */ -XFS_DAS_RMTBLK ,/* Removing remote blks */ -XFS_DAS_RM_NAME ,/* Remove attr name */ -XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ -XFS_DAS_FOUND_LBLK ,/* We found leaf blk for attr */ -XFS_DAS_FOUND_NBLK ,/* We found node blk for attr */ -XFS_DAS_FLIP_LFLAG ,/* Flipped leaf INCOMPLETE attr flag */
fs/xfs/libxfs/xfs_attr.h +0
-3-XFS_DAS_RM_LBLK ,/* A rename is removing leaf blocks */ -XFS_DAS_RD_LEAF ,/* Read in the new leaf */ - XFS_DAS_ALLOC_NODE, /* We are allocating nodeblocks */
fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_FLIP_NFLAG, /* Flipped node INCOMPLETE attrflag */
fs/xfs/libxfs/xfs_attr.h +1
-2-XFS_DAS_RM_NBLK ,/* A rename is removing node blocks */ - XFS_DAS_CLR_FLAG, /* Clear incomplete flag */ + XFS_DAS_UNINIT = 0, /* No state has been set yet*/
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_SF_ADD, /* Initial shortform set iterstate */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_LEAF_ADD, /* Initial leaf form set iter state*/
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_NODE_ADD, /* Initial node form set iter state*/
fs/xfs/libxfs/xfs_attr.h +3
-0+XFS_DAS_RMTBLK ,/* Removing remote blks */ +XFS_DAS_RM_NAME ,/* Remove attr name */ + XFS_DAS_RM_SHRINK, /* We are shrinking the tree*/
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_FOUND_LBLK, /* We found leaf blk for attr*/
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_FOUND_NBLK, /* We found node blk for attr*/
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_FLIP_LFLAG, /* Flipped leaf INCOMPLETEattr flag */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_RM_LBLK, /* A rename is removing leaf blocks*/
fs/xfs/libxfs/xfs_attr.h +2
-0+XFS_DAS_RD_LEAF ,/* Read in the new leaf */ + XFS_DAS_ALLOC_NODE, /* We are allocating nodeblocks */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_FLIP_NFLAG, /* Flipped node INCOMPLETEattr flag */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_RM_NBLK, /* A rename is removing node blocks*/
fs/xfs/libxfs/xfs_attr.h +23
-0+XFS_DAS_CLR_FLAG ,/* Clear incomplete flag */ + XFS_DAS_DONE, /* finished operation */ }; +#define XFS_DAS_STRINGS \ + { XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \ + { XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \ + { XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \ + { XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \ + { XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \ + { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ + { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ + { XFS_DAS_FOUND_LBLK, "XFS_DAS_FOUND_LBLK" }, \ + { XFS_DAS_FOUND_NBLK, "XFS_DAS_FOUND_NBLK" }, \ + { XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \ + { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ + { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ + { XFS_DAS_ALLOC_NODE, "XFS_DAS_ALLOC_NODE" }, \ + { XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \ + { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ + { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \ + { XFS_DAS_DONE, "XFS_DAS_DONE" } +/* * Defines for xfs_attr_item.xattri_flags */ @@ -530,4 +553,35 @@ void xfs_attri_destroy_cache(void);int __init xfs_attrd_init_cache (void );void xfs_attrd_destroy_cache (void ); +/* +* Check to see if the attr should be upgraded from non-existent or shortform to
+ * single-leaf-block attribute list.
+ */fs/xfs/libxfs/xfs_attr.h +27
-0+static inline bool +xfs_attr_is_shortform ( +struct xfs_inode *ip) +{ +return ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL || + (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && + ip->i_afp->if_nextents ==0 ); +} + +static inline enum xfs_delattr_state +xfs_attr_init_add_state (struct xfs_da_args *args) +{ +if (!args->dp->i_afp) +return XFS_DAS_DONE ; +if (xfs_attr_is_shortform (args->dp)) +return XFS_DAS_SF_ADD ; +if (xfs_attr_is_leaf (args->dp)) +return XFS_DAS_LEAF_ADD ; +return XFS_DAS_NODE_ADD ; +} + +static inline enum xfs_delattr_state +xfs_attr_init_replace_state (struct xfs_da_args *args) +{ +return xfs_attr_init_add_state (args); +} +#endif /* __XFS_ATTR_H__ */ fs/xfs/libxfs/xfs_defer.c +2
-0@@ -23,6 +23,8 @@#include "xfs_bmap.h" #include "xfs_alloc.h" #include "xfs_buf.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" static struct kmem_cache *xfs_defer_pending_cache;fs/xfs/xfs_acl.c +2
-2@@ -10,12 +10,12 @@#include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_inode.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_trace.h" #include "xfs_error.h" #include "xfs_acl.h" -#include "xfs_da_format.h" -#include "xfs_da_btree.h" #include "xfs_trans.h" #include <linux/posix_acl_xattr.h> fs/xfs/xfs_attr_item.c +12
-1@@ -570,10 +570,21 @@ xfs_attri_item_recover( args->hashval =xfs_da_hashname (args->name, args->namelen); args->attr_filter = attrp->alfi_attr_flags; -if (attrp->alfi_op_flags ==XFS_ATTR_OP_FLAGS_SET ) { +switch (attrp->alfi_op_flags &XFS_ATTR_OP_FLAGS_TYPE_MASK ) { +case XFS_ATTR_OP_FLAGS_SET : +case XFS_ATTR_OP_FLAGS_REPLACE : args->value = attrip->attri_value; args->valuelen = attrp->alfi_value_len; args->total =xfs_attr_calc_size (args, &local); + attr->xattri_dela_state =xfs_attr_init_add_state (args); +break ; +case XFS_ATTR_OP_FLAGS_REMOVE : + attr->xattri_dela_state =XFS_DAS_UNINIT ; +break ; +default : +ASSERT (0 ); + error = -EFSCORRUPTED ; + goto out; }fs/xfs/xfs_attr_item.c +0
-0xfs_init_attr_trans (args, &tres, &total);fs/xfs/xfs_ioctl.c +2
-2@@ -15,6 +15,8 @@#include "xfs_iwalk.h" #include "xfs_itable.h" #include "xfs_error.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_bmap.h" #include "xfs_bmap_util.h" @@ -35,8 +37,6 @@#include "xfs_health.h" #include "xfs_reflink.h" #include "xfs_ioctl.h" -#include "xfs_da_format.h" -#include "xfs_da_btree.h" #include <linux/mount.h> #include <linux/namei.h> fs/xfs/xfs_trace.h +20
-2@@ -4129,6 +4129,23 @@ DEFINE_ICLOG_EVENT(xlog_iclog_want_sync);DEFINE_ICLOG_EVENT (xlog_iclog_wait_on);DEFINE_ICLOG_EVENT (xlog_iclog_write); +TRACE_DEFINE_ENUM (XFS_DAS_UNINIT ); +TRACE_DEFINE_ENUM (XFS_DAS_SF_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD ); +TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK ); +TRACE_DEFINE_ENUM (XFS_DAS_FOUND_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_FOUND_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF ); +TRACE_DEFINE_ENUM (XFS_DAS_ALLOC_NODE ); +TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG ); + DECLARE_EVENT_CLASS(xfs_das_state_class, TP_PROTO(int das, struct xfs_inode *ip), TP_ARGS(das, ip),@@ -4140,8 +4157,9 @@ DECLARE_EVENT_CLASS(xfs_das_state_class, __entry->das = das; __entry->ino = ip->i_ino; ), - TP_printk("state change %d ino 0x%llx", - __entry->das, __entry->ino) + TP_printk("state change %s ino 0x%llx", + __print_symbolic(__entry->das, XFS_DAS_STRINGS), + __entry->ino) )#define DEFINE_DAS_STATE_EVENT (name) \fs/xfs/xfs_xattr.c +1
-1@@ -12,9 +12,9 @@#include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_inode.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_acl.h" -#include "xfs_da_btree.h" #include <linux/posix_acl_xattr.h>
PATCH v3 6/17 xfs: kill XFS_DAC_LEAF_ADDNAME_INIT
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We re-enter the XFS_DAS_FOUND_LBLK state when we have to allocate multiple extents for a remote xattr. We currently have a flag called XFS_DAC_LEAF_ADDNAME_INIT to avoid running the remote attr hole finding code more than once.
However, for the node format tree, we have a separate state for this so we never reenter the state machine at XFS_DAS_FOUND_NBLK and so it does not need a special flag to skip over the remote attr hold finding code.
Convert the leaf block code to use the same state machine as the node blocks and kill the XFS_DAC_LEAF_ADDNAME_INIT flag.
This further points out that this "ALLOC" state is only traversed if we have remote xattrs or we are doing a rename operation. Rename both the leaf and node alloc states to _ALLOC_RMT to indicate they are iterating to do allocation of remote xattr blocks.
--- fs/xfs/libxfs/xfs_attr.c | 45 ++++++++++++++++++++-------------------- fs/xfs/libxfs/xfs_attr.h | 6 ++++-- fs/xfs/xfs_trace.h | 3 ++- 3 files changed, 29 insertions(+), 25 deletions(-)
fs/xfs/libxfs/xfs_attr.c +23 -22
@@ -406,40 +406,41 @@ xfs_attr_set_iter(return xfs_attr_node_addname (attr);case XFS_DAS_FOUND_LBLK : +/* +* Find space for remote blocks and fall into the allocation +* state. +*/ +if (args->rmtblkno >0 ) { + error =xfs_attr_rmtval_find_space (attr); +if (error) +return error; + } + attr->xattri_dela_state =XFS_DAS_LEAF_ALLOC_RMT ; + fallthrough; +case XFS_DAS_LEAF_ALLOC_RMT : +/* * If there was an out-of-line value, allocate the blocks we * identified for its storage and copy the value. This is done * after we create the attribute so that we don't overflow the * maximum size of a transaction and/or hit a deadlock. */ - -/* Open coded xfs_attr_rmtval_set without trans handling */ -if ((attr->xattri_flags &XFS_DAC_LEAF_ADDNAME_INIT ) ==0 ) { - attr->xattri_flags |=XFS_DAC_LEAF_ADDNAME_INIT ; -if (args->rmtblkno >0 ) { - error =xfs_attr_rmtval_find_space (attr); +if (args->rmtblkno >0 ) { +if (attr->xattri_blkcnt >0 ) { + error =xfs_attr_rmtval_set_blk (attr);if (error)return error; +trace_xfs_attr_set_iter_return ( + attr->xattri_dela_state, + args->dp); +return -EAGAIN ; } - } -/* -* Repeat allocating remote blocks for the attr value until -* blkcnt drops to zero. -*/ -if (attr->xattri_blkcnt >0 ) { - error =xfs_attr_rmtval_set_blk (attr); + error =xfs_attr_rmtval_set_value (args);if (error)return error; -trace_xfs_attr_set_iter_return (attr->xattri_dela_state, - args->dp); -return -EAGAIN ; } - error =xfs_attr_rmtval_set_value (args); -if (error) -return error; -/* * If this is not a rename, clear the incomplete flag and we're * done.
@@ -534,15 +535,15 @@ xfs_attr_set_iter(return error; } + attr->xattri_dela_state =XFS_DAS_NODE_ALLOC_RMT ; fallthrough; -case XFS_DAS_ALLOC_NODE : +case XFS_DAS_NODE_ALLOC_RMT :/* * If there was an out-of-line value, allocate the blocks we * identified for its storage and copy the value. This is done * after we create the attribute so that we don't overflow the * maximum size of a transaction and/or hit a deadlock. */ - attr->xattri_dela_state =XFS_DAS_ALLOC_NODE ;if (args->rmtblkno >0 ) {if (attr->xattri_blkcnt >0 ) { error =xfs_attr_rmtval_set_blk (attr);
fs/xfs/libxfs/xfs_attr.h +4 -2
@@ -451,11 +451,12 @@ enum xfs_delattr_state {XFS_DAS_RM_NAME ,/* Remove attr name */ XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ XFS_DAS_FOUND_LBLK ,/* We found leaf blk for attr */ +XFS_DAS_LEAF_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_FOUND_NBLK ,/* We found node blk for attr */ +XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_FLIP_LFLAG ,/* Flipped leaf INCOMPLETE attr flag */ XFS_DAS_RM_LBLK ,/* A rename is removing leaf blocks */ XFS_DAS_RD_LEAF ,/* Read in the new leaf */ -XFS_DAS_ALLOC_NODE ,/* We are allocating node blocks */ XFS_DAS_FLIP_NFLAG ,/* Flipped node INCOMPLETE attr flag */ XFS_DAS_RM_NBLK ,/* A rename is removing node blocks */ XFS_DAS_CLR_FLAG, /* Clear incomplete flag */
@@ -471,11 +472,12 @@ enum xfs_delattr_state { { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ { XFS_DAS_FOUND_LBLK, "XFS_DAS_FOUND_LBLK" }, \ + { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ { XFS_DAS_FOUND_NBLK, "XFS_DAS_FOUND_NBLK" }, \ + { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ { XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \ { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ - { XFS_DAS_ALLOC_NODE, "XFS_DAS_ALLOC_NODE" }, \ { XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \ { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \
fs/xfs/xfs_trace.h +2 -1
@@ -4137,11 +4137,12 @@ TRACE_DEFINE_ENUM(XFS_DAS_RMTBLK);TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME );TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK );TRACE_DEFINE_ENUM (XFS_DAS_FOUND_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_FOUND_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG );TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK );TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF ); -TRACE_DEFINE_ENUM (XFS_DAS_ALLOC_NODE );TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG );TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK );TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG );
Signature · 1 line
2.35.1
PATCH v3 7/17 xfs: consolidate leaf/node states in xfs_attr_set_iter
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
The operations performed from XFS_DAS_FOUND_LBLK through to XFS_DAS_RM_LBLK are now identical to XFS_DAS_FOUND_NBLK through to XFS_DAS_RM_NBLK. We can collapse these down into a single set of code.
To do this, define the states that leaf and node run through as separate sets of sequential states. Then as we move to the next state, we can use increments rather than specific state assignments to move through the states. This means the state progression is set by the initial state that enters the series and we don't need to duplicate the code anymore.
At the exit point of the series we need to select the correct leaf or node state, but that can also be done by state increment rather than assignment.
--- fs/xfs/libxfs/xfs_attr.c | 127 ++++++--------------------------------- fs/xfs/libxfs/xfs_attr.h | 9 ++- 2 files changed, 27 insertions(+), 109 deletions(-)
fs/xfs/libxfs/xfs_attr.c +20 -107
@@ -394,6 +394,7 @@ xfs_attr_set_iter(struct xfs_mount *mp = args->dp->i_mount;/* State machine switch */ +next_state:switch (attr->xattri_dela_state) {case XFS_DAS_UNINIT :ASSERT (0 );
@@ -406,6 +407,7 @@ xfs_attr_set_iter(return xfs_attr_node_addname (attr);case XFS_DAS_FOUND_LBLK : +case XFS_DAS_FOUND_NBLK :/* * Find space for remote blocks and fall into the allocation * state.
@@ -415,9 +417,10 @@ xfs_attr_set_iter(if (error)return error; } - attr->xattri_dela_state =XFS_DAS_LEAF_ALLOC_RMT ; + attr->xattri_dela_state++; fallthrough;case XFS_DAS_LEAF_ALLOC_RMT : +case XFS_DAS_NODE_ALLOC_RMT :/* * If there was an out-of-line value, allocate the blocks we
@@ -466,16 +469,18 @@ xfs_attr_set_iter(return error;/* * Commit the flag value change and start the next trans -* in series. +* in series at FLIP_FLAG. */ - attr->xattri_dela_state =XFS_DAS_FLIP_LFLAG ; + attr->xattri_dela_state++;trace_xfs_attr_set_iter_return (attr->xattri_dela_state, args->dp);return -EAGAIN ; } + attr->xattri_dela_state++; fallthrough;case XFS_DAS_FLIP_LFLAG : +case XFS_DAS_FLIP_NFLAG :/* * Dismantle the "old" attribute/value pair by removing a * "remote" value (if it exists).
@@ -485,10 +490,10 @@ xfs_attr_set_iter(if (error)return error; + attr->xattri_dela_state++; fallthrough;case XFS_DAS_RM_LBLK : -/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */ - attr->xattri_dela_state =XFS_DAS_RM_LBLK ; +case XFS_DAS_RM_NBLK :if (args->rmtblkno) { error =xfs_attr_rmtval_remove (attr);if (error == -EAGAIN )
@@ -503,7 +508,16 @@ xfs_attr_set_iter(return -EAGAIN ; } - fallthrough; +/* +* This is the end of the shared leaf/node sequence. We need +* to continue at the next state in the sequence, but we can't +* easily just fall through. So we increment to the next state +* and then jump back to switch statement to evaluate the next +* state correctly. +*/ + attr->xattri_dela_state++; + goto next_state; +case XFS_DAS_RD_LEAF :/* * This is the last step for leaf format. Read the block with
@@ -524,106 +538,6 @@ xfs_attr_set_iter(return error; -case XFS_DAS_FOUND_NBLK : -/* -* Find space for remote blocks and fall into the allocation -* state. -*/ -if (args->rmtblkno >0 ) { - error =xfs_attr_rmtval_find_space (attr); -if (error) -return error; - } - - attr->xattri_dela_state =XFS_DAS_NODE_ALLOC_RMT ; - fallthrough; -case XFS_DAS_NODE_ALLOC_RMT : -/* -* If there was an out-of-line value, allocate the blocks we -* identified for its storage and copy the value. This is done -* after we create the attribute so that we don't overflow the -* maximum size of a transaction and/or hit a deadlock. -*/ -if (args->rmtblkno >0 ) { -if (attr->xattri_blkcnt >0 ) { - error =xfs_attr_rmtval_set_blk (attr); -if (error) -return error; -trace_xfs_attr_set_iter_return ( - attr->xattri_dela_state, args->dp); -return -EAGAIN ; - } - - error =xfs_attr_rmtval_set_value (args); -if (error) -return error; - } - -/* -* If this was not a rename, clear the incomplete flag and we're -* done. -*/ -if (!(args->op_flags &XFS_DA_OP_RENAME )) { -if (args->rmtblkno >0 ) - error =xfs_attr3_leaf_clearflag (args); - goto out; - } - -/* -* If this is an atomic rename operation, we must "flip" the -* incomplete flags on the "new" and "old" attribute/value pairs -* so that one disappears and one appears atomically. Then we -* must remove the "old" attribute/value pair. -* -* In a separate transaction, set the incomplete flag on the -* "old" attr and clear the incomplete flag on the "new" attr. -*/ -if (!xfs_has_larp (mp)) { - error =xfs_attr3_leaf_flipflags (args); -if (error) - goto out; -/* -* Commit the flag value change and start the next trans -* in series -*/ - attr->xattri_dela_state =XFS_DAS_FLIP_NFLAG ; -trace_xfs_attr_set_iter_return (attr->xattri_dela_state, - args->dp); -return -EAGAIN ; - } - - fallthrough; -case XFS_DAS_FLIP_NFLAG : -/* -* Dismantle the "old" attribute/value pair by removing a -* "remote" value (if it exists). -*/ -xfs_attr_restore_rmt_blk (args); - - error =xfs_attr_rmtval_invalidate (args); -if (error) -return error; - - fallthrough; -case XFS_DAS_RM_NBLK : -/* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */ - attr->xattri_dela_state =XFS_DAS_RM_NBLK ; -if (args->rmtblkno) { - error =xfs_attr_rmtval_remove (attr); -if (error == -EAGAIN ) -trace_xfs_attr_set_iter_return ( - attr->xattri_dela_state, args->dp); - -if (error) -return error; - - attr->xattri_dela_state =XFS_DAS_CLR_FLAG ; -trace_xfs_attr_set_iter_return (attr->xattri_dela_state, - args->dp); -return -EAGAIN ; - } - - fallthrough;case XFS_DAS_CLR_FLAG :/* * The last state for node format. Look up the old attr and
@@ -635,7 +549,6 @@ xfs_attr_set_iter(ASSERT (0 );break ; } -out:return error; }
fs/xfs/libxfs/xfs_attr.h +7 -2
@@ -450,16 +450,21 @@ enum xfs_delattr_state {XFS_DAS_RMTBLK ,/* Removing remote blks */ XFS_DAS_RM_NAME ,/* Remove attr name */ XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ + +/* Leaf state set sequence */ XFS_DAS_FOUND_LBLK ,/* We found leaf blk for attr */ XFS_DAS_LEAF_ALLOC_RMT ,/* We are allocating remote blocks */ -XFS_DAS_FOUND_NBLK ,/* We found node blk for attr */ -XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_FLIP_LFLAG ,/* Flipped leaf INCOMPLETE attr flag */ XFS_DAS_RM_LBLK ,/* A rename is removing leaf blocks */ XFS_DAS_RD_LEAF ,/* Read in the new leaf */ + +/* Node state set sequence, must match leaf state above */ +XFS_DAS_FOUND_NBLK ,/* We found node blk for attr */ +XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_FLIP_NFLAG ,/* Flipped node INCOMPLETE attr flag */ XFS_DAS_RM_NBLK ,/* A rename is removing node blocks */ XFS_DAS_CLR_FLAG ,/* Clear incomplete flag */ + XFS_DAS_DONE, /* finished operation */ };
Signature · 1 line
2.35.1
PATCH v3 8/17 xfs: split remote attr setting out from replace path
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
When we set a new xattr, we have three exit paths:
1. nothing else to do
2. allocate and set the remote xattr value
3. perform the rest of a replace operation
Currently we push both 2 and 3 into the same state, regardless of whether we just set a remote attribute or not. Once we've set the remote xattr, we have two exit states:
1. nothing else to do
2. perform the rest of a replace operation
Hence we can split the remote xattr allocation and setting into their own states and factor it out of xfs_attr_set_iter() to further clean up the state machine and the implementation of the state machine.
--- fs/xfs/libxfs/xfs_attr.c | 113 +++++++++++++++++++++------------------ fs/xfs/libxfs/xfs_attr.h | 14 +++-- fs/xfs/xfs_trace.h | 9 ++-- 3 files changed, 77 insertions(+), 59 deletions(-)
fs/xfs/libxfs/xfs_attr.c +62 -51
@@ -334,9 +334,11 @@ xfs_attr_leaf_addname(* or perform more xattr manipulations. Otherwise there is nothing more * to do and we can return success. */ -if (args->rmtblkno || - (args->op_flags &XFS_DA_OP_RENAME )) { - attr->xattri_dela_state =XFS_DAS_FOUND_LBLK ; +if (args->rmtblkno) { + attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; + error = -EAGAIN ; + }else if (args->op_flags &XFS_DA_OP_RENAME ) { + attr->xattri_dela_state =XFS_DAS_LEAF_REPLACE ; error = -EAGAIN ; }else { attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -363,9 +365,11 @@ xfs_attr_node_addname(if (error)return error; -if (args->rmtblkno || - (args->op_flags &XFS_DA_OP_RENAME )) { - attr->xattri_dela_state =XFS_DAS_FOUND_NBLK ; +if (args->rmtblkno) { + attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; + error = -EAGAIN ; + }else if (args->op_flags &XFS_DA_OP_RENAME ) { + attr->xattri_dela_state =XFS_DAS_NODE_REPLACE ; error = -EAGAIN ; }else { attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -375,6 +379,40 @@ xfs_attr_node_addname(return error; } +static int +xfs_attr_rmtval_alloc ( +struct xfs_attr_item *attr) +{ +struct xfs_da_args *args = attr->xattri_da_args; +int error =0 ; + +/* +* If there was an out-of-line value, allocate the blocks we +* identified for its storage and copy the value. This is done +* after we create the attribute so that we don't overflow the +* maximum size of a transaction and/or hit a deadlock. +*/ +if (attr->xattri_blkcnt >0 ) { + error =xfs_attr_rmtval_set_blk (attr); +if (error) +return error; + error = -EAGAIN ; + goto out; + } + + error =xfs_attr_rmtval_set_value (args); +if (error) +return error; + +/* If this is not a rename, clear the incomplete flag and we're done. */ +if (!(args->op_flags &XFS_DA_OP_RENAME )) { + error =xfs_attr3_leaf_clearflag (args); + attr->xattri_dela_state =XFS_DAS_DONE ; + } +out: +trace_xfs_attr_rmtval_alloc (attr->xattri_dela_state, args->dp); +return error; +}/* * Set the attribute specified in @args.
@@ -406,54 +444,26 @@ xfs_attr_set_iter(case XFS_DAS_NODE_ADD :return xfs_attr_node_addname (attr); -case XFS_DAS_FOUND_LBLK : -case XFS_DAS_FOUND_NBLK : -/* -* Find space for remote blocks and fall into the allocation -* state. -*/ -if (args->rmtblkno >0 ) { - error =xfs_attr_rmtval_find_space (attr); -if (error) -return error; - } +case XFS_DAS_LEAF_SET_RMT : +case XFS_DAS_NODE_SET_RMT : + error =xfs_attr_rmtval_find_space (attr); +if (error) +return error; attr->xattri_dela_state++; fallthrough; +case XFS_DAS_LEAF_ALLOC_RMT :case XFS_DAS_NODE_ALLOC_RMT : - -/* -* If there was an out-of-line value, allocate the blocks we -* identified for its storage and copy the value. This is done -* after we create the attribute so that we don't overflow the -* maximum size of a transaction and/or hit a deadlock. -*/ -if (args->rmtblkno >0 ) { -if (attr->xattri_blkcnt >0 ) { - error =xfs_attr_rmtval_set_blk (attr); -if (error) -return error; -trace_xfs_attr_set_iter_return ( - attr->xattri_dela_state, - args->dp); -return -EAGAIN ; - } - - error =xfs_attr_rmtval_set_value (args); -if (error) -return error; - } - -/* -* If this is not a rename, clear the incomplete flag and we're -* done. -*/ -if (!(args->op_flags &XFS_DA_OP_RENAME )) { -if (args->rmtblkno >0 ) - error =xfs_attr3_leaf_clearflag (args); + error =xfs_attr_rmtval_alloc (attr); +if (error)return error; - } +if (attr->xattri_dela_state ==XFS_DAS_DONE ) +break ; + attr->xattri_dela_state++; + fallthrough; +case XFS_DAS_LEAF_REPLACE : +case XFS_DAS_NODE_REPLACE :/* * If this is an atomic rename operation, we must "flip" the * incomplete flags on the "new" and "old" attribute/value pairs
@@ -471,10 +481,9 @@ xfs_attr_set_iter(* Commit the flag value change and start the next trans * in series at FLIP_FLAG. */ + error = -EAGAIN ; attr->xattri_dela_state++; -trace_xfs_attr_set_iter_return (attr->xattri_dela_state, - args->dp); -return -EAGAIN ; +break ; } attr->xattri_dela_state++;
@@ -549,6 +558,8 @@ xfs_attr_set_iter(ASSERT (0 );break ; } + +trace_xfs_attr_set_iter_return (attr->xattri_dela_state, args->dp);return error; }
fs/xfs/libxfs/xfs_attr.h +9 -5
@@ -452,15 +452,17 @@ enum xfs_delattr_state {XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ /* Leaf state set sequence */ -XFS_DAS_FOUND_LBLK ,/* We found leaf blk for attr */ +XFS_DAS_LEAF_SET_RMT ,/* set a remote xattr from a leaf */ XFS_DAS_LEAF_ALLOC_RMT ,/* We are allocating remote blocks */ +XFS_DAS_LEAF_REPLACE ,/* Perform replace ops on a leaf */ XFS_DAS_FLIP_LFLAG ,/* Flipped leaf INCOMPLETE attr flag */ XFS_DAS_RM_LBLK ,/* A rename is removing leaf blocks */ XFS_DAS_RD_LEAF ,/* Read in the new leaf */ /* Node state set sequence, must match leaf state above */ -XFS_DAS_FOUND_NBLK ,/* We found node blk for attr */ +XFS_DAS_NODE_SET_RMT ,/* set a remote xattr from a node */ XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ +XFS_DAS_NODE_REPLACE ,/* Perform replace ops on a node */ XFS_DAS_FLIP_NFLAG ,/* Flipped node INCOMPLETE attr flag */ XFS_DAS_RM_NBLK ,/* A rename is removing node blocks */ XFS_DAS_CLR_FLAG, /* Clear incomplete flag */
@@ -476,13 +478,15 @@ enum xfs_delattr_state { { XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \ { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ - { XFS_DAS_FOUND_LBLK, "XFS_DAS_FOUND_LBLK" }, \ + { XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \ { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ - { XFS_DAS_FOUND_NBLK, "XFS_DAS_FOUND_NBLK" }, \ - { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ + { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \ { XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \ { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ + { XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \ + { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ + { XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \ { XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \ { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \
fs/xfs/xfs_trace.h +6 -3
@@ -4136,13 +4136,15 @@ TRACE_DEFINE_ENUM(XFS_DAS_NODE_ADD);TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK );TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME );TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK ); -TRACE_DEFINE_ENUM (XFS_DAS_FOUND_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT ); -TRACE_DEFINE_ENUM (XFS_DAS_FOUND_NBLK ); -TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG );TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK );TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_SET_RMT ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG );TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK );TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG );
@@ -4172,6 +4174,7 @@ DEFINE_DAS_STATE_EVENT(xfs_attr_set_iter_return);DEFINE_DAS_STATE_EVENT (xfs_attr_leaf_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_node_addname_return);DEFINE_DAS_STATE_EVENT (xfs_attr_remove_iter_return); +DEFINE_DAS_STATE_EVENT (xfs_attr_rmtval_alloc);DEFINE_DAS_STATE_EVENT (xfs_attr_rmtval_remove_return);DEFINE_DAS_STATE_EVENT (xfs_attr_defer_add);DEFINE_DAS_STATE_EVENT (xfs_attr_defer_replace);
Signature · 1 line
2.35.1
PATCH v3 9/17 xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We can skip the REPLACE state when LARP is enabled, but that means the XFS_DAS_FLIP_LFLAG state is now poorly named - it indicates something that has been done rather than what the state is going to do. Rename it to "REMOVE_OLD" to indicate that we are now going to perform removal of the old attr.
--- fs/xfs/libxfs/xfs_attr.c | 81 +++++++++++++++++++++++++--------------- fs/xfs/libxfs/xfs_attr.h | 44 +++++++++++----------- fs/xfs/xfs_trace.h | 4 +- 3 files changed, 75 insertions(+), 54 deletions(-)
fs/xfs/libxfs/xfs_attr.c +51 -30
@@ -296,6 +296,26 @@ xfs_attr_sf_addname(return error; } +/* +* When we bump the state to REPLACE, we may actually need to skip over the +* state. When LARP mode is enabled, we don't need to run the atomic flags flip, +* so we skip straight over the REPLACE state and go on to REMOVE_OLD. +*/ +static void +xfs_attr_dela_state_set_replace ( +struct xfs_attr_item *attr, +enum xfs_delattr_state replace) +{ +struct xfs_da_args *args = attr->xattri_da_args; + +ASSERT (replace ==XFS_DAS_LEAF_REPLACE || + replace ==XFS_DAS_NODE_REPLACE ); + + attr->xattri_dela_state = replace; +if (xfs_has_larp (args->dp->i_mount)) + attr->xattri_dela_state++; +} +static int xfs_attr_leaf_addname (struct xfs_attr_item *attr)
@@ -338,7 +358,7 @@ xfs_attr_leaf_addname( attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; error = -EAGAIN ; }else if (args->op_flags &XFS_DA_OP_RENAME ) { - attr->xattri_dela_state =XFS_DAS_LEAF_REPLACE ; +xfs_attr_dela_state_set_replace (attr,XFS_DAS_LEAF_REPLACE ); error = -EAGAIN ; }else { attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -369,7 +389,7 @@ xfs_attr_node_addname( attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; error = -EAGAIN ; }else if (args->op_flags &XFS_DA_OP_RENAME ) { - attr->xattri_dela_state =XFS_DAS_NODE_REPLACE ; +xfs_attr_dela_state_set_replace (attr,XFS_DAS_NODE_REPLACE ); error = -EAGAIN ; }else { attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -396,8 +416,11 @@ xfs_attr_rmtval_alloc( error =xfs_attr_rmtval_set_blk (attr);if (error)return error; - error = -EAGAIN ; - goto out; +/* Roll the transaction only if there is more to allocate. */ +if (attr->xattri_blkcnt >0 ) { + error = -EAGAIN ; + goto out; + } } error =xfs_attr_rmtval_set_value (args);
@@ -408,6 +431,13 @@ xfs_attr_rmtval_alloc(if (!(args->op_flags &XFS_DA_OP_RENAME )) { error =xfs_attr3_leaf_clearflag (args); attr->xattri_dela_state =XFS_DAS_DONE ; + }else { +/* +* We are running a REPLACE operation, so we need to bump the +* state to the step in that operation. +*/ + attr->xattri_dela_state++; +xfs_attr_dela_state_set_replace (attr, attr->xattri_dela_state); } out:trace_xfs_attr_rmtval_alloc (attr->xattri_dela_state, args->dp);
@@ -429,7 +459,6 @@ xfs_attr_set_iter(struct xfs_inode *dp = args->dp;struct xfs_buf *bp =NULL ;int forkoff, error =0 ; -struct xfs_mount *mp = args->dp->i_mount;/* State machine switch */ next_state:
@@ -459,37 +488,29 @@ xfs_attr_set_iter(return error;if (attr->xattri_dela_state ==XFS_DAS_DONE )break ; - attr->xattri_dela_state++; - fallthrough; + goto next_state;case XFS_DAS_LEAF_REPLACE :case XFS_DAS_NODE_REPLACE :/* -* If this is an atomic rename operation, we must "flip" the -* incomplete flags on the "new" and "old" attribute/value pairs -* so that one disappears and one appears atomically. Then we -* must remove the "old" attribute/value pair. -* -* In a separate transaction, set the incomplete flag on the -* "old" attr and clear the incomplete flag on the "new" attr. +* We must "flip" the incomplete flags on the "new" and "old" +* attribute/value pairs so that one disappears and one appears +* atomically. Then we must remove the "old" attribute/value +* pair. */ -if (!xfs_has_larp (mp)) { - error =xfs_attr3_leaf_flipflags (args); -if (error) -return error; -/* -* Commit the flag value change and start the next trans -* in series at FLIP_FLAG. -*/ - error = -EAGAIN ; - attr->xattri_dela_state++; -break ; - } - + error =xfs_attr3_leaf_flipflags (args); +if (error) +return error; +/* +* Commit the flag value change and start the next trans +* in series at REMOVE_OLD. +*/ + error = -EAGAIN ; attr->xattri_dela_state++; - fallthrough; -case XFS_DAS_FLIP_LFLAG : -case XFS_DAS_FLIP_NFLAG : +break ; + +case XFS_DAS_LEAF_REMOVE_OLD : +case XFS_DAS_NODE_REMOVE_OLD :/* * Dismantle the "old" attribute/value pair by removing a * "remote" value (if it exists).
fs/xfs/libxfs/xfs_attr.h +22 -22
62 lines not on this page · raw message
fs/xfs/xfs_trace.h +2 -2
@@ -4139,13 +4139,13 @@ TRACE_DEFINE_ENUM(XFS_DAS_RM_SHRINK);TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE ); -TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK );TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF );TRACE_DEFINE_ENUM (XFS_DAS_NODE_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REPLACE ); -TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK );TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG );
Signature · 1 line
2.35.1
Re: [PATCH 09/17] xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
We can skip the REPLACE state when LARP is enabled, but that means the
XFS_DAS_FLIP_LFLAGstate is now poorly named - it indicates something that has been done rather than what the state is going to do. Rename it to "REMOVE_OLD" to indicate that we are now going to perform removal of the old attr.Signed-off-by Dave Chinner <[email protected]>
Ok, looks good now
Quoted 269 lines
--- fs/xfs/libxfs/xfs_attr.c | 81 +++++++++++++++++++++++++------------- -- fs/xfs/libxfs/xfs_attr.h | 44 +++++++++++----------- fs/xfs/xfs_trace.h | 4 +- 3 files changed, 75 insertions(+), 54 deletions(-)fs/xfs/libxfs/xfs_attr.c +2
-0@@ -296,6 +296,26 @@ xfs_attr_sf_addname(return error; } +/* +* When we bump the state to REPLACE, we may actually need to skip over the
+ * state. When LARP mode is enabled, we don't need to run the atomic flags flip,
+ * so we skip straight over the REPLACE state and go on toREMOVE_OLD.
+ */fs/xfs/libxfs/xfs_attr.c +16
-1+static void +xfs_attr_dela_state_set_replace ( +struct xfs_attr_item *attr, +enum xfs_delattr_state replace) +{ +struct xfs_da_args *args = attr->xattri_da_args; + +ASSERT (replace ==XFS_DAS_LEAF_REPLACE || + replace ==XFS_DAS_NODE_REPLACE ); + + attr->xattri_dela_state = replace; +if (xfs_has_larp (args->dp->i_mount)) + attr->xattri_dela_state++; +} +static int xfs_attr_leaf_addname (struct xfs_attr_item *attr)@@ -338,7 +358,7 @@ xfs_attr_leaf_addname( attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; error = -EAGAIN ; }else if (args->op_flags &XFS_DA_OP_RENAME ) { - attr->xattri_dela_state =XFS_DAS_LEAF_REPLACE ; +xfs_attr_dela_state_set_replace (attr,XFS_DAS_LEAF_REPLACE ); error = -EAGAIN ; }else {fs/xfs/libxfs/xfs_attr.c +1
-1attr->xattri_dela_state =XFS_DAS_DONE ;@@ -369,7 +389,7 @@ xfs_attr_node_addname( attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; error = -EAGAIN ; }else if (args->op_flags &XFS_DA_OP_RENAME ) { - attr->xattri_dela_state =XFS_DAS_NODE_REPLACE ; +xfs_attr_dela_state_set_replace (attr,XFS_DAS_NODE_REPLACE ); error = -EAGAIN ; }else {fs/xfs/libxfs/xfs_attr.c +1
-2attr->xattri_dela_state =XFS_DAS_DONE ;@@ -396,8 +416,11 @@ xfs_attr_rmtval_alloc( error =xfs_attr_rmtval_set_blk (attr);if (error)return error; - error = -EAGAIN ; - goto out; +/* Roll the transaction only if there is more to allocate. */
fs/xfs/libxfs/xfs_attr.c +7
-0+if (attr->xattri_blkcnt >0 ) { + error = -EAGAIN ; + goto out; + } } error =xfs_attr_rmtval_set_value (args);@@ -408,6 +431,13 @@ xfs_attr_rmtval_alloc(if (!(args->op_flags &XFS_DA_OP_RENAME )) { error =xfs_attr3_leaf_clearflag (args); attr->xattri_dela_state =XFS_DAS_DONE ; + }else { +/* +* We are running a REPLACE operation, so we need to bump the
fs/xfs/libxfs/xfs_attr.c +4
-0+* state to the step in that operation. +*/ + attr->xattri_dela_state++; + xfs_attr_dela_state_set_replace(attr, attr-Quoted 1 line
xattri_dela_state);fs/xfs/libxfs/xfs_attr.c +1
-4} out:trace_xfs_attr_rmtval_alloc (attr->xattri_dela_state, args->dp);@@ -429,7 +459,6 @@ xfs_attr_set_iter(struct xfs_inode *dp = args->dp;struct xfs_buf *bp =NULL ;int forkoff, error =0 ; -struct xfs_mount *mp = args->dp->i_mount;/* State machine switch */ next_state:@@ -459,37 +488,29 @@ xfs_attr_set_iter(return error;if (attr->xattri_dela_state ==XFS_DAS_DONE )break ; - attr->xattri_dela_state++; - fallthrough; + goto next_state;case XFS_DAS_LEAF_REPLACE :case XFS_DAS_NODE_REPLACE :/* -* If this is an atomic rename operation, we must "flip" the
fs/xfs/libxfs/xfs_attr.c +0
-1-* incomplete flags on the "new" and "old" attribute/value pairs
fs/xfs/libxfs/xfs_attr.c +0
-1-* so that one disappears and one appears atomically. Then we
fs/xfs/libxfs/xfs_attr.c +0
-3-* must remove the "old" attribute/value pair. -* -* In a separate transaction, set the incomplete flag on the
fs/xfs/libxfs/xfs_attr.c +0
-1-* "old" attr and clear the incomplete flag on the "new" attr.
fs/xfs/libxfs/xfs_attr.c +1
-0+* We must "flip" the incomplete flags on the "new" and "old"
fs/xfs/libxfs/xfs_attr.c +1
-0+* attribute/value pairs so that one disappears and one appears
fs/xfs/libxfs/xfs_attr.c +1
-0+* atomically. Then we must remove the "old" attribute/value
fs/xfs/libxfs/xfs_attr.c +1
-6+* pair. */ -if (!xfs_has_larp (mp)) { - error =xfs_attr3_leaf_flipflags (args); -if (error) -return error; -/* -* Commit the flag value change and start the next trans
fs/xfs/libxfs/xfs_attr.c +5
-7-* in series at FLIP_FLAG. -*/ - error = -EAGAIN ; - attr->xattri_dela_state++; -break ; - } - + error =xfs_attr3_leaf_flipflags (args); +if (error) +return error; +/* +* Commit the flag value change and start the next trans
fs/xfs/libxfs/xfs_attr.c +7
-3+* in series at REMOVE_OLD. +*/ + error = -EAGAIN ; attr->xattri_dela_state++; - fallthrough; -case XFS_DAS_FLIP_LFLAG : -case XFS_DAS_FLIP_NFLAG : +break ; + +case XFS_DAS_LEAF_REMOVE_OLD : +case XFS_DAS_NODE_REMOVE_OLD :/* * Dismantle the "old" attribute/value pair by removing a
fs/xfs/libxfs/xfs_attr.c +0
-0* "remote" value (if it exists). fs/xfs/libxfs/xfs_attr.h +0
-0@@ -455,7 +455,7 @@ enum xfs_delattr_state { XFS_DAS_LEAF_SET_RMT, /* set a remote xattr from aleaf */
XFS_DAS_LEAF_ALLOC_RMT, /* We are allocating remote
blocks */
XFS_DAS_LEAF_REPLACE, /* Perform replace ops on a
leaf */fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_FLIP_LFLAG, /* Flipped leaf INCOMPLETEattr flag */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_LEAF_REMOVE_OLD, /* Start removing old attr from leaf*/
XFS_DAS_RM_LBLK, /* A rename is removing leaf blocks
*/fs/xfs/libxfs/xfs_attr.h +0
-0XFS_DAS_RD_LEAF, /* Read in the new leaf */@@ -463,7 +463,7 @@ enum xfs_delattr_state { XFS_DAS_NODE_SET_RMT, /* set a remote xattr from anode */
XFS_DAS_NODE_ALLOC_RMT, /* We are allocating remote
blocks */
XFS_DAS_NODE_REPLACE, /* Perform replace ops on a
node */fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_FLIP_NFLAG, /* Flipped node INCOMPLETEattr flag */
fs/xfs/libxfs/xfs_attr.h +1
-0+ XFS_DAS_NODE_REMOVE_OLD, /* Start removing old attr from node*/
XFS_DAS_RM_NBLK, /* A rename is removing node blocks
*/fs/xfs/libxfs/xfs_attr.h +20
-20XFS_DAS_CLR_FLAG, /* Clear incomplete flag */@@ -471,26 +471,26 @@ enum xfs_delattr_state { };#define XFS_DAS_STRINGS \ - { XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \ - { XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \ - { XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \ - { XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \ - { XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \ - { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ - { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ - { XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \ - { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ - { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \ - { XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \ - { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ - { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ - { XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \ - { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ - { XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \ - { XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \ - { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ - { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \ - { XFS_DAS_DONE, "XFS_DAS_DONE" } + { XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \ + { XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \ + { XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \ + { XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \ + { XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \ + { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ + { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ + { XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \ + { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ + { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \ + { XFS_DAS_LEAF_REMOVE_OLD, "XFS_DAS_LEAF_REMOVE_OLD" }, \ + { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ + { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ + { XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \ + { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ + { XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \ + { XFS_DAS_NODE_REMOVE_OLD, "XFS_DAS_NODE_REMOVE_OLD" }, \ + { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ + { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \ + { XFS_DAS_DONE, "XFS_DAS_DONE" }/*
* Defines for xfs_attr_item.xattri_flagsfs/xfs/xfs_trace.h +2
-2@@ -4139,13 +4139,13 @@ TRACE_DEFINE_ENUM(XFS_DAS_RM_SHRINK);TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE ); -TRACE_DEFINE_ENUM (XFS_DAS_FLIP_LFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK );TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF );TRACE_DEFINE_ENUM (XFS_DAS_NODE_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REPLACE ); -TRACE_DEFINE_ENUM (XFS_DAS_FLIP_NFLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK );TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG );
PATCH v3 10/17 xfs: remote xattr removal in xfs_attr_set_iter() is conditional
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We may not have a remote value for the old xattr we have to remove, so skip over the remote value removal states and go straight to the xattr name removal in the leaf/node block.
--- fs/xfs/libxfs/xfs_attr.c | 59 ++++++++++++++++++++-------------------- fs/xfs/libxfs/xfs_attr.h | 8 +++--- fs/xfs/xfs_trace.h | 4 +-- 3 files changed, 36 insertions(+), 35 deletions(-)
fs/xfs/libxfs/xfs_attr.c +30 -29
@@ -495,15 +495,14 @@ xfs_attr_set_iter(/* * We must "flip" the incomplete flags on the "new" and "old" * attribute/value pairs so that one disappears and one appears -* atomically. Then we must remove the "old" attribute/value -* pair. +* atomically. */ error =xfs_attr3_leaf_flipflags (args);if (error)return error;/* -* Commit the flag value change and start the next trans -* in series at REMOVE_OLD. +* We must commit the flag value change now to make it atomic +* and then we can start the next trans in series at REMOVE_OLD. */ error = -EAGAIN ; attr->xattri_dela_state++;
@@ -512,41 +511,43 @@ xfs_attr_set_iter(case XFS_DAS_LEAF_REMOVE_OLD :case XFS_DAS_NODE_REMOVE_OLD :/* -* Dismantle the "old" attribute/value pair by removing a -* "remote" value (if it exists). +* If we have a remote attr, start the process of removing it +* by invalidating any cached buffers. +* +* If we don't have a remote attr, we skip the remote block +* removal state altogether with a second state increment. */ xfs_attr_restore_rmt_blk (args); - error =xfs_attr_rmtval_invalidate (args); -if (error) -return error; - - attr->xattri_dela_state++; - fallthrough; -case XFS_DAS_RM_LBLK : -case XFS_DAS_RM_NBLK :if (args->rmtblkno) { - error =xfs_attr_rmtval_remove (attr); -if (error == -EAGAIN ) -trace_xfs_attr_set_iter_return ( - attr->xattri_dela_state, args->dp); + error =xfs_attr_rmtval_invalidate (args);if (error)return error; - - attr->xattri_dela_state =XFS_DAS_RD_LEAF ; -trace_xfs_attr_set_iter_return (attr->xattri_dela_state, - args->dp); -return -EAGAIN ; + }else { + attr->xattri_dela_state++; } + attr->xattri_dela_state++; + goto next_state; + +case XFS_DAS_LEAF_REMOVE_RMT : +case XFS_DAS_NODE_REMOVE_RMT : + error =xfs_attr_rmtval_remove (attr); +if (error == -EAGAIN ) +break ; +if (error) +return error; +/* -* This is the end of the shared leaf/node sequence. We need -* to continue at the next state in the sequence, but we can't -* easily just fall through. So we increment to the next state -* and then jump back to switch statement to evaluate the next -* state correctly. +* We've finished removing the remote attr blocks, so commit the +* transaction and move on to removing the attr name from the +* leaf/node block. Removing the attr might require a full +* transaction reservation for btree block freeing, so we +* can't do that in the same transaction where we removed the +* remote attr blocks. */ + error = -EAGAIN ; attr->xattri_dela_state++; - goto next_state; +break ;case XFS_DAS_RD_LEAF :/*
fs/xfs/libxfs/xfs_attr.h +4 -4
@@ -456,7 +456,7 @@ enum xfs_delattr_state {XFS_DAS_LEAF_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_LEAF_REPLACE ,/* Perform replace ops on a leaf */ XFS_DAS_LEAF_REMOVE_OLD ,/* Start removing old attr from leaf */ -XFS_DAS_RM_LBLK ,/* A rename is removing leaf blocks */ +XFS_DAS_LEAF_REMOVE_RMT ,/* A rename is removing remote blocks */ XFS_DAS_RD_LEAF, /* Read in the new leaf *//* Node state set sequence, must match leaf state above */
@@ -464,7 +464,7 @@ enum xfs_delattr_state {XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_NODE_REPLACE ,/* Perform replace ops on a node */ XFS_DAS_NODE_REMOVE_OLD ,/* Start removing old attr from node */ -XFS_DAS_RM_NBLK ,/* A rename is removing node blocks */ +XFS_DAS_NODE_REMOVE_RMT ,/* A rename is removing remote blocks */ XFS_DAS_CLR_FLAG ,/* Clear incomplete flag */ XFS_DAS_DONE, /* finished operation */
@@ -482,13 +482,13 @@ enum xfs_delattr_state { { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \ { XFS_DAS_LEAF_REMOVE_OLD, "XFS_DAS_LEAF_REMOVE_OLD" }, \ - { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \ + { XFS_DAS_LEAF_REMOVE_RMT, "XFS_DAS_LEAF_REMOVE_RMT" }, \ { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ { XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \ { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ { XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \ { XFS_DAS_NODE_REMOVE_OLD, "XFS_DAS_NODE_REMOVE_OLD" }, \ - { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \ + { XFS_DAS_NODE_REMOVE_RMT, "XFS_DAS_NODE_REMOVE_RMT" }, \ { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \ { XFS_DAS_DONE, "XFS_DAS_DONE" }
fs/xfs/xfs_trace.h +2 -2
@@ -4140,13 +4140,13 @@ TRACE_DEFINE_ENUM(XFS_DAS_LEAF_SET_RMT);TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_OLD ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_LBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_RMT );TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF );TRACE_DEFINE_ENUM (XFS_DAS_NODE_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_OLD ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_NBLK ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_RMT );TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG ); DECLARE_EVENT_CLASS(xfs_das_state_class,
Signature · 1 line
2.35.1
PATCH v3 11/17 xfs: clean up final attr removal in xfs_attr_set_iter
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Clean up the final leaf/node states in xfs_attr_set_iter() to further simplify the highe level state machine and to set the completion state correctly.
--- fs/xfs/libxfs/xfs_attr.c | 72 +++++++++++++++++++++++----------------- fs/xfs/libxfs/xfs_attr.h | 12 +++---- fs/xfs/xfs_trace.h | 5 +-- 3 files changed, 50 insertions(+), 39 deletions(-)
fs/xfs/libxfs/xfs_attr.c +41 -31
@@ -61,7 +61,7 @@ STATIC int xfs_attr_node_get(xfs_da_args_t *args); STATIC void xfs_attr_restore_rmt_blk(struct xfs_da_args *args);static int xfs_attr_node_try_addname (struct xfs_attr_item *attr); STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr); -STATIC int xfs_attr_node_addname_clear_incomplete(struct xfs_attr_item *attr); +STATIC int xfs_attr_node_remove_attr(struct xfs_attr_item *attr); STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,struct xfs_da_state **state); STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
@@ -444,6 +444,36 @@ xfs_attr_rmtval_alloc(return error; } +/* +* Remove the original attr we have just replaced. This is dependent on the +* original lookup and insert placing the old attr in args->blkno/args->index +* and the new attr in args->blkno2/args->index2. +*/ +static int +xfs_attr_leaf_remove_attr ( +struct xfs_attr_item *attr) +{ +struct xfs_da_args *args = attr->xattri_da_args; +struct xfs_inode *dp = args->dp; +struct xfs_buf *bp =NULL ; +int forkoff; +int error; + + error =xfs_attr3_leaf_read (args->trans, args->dp, args->blkno, + &bp); +if (error) +return error; + +xfs_attr3_leaf_remove (bp, args); + + forkoff =xfs_attr_shortform_allfit (bp, dp); +if (forkoff) + error =xfs_attr3_leaf_to_shortform (bp, args, forkoff); +/* bp is gone due to xfs_da_shrink_inode */ + +return error; +} +/* * Set the attribute specified in @args. * This routine is meant to function as a delayed operation, and may return
@@ -456,9 +486,7 @@ xfs_attr_set_iter( struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args; -struct xfs_inode *dp = args->dp; -struct xfs_buf *bp =NULL ; -int forkoff, error =0 ; +int error =0 ;/* State machine switch */ next_state:
@@ -549,32 +577,14 @@ xfs_attr_set_iter( attr->xattri_dela_state++;break ; -case XFS_DAS_RD_LEAF : -/* -* This is the last step for leaf format. Read the block with -* the old attr, remove the old attr, check for shortform -* conversion and return. -*/ - error =xfs_attr3_leaf_read (args->trans, args->dp, args->blkno, - &bp); -if (error) -return error; - -xfs_attr3_leaf_remove (bp, args); - - forkoff =xfs_attr_shortform_allfit (bp, dp); -if (forkoff) - error =xfs_attr3_leaf_to_shortform (bp, args, forkoff); -/* bp is gone due to xfs_da_shrink_inode */ - -return error; +case XFS_DAS_LEAF_REMOVE_ATTR : + error =xfs_attr_leaf_remove_attr (attr); + attr->xattri_dela_state =XFS_DAS_DONE ; +break ; -case XFS_DAS_CLR_FLAG : -/* -* The last state for node format. Look up the old attr and -* remove it. -*/ - error =xfs_attr_node_addname_clear_incomplete (attr); +case XFS_DAS_NODE_REMOVE_ATTR : + error =xfs_attr_node_remove_attr (attr); + attr->xattri_dela_state =XFS_DAS_DONE ;break ;default :ASSERT (0 );
@@ -1269,8 +1279,8 @@ xfs_attr_node_try_addname( } -STATIC int -xfs_attr_node_addname_clear_incomplete ( +static int +xfs_attr_node_remove_attr (struct xfs_attr_item *attr) {struct xfs_da_args *args = attr->xattri_da_args;
fs/xfs/libxfs/xfs_attr.h +6 -6
@@ -451,21 +451,21 @@ enum xfs_delattr_state {XFS_DAS_RM_NAME ,/* Remove attr name */ XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ -/* Leaf state set sequence */ +/* Leaf state set/replace sequence */ XFS_DAS_LEAF_SET_RMT ,/* set a remote xattr from a leaf */ XFS_DAS_LEAF_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_LEAF_REPLACE ,/* Perform replace ops on a leaf */ XFS_DAS_LEAF_REMOVE_OLD ,/* Start removing old attr from leaf */ XFS_DAS_LEAF_REMOVE_RMT ,/* A rename is removing remote blocks */ -XFS_DAS_RD_LEAF ,/* Read in the new leaf */ +XFS_DAS_LEAF_REMOVE_ATTR ,/* Remove the old attr from a leaf */ -/* Node state set sequence, must match leaf state above */ +/* Node state set/replace sequence, must match leaf state above */ XFS_DAS_NODE_SET_RMT ,/* set a remote xattr from a node */ XFS_DAS_NODE_ALLOC_RMT ,/* We are allocating remote blocks */ XFS_DAS_NODE_REPLACE ,/* Perform replace ops on a node */ XFS_DAS_NODE_REMOVE_OLD ,/* Start removing old attr from node */ XFS_DAS_NODE_REMOVE_RMT ,/* A rename is removing remote blocks */ -XFS_DAS_CLR_FLAG ,/* Clear incomplete flag */ +XFS_DAS_NODE_REMOVE_ATTR ,/* Remove the old attr from a node */ XFS_DAS_DONE, /* finished operation */ };
@@ -483,13 +483,13 @@ enum xfs_delattr_state { { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \ { XFS_DAS_LEAF_REMOVE_OLD, "XFS_DAS_LEAF_REMOVE_OLD" }, \ { XFS_DAS_LEAF_REMOVE_RMT, "XFS_DAS_LEAF_REMOVE_RMT" }, \ - { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \ + { XFS_DAS_LEAF_REMOVE_ATTR, "XFS_DAS_LEAF_REMOVE_ATTR" }, \ { XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \ { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \ { XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \ { XFS_DAS_NODE_REMOVE_OLD, "XFS_DAS_NODE_REMOVE_OLD" }, \ { XFS_DAS_NODE_REMOVE_RMT, "XFS_DAS_NODE_REMOVE_RMT" }, \ - { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \ + { XFS_DAS_NODE_REMOVE_ATTR, "XFS_DAS_NODE_REMOVE_ATTR" }, \ { XFS_DAS_DONE, "XFS_DAS_DONE" }/*
fs/xfs/xfs_trace.h +3 -2
@@ -4141,13 +4141,14 @@ TRACE_DEFINE_ENUM(XFS_DAS_LEAF_ALLOC_RMT);TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_RMT ); -TRACE_DEFINE_ENUM (XFS_DAS_RD_LEAF ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE_ATTR );TRACE_DEFINE_ENUM (XFS_DAS_NODE_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REPLACE );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_OLD );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_RMT ); -TRACE_DEFINE_ENUM (XFS_DAS_CLR_FLAG ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE_ATTR ); +TRACE_DEFINE_ENUM (XFS_DAS_DONE ); DECLARE_EVENT_CLASS(xfs_das_state_class, TP_PROTO(int das, struct xfs_inode *ip),
Signature · 1 line
2.35.1
PATCH v3 12/17 xfs: xfs_attr_set_iter() does not need to return EAGAIN
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that the full xfs_attr_set_iter() state machine always terminates with either the state being XFS_DAS_DONE on success or an error on failure, we can get rid of the need for it to return -EAGAIN whenever it needs to roll the transaction before running the next state.
That is, we don't need to spray -EAGAIN return states everywhere, the caller just check the state machine state for completion to determine what action should be taken next. This greatly simplifies the code within the state machine implementation as it now only has to handle 0 for success or -errno for error and it doesn't need to tell the caller to retry.
--- fs/xfs/libxfs/xfs_attr.c | 86 +++++++++++++++++----------------------- fs/xfs/xfs_attr_item.c | 2 + 2 files changed, 38 insertions(+), 50 deletions(-)
fs/xfs/libxfs/xfs_attr.c +36 -50
@@ -290,7 +290,6 @@ xfs_attr_sf_addname(*/ xfs_trans_bhold (args->trans, attr->xattri_leaf_bp); attr->xattri_dela_state =XFS_DAS_LEAF_ADD ; - error = -EAGAIN ; out:trace_xfs_attr_sf_addname_return (attr->xattri_dela_state, args->dp);return error;
@@ -343,7 +342,6 @@ xfs_attr_leaf_addname(* retry the add to the newly allocated node block. */ attr->xattri_dela_state =XFS_DAS_NODE_ADD ; - error = -EAGAIN ; goto out; }if (error)
@@ -354,20 +352,24 @@ xfs_attr_leaf_addname(* or perform more xattr manipulations. Otherwise there is nothing more * to do and we can return success. */ -if (args->rmtblkno) { +if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; - error = -EAGAIN ; - }else if (args->op_flags &XFS_DA_OP_RENAME ) { +else if (args->op_flags &XFS_DA_OP_RENAME )xfs_attr_dela_state_set_replace (attr,XFS_DAS_LEAF_REPLACE ); - error = -EAGAIN ; - }else { +else attr->xattri_dela_state =XFS_DAS_DONE ; - } out:trace_xfs_attr_leaf_addname_return (attr->xattri_dela_state, args->dp);return error; } +/* +* Add an entry to a node format attr tree. +* +* Note that we might still have a leaf here - xfs_attr_is_leaf() cannot tell +* the difference between leaf + remote attr blocks and a node format tree, +* so we may still end up having to convert from leaf to node format here. +*/ static int xfs_attr_node_addname (struct xfs_attr_item *attr)
@@ -382,19 +384,26 @@ xfs_attr_node_addname(return error; error =xfs_attr_node_try_addname (attr); +if (error == -ENOSPC ) { + error =xfs_attr3_leaf_to_node (args); +if (error) +return error; +/* +* No state change, we really are in node form now +* but we need the transaction rolled to continue. +*/ + goto out; + }if (error)return error; -if (args->rmtblkno) { +if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; - error = -EAGAIN ; - }else if (args->op_flags &XFS_DA_OP_RENAME ) { +else if (args->op_flags &XFS_DA_OP_RENAME )xfs_attr_dela_state_set_replace (attr,XFS_DAS_NODE_REPLACE ); - error = -EAGAIN ; - }else { +else attr->xattri_dela_state =XFS_DAS_DONE ; - } - +out:trace_xfs_attr_node_addname_return (attr->xattri_dela_state, args->dp);return error; }
@@ -417,10 +426,8 @@ xfs_attr_rmtval_alloc(if (error)return error;/* Roll the transaction only if there is more to allocate. */ -if (attr->xattri_blkcnt >0 ) { - error = -EAGAIN ; +if (attr->xattri_blkcnt >0 ) goto out; - } } error =xfs_attr_rmtval_set_value (args);
@@ -475,11 +482,12 @@ xfs_attr_leaf_remove_attr( }/* -* Set the attribute specified in @args. -* This routine is meant to function as a delayed operation, and may return -* -EAGAIN when the transaction needs to be rolled. Calling functions will need -* to handle this, and recall the function until a successful error code is -* returned. +* Run the attribute operation specified in @attr. +* +* This routine is meant to function as a delayed operation and will set the +* state to XFS_DAS_DONE when the operation is complete. Calling functions will +* need to handle this, and recall the function until either an error or +* XFS_DAS_DONE is detected. */ int xfs_attr_set_iter(
@@ -532,7 +540,6 @@ xfs_attr_set_iter(* We must commit the flag value change now to make it atomic * and then we can start the next trans in series at REMOVE_OLD. */ - error = -EAGAIN ; attr->xattri_dela_state++;break ;
@@ -560,8 +567,10 @@ xfs_attr_set_iter(case XFS_DAS_LEAF_REMOVE_RMT :case XFS_DAS_NODE_REMOVE_RMT : error =xfs_attr_rmtval_remove (attr); -if (error == -EAGAIN ) +if (error == -EAGAIN ) { + error =0 ;break ; + }if (error)return error;
@@ -573,7 +582,6 @@ xfs_attr_set_iter(* can't do that in the same transaction where we removed the * remote attr blocks. */ - error = -EAGAIN ; attr->xattri_dela_state++;break ;
@@ -1207,14 +1215,6 @@ xfs_attr_node_addname_find_attr(* This will involve walking down the Btree, and may involve splitting * leaf nodes and even splitting intermediate nodes up to and including * the root node (a special case of an intermediate node). -* -* "Remote" attribute values confuse the issue and atomic rename operations -* add a whole extra layer of confusion on top of that. -* -* This routine is meant to function as a delayed operation, and may return -* -EAGAIN when the transaction needs to be rolled. Calling functions will need -* to handle this, and recall the function until a successful error code is -*returned. */ static int xfs_attr_node_try_addname(
@@ -1236,24 +1236,10 @@ xfs_attr_node_try_addname(/* * Its really a single leaf node, but it had * out-of-line values so it looked like it *might* -* have been a b-tree. +* have been a b-tree. Let the caller deal with this. */ xfs_da_state_free (state); - state =NULL ; - error =xfs_attr3_leaf_to_node (args); -if (error) - goto out; - -/* -* Now that we have converted the leaf to a node, we can -* roll the transaction, and try xfs_attr3_leaf_add -* again on re-entry. No need to set dela_state to do -* this. dela_state is still unset by this function at -* this point. -*/ -trace_xfs_attr_node_addname_return ( - attr->xattri_dela_state, args->dp); -return -EAGAIN ; +return -ENOSPC ; }/*
fs/xfs/xfs_attr_item.c +2 -0
@@ -313,6 +313,8 @@ xfs_xattri_finish_update(case XFS_ATTR_OP_FLAGS_SET :case XFS_ATTR_OP_FLAGS_REPLACE : error =xfs_attr_set_iter (attr); +if (!error && attr->xattri_dela_state !=XFS_DAS_DONE ) + error = -EAGAIN ;break ;case XFS_ATTR_OP_FLAGS_REMOVE :ASSERT (XFS_IFORK_Q (args->dp));
Signature · 1 line
2.35.1
PATCH v3 13/17 xfs: introduce attr remove initial states into xfs_attr_set_iter
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We need to merge the add and remove code paths to enable safe recovery of replace operations. Hoist the initial remove states from xfs_attr_remove_iter into xfs_attr_set_iter. We will make use of them in the next patches.
--- fs/xfs/libxfs/xfs_attr.c | 139 ++++++++++++++++++++++----------------- fs/xfs/libxfs/xfs_attr.h | 4 ++ fs/xfs/xfs_trace.h | 3 + 3 files changed, 84 insertions(+), 62 deletions(-)
fs/xfs/libxfs/xfs_attr.c +77 -62
@@ -451,6 +451,68 @@ xfs_attr_rmtval_alloc(return error; } +/* +* Mark an attribute entry INCOMPLETE and save pointers to the relevant buffers +* for later deletion of the entry. +*/ +static int +xfs_attr_leaf_mark_incomplete ( +struct xfs_da_args *args, +struct xfs_da_state *state) +{ +int error; + +/* +* Fill in disk block numbers in the state structure +* so that we can get the buffers back after we commit +* several transactions in the following calls. +*/ + error =xfs_attr_fillstate (state); +if (error) +return error; + +/* +* Mark the attribute as INCOMPLETE +*/ +return xfs_attr3_leaf_setflag (args); +} + +/* +* Initial setup for xfs_attr_node_removename. Make sure the attr is there and +* the blocks are valid. Attr keys with remote blocks will be marked +* incomplete. +*/ +static +int xfs_attr_node_removename_setup ( +struct xfs_attr_item *attr) +{ +struct xfs_da_args *args = attr->xattri_da_args; +struct xfs_da_state **state = &attr->xattri_da_state; +int error; + + error =xfs_attr_node_hasname (args, state); +if (error != -EEXIST ) + goto out; + error =0 ; + +ASSERT ((*state)->path.blk[(*state)->path.active -1 ].bp !=NULL ); +ASSERT ((*state)->path.blk[(*state)->path.active -1 ].magic == +XFS_ATTR_LEAF_MAGIC ); + +if (args->rmtblkno >0 ) { + error =xfs_attr_leaf_mark_incomplete (args, *state); +if (error) + goto out; + + error =xfs_attr_rmtval_invalidate (args); + } +out: +if (error) +xfs_da_state_free (*state); + +return error; +} +/* * Remove the original attr we have just replaced. This is dependent on the * original lookup and insert placing the old attr in args->blkno/args->index
@@ -509,6 +571,21 @@ xfs_attr_set_iter(case XFS_DAS_NODE_ADD :return xfs_attr_node_addname (attr); +case XFS_DAS_SF_REMOVE : + attr->xattri_dela_state =XFS_DAS_DONE ; +return xfs_attr_sf_removename (args); +case XFS_DAS_LEAF_REMOVE : + attr->xattri_dela_state =XFS_DAS_DONE ; +return xfs_attr_leaf_removename (args); +case XFS_DAS_NODE_REMOVE : + error =xfs_attr_node_removename_setup (attr); +if (error) +return error; + attr->xattri_dela_state =XFS_DAS_NODE_REMOVE_RMT ; +if (args->rmtblkno ==0 ) + attr->xattri_dela_state++; +break ; +case XFS_DAS_LEAF_SET_RMT :case XFS_DAS_NODE_SET_RMT : error =xfs_attr_rmtval_find_space (attr);
@@ -1340,68 +1417,6 @@ xfs_attr_node_shrink(return error; } -/* -* Mark an attribute entry INCOMPLETE and save pointers to the relevant buffers -* for later deletion of the entry. -*/ -STATIC int -xfs_attr_leaf_mark_incomplete ( -struct xfs_da_args *args, -struct xfs_da_state *state) -{ -int error; - -/* -* Fill in disk block numbers in the state structure -* so that we can get the buffers back after we commit -* several transactions in the following calls. -*/ - error =xfs_attr_fillstate (state); -if (error) -return error; - -/* -* Mark the attribute as INCOMPLETE -*/ -return xfs_attr3_leaf_setflag (args); -} - -/* -* Initial setup for xfs_attr_node_removename. Make sure the attr is there and -* the blocks are valid. Attr keys with remote blocks will be marked -* incomplete. -*/ -STATIC -int xfs_attr_node_removename_setup( -struct xfs_attr_item *attr) -{ -struct xfs_da_args *args = attr->xattri_da_args; -struct xfs_da_state **state = &attr->xattri_da_state; -int error; - - error =xfs_attr_node_hasname (args, state); -if (error != -EEXIST ) - goto out; - error =0 ; - -ASSERT ((*state)->path.blk[(*state)->path.active -1 ].bp !=NULL ); -ASSERT ((*state)->path.blk[(*state)->path.active -1 ].magic == -XFS_ATTR_LEAF_MAGIC ); - -if (args->rmtblkno >0 ) { - error =xfs_attr_leaf_mark_incomplete (args, *state); -if (error) - goto out; - - error =xfs_attr_rmtval_invalidate (args); - } -out: -if (error) -xfs_da_state_free (*state); - -return error; -} - STATIC int xfs_attr_node_removename( struct xfs_da_args *args,
fs/xfs/libxfs/xfs_attr.h +4 -0
@@ -451,6 +451,10 @@ enum xfs_delattr_state {XFS_DAS_RM_NAME ,/* Remove attr name */ XFS_DAS_RM_SHRINK ,/* We are shrinking the tree */ +XFS_DAS_SF_REMOVE ,/* Initial shortform set iter state */ +XFS_DAS_LEAF_REMOVE ,/* Initial leaf form set iter state */ +XFS_DAS_NODE_REMOVE ,/* Initial node form set iter state */ +/* Leaf state set/replace sequence */ XFS_DAS_LEAF_SET_RMT ,/* set a remote xattr from a leaf */ XFS_DAS_LEAF_ALLOC_RMT, /* We are allocating remote blocks */
fs/xfs/xfs_trace.h +3 -0
@@ -4136,6 +4136,9 @@ TRACE_DEFINE_ENUM(XFS_DAS_NODE_ADD);TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK );TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME );TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK ); +TRACE_DEFINE_ENUM (XFS_DAS_SF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REPLACE );
Signature · 1 line
2.35.1
PATCH v3 14/17 xfs: switch attr remove to xfs_attri_set_iter
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that xfs_attri_set_iter() has initial states for removing attributes, switch the pure attribute removal code over to using it. This requires attrs being removed to always be marked as INCOMPLETE before we start the removal due to the fact we look up the attr to remove again in xfs_attr_node_remove_attr().
Note: this drops the fillstate/refillstate optimisations from the remove path that avoid having to look up the path again after setting the incomplete flag and removeing remote attrs. Restoring that optimisation to this path is future Dave's problem.
--- fs/xfs/libxfs/xfs_attr.c | 21 +++++++++------------ fs/xfs/libxfs/xfs_attr.h | 10 ++++++++++ fs/xfs/xfs_attr_item.c | 31 +++++++------------------------ 3 files changed, 26 insertions(+), 36 deletions(-)
fs/xfs/libxfs/xfs_attr.c +9 -12
@@ -499,13 +499,11 @@ int xfs_attr_node_removename_setup(ASSERT ((*state)->path.blk[(*state)->path.active -1 ].magic ==XFS_ATTR_LEAF_MAGIC ); -if (args->rmtblkno >0 ) { - error =xfs_attr_leaf_mark_incomplete (args, *state); -if (error) - goto out; - + error =xfs_attr_leaf_mark_incomplete (args, *state); +if (error) + goto out; +if (args->rmtblkno >0 ) error =xfs_attr_rmtval_invalidate (args); - } out:if (error)xfs_da_state_free (*state);
@@ -778,7 +776,7 @@ xfs_attr_defer_remove(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_remove_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list);trace_xfs_attr_defer_remove (new->xattri_dela_state, args->dp);
@@ -1348,16 +1346,15 @@ xfs_attr_node_remove_attr( {struct xfs_da_args *args = attr->xattri_da_args;struct xfs_da_state *state =NULL ; -struct xfs_mount *mp = args->dp->i_mount;int retval =0 ;int error =0 ;/* -* Re-find the "old" attribute entry after any split ops. The INCOMPLETE -* flag means that we will find the "old" attr, not the "new" one. +* The attr we are removing has already been marked incomplete, so +* we need to set the filter appropriately to re-find the "old" +* attribute entry after any split ops. */ -if (!xfs_has_larp (mp)) - args->attr_filter |=XFS_ATTR_INCOMPLETE ; + args->attr_filter |=XFS_ATTR_INCOMPLETE ; state =xfs_da_state_alloc (args); state->inleaf =0 ; error =xfs_da3_node_lookup_int (state, &retval);
fs/xfs/libxfs/xfs_attr.h +10 -0
@@ -593,6 +593,16 @@ xfs_attr_init_add_state(struct xfs_da_args *args)return XFS_DAS_NODE_ADD ; } +static inline enum xfs_delattr_state +xfs_attr_init_remove_state (struct xfs_da_args *args) +{ +if (xfs_attr_is_shortform (args->dp)) +return XFS_DAS_SF_REMOVE ; +if (xfs_attr_is_leaf (args->dp)) +return XFS_DAS_LEAF_REMOVE ; +return XFS_DAS_NODE_REMOVE ; +} +static inline enum xfs_delattr_state xfs_attr_init_replace_state (struct xfs_da_args *args) {
fs/xfs/xfs_attr_item.c +7 -24
@@ -296,12 +296,9 @@ xfs_attrd_item_release( STATIC intxfs_xattri_finish_update (struct xfs_attr_item *attr, -struct xfs_attrd_log_item *attrdp, -uint32_t op_flags) +struct xfs_attrd_log_item *attrdp) {struct xfs_da_args *args = attr->xattri_da_args; -unsigned int op = op_flags & -XFS_ATTR_OP_FLAGS_TYPE_MASK ;int error;if (XFS_TEST_ERROR (false, args->dp->i_mount,XFS_ERRTAG_LARP )) {
@@ -309,22 +306,9 @@ xfs_xattri_finish_update( goto out; } -switch (op) { -case XFS_ATTR_OP_FLAGS_SET : -case XFS_ATTR_OP_FLAGS_REPLACE : - error =xfs_attr_set_iter (attr); -if (!error && attr->xattri_dela_state !=XFS_DAS_DONE ) - error = -EAGAIN ; -break ; -case XFS_ATTR_OP_FLAGS_REMOVE : -ASSERT (XFS_IFORK_Q (args->dp)); - error =xfs_attr_remove_iter (attr); -break ; -default : - error = -EFSCORRUPTED ; -break ; - } - + error =xfs_attr_set_iter (attr); +if (!error && attr->xattri_dela_state !=XFS_DAS_DONE ) + error = -EAGAIN ; out:/* * Mark the transaction dirty, even on error. This ensures the
@@ -432,8 +416,7 @@ xfs_attr_finish_item(*/ attr->xattri_da_args->trans = tp; - error =xfs_xattri_finish_update (attr, done_item, - attr->xattri_op_flags); + error =xfs_xattri_finish_update (attr, done_item);if (error != -EAGAIN )kmem_free (attr);
@@ -581,7 +564,7 @@ xfs_attri_item_recover( attr->xattri_dela_state =xfs_attr_init_add_state (args);break ;case XFS_ATTR_OP_FLAGS_REMOVE : - attr->xattri_dela_state =XFS_DAS_UNINIT ; + attr->xattri_dela_state =xfs_attr_init_remove_state (args);break ;default :ASSERT (0 );
@@ -600,7 +583,7 @@ xfs_attri_item_recover(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); - ret =xfs_xattri_finish_update (attr, done_item, attrp->alfi_op_flags); + ret =xfs_xattri_finish_update (attr, done_item);if (ret == -EAGAIN ) {/* There's more work to do, so add it to this transaction */ xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_ATTR , &attr->xattri_list);
Signature · 1 line
2.35.1
Re: [PATCH 14/17] xfs: switch attr remove to xfs_attri_set_iter
Quoted 8 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Now that
xfs_attri_set_iter()has initial states for removing attributes, switch the pure attribute removal code over to using it. This requires attrs being removed to always be marked as INCOMPLETE before we start the removal due to the fact we look up the attr to remove again inxfs_attr_node_remove_attr().
Quoted 6 lines
Note: this drops the fillstate/refillstate optimisations from the remove path that avoid having to look up the path again after setting the incomplete flag and removeing remote attrs. Restoring that optimisation to this path is future Dave's problem.
Signed-off-by Dave Chinner <[email protected]>
Ok, I think this looks ok now
Quoted 163 lines
--- fs/xfs/libxfs/xfs_attr.c | 21 +++++++++------------ fs/xfs/libxfs/xfs_attr.h | 10 ++++++++++ fs/xfs/xfs_attr_item.c | 31 +++++++------------------------ 3 files changed, 26 insertions(+), 36 deletions(-)fs/xfs/libxfs/xfs_attr.c +5
-9@@ -499,13 +499,11 @@ int xfs_attr_node_removename_setup(ASSERT ((*state)->path.blk[(*state)->path.active -1 ].magic ==XFS_ATTR_LEAF_MAGIC ); -if (args->rmtblkno >0 ) { - error =xfs_attr_leaf_mark_incomplete (args, *state); -if (error) - goto out; - + error =xfs_attr_leaf_mark_incomplete (args, *state); +if (error) + goto out; +if (args->rmtblkno >0 ) error =xfs_attr_rmtval_invalidate (args); - } out:if (error)xfs_da_state_free (*state);@@ -778,7 +776,7 @@ xfs_attr_defer_remove(if (error)return error; - new->xattri_dela_state =XFS_DAS_UNINIT ; + new->xattri_dela_state =xfs_attr_init_remove_state (args);xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new- >xattri_list);trace_xfs_attr_defer_remove (new->xattri_dela_state, args->dp);@@ -1348,16 +1346,15 @@ xfs_attr_node_remove_attr( {struct xfs_da_args *args = attr->xattri_da_args;struct xfs_da_state *state =NULL ; -struct xfs_mount *mp = args->dp->i_mount;int retval =0 ;int error =0 ;/* -* Re-find the "old" attribute entry after any split ops. The INCOMPLETE
fs/xfs/libxfs/xfs_attr.c +0
-1-* flag means that we will find the "old" attr, not the "new" one.
fs/xfs/libxfs/xfs_attr.c +1
-0+* The attr we are removing has already been marked incomplete, so
fs/xfs/libxfs/xfs_attr.c +3
-2+* we need to set the filter appropriately to re-find the "old" +* attribute entry after any split ops. */ -if (!xfs_has_larp (mp)) - args->attr_filter |=XFS_ATTR_INCOMPLETE ; + args->attr_filter |=XFS_ATTR_INCOMPLETE ; state =xfs_da_state_alloc (args); state->inleaf =0 ; error =xfs_da3_node_lookup_int (state, &retval);fs/xfs/libxfs/xfs_attr.h +10
-0@@ -593,6 +593,16 @@ xfs_attr_init_add_state(struct xfs_da_args *args)return XFS_DAS_NODE_ADD ; } +static inline enum xfs_delattr_state +xfs_attr_init_remove_state (struct xfs_da_args *args) +{ +if (xfs_attr_is_shortform (args->dp)) +return XFS_DAS_SF_REMOVE ; +if (xfs_attr_is_leaf (args->dp)) +return XFS_DAS_LEAF_REMOVE ; +return XFS_DAS_NODE_REMOVE ; +} +static inline enum xfs_delattr_state xfs_attr_init_replace_state (struct xfs_da_args *args){
fs/xfs/xfs_attr_item.c +1
-4@@ -296,12 +296,9 @@ xfs_attrd_item_release( STATIC intxfs_xattri_finish_update (struct xfs_attr_item *attr, -struct xfs_attrd_log_item *attrdp, -uint32_t op_flags) +struct xfs_attrd_log_item *attrdp) {struct xfs_da_args *args = attr->xattri_da_args; -unsigned int op = op_flags & -XFS_ATTR_OP_FLAGS_TYPE_MAS K ;int error;if (
XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_LARP))
{fs/xfs/xfs_attr_item.c +5
-19@@ -309,22 +306,9 @@ xfs_xattri_finish_update( goto out; } -switch (op) { -case XFS_ATTR_OP_FLAGS_SET : -case XFS_ATTR_OP_FLAGS_REPLACE : - error =xfs_attr_set_iter (attr); -if (!error && attr->xattri_dela_state !=XFS_DAS_DONE ) - error = -EAGAIN ; -break ; -case XFS_ATTR_OP_FLAGS_REMOVE : -ASSERT (XFS_IFORK_Q (args->dp)); - error =xfs_attr_remove_iter (attr); -break ; -default : - error = -EFSCORRUPTED ; -break ; - } - + error =xfs_attr_set_iter (attr); +if (!error && attr->xattri_dela_state !=XFS_DAS_DONE ) + error = -EAGAIN ; out:/* * Mark the transaction dirty, even on error. This ensures the @@ -432,8 +416,7 @@ xfs_attr_finish_item(*/ attr->xattri_da_args->trans = tp; - error =xfs_xattri_finish_update (attr, done_item, - attr->xattri_op_flags); + error =xfs_xattri_finish_update (attr, done_item);if (error != -EAGAIN )kmem_free (attr);@@ -581,7 +564,7 @@ xfs_attri_item_recover( attr->xattri_dela_state =xfs_attr_init_add_state (args);break ;case XFS_ATTR_OP_FLAGS_REMOVE : - attr->xattri_dela_state =XFS_DAS_UNINIT ; + attr->xattri_dela_state =xfs_attr_init_remove_state (args);break ;fs/xfs/xfs_attr_item.c +1
-1default :ASSERT (0 );@@ -600,7 +583,7 @@ xfs_attri_item_recover(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); - ret =xfs_xattri_finish_update (attr, done_item, attrp- >alfi_op_flags); + ret =xfs_xattri_finish_update (attr, done_item);if (ret == -EAGAIN ) {/* There's more work to do, so add it to this transaction */
xfs_defer_add(tp,XFS_DEFER_OPS_TYPE_ATTR, &attr-Quoted 1 line
xattri_list);
PATCH v3 15/17 xfs: remove xfs_attri_remove_iter
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
xfs_attri_remove_iter is not used anymore, so remove it and all the infrastructure it uses and is needed to drive it. THe xfs_attr_refillstate() function now throws an unused warning, so isolate the xfs_attr_fillstate()/xfs_attr_refillstate() code pair with an #if 0 and a comment explaining why we want to keep this code and restore the optimisation it provides in the near future.
--- fs/xfs/libxfs/xfs_attr.c | 431 ++++++++++++--------------------------- 1 file changed, 135 insertions(+), 296 deletions(-)
fs/xfs/libxfs/xfs_attr.c +135 -296
@@ -64,8 +64,6 @@ STATIC int xfs_attr_node_addname_find_attr(struct xfs_attr_item *attr); STATIC int xfs_attr_node_remove_attr(struct xfs_attr_item *attr); STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,struct xfs_da_state **state); -STATIC int xfs_attr_fillstate(xfs_da_state_t *state); -STATIC int xfs_attr_refillstate(xfs_da_state_t *state); STATIC int xfs_attr_node_removename(struct xfs_da_args *args,struct xfs_da_state *state);
@@ -100,6 +98,123 @@ xfs_attr_is_leaf(return imap.br_startoff ==0 && imap.br_blockcount ==1 ; } +/* +* XXX (dchinner): name path state saving and refilling is an optimisation to +* avoid needing to look up name entries after rolling transactions removing +* remote xattr blocks between the name entry lookup and name entry removal. +* This optimisation got sidelined when combining the set and remove state +* machines, but the code has been left in place because it is worthwhile to +* restore the optimisation once the combined state machine paths have settled. +* +* This comment is a public service announcement to remind Future Dave that he +* still needs to restore this code to working order. +*/ +#if 0 +/* +* Fill in the disk block numbers in the state structure for the buffers +* that are attached to the state structure. +* This is done so that we can quickly reattach ourselves to those buffers +* after some set of transaction commits have released these buffers. +*/ +static int +xfs_attr_fillstate (xfs_da_state_t *state) +{ +xfs_da_state_path_t *path; +xfs_da_state_blk_t *blk; +int level; + +trace_xfs_attr_fillstate (state->args); + +/* +* Roll down the "path" in the state structure, storing the on-disk +* block number for those buffers in the "path". +*/ + path = &state->path; +ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); +for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { +if (blk->bp) { + blk->disk_blkno =xfs_buf_daddr (blk->bp); + blk->bp =NULL ; + }else { + blk->disk_blkno =0 ; + } + } + +/* +* Roll down the "altpath" in the state structure, storing the on-disk +* block number for those buffers in the "altpath". +*/ + path = &state->altpath; +ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); +for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { +if (blk->bp) { + blk->disk_blkno =xfs_buf_daddr (blk->bp); + blk->bp =NULL ; + }else { + blk->disk_blkno =0 ; + } + } + +return 0 ; +} + +/* +* Reattach the buffers to the state structure based on the disk block +* numbers stored in the state structure. +* This is done after some set of transaction commits have released those +* buffers from our grip. +*/ +static int +xfs_attr_refillstate (xfs_da_state_t *state) +{ +xfs_da_state_path_t *path; +xfs_da_state_blk_t *blk; +int level, error; + +trace_xfs_attr_refillstate (state->args); + +/* +* Roll down the "path" in the state structure, storing the on-disk +* block number for those buffers in the "path". +*/ + path = &state->path; +ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); +for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { +if (blk->disk_blkno) { + error =xfs_da3_node_read_mapped (state->args->trans, + state->args->dp, blk->disk_blkno, + &blk->bp,XFS_ATTR_FORK ); +if (error) +return error; + }else { + blk->bp =NULL ; + } + } + +/* +* Roll down the "altpath" in the state structure, storing the on-disk +* block number for those buffers in the "altpath". +*/ + path = &state->altpath; +ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); +for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { +if (blk->disk_blkno) { + error =xfs_da3_node_read_mapped (state->args->trans, + state->args->dp, blk->disk_blkno, + &blk->bp,XFS_ATTR_FORK ); +if (error) +return error; + }else { + blk->bp =NULL ; + } + } + +return 0 ; +} +#else +static int xfs_attr_fillstate (xfs_da_state_t *state) {return 0 ; } +#endif +/*======================================================================== * Overall external interface routines. *========================================================================*/
@@ -1339,6 +1454,24 @@ xfs_attr_node_try_addname(return error; } +static int +xfs_attr_node_removename ( +struct xfs_da_args *args, +struct xfs_da_state *state) +{ +struct xfs_da_state_blk *blk; +int retval; + +/* +* Remove the name and update the hashvals in the tree. +*/ + blk = &state->path.blk[state->path.active-1 ]; +ASSERT (blk->magic ==XFS_ATTR_LEAF_MAGIC ); + retval =xfs_attr3_leaf_remove (blk->bp, args); +xfs_da3_fixhashpath (state, &state->path); + +return retval; +}static int xfs_attr_node_remove_attr(
@@ -1381,300 +1514,6 @@ xfs_attr_node_remove_attr(return retval; } -/* -* Shrink an attribute from leaf to shortform -*/ -STATIC int -xfs_attr_node_shrink ( -struct xfs_da_args *args, -struct xfs_da_state *state) -{ -struct xfs_inode *dp = args->dp; -int error, forkoff; -struct xfs_buf *bp; - -/* -* Have to get rid of the copy of this dabuf in the state. -*/ -ASSERT (state->path.active ==1 ); -ASSERT (state->path.blk[0 ].bp); - state->path.blk[0 ].bp =NULL ; - - error =xfs_attr3_leaf_read (args->trans, args->dp,0 , &bp); -if (error) -return error; - - forkoff =xfs_attr_shortform_allfit (bp, dp); -if (forkoff) { - error =xfs_attr3_leaf_to_shortform (bp, args, forkoff); -/* bp is gone due to xfs_da_shrink_inode */ - }else -xfs_trans_brelse (args->trans, bp); - -return error; -} - -STATIC int -xfs_attr_node_removename ( -struct xfs_da_args *args, -struct xfs_da_state *state) -{ -struct xfs_da_state_blk *blk; -int retval; - -/* -* Remove the name and update the hashvals in the tree. -*/ - blk = &state->path.blk[state->path.active-1 ]; -ASSERT (blk->magic ==XFS_ATTR_LEAF_MAGIC ); - retval =xfs_attr3_leaf_remove (blk->bp, args); -xfs_da3_fixhashpath (state, &state->path); - -return retval; -} - -/* -* Remove the attribute specified in @args. -* -* This will involve walking down the Btree, and may involve joining -* leaf nodes and even joining intermediate nodes up to and including -* the root node (a special case of an intermediate node). -* -* This routine is meant to function as either an in-line or delayed operation, -* and may return -EAGAIN when the transaction needs to be rolled. Calling -* functions will need to handle this, and call the function until a -* successful error code is returned. -*/ -int -xfs_attr_remove_iter ( -struct xfs_attr_item *attr) -{ -struct xfs_da_args *args = attr->xattri_da_args; -struct xfs_da_state *state = attr->xattri_da_state; -int retval, error =0 ; -struct xfs_inode *dp = args->dp; - -trace_xfs_attr_node_removename (args); - -switch (attr->xattri_dela_state) { -case XFS_DAS_UNINIT : -if (!xfs_inode_hasattr (dp)) -return -ENOATTR ; - -/* -* Shortform or leaf formats don't require transaction rolls and -* thus state transitions. Call the right helper and return. -*/ -if (dp->i_afp->if_format ==XFS_DINODE_FMT_LOCAL ) -return xfs_attr_sf_removename (args); - -if (xfs_attr_is_leaf (dp)) -return xfs_attr_leaf_removename (args); - -/* -* Node format may require transaction rolls. Set up the -* state context and fall into the state machine. -*/ -if (!attr->xattri_da_state) { - error =xfs_attr_node_removename_setup (attr); -if (error) -return error; - state = attr->xattri_da_state; - } - - fallthrough; -case XFS_DAS_RMTBLK : - attr->xattri_dela_state =XFS_DAS_RMTBLK ; - -/* -* If there is an out-of-line value, de-allocate the blocks. -* This is done before we remove the attribute so that we don't -* overflow the maximum size of a transaction and/or hit a -* deadlock. -*/ -if (args->rmtblkno >0 ) { -/* -* May return -EAGAIN. Roll and repeat until all remote -* blocks are removed. -*/ - error =xfs_attr_rmtval_remove (attr); -if (error == -EAGAIN ) { -trace_xfs_attr_remove_iter_return ( - attr->xattri_dela_state, args->dp); -return error; - }else if (error) { - goto out; - } - -/* -* Refill the state structure with buffers (the prior -* calls released our buffers) and close out this -* transaction before proceeding. -*/ -ASSERT (args->rmtblkno ==0 ); - error =xfs_attr_refillstate (state); -if (error) - goto out; - - attr->xattri_dela_state =XFS_DAS_RM_NAME ; -trace_xfs_attr_remove_iter_return ( - attr->xattri_dela_state, args->dp); -return -EAGAIN ; - } - - fallthrough; -case XFS_DAS_RM_NAME : -/* -* If we came here fresh from a transaction roll, reattach all -* the buffers to the current transaction. -*/ -if (attr->xattri_dela_state ==XFS_DAS_RM_NAME ) { - error =xfs_attr_refillstate (state); -if (error) - goto out; - } - - retval =xfs_attr_node_removename (args, state); - -/* -* Check to see if the tree needs to be collapsed. If so, roll -* the transacton and fall into the shrink state. -*/ -if (retval && (state->path.active >1 )) { - error =xfs_da3_join (state); -if (error) - goto out; - - attr->xattri_dela_state =XFS_DAS_RM_SHRINK ; -trace_xfs_attr_remove_iter_return ( - attr->xattri_dela_state, args->dp); -return -EAGAIN ; - } - - fallthrough; -case XFS_DAS_RM_SHRINK : -/* -* If the result is small enough, push it all into the inode. -* This is our final state so it's safe to return a dirty -* transaction. -*/ -if (xfs_attr_is_leaf (dp)) - error =xfs_attr_node_shrink (args, state); -ASSERT (error != -EAGAIN ); -break ; -default : -ASSERT (0 ); - error = -EINVAL ; - goto out; - } -out: -if (state) -xfs_da_state_free (state); -return error; -} - -/* -* Fill in the disk block numbers in the state structure for the buffers -* that are attached to the state structure. -* This is done so that we can quickly reattach ourselves to those buffers -* after some set of transaction commits have released these buffers. -*/ -STATIC int -xfs_attr_fillstate (xfs_da_state_t *state) -{ -xfs_da_state_path_t *path; -xfs_da_state_blk_t *blk; -int level; - -trace_xfs_attr_fillstate (state->args); - -/* -* Roll down the "path" in the state structure, storing the on-disk -* block number for those buffers in the "path". -*/ - path = &state->path; -ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); -for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { -if (blk->bp) { - blk->disk_blkno =xfs_buf_daddr (blk->bp); - blk->bp =NULL ; - }else { - blk->disk_blkno =0 ; - } - } - -/* -* Roll down the "altpath" in the state structure, storing the on-disk -* block number for those buffers in the "altpath". -*/ - path = &state->altpath; -ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); -for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { -if (blk->bp) { - blk->disk_blkno =xfs_buf_daddr (blk->bp); - blk->bp =NULL ; - }else { - blk->disk_blkno =0 ; - } - } - -return 0 ; -} - -/* -* Reattach the buffers to the state structure based on the disk block -* numbers stored in the state structure. -* This is done after some set of transaction commits have released those -* buffers from our grip. -*/ -STATIC int -xfs_attr_refillstate (xfs_da_state_t *state) -{ -xfs_da_state_path_t *path; -xfs_da_state_blk_t *blk; -int level, error; - -trace_xfs_attr_refillstate (state->args); - -/* -* Roll down the "path" in the state structure, storing the on-disk -* block number for those buffers in the "path". -*/ - path = &state->path; -ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); -for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { -if (blk->disk_blkno) { - error =xfs_da3_node_read_mapped (state->args->trans, - state->args->dp, blk->disk_blkno, - &blk->bp,XFS_ATTR_FORK ); -if (error) -return error; - }else { - blk->bp =NULL ; - } - } - -/* -* Roll down the "altpath" in the state structure, storing the on-disk -* block number for those buffers in the "altpath". -*/ - path = &state->altpath; -ASSERT ((path->active >=0 ) && (path->active <XFS_DA_NODE_MAXDEPTH )); -for (blk = path->blk, level =0 ; level < path->active; blk++, level++) { -if (blk->disk_blkno) { - error =xfs_da3_node_read_mapped (state->args->trans, - state->args->dp, blk->disk_blkno, - &blk->bp,XFS_ATTR_FORK ); -if (error) -return error; - }else { - blk->bp =NULL ; - } - } - -return 0 ; -} -/* * Retrieve the attribute data from a node attribute list. *
Signature · 1 line
2.35.1
PATCH v3 16/17 xfs: use XFS_DA_OP flags in deferred attr ops
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We currently store the high level attr operation in args->attr_flags. This falgs are what the VFS is telling us to do, but don't necessarily match what we are doing in the low level modification state machine. e.g. XATTR_REPLACE implies both XFS_DA_OP_ADDNAME and XFS_DA_OP_RENAME because it is doing both a remove and adding a new attr.
However, deep in the individual state machine operations, we check errors against this high level VFS op flags, not the low level XFS_DA_OP flags. Indeed, we don't even have a low level flag for a REMOVE operation, so the only way we know we are doing a remove is the complete absence of XATTR_REPLACE, XATTR_CREATE, XFS_DA_OP_ADDNAME and XFS_DA_OP_RENAME. And because there are other flags in these fields, this is a pain to check if we need to.
As the XFS_DA_OP flags are only needed once the deferred operations are set up, set these flags appropriately when we set the initial operation state. We also introduce a XFS_DA_OP_REMOVE flag to make it easy to know that we are doing a remove operation.
With these, we can remove the use of XATTR_REPLACE and XATTR_CREATE in low level lookup operations, and manipulate the low level flags according to the low level context that is operating. e.g. log recovery does not have a VFS xattr operation state to copy into args->attr_flags, and the low level state machine ops we do for recovery do not match the high level VFS operations that were in progress when the system failed...
--- fs/xfs/libxfs/xfs_attr.c | 124 +++++++++++++++++++--------------- fs/xfs/libxfs/xfs_attr.h | 3 + fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- fs/xfs/libxfs/xfs_da_btree.h | 9 ++- 4 files changed, 78 insertions(+), 60 deletions(-)
fs/xfs/libxfs/xfs_attr.c +68 -56
@@ -469,7 +469,7 @@ xfs_attr_leaf_addname(*/ if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_RENAME ) +else if (args->op_flags &XFS_DA_OP_REPLACE )xfs_attr_dela_state_set_replace (attr,XFS_DAS_LEAF_REPLACE );else attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -514,7 +514,7 @@ xfs_attr_node_addname(if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_RENAME ) +else if (args->op_flags &XFS_DA_OP_REPLACE )xfs_attr_dela_state_set_replace (attr,XFS_DAS_NODE_REPLACE );else attr->xattri_dela_state =XFS_DAS_DONE ;
@@ -550,7 +550,7 @@ xfs_attr_rmtval_alloc(return error;/* If this is not a rename, clear the incomplete flag and we're done. */ -if (!(args->op_flags &XFS_DA_OP_RENAME )) { +if (!(args->op_flags &XFS_DA_OP_REPLACE )) { error =xfs_attr3_leaf_clearflag (args); attr->xattri_dela_state =XFS_DAS_DONE ; }else {
@@ -935,8 +935,6 @@ xfs_attr_set(if (args->value) {XFS_STATS_INC (mp, xs_attr_set); - - args->op_flags |=XFS_DA_OP_ADDNAME ; args->total =xfs_attr_calc_size (args, &local);/*
@@ -1094,28 +1092,41 @@ static inline int xfs_attr_sf_totsize(struct xfs_inode *dp)* Add a name to the shortform attribute list structure * This is the external routine. */ -STATIC int -xfs_attr_shortform_addname (xfs_da_args_t *args) +static int +xfs_attr_shortform_addname ( +struct xfs_da_args *args) { -int newsize, forkoff, retval; +int newsize, forkoff; +int error;trace_xfs_attr_sf_addname (args); - retval =xfs_attr_shortform_lookup (args); -if (retval == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) -return retval; -if (retval == -EEXIST ) { -if (args->attr_flags &XATTR_CREATE ) -return retval; - retval =xfs_attr_sf_removename (args); -if (retval) -return retval; + error =xfs_attr_shortform_lookup (args); +switch (error) { +case -ENOATTR : +if (args->op_flags &XFS_DA_OP_REPLACE ) +return error; +break ; +case -EEXIST : +if (!(args->op_flags &XFS_DA_OP_REPLACE )) +return error; + + error =xfs_attr_sf_removename (args); +if (error) +return error; +/* -* Since we have removed the old attr, clear ATTR_REPLACE so -* that the leaf format add routine won't trip over the attr -* not being around. +* Since we have removed the old attr, clear XFS_DA_OP_REPLACE +* so that the new attr doesn't fit in shortform format, the +* leaf format add routine won't trip over the attr not being +* around. */ - args->attr_flags &= ~XATTR_REPLACE ; + args->op_flags &= ~XFS_DA_OP_REPLACE ; +break ; +case 0 : +break ; +default : +return error; } if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
@@ -1197,28 +1208,30 @@ xfs_attr_leaf_try_add(* Look up the xattr name to set the insertion point for the new xattr. */ error =xfs_attr3_leaf_lookup_int (bp, args); -if (error != -ENOATTR && error != -EEXIST ) - goto out_brelse; -if (error == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) - goto out_brelse; -if (error == -EEXIST ) { -if (args->attr_flags &XATTR_CREATE ) +switch (error) { +case -ENOATTR : +if (args->op_flags &XFS_DA_OP_REPLACE ) + goto out_brelse; +break ; +case -EEXIST : +if (!(args->op_flags &XFS_DA_OP_REPLACE )) goto out_brelse;trace_xfs_attr_leaf_replace (args); - -/* save the attribute state for later removal*/ - args->op_flags |=XFS_DA_OP_RENAME ;/* an atomic rename */ -xfs_attr_save_rmt_blk (args); -/* -* clear the remote attr state now that it is saved so that the -* values reflect the state of the attribute we are about to +* Save the existing remote attr state so that the current +* values reflect the state of the new attribute we are about to * add, not the attribute we just found and will remove later. */ +xfs_attr_save_rmt_blk (args); args->rmtblkno =0 ; args->rmtblkcnt =0 ; args->rmtvaluelen =0 ; +break ; +case 0 : +break ; +default : + goto out_brelse; }return xfs_attr3_leaf_add (bp, args);
@@ -1357,46 +1370,45 @@ xfs_attr_node_hasname( STATIC intxfs_attr_node_addname_find_attr ( -struct xfs_attr_item *attr) +struct xfs_attr_item *attr) { -struct xfs_da_args *args = attr->xattri_da_args; -int retval; +struct xfs_da_args *args = attr->xattri_da_args; +int error;/* * Search to see if name already exists, and get back a pointer * to where it should go. */ - retval =xfs_attr_node_hasname (args, &attr->xattri_da_state); -if (retval != -ENOATTR && retval != -EEXIST ) - goto error; - -if (retval == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) - goto error; -if (retval == -EEXIST ) { -if (args->attr_flags &XATTR_CREATE ) + error =xfs_attr_node_hasname (args, &attr->xattri_da_state); +switch (error) { +case -ENOATTR : +if (args->op_flags &XFS_DA_OP_REPLACE ) + goto error; +break ; +case -EEXIST : +if (!(args->op_flags &XFS_DA_OP_REPLACE )) goto error; -trace_xfs_attr_node_replace (args); - -/* save the attribute state for later removal*/ - args->op_flags |=XFS_DA_OP_RENAME ;/* atomic rename op */ -xfs_attr_save_rmt_blk (args); +trace_xfs_attr_node_replace (args);/* -* clear the remote attr state now that it is saved so that the -* values reflect the state of the attribute we are about to +* Save the existing remote attr state so that the current +* values reflect the state of the new attribute we are about to * add, not the attribute we just found and will remove later. */ - args->rmtblkno =0 ; - args->rmtblkcnt =0 ; - args->rmtvaluelen =0 ; +xfs_attr_save_rmt_blk (args); +break ; +case 0 : +break ; +default : + goto error; }return 0 ; error:if (attr->xattri_da_state)xfs_da_state_free (attr->xattri_da_state); -return retval; +return error; }/*
fs/xfs/libxfs/xfs_attr.h +3 -0
@@ -584,6 +584,7 @@ xfs_attr_is_shortform(static inline enum xfs_delattr_state xfs_attr_init_add_state (struct xfs_da_args *args) { + args->op_flags |=XFS_DA_OP_ADDNAME ;if (!args->dp->i_afp)return XFS_DAS_DONE ;if (xfs_attr_is_shortform (args->dp))
@@ -596,6 +597,7 @@ xfs_attr_init_add_state(struct xfs_da_args *args)static inline enum xfs_delattr_state xfs_attr_init_remove_state (struct xfs_da_args *args) { + args->op_flags |=XFS_DA_OP_REMOVE ;if (xfs_attr_is_shortform (args->dp))return XFS_DAS_SF_REMOVE ;if (xfs_attr_is_leaf (args->dp))
@@ -606,6 +608,7 @@ xfs_attr_init_remove_state(struct xfs_da_args *args)static inline enum xfs_delattr_state xfs_attr_init_replace_state (struct xfs_da_args *args) { + args->op_flags |=XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE ;return xfs_attr_init_add_state (args); }
fs/xfs/libxfs/xfs_attr_leaf.c +1 -1
@@ -1492,7 +1492,7 @@ xfs_attr3_leaf_add_work( entry->flags = args->attr_filter;if (tmp) entry->flags |=XFS_ATTR_LOCAL ; -if (args->op_flags &XFS_DA_OP_RENAME ) { +if (args->op_flags &XFS_DA_OP_REPLACE ) {if (!xfs_has_larp (mp)) entry->flags |=XFS_ATTR_INCOMPLETE ; if ((args->blkno2 == args->blkno) &&
fs/xfs/libxfs/xfs_da_btree.h +6 -3
@@ -85,19 +85,22 @@ typedef struct xfs_da_args {* Operation flags: */ #define XFS_DA_OP_JUSTCHECK (1u << 0)/* check for ok with no space */ -#define XFS_DA_OP_RENAME (1u << 1)/* this is an atomic rename op */ +#define XFS_DA_OP_REPLACE (1u << 1)/* this is an atomic replace op */ #define XFS_DA_OP_ADDNAME (1u << 2)/* this is an add operation */ #define XFS_DA_OP_OKNOENT (1u << 3)/* lookup op, ENOENT ok, else die */ #define XFS_DA_OP_CILOOKUP (1u << 4)/* lookup returns CI name if found */ #define XFS_DA_OP_NOTIME (1u << 5)/* don't update inode timestamps */ +#define XFS_DA_OP_REMOVE (1u << 6)/* this is a remove operation */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \ - { XFS_DA_OP_RENAME, "RENAME" }, \ + { XFS_DA_OP_REPLACE, "REPLACE" }, \ { XFS_DA_OP_ADDNAME, "ADDNAME" }, \ { XFS_DA_OP_OKNOENT, "OKNOENT" }, \ { XFS_DA_OP_CILOOKUP, "CILOOKUP" }, \ - { XFS_DA_OP_NOTIME, "NOTIME" } + { XFS_DA_OP_NOTIME, "NOTIME" }, \ + { XFS_DA_OP_REMOVE, "REMOVE" } +/* * Storage for holding state during Btree searches and split/join ops.
Signature · 1 line
2.35.1
Re: [PATCH 16/17] xfs: use XFS_DA_OP flags in deferred attr ops
Quoted 42 lines · Dave Chinner
fs/xfs/libxfs/xfs_attr.c +12
-16@@ -1357,46 +1370,45 @@ xfs_attr_node_hasname( STATIC intxfs_attr_node_addname_find_attr ( -struct xfs_attr_item *attr) +struct xfs_attr_item *attr) { -struct xfs_da_args *args = attr->xattri_da_args; -int retval; +struct xfs_da_args *args = attr->xattri_da_args; +int error;/* * Search to see if name already exists, and get back a pointer * to where it should go. */ - retval =xfs_attr_node_hasname (args, &attr->xattri_da_state); -if (retval != -ENOATTR && retval != -EEXIST ) - goto error; - -if (retval == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) - goto error; -if (retval == -EEXIST ) { -if (args->attr_flags &XATTR_CREATE ) + error =xfs_attr_node_hasname (args, &attr->xattri_da_state); +switch (error) { +case -ENOATTR : +if (args->op_flags &XFS_DA_OP_REPLACE ) + goto error; +break ; +case -EEXIST : +if (!(args->op_flags &XFS_DA_OP_REPLACE )) goto error; -trace_xfs_attr_node_replace (args); - -/* save the attribute state for later removal*/ - args->op_flags |=XFS_DA_OP_RENAME ;/* atomic rename op */ -xfs_attr_save_rmt_blk (args); +trace_xfs_attr_node_replace (args);/*
fs/xfs/libxfs/xfs_attr.c xfs_attr_node_hasname( · line 1399
Quoted 10 lines
fs/xfs/libxfs/xfs_attr.c +3
-5-* clear the remote attr state now that it is saved so that the -* values reflect the state of the attribute we are about to +* Save the existing remote attr state so that the current +* values reflect the state of the new attribute we are about to * add, not the attribute we just found and will remove later. */ - args->rmtblkno =0 ; - args->rmtblkcnt =0 ; - args->rmtvaluelen =0 ; +xfs_attr_save_rmt_blk (args);
Ok, removing the rmtblk zeroing right there is a bug. Not sure how I introduced that, or why it didn't show up until this afternoon. The leaf version of this same code is correct, and it triggers on generic/026 when larp = 0 but not when larp = 1.
I've fixed it, but vger is constipated again and I patches sent 8 hours ago haven't reached the list yet so when I arrives I'll post an updated version of this patch against it....
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Alli
Reviewed-byRe: [PATCH 16/17] xfs: use XFS_DA_OP flags in deferred attr ops
Quoted 65 lines · Dave Chinner
Quoted 53 lines · Dave Chinner
fs/xfs/libxfs/xfs_attr.c +12
-17@@ -1357,46 +1370,45 @@ xfs_attr_node_hasname(STATIC int xfs_attr_node_addname_find_attr( -struct xfs_attr_item *attr) +struct xfs_attr_item *attr) { -struct xfs_da_args *args = attr->xattri_da_args; -int retval; +struct xfs_da_args *args = attr->xattri_da_args; +int error; /* * Search to see if name already exists, and get back a pointer * to where it should go. */ - retval =xfs_attr_node_hasname (args, &attr->xattri_da_state); -if (retval != -ENOATTR && retval != -EEXIST ) - goto error; - -if (retval == -ENOATTR && (args->attr_flags &XATTR_REPLACE )) - goto error; -if (retval == -EEXIST ) { -if (args->attr_flags &XATTR_CREATE ) + error =xfs_attr_node_hasname (args, &attr->xattri_da_state); +switch (error) { +case -ENOATTR : +if (args->op_flags &XFS_DA_OP_REPLACE ) + goto error; +break ; +case -EEXIST : +if (!(args->op_flags &XFS_DA_OP_REPLACE )) goto error; -trace_xfs_attr_node_replace (args); - -/* save the attribute state for later removal*/ - args->op_flags |=XFS_DA_OP_RENAME ;/* atomic rename op */ -xfs_attr_save_rmt_blk (args); +trace_xfs_attr_node_replace (args);/* -* clear the remote attr state now that it is saved so that the
(quoted diff) +0
-1- * values reflect the state of the attribute we areabout to
(quoted diff) +1
-0+ * Save the existing remote attr state so that thecurrent
(quoted diff) +1
-0+ * values reflect the state of the new attribute we areabout to
* add, not the attribute we just found and will remove
later.fs/xfs/libxfs/xfs_attr.c xfs_attr_node_hasname( · line 1399
Quoted 5 lines
fs/xfs/libxfs/xfs_attr.c +1
-3*/ - args->rmtblkno =0 ; - args->rmtblkcnt =0 ; - args->rmtvaluelen =0 ; +xfs_attr_save_rmt_blk (args);Ok, removing the rmtblk zeroing right there is a bug. Not sure how I introduced that, or why it didn't show up until this afternoon. The leaf version of this same code is correct, and it triggers on generic/026 when larp = 0 but not when larp = 1.
Quoted 7 lines
I've fixed it, but vger is constipated again and I patches sent 8 hours ago haven't reached the list yet so when I arrives I'll post an updated version of this patch against it....
Cheers,
Dave.
Alrighty, this part aside, I think this patch looks ok. I've applied this set, plus a small manual fix to put back the rmtblk zeroing, and things seem to be running ok for me now.
PATCH v3 17/17 xfs: ATTR_REPLACE algorithm with LARP enabled needs rework
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We can't use the same algorithm for replacing an existing attribute when logging attributes. The existing algorithm is essentially:
1. create new attr w/ INCOMPLETE
2. atomically flip INCOMPLETE flags between old + new attribute
3. remove old attr which is marked w/ INCOMPLETE
This algorithm guarantees that we see either the old or new attribute, and if we fail after the atomic flag flip, we don't have to recover the removal of the old attr because we never see INCOMPLETE attributes in lookups.
For logged attributes, however, this does not work. The logged attribute intents do not track the work that has been done as the transaction rolls, and hence the only recovery mechanism we have is "run the replace operation from scratch".
This is further exacerbated by the attempt to avoid needing the INCOMPLETE flag to create an atomic swap. This means we can create a second active attribute of the same name before we remove the original. If we fail at any point after the create but before the removal has completed, we end up with duplicate attributes in the attr btree and recovery only tries to replace one of them.
There are several other failure modes where we can leave partially allocated remote attributes that expose stale data, partially free remote attributes that enable UAF based stale data exposure, etc.
TO fix this, we need a different algorithm for replace operations when LARP is enabled. Luckily, it's not that complex if we take the right first step. That is, the first thing we log is the attri intent with the new name/value pair and mark the old attr as INCOMPLETE in the same transaction.
From there, we then remove the old attr and keep relogging the new name/value in the intent, such that we always know that we have to create the new attr in recovery. Once the old attr is removed, we then run a normal ATTR_CREATE operation relogging the intent as we go. If the new attr is local, then it gets created in a single atomic transaction that also logs the final intent done. If the new attr is remote, the we set INCOMPLETE on the new attr while we allocate and set the remote value, and then we clear the INCOMPLETE flag at in the last transaction taht logs the final intent done.
If we fail at any point in this algorithm, log recovery will always see the same state on disk: the new name/value in the intent, and either an INCOMPLETE attr or no attr in the attr btree. If we find an INCOMPLETE attr, we run the full replace starting with removing the INCOMPLETE attr. If we don't find it, then we simply create the new attr.
Notably, recovery of a failed create that has an INCOMPLETE flag set is now the same - we start with the lookup of the INCOMPLETE attr, and if that exists then we do the full replace recovery process, otherwise we just create the new attr.
Hence changing the way we do the replace operation when LARP is enabled allows us to use the same log recovery algorithm for both the ATTR_CREATE and ATTR_REPLACE operations. This is also the same algorithm we use for runtime ATTR_REPLACE operations (except for the step setting up the initial conditions).
The result is that:
- ATTR_CREATE uses the same algorithm regardless of whether LARP is enabled or not
- ATTR_REPLACE with larp=0 is identical to the old algorithm
- ATTR_REPLACE with larp=1 runs an unmodified attr removal algorithm from the larp=0 code and then runs the unmodified ATTR_CREATE code.
- log recovery when larp=1 runs the same ATTR_REPLACE algorithm as it uses at runtime.
Because the state machine is now quite clean, changing the algorithm is really just a case of changing the initial state and how the states link together for the ATTR_REPLACE case. Hence it's not a huge amoutn of code for what is a fairly substantial rework of the attr logging and recovery algorithm....
--- fs/xfs/libxfs/xfs_attr.c | 97 +++++++++++++++++++++-------------- fs/xfs/libxfs/xfs_attr.h | 49 +++++++++++------- fs/xfs/libxfs/xfs_attr_leaf.c | 44 +++++++++++++--- fs/xfs/libxfs/xfs_da_btree.h | 4 +- fs/xfs/xfs_attr_item.c | 8 ++- fs/xfs/xfs_trace.h | 7 +-- 6 files changed, 137 insertions(+), 72 deletions(-)
fs/xfs/libxfs/xfs_attr.c +58 -39
@@ -71,9 +71,12 @@ intxfs_inode_hasattr ( struct xfs_inode *ip) { -if (!XFS_IFORK_Q (ip) || - (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && - ip->i_afp->if_nextents ==0 )) +if (!XFS_IFORK_Q (ip)) +return 0 ; +if (!ip->i_afp) +return 0 ; +if (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && + ip->i_afp->if_nextents ==0 )return 0 ;return 1 ; }
@@ -411,23 +414,30 @@ xfs_attr_sf_addname( }/* -* When we bump the state to REPLACE, we may actually need to skip over the -* state. When LARP mode is enabled, we don't need to run the atomic flags flip, -* so we skip straight over the REPLACE state and go on to REMOVE_OLD. +* Handle the state change on completion of a multi-state attr operation. +* +* If the XFS_DA_OP_REPLACE flag is set, this means the operation was the first +* modification in a attr replace operation and we still have to do the second +* state, indicated by @replace_state. +* +* We consume the XFS_DA_OP_REPLACE flag so that when we are called again on +* completion of the second half of the attr replace operation we correctly +* signal that it is done. */ -static void -xfs_attr_dela_state_set_replace ( +static enum xfs_delattr_state +xfs_attr_complete_op (struct xfs_attr_item *attr, -enum xfs_delattr_state replace) +enum xfs_delattr_state replace_state) {struct xfs_da_args *args = attr->xattri_da_args; +bool do_replace = args->op_flags &XFS_DA_OP_REPLACE ; -ASSERT (replace ==XFS_DAS_LEAF_REPLACE || - replace ==XFS_DAS_NODE_REPLACE ); - - attr->xattri_dela_state = replace; -if (xfs_has_larp (args->dp->i_mount)) - attr->xattri_dela_state++; + args->op_flags &= ~XFS_DA_OP_REPLACE ; +if (do_replace) { + args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +return replace_state; + } +return XFS_DAS_DONE ; } static int
@@ -469,10 +479,9 @@ xfs_attr_leaf_addname(*/ if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_REPLACE ) -xfs_attr_dela_state_set_replace (attr,XFS_DAS_LEAF_REPLACE );else - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +XFS_DAS_LEAF_REPLACE ); out:trace_xfs_attr_leaf_addname_return (attr->xattri_dela_state, args->dp);return error;
@@ -514,10 +523,9 @@ xfs_attr_node_addname(if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_REPLACE ) -xfs_attr_dela_state_set_replace (attr,XFS_DAS_NODE_REPLACE );else - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +XFS_DAS_NODE_REPLACE ); out:trace_xfs_attr_node_addname_return (attr->xattri_dela_state, args->dp);return error;
@@ -549,18 +557,15 @@ xfs_attr_rmtval_alloc(if (error)return error; -/* If this is not a rename, clear the incomplete flag and we're done. */ -if (!(args->op_flags &XFS_DA_OP_REPLACE )) { + attr->xattri_dela_state =xfs_attr_complete_op (attr, + ++attr->xattri_dela_state); +/* +* If we are not doing a rename, we've finished the operation but still +* have to clear the incomplete flag protecting the new attr from +* exposing partially initialised state if we crash during creation. +*/ +if (attr->xattri_dela_state ==XFS_DAS_DONE ) error =xfs_attr3_leaf_clearflag (args); - attr->xattri_dela_state =XFS_DAS_DONE ; - }else { -/* -* We are running a REPLACE operation, so we need to bump the -* state to the step in that operation. -*/ - attr->xattri_dela_state++; -xfs_attr_dela_state_set_replace (attr, attr->xattri_dela_state); - } out:trace_xfs_attr_rmtval_alloc (attr->xattri_dela_state, args->dp);return error;
@@ -685,13 +690,24 @@ xfs_attr_set_iter(return xfs_attr_node_addname (attr);case XFS_DAS_SF_REMOVE : - attr->xattri_dela_state =XFS_DAS_DONE ; -return xfs_attr_sf_removename (args); + error =xfs_attr_sf_removename (args); + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args)); +break ;case XFS_DAS_LEAF_REMOVE : - attr->xattri_dela_state =XFS_DAS_DONE ; -return xfs_attr_leaf_removename (args); + error =xfs_attr_leaf_removename (args); + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args)); +break ;case XFS_DAS_NODE_REMOVE : error =xfs_attr_node_removename_setup (attr); +if (error == -ENOATTR && + (args->op_flags &XFS_DA_OP_RECOVERY )) { + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args)); + error =0 ; +break ; + }if (error)return error; attr->xattri_dela_state =XFS_DAS_NODE_REMOVE_RMT ;
@@ -777,12 +793,14 @@ xfs_attr_set_iter(case XFS_DAS_LEAF_REMOVE_ATTR : error =xfs_attr_leaf_remove_attr (attr); - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args));break ;case XFS_DAS_NODE_REMOVE_ATTR : error =xfs_attr_node_remove_attr (attr); - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args));break ;default :ASSERT (0 );
@@ -1284,9 +1302,10 @@ xfs_attr_leaf_removename( dp = args->dp; error =xfs_attr_leaf_hasname (args, &bp); -if (error == -ENOATTR ) {xfs_trans_brelse (args->trans, bp); +if (args->op_flags &XFS_DA_OP_RECOVERY ) +return 0 ;return error; }else if (error != -EEXIST )return error;
fs/xfs/libxfs/xfs_attr.h +31 -18
85 lines not on this page · raw message
fs/xfs/libxfs/xfs_attr_leaf.c +36 -8
78 lines not on this page · raw message
fs/xfs/libxfs/xfs_da_btree.h +3 -1
@@ -91,6 +91,7 @@ typedef struct xfs_da_args {#define XFS_DA_OP_CILOOKUP (1u << 4)/* lookup returns CI name if found */ #define XFS_DA_OP_NOTIME (1u << 5)/* don't update inode timestamps */ #define XFS_DA_OP_REMOVE (1u << 6)/* this is a remove operation */ +#define XFS_DA_OP_RECOVERY (1u << 7)/* Log recovery operation */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \
@@ -99,7 +100,8 @@ typedef struct xfs_da_args { { XFS_DA_OP_OKNOENT, "OKNOENT" }, \ { XFS_DA_OP_CILOOKUP, "CILOOKUP" }, \ { XFS_DA_OP_NOTIME, "NOTIME" }, \ - { XFS_DA_OP_REMOVE, "REMOVE" } + { XFS_DA_OP_REMOVE, "REMOVE" }, \ + { XFS_DA_OP_RECOVERY, "RECOVERY" }/*
fs/xfs/xfs_attr_item.c +7 -1
@@ -554,6 +554,7 @@ xfs_attri_item_recover( args->namelen = attrp->alfi_name_len; args->hashval =xfs_da_hashname (args->name, args->namelen); args->attr_filter = attrp->alfi_attr_flags; + args->op_flags =XFS_DA_OP_RECOVERY |XFS_DA_OP_OKNOENT ;switch (attrp->alfi_op_flags &XFS_ATTR_OP_FLAGS_TYPE_MASK ) {case XFS_ATTR_OP_FLAGS_SET :
@@ -561,9 +562,14 @@ xfs_attri_item_recover( args->value = attrip->attri_value; args->valuelen = attrp->alfi_value_len; args->total =xfs_attr_calc_size (args, &local); - attr->xattri_dela_state =xfs_attr_init_add_state (args); +if (xfs_inode_hasattr (args->dp)) + attr->xattri_dela_state =xfs_attr_init_replace_state (args); +else + attr->xattri_dela_state =xfs_attr_init_add_state (args);break ;case XFS_ATTR_OP_FLAGS_REMOVE : +if (!xfs_inode_hasattr (args->dp)) + goto out; attr->xattri_dela_state =xfs_attr_init_remove_state (args);break ;default :
fs/xfs/xfs_trace.h +2 -5
@@ -4131,13 +4131,10 @@ DEFINE_ICLOG_EVENT(xlog_iclog_write);TRACE_DEFINE_ENUM (XFS_DAS_UNINIT );TRACE_DEFINE_ENUM (XFS_DAS_SF_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK );TRACE_DEFINE_ENUM (XFS_DAS_SF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );
Signature · 1 line
2.35.1
Re: [PATCH 17/17] xfs: ATTR_REPLACE algorithm with LARP enabled needs rework
Quoted 75 lines · Dave Chinner
From: Dave Chinner <[email protected]>
We can't use the same algorithm for replacing an existing attribute when logging attributes. The existing algorithm is essentially:
1. create new attr w/ INCOMPLETE
2. atomically flip INCOMPLETE flags between old + new attribute
3. remove old attr which is marked w/ INCOMPLETEThis algorithm guarantees that we see either the old or new attribute, and if we fail after the atomic flag flip, we don't have to recover the removal of the old attr because we never see INCOMPLETE attributes in lookups.
For logged attributes, however, this does not work. The logged attribute intents do not track the work that has been done as the transaction rolls, and hence the only recovery mechanism we have is "run the replace operation from scratch".
This is further exacerbated by the attempt to avoid needing the INCOMPLETE flag to create an atomic swap. This means we can create a second active attribute of the same name before we remove the original. If we fail at any point after the create but before the removal has completed, we end up with duplicate attributes in the attr btree and recovery only tries to replace one of them.
There are several other failure modes where we can leave partially allocated remote attributes that expose stale data, partially free remote attributes that enable UAF based stale data exposure, etc.
TO fix this, we need a different algorithm for replace operations when LARP is enabled. Luckily, it's not that complex if we take the right first step. That is, the first thing we log is the attri intent with the new name/value pair and mark the old attr as INCOMPLETE in the same transaction.
From there, we then remove the old attr and keep relogging the new name/value in the intent, such that we always know that we have to create the new attr in recovery. Once the old attr is removed, we then run a normal
ATTR_CREATEoperation relogging the intent as we go. If the new attr is local, then it gets created in a single atomic transaction that also logs the final intent done. If the new attr is remote, the we set INCOMPLETE on the new attr while we allocate and set the remote value, and then we clear the INCOMPLETE flag at in the last transaction taht logs the final intent done.If we fail at any point in this algorithm, log recovery will always see the same state on disk: the new name/value in the intent, and either an INCOMPLETE attr or no attr in the attr btree. If we find an INCOMPLETE attr, we run the full replace starting with removing the INCOMPLETE attr. If we don't find it, then we simply create the new attr.
Notably, recovery of a failed create that has an INCOMPLETE flag set is now the same - we start with the lookup of the INCOMPLETE attr, and if that exists then we do the full replace recovery process, otherwise we just create the new attr.
Hence changing the way we do the replace operation when LARP is enabled allows us to use the same log recovery algorithm for both the
ATTR_CREATEandATTR_REPLACEoperations. This is also the same algorithm we use for runtimeATTR_REPLACEoperations (except for the step setting up the initial conditions).The result is that:
-
ATTR_CREATEuses the same algorithm regardless of whether LARP is enabled or not
-ATTR_REPLACEwith larp=0 is identical to the old algorithm
-ATTR_REPLACEwith larp=1 runs an unmodified attr removal algorithm from the larp=0 code and then runs the unmodifiedATTR_CREATEcode.
- log recovery when larp=1 runs the sameATTR_REPLACEalgorithm as it uses at runtime.
Quoted 7 lines
Because the state machine is now quite clean, changing the algorithm is really just a case of changing the initial state and how the states link together for the
ATTR_REPLACEcase. Hence it's not a huge amoutn of code for what is a fairly substantial rework of the attr logging and recovery algorithm....Signed-off-by Dave Chinner <[email protected]>
This looks mostly good, though when I run it with the new tests, I seem to run into a failed filesystem check at the end. "bad attribute count 0 in attr block 0". I suspect we still dont have the removal of the fork quite right. It sounds like you're still working with things though, I'll keep looking too.
Allison
Quoted 512 lines
--- fs/xfs/libxfs/xfs_attr.c | 97 +++++++++++++++++++++---------- ---- fs/xfs/libxfs/xfs_attr.h | 49 +++++++++++------- fs/xfs/libxfs/xfs_attr_leaf.c | 44 +++++++++++++--- fs/xfs/libxfs/xfs_da_btree.h | 4 +- fs/xfs/xfs_attr_item.c | 8 ++- fs/xfs/xfs_trace.h | 7 +-- 6 files changed, 137 insertions(+), 72 deletions(-)fs/xfs/libxfs/xfs_attr.c +6
-4@@ -71,9 +71,12 @@ intxfs_inode_hasattr ( struct xfs_inode *ip) { -if (!XFS_IFORK_Q (ip) || - (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && - ip->i_afp->if_nextents ==0 )) +if (!XFS_IFORK_Q (ip)) +return 0 ; +if (!ip->i_afp) +return 0 ; +if (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && + ip->i_afp->if_nextents ==0 )return 0 ;return 1 ; }@@ -411,23 +414,30 @@ xfs_attr_sf_addname( }/* -* When we bump the state to REPLACE, we may actually need to skip over the
- * state. When LARP mode is enabled, we don't need to run the atomic flags flip,
- * so we skip straight over the REPLACE state and go on toREMOVE_OLD.
+ * Handle the state change on completion of a multi-state attr operation.
+ *
+ * If theXFS_DA_OP_REPLACEflag is set, this means the operation was the first
+ * modification in a attr replace operation and we still have to do the second
+ * state, indicated by @replace_state.
+ *
+ * We consume theXFS_DA_OP_REPLACEflag so that when we are called again on
+ * completion of the second half of the attr replace operation we correctly
+ * signal that it is done.
*/fs/xfs/libxfs/xfs_attr.c +4
-3-static void -xfs_attr_dela_state_set_replace ( +static enum xfs_delattr_state +xfs_attr_complete_op (struct xfs_attr_item *attr, -enum xfs_delattr_state replace) +enum xfs_delattr_state replace_state) {struct xfs_da_args *args = attr->xattri_da_args; + bool do_replace = args->op_flags &
XFS_DA_OP_REPLACE;fs/xfs/libxfs/xfs_attr.c +8
-9-ASSERT (replace ==XFS_DAS_LEAF_REPLACE || - replace ==XFS_DAS_NODE_REPLACE ); - - attr->xattri_dela_state = replace; -if (xfs_has_larp (args->dp->i_mount)) - attr->xattri_dela_state++; + args->op_flags &= ~XFS_DA_OP_REPLACE ; +if (do_replace) { + args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +return replace_state; + } +return XFS_DAS_DONE ; } static int@@ -469,10 +479,9 @@ xfs_attr_leaf_addname(*/ if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_LEAF_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_REPLACE ) -xfs_attr_dela_state_set_replace (attr, XFS_DAS_LEAF_REPLACE); else - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state = xfs_attr_complete_op(attr, +XFS_DAS_LEAF_RE PLACE); out:trace_xfs_attr_leaf_addname_return(attr->xattri_dela_state,
args->dp);fs/xfs/libxfs/xfs_attr.c +2
-3return error;@@ -514,10 +523,9 @@ xfs_attr_node_addname(if (args->rmtblkno) attr->xattri_dela_state =XFS_DAS_NODE_SET_RMT ; -else if (args->op_flags &XFS_DA_OP_REPLACE ) -xfs_attr_dela_state_set_replace (attr, XFS_DAS_NODE_REPLACE); else - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state = xfs_attr_complete_op(attr, +XFS_DAS_NODE_RE PLACE); out:trace_xfs_attr_node_addname_return(attr->xattri_dela_state,
args->dp);fs/xfs/libxfs/xfs_attr.c +0
-1return error;@@ -549,18 +557,15 @@ xfs_attr_rmtval_alloc(if (error)return error; -/* If this is not a rename, clear the incomplete flag and we're done. */
fs/xfs/libxfs/xfs_attr.c +2
-1-if (!(args->op_flags &XFS_DA_OP_REPLACE )) { + attr->xattri_dela_state = xfs_attr_complete_op(attr, + ++attr-Quoted 1 line
xattri_dela_state);fs/xfs/libxfs/xfs_attr.c +2
-0+/* +* If we are not doing a rename, we've finished the operation but still
fs/xfs/libxfs/xfs_attr.c +1
-0+* have to clear the incomplete flag protecting the new attr from
fs/xfs/libxfs/xfs_attr.c +1
-0+* exposing partially initialised state if we crash during creation.
fs/xfs/libxfs/xfs_attr.c +2
-4+*/ +if (attr->xattri_dela_state ==XFS_DAS_DONE ) error =xfs_attr3_leaf_clearflag (args); - attr->xattri_dela_state =XFS_DAS_DONE ; - }else { -/* -* We are running a REPLACE operation, so we need to bump the
fs/xfs/libxfs/xfs_attr.c +0
-4-* state to the step in that operation. -*/ - attr->xattri_dela_state++; - xfs_attr_dela_state_set_replace(attr, attr-Quoted 1 line
xattri_dela_state);fs/xfs/libxfs/xfs_attr.c +12
-5- } out:trace_xfs_attr_rmtval_alloc (attr->xattri_dela_state, args->dp);return error;@@ -685,13 +690,24 @@ xfs_attr_set_iter(return xfs_attr_node_addname (attr);case XFS_DAS_SF_REMOVE : - attr->xattri_dela_state =XFS_DAS_DONE ; -return xfs_attr_sf_removename (args); + error =xfs_attr_sf_removename (args); + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args)); +break ;case XFS_DAS_LEAF_REMOVE : - attr->xattri_dela_state =XFS_DAS_DONE ; -return xfs_attr_leaf_removename (args); + error =xfs_attr_leaf_removename (args); + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args)); +break ;case XFS_DAS_NODE_REMOVE : error =xfs_attr_node_removename_setup (attr); +if (error == -ENOATTR && + (args->op_flags &XFS_DA_OP_RECOVERY )) { + attr->xattri_dela_state =xfs_attr_complete_op (attr, + xfs_attr_init_add_state(args));
fs/xfs/libxfs/xfs_attr.c +7
-2+ error =0 ; +break ; + }if (error)return error; attr->xattri_dela_state =XFS_DAS_NODE_REMOVE_RMT ;@@ -777,12 +793,14 @@ xfs_attr_set_iter(case XFS_DAS_LEAF_REMOVE_ATTR : error =xfs_attr_leaf_remove_attr (attr); - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args));break ;case XFS_DAS_NODE_REMOVE_ATTR : error =xfs_attr_node_remove_attr (attr); - attr->xattri_dela_state =XFS_DAS_DONE ; + attr->xattri_dela_state =xfs_attr_complete_op (attr, +xfs_attr_init_add_state (args));break ;fs/xfs/libxfs/xfs_attr.c +2
-1default :ASSERT (0 );@@ -1284,9 +1302,10 @@ xfs_attr_leaf_removename( dp = args->dp; error =xfs_attr_leaf_hasname (args, &bp); -if (error == -ENOATTR ) {xfs_trans_brelse (args->trans, bp); +if (args->op_flags &XFS_DA_OP_RECOVERY ) +return 0 ;return error; }else if (error != -EEXIST )return error;fs/xfs/libxfs/xfs_attr.h +0
-1@@ -444,18 +444,23 @@ struct xfs_attr_list_context {*/ enum xfs_delattr_state {XFS_DAS_UNINIT =0 ,/* No state has been set yet */ -XFS_DAS_SF_ADD ,/* Initial shortform set iter state */
fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_LEAF_ADD, /* Initial leaf form set iter state*/
fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_NODE_ADD, /* Initial node form set iter state*/
fs/xfs/libxfs/xfs_attr.h +0
-3-XFS_DAS_RMTBLK ,/* Removing remote blks */ -XFS_DAS_RM_NAME ,/* Remove attr name */ - XFS_DAS_RM_SHRINK, /* We are shrinking the tree*/
fs/xfs/libxfs/xfs_attr.h +0
-2- - XFS_DAS_SF_REMOVE, /* Initial shortform set iterstate */
fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_LEAF_REMOVE, /* Initial leaf form set iterstate */
fs/xfs/libxfs/xfs_attr.h +0
-1- XFS_DAS_NODE_REMOVE, /* Initial node form set iterstate */
fs/xfs/libxfs/xfs_attr.h +3
-2- -/* Leaf state set/replace sequence */ + +/* +* Initial sequence states. The replace setup code relies on the
fs/xfs/libxfs/xfs_attr.h +1
-0+* ADD and REMOVE states for a specific format to be sequential so
fs/xfs/libxfs/xfs_attr.h +5
-0+* that we can transform the initial operation to be performed +* according to the xfs_has_larp() state easily. +*/ +XFS_DAS_SF_ADD ,/* Initial sf add state */ + XFS_DAS_SF_REMOVE, /* Initial sf replace/removestate */
fs/xfs/libxfs/xfs_attr.h +3
-0+ +XFS_DAS_LEAF_ADD ,/* Initial leaf add state */ + XFS_DAS_LEAF_REMOVE, /* Initial leafreplace/remove state */
fs/xfs/libxfs/xfs_attr.h +3
-0+ +XFS_DAS_NODE_ADD ,/* Initial node add state */ + XFS_DAS_NODE_REMOVE, /* Initial nodereplace/remove state */
fs/xfs/libxfs/xfs_attr.h +2
-0+ +/* Leaf state set/replace/remove sequence */ XFS_DAS_LEAF_SET_RMT, /* set a remote xattr from aleaf */
XFS_DAS_LEAF_ALLOC_RMT, /* We are allocating remote
blocks */
XFS_DAS_LEAF_REPLACE, /* Perform replace ops on a
leaf */fs/xfs/libxfs/xfs_attr.h +1
-1@@ -463,7 +468,7 @@ enum xfs_delattr_state {XFS_DAS_LEAF_REMOVE_RMT, /* A rename is removing remote blocks */ XFS_DAS_LEAF_REMOVE_ATTR ,/* Remove the old attr from a leaf */ -/* Node state set/replace sequence, must match leaf state above */ +/* Node state sequence, must match leaf state above */ XFS_DAS_NODE_SET_RMT, /* set a remote xattr from anode */
XFS_DAS_NODE_ALLOC_RMT, /* We are allocating remote
blocks */
XFS_DAS_NODE_REPLACE, /* Perform replace ops on a
node */fs/xfs/libxfs/xfs_attr.h +6
-5@@ -477,11 +482,11 @@ enum xfs_delattr_state {#define XFS_DAS_STRINGS \ { XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \ { XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \ + { XFS_DAS_SF_REMOVE, "XFS_DAS_SF_REMOVE" }, \ { XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \ + { XFS_DAS_LEAF_REMOVE, "XFS_DAS_LEAF_REMOVE" }, \ { XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \ - { XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \ - { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \ - { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \ + { XFS_DAS_NODE_REMOVE, "XFS_DAS_NODE_REMOVE" }, \ { XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \ { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \ { XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \@@ -525,8 +530,7 @@ struct xfs_attr_item {enum xfs_delattr_state xattri_dela_state;/* -* Indicates if the attr operation is a set or a remove -* XFS_ATTR_OP_FLAGS_{SET,REMOVE} +* Attr operation being performed - XFS_ATTR_OP_FLAGS_* */ unsigned int xattri_op_flags;@@ -605,10 +609,19 @@ xfs_attr_init_remove_state(struct xfs_da_args *args)return XFS_DAS_NODE_REMOVE ; } +/* +* If we are logging the attributes, then we have to start with removal of the
+ * old attribute so that there is always consistent state that we can recover
+ * from if the system goes down part way through. We always log the new attr
+ * value, so even when we remove the attr first we still have the information in
+ * the log to finish the replace operation atomically.
+ */
static inline enumxfs_delattr_statexfs_attr_init_replace_state(struct xfs_da_args *args)
{fs/xfs/libxfs/xfs_attr.h +2
-0args->op_flags |=XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE ; +if (xfs_has_larp (args->dp->i_mount)) +return xfs_attr_init_remove_state (args);return xfs_attr_init_add_state (args); }fs/xfs/libxfs/xfs_attr_leaf.c +0
-0@@ -446,6 +446,14 @@ xfs_attr3_leaf_read( * Namespace helper routines *========================================================================*/
+/*
+ * If we are in log recovery, then we want the lookup to ignore the INCOMPLETE
+ * flag on disk - if there's an incomplete attr then recovery needs to tear it
+ * down. If there's no incomplete attr, then recovery needs to tear that attr
+ * down to replace it with the attr that has been logged. In this case, the
+ * INCOMPLETE flag will not be set inattr->attr_filter, but rather
+ *XFS_DA_OP_RECOVERYwill be set inargs->op_flags.
+ */
static bool
xfs_attr_match(fs/xfs/libxfs/xfs_attr_leaf.c +1
-2struct xfs_da_args *args,@@ -453,14 +461,18 @@ xfs_attr_match( unsigned char *name, int flags) { +if (args->namelen != namelen)return false;if (memcmp (args->name, name, namelen) !=0 )return false; -/* -* If we are looking for incomplete entries, show only those, else only
fs/xfs/libxfs/xfs_attr_leaf.c +7
-2-* show complete entries. -*/ + +/* Recovery ignores the INCOMPLETE flag. */ +if ((args->op_flags &XFS_DA_OP_RECOVERY ) && + args->attr_filter == (flags &XFS_ATTR_NSP_ONDISK_MASK )) +return true; + +/* All remaining matches need to be filtered by INCOMPLETE state. */
fs/xfs/libxfs/xfs_attr_leaf.c +8
-0if (args->attr_filter != (flags & (XFS_ATTR_NSP_ONDISK_MASK |XFS_ATTR_INCOMPLETE )))return false;@@ -799,6 +811,14 @@ xfs_attr_sf_removename( sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data; error =xfs_attr_sf_findname (args, &sfe, &base); + +/* +* If we are recovering an operation, finding nothing to +* remove is not an error - it just means there was nothing +* to clean up. +*/ +if (error == -ENOATTR && (args->op_flags &XFS_DA_OP_RECOVERY )) +return 0 ;if (error != -EEXIST )return error; size =xfs_attr_sf_entsize (sfe);@@ -819,7 +839,7 @@ xfs_attr_sf_removename( totsize -= size; if (totsize == sizeof(xfs_attr_sf_hdr_t) && xfs_has_attr2(mp)&&
fs/xfs/libxfs/xfs_attr_leaf.c +1
-1(dp->i_df.if_format != XFS_DINODE_FMT_BTREE) && - !(args->op_flags & XFS_DA_OP_ADDNAME)) { + !(args->op_flags & (XFS_DA_OP_ADDNAME |
XFS_DA_OP_REPLACE))) {fs/xfs/libxfs/xfs_attr_leaf.c +2
-3xfs_attr_fork_remove (dp, args->trans); }else {xfs_idata_realloc (dp, -size,XFS_ATTR_FORK );@@ -1128,9 +1148,17 @@ xfs_attr3_leaf_to_shortform( goto out;if (forkoff ==-1 ) { -ASSERT (xfs_has_attr2 (dp->i_mount)); -ASSERT (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ); -xfs_attr_fork_remove (dp, args->trans); +/* +* Don't remove the attr fork if this operation is the first
fs/xfs/libxfs/xfs_attr_leaf.c +1
-0+* part of a attr replace operations. We're going to add a new
fs/xfs/libxfs/xfs_attr_leaf.c +1
-0+* attr immediately, so we need to keep the attr fork around in
fs/xfs/libxfs/xfs_attr_leaf.c +5
-0+* this case. +*/ +if (!(args->op_flags &XFS_DA_OP_REPLACE )) { +ASSERT (xfs_has_attr2 (dp->i_mount)); + ASSERT(dp->i_df.if_format !=
XFS_DINODE_FMT_BTREE);fs/xfs/libxfs/xfs_attr_leaf.c +2
-0+xfs_attr_fork_remove (dp, args->trans); + } goto out; }fs/xfs/libxfs/xfs_da_btree.h +0
-0@@ -91,6 +91,7 @@ typedef struct xfs_da_args {#define XFS_DA_OP_CILOOKUP (1u << 4)/* lookup returns CI name if found */
#defineXFS_DA_OP_NOTIME(1u << 5) /* don't update inode
timestamps */
#defineXFS_DA_OP_REMOVE(1u << 6) /* this is a remove operation
*/fs/xfs/libxfs/xfs_da_btree.h +3
-1+#define XFS_DA_OP_RECOVERY (1u << 7)/* Log recovery operation */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \@@ -99,7 +100,8 @@ typedef struct xfs_da_args { { XFS_DA_OP_OKNOENT, "OKNOENT" }, \ { XFS_DA_OP_CILOOKUP, "CILOOKUP" }, \ { XFS_DA_OP_NOTIME, "NOTIME" }, \ - { XFS_DA_OP_REMOVE, "REMOVE" } + { XFS_DA_OP_REMOVE, "REMOVE" }, \ + { XFS_DA_OP_RECOVERY, "RECOVERY" }/* fs/xfs/xfs_attr_item.c +7
-1@@ -554,6 +554,7 @@ xfs_attri_item_recover( args->namelen = attrp->alfi_name_len; args->hashval =xfs_da_hashname (args->name, args->namelen); args->attr_filter = attrp->alfi_attr_flags; + args->op_flags =XFS_DA_OP_RECOVERY |XFS_DA_OP_OKNOENT ;switch (attrp->alfi_op_flags &XFS_ATTR_OP_FLAGS_TYPE_MASK ) {case XFS_ATTR_OP_FLAGS_SET :@@ -561,9 +562,14 @@ xfs_attri_item_recover( args->value = attrip->attri_value; args->valuelen = attrp->alfi_value_len; args->total =xfs_attr_calc_size (args, &local); - attr->xattri_dela_state =xfs_attr_init_add_state (args); +if (xfs_inode_hasattr (args->dp)) + attr->xattri_dela_state =xfs_attr_init_replace_state (args); +else + attr->xattri_dela_state =xfs_attr_init_add_state (args);break ;case XFS_ATTR_OP_FLAGS_REMOVE : +if (!xfs_inode_hasattr (args->dp)) + goto out;
attr->xattri_dela_state=xfs_attr_init_remove_state(args);fs/xfs/xfs_attr_item.c +0
-0break ;default :fs/xfs/xfs_trace.h +2
-5@@ -4131,13 +4131,10 @@ DEFINE_ICLOG_EVENT(xlog_iclog_write);TRACE_DEFINE_ENUM (XFS_DAS_UNINIT );TRACE_DEFINE_ENUM (XFS_DAS_SF_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD ); -TRACE_DEFINE_ENUM (XFS_DAS_RMTBLK ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_NAME ); -TRACE_DEFINE_ENUM (XFS_DAS_RM_SHRINK );TRACE_DEFINE_ENUM (XFS_DAS_SF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ADD );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_REMOVE ); +TRACE_DEFINE_ENUM (XFS_DAS_NODE_ADD );TRACE_DEFINE_ENUM (XFS_DAS_NODE_REMOVE );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_SET_RMT );TRACE_DEFINE_ENUM (XFS_DAS_LEAF_ALLOC_RMT );
Re: [PATCH 17/17] xfs: ATTR_REPLACE algorithm with LARP enabled needs rework
Quoted 82 lines · Alli
Quoted 81 lines · Dave Chinner
From: Dave Chinner <[email protected]>
We can't use the same algorithm for replacing an existing attribute when logging attributes. The existing algorithm is essentially:
1. create new attr w/ INCOMPLETE
2. atomically flip INCOMPLETE flags between old + new attribute
3. remove old attr which is marked w/ INCOMPLETEThis algorithm guarantees that we see either the old or new attribute, and if we fail after the atomic flag flip, we don't have to recover the removal of the old attr because we never see INCOMPLETE attributes in lookups.
For logged attributes, however, this does not work. The logged attribute intents do not track the work that has been done as the transaction rolls, and hence the only recovery mechanism we have is "run the replace operation from scratch".
This is further exacerbated by the attempt to avoid needing the INCOMPLETE flag to create an atomic swap. This means we can create a second active attribute of the same name before we remove the original. If we fail at any point after the create but before the removal has completed, we end up with duplicate attributes in the attr btree and recovery only tries to replace one of them.
There are several other failure modes where we can leave partially allocated remote attributes that expose stale data, partially free remote attributes that enable UAF based stale data exposure, etc.
TO fix this, we need a different algorithm for replace operations when LARP is enabled. Luckily, it's not that complex if we take the right first step. That is, the first thing we log is the attri intent with the new name/value pair and mark the old attr as INCOMPLETE in the same transaction.
From there, we then remove the old attr and keep relogging the new name/value in the intent, such that we always know that we have to create the new attr in recovery. Once the old attr is removed, we then run a normal
ATTR_CREATEoperation relogging the intent as we go. If the new attr is local, then it gets created in a single atomic transaction that also logs the final intent done. If the new attr is remote, the we set INCOMPLETE on the new attr while we allocate and set the remote value, and then we clear the INCOMPLETE flag at in the last transaction taht logs the final intent done.If we fail at any point in this algorithm, log recovery will always see the same state on disk: the new name/value in the intent, and either an INCOMPLETE attr or no attr in the attr btree. If we find an INCOMPLETE attr, we run the full replace starting with removing the INCOMPLETE attr. If we don't find it, then we simply create the new attr.
Notably, recovery of a failed create that has an INCOMPLETE flag set is now the same - we start with the lookup of the INCOMPLETE attr, and if that exists then we do the full replace recovery process, otherwise we just create the new attr.
Hence changing the way we do the replace operation when LARP is enabled allows us to use the same log recovery algorithm for both the
ATTR_CREATEandATTR_REPLACEoperations. This is also the same algorithm we use for runtimeATTR_REPLACEoperations (except for the step setting up the initial conditions).The result is that:
-
ATTR_CREATEuses the same algorithm regardless of whether LARP is enabled or not
-ATTR_REPLACEwith larp=0 is identical to the old algorithm
-ATTR_REPLACEwith larp=1 runs an unmodified attr removal algorithm from the larp=0 code and then runs the unmodifiedATTR_CREATEcode.
- log recovery when larp=1 runs the sameATTR_REPLACEalgorithm as it uses at runtime.Because the state machine is now quite clean, changing the algorithm is really just a case of changing the initial state and how the states link together for the
ATTR_REPLACEcase. Hence it's not a huge amoutn of code for what is a fairly substantial rework of the attr logging and recovery algorithm....
Quoted 6 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>This looks mostly good, though when I run it with the new tests, I seem to run into a failed filesystem check at the end. "bad attribute count 0 in attr block 0". I suspect we still dont have the removal of the fork quite right. It sounds like you're still working with things though, I'll keep looking too.
Yeah, that's a strange one. I didn't get it with the based branch testing (based on 5.18-rc+for-next) but over the weekend where it got merged with 5.18-rc5 it appears that the error has manifested in several test runs. I'll dig into it this morning.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH 17/17] xfs: ATTR_REPLACE algorithm with LARP enabled needs rework
Quoted 90 lines · Dave Chinner
Quoted 82 lines · Alli
Quoted 81 lines · Dave Chinner
From: Dave Chinner <[email protected]>
We can't use the same algorithm for replacing an existing attribute when logging attributes. The existing algorithm is essentially:
1. create new attr w/ INCOMPLETE
2. atomically flip INCOMPLETE flags between old + new attribute
3. remove old attr which is marked w/ INCOMPLETEThis algorithm guarantees that we see either the old or new attribute, and if we fail after the atomic flag flip, we don't have to recover the removal of the old attr because we never see INCOMPLETE attributes in lookups.
For logged attributes, however, this does not work. The logged attribute intents do not track the work that has been done as the transaction rolls, and hence the only recovery mechanism we have is "run the replace operation from scratch".
This is further exacerbated by the attempt to avoid needing the INCOMPLETE flag to create an atomic swap. This means we can create a second active attribute of the same name before we remove the original. If we fail at any point after the create but before the removal has completed, we end up with duplicate attributes in the attr btree and recovery only tries to replace one of them.
There are several other failure modes where we can leave partially allocated remote attributes that expose stale data, partially free remote attributes that enable UAF based stale data exposure, etc.
TO fix this, we need a different algorithm for replace operations when LARP is enabled. Luckily, it's not that complex if we take the right first step. That is, the first thing we log is the attri intent with the new name/value pair and mark the old attr as INCOMPLETE in the same transaction.
From there, we then remove the old attr and keep relogging the new name/value in the intent, such that we always know that we have to create the new attr in recovery. Once the old attr is removed, we then run a normal
ATTR_CREATEoperation relogging the intent as we go. If the new attr is local, then it gets created in a single atomic transaction that also logs the final intent done. If the new attr is remote, the we set INCOMPLETE on the new attr while we allocate and set the remote value, and then we clear the INCOMPLETE flag at in the last transaction taht logs the final intent done.If we fail at any point in this algorithm, log recovery will always see the same state on disk: the new name/value in the intent, and either an INCOMPLETE attr or no attr in the attr btree. If we find an INCOMPLETE attr, we run the full replace starting with removing the INCOMPLETE attr. If we don't find it, then we simply create the new attr.
Notably, recovery of a failed create that has an INCOMPLETE flag set is now the same - we start with the lookup of the INCOMPLETE attr, and if that exists then we do the full replace recovery process, otherwise we just create the new attr.
Hence changing the way we do the replace operation when LARP is enabled allows us to use the same log recovery algorithm for both the
ATTR_CREATEandATTR_REPLACEoperations. This is also the same algorithm we use for runtimeATTR_REPLACEoperations (except for the step setting up the initial conditions).The result is that:
-
ATTR_CREATEuses the same algorithm regardless of whether LARP is enabled or not
-ATTR_REPLACEwith larp=0 is identical to the old algorithm
-ATTR_REPLACEwith larp=1 runs an unmodified attr removal algorithm from the larp=0 code and then runs the unmodifiedATTR_CREATEcode.
- log recovery when larp=1 runs the sameATTR_REPLACEalgorithm as it uses at runtime.Because the state machine is now quite clean, changing the algorithm is really just a case of changing the initial state and how the states link together for the
ATTR_REPLACEcase. Hence it's not a huge amoutn of code for what is a fairly substantial rework of the attr logging and recovery algorithm....Quoted 6 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>This looks mostly good, though when I run it with the new tests, I seem to run into a failed filesystem check at the end. "bad attribute count 0 in attr block 0". I suspect we still dont have the removal of the fork quite right. It sounds like you're still working with things though, I'll keep looking too.
Quoted 4 lines
Yeah, that's a strange one. I didn't get it with the based branch testing (based on 5.18-rc+for-next) but over the weekend where it got merged with 5.18-rc5 it appears that the error has manifested in several test runs. I'll dig into it this morning.
Ok, the bug is in the intorduction of the remove path to the _set_iter() state machine - the node attr remove path doesn't collapse empty leaf blocks back down to shortform. That removes the fork if there are not attrs left at all.
That needs to be fixed in the patch that introduces this, and it that will cascade into needing to rebase subsequent patches, so I might just resend the lot.
Hmmm - xfs_attr3_leaf_verify() doesn't verify that the attr count is non-zero in a leaf block. That would have could this before it was written to disk. We should probably fix that, seeing as repair complains about it...
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
v3 cover XFS: LARP state machine and recovery rework
In reply to Dave ChinnerOops, I screwed up the the subject line. Let's fix that up so that archive searches can find it easily.
Quoted 95 lines · Dave Chinner
[PATCH 00/17 V3] XFS: LARP state machine and recovery rework
This patchset aims to simplify the state machine that the new logged attributes require to do their stuff. It also reworks the attribute logging and recovery algorithms to simplify them and to avoid leaving incomplete attributes around after recovery.
When I first dug into this code, I modified the state machine to try to simplify the set and replace operations as there was a lot of duplicate code in them. I also wasn't completely happy with the different transistions for replace operations when larp mode was enabled. I simplified the state machien and renumbered the states so that we can iterate through the same state progression for different attr formats just by having different inital leaf and node states.
Once I'd largely done this and started testing it, I realised that recovery wasn't setting the initial state properly, so I started digging into the recovery code. At this point, I realised the recovery code didn't work correctly in all cases and could often leave unremovable incomplete attrs sitting around. The issues are larger documented in the last patch in the series, so I won't go over them here, just read that patch.
However, to get, the whole replace operation for LARP=1 needed to change. Luckily, that turned out to be pretty simple because it was largely already broken down into component operations in the state machine. hence I just needed to add new "remove" initial states to the
set_iterstate machine, and that allowed the new algorithm to function.Then I realised that I'd just implemented the
remove_iteralgorithm in theset_iterstate machine, so I removed theremove_itercode and it's states altogether and just pointed remove ops at the set-iter remove initial states. The code now uses theXFS_DA_OP_RENAMEflag to determine if it should follow up an add or remove with a remove or add, and it all largely just works. All runtime algorithms run throught he same state machine just with different initial states and state progressions.And with the last patch in the series, attr item log recovery uses that same state machine, too. It has a few quirks that need to be handled, so I added the
XFS_DA_OP_RECOVERYflag to allow the right thing to be done with the INCOMPLETE flag deep in the guts of the attr lookup code. And so recovery with LARP=1 now seems to mostly work.This version passes fstests, several recoveryloop passes and the targeted error injection based attr recovery test that Catherine wrote. There's a fair bit of re-org in the patch series since V2, but most of that is pulling stuff from the last patch and putting it in the right place in the series. hence the only real logic iand bug fixes changes occurred in the last patch that changes the logging and recovery algorithm.
Comments, reviews and, most especially, testing welcome.
A compose of the patchset I've been testing based on the current for-next tree can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.gitxfs-5.19-composeVersion 3:
- rebased on 5.18-rc2 + for-next + rebased larp v29
- added state asserts toxfs_attr_dela_state_set_replace()
- only roll the transactions inALLOC_RMTwhen we need to do more extent allocation for the remote attr value container.
- removed unnecessaryattr->xattri_blkcntcheck inALLOC_RMT
- added comments to commit message to explain why we are combining the set and remove paths.
- preserved and isolated the state path save/restore code for avoiding repeated name entry path lookups when rolling transactins across remove operations. Left a big comment for Future Dave to re-enable the optimisation.
- fixed a transient attr fork removal bug inxfs_attr3_leaf_to_shortform()in the new removal algorithm which can result in the attr fork being removed between the remove and set ops in a REPLACE operation.
- moved defer operation setup changes ("split replace from set op") to early on in the series and combined it with the refactoring done immediately afterwards in the last patch of the series. This allows for cleanly fixing the log recovery state initialisation problem the patchset had.
- pulled the state initialisation for log recovery up into the patches that introduce the state machine changes for the given operations.
- Lots of changes to log recovery algorithm change in last patch.Version 2:
https://lore.kernel.org/linux-xfs/[email protected]/
- fixed attrd initialisation for LARP=1 mode
- fixedREPLACE->REMOVE_OLDstate transition for LARP=1 mode
- added more comments to describe the assumptions that allowxfs_attr_remove_leaf_attr()to work for both modes
Signature · 2 lines
Dave Chinner [email protected]