From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v9 23/24] xfs: Add delay ready attr set routines
Date: Mon, 4 May 2020 18:31:43 -0700 [thread overview]
Message-ID: <43ad33fc-4603-2e15-eb5c-59ee94fcdb49@oracle.com> (raw)
In-Reply-To: <20200504194907.GK5703@magnolia>
On 5/4/20 12:49 PM, Darrick J. Wong wrote:
> On Thu, Apr 30, 2020 at 03:50:15PM -0700, Allison Collins wrote:
>> This patch modifies the attr set routines to be delay ready. This means
>> they no longer roll or commit transactions, but instead return -EAGAIN
>> to have the calling routine roll and refresh the transaction. In this
>> series, xfs_attr_set_args has become xfs_attr_set_iter, which uses a
>> state machine like switch to keep track of where it was when EAGAIN was
>> returned.
>>
>> Two new helper functions have been added: xfs_attr_rmtval_set_init and
>> xfs_attr_rmtval_set_blk. They provide a subset of logic similar to
>> xfs_attr_rmtval_set, but they store the current block in the delay attr
>> context to allow the caller to roll the transaction between allocations.
>> This helps to simplify and consolidate code used by
>> xfs_attr_leaf_addname and xfs_attr_node_addname. xfs_attr_set_args has
>> now become a simple loop to refresh the transaction until the operation
>> is completed. Lastly, xfs_attr_rmtval_remove is no longer used, and is
>> removed.
>>
>> Below is a state machine diagram for attr set operations. The XFS_DAS_*
>> states indicate places where the function would return -EAGAIN, and then
>> immediately resume from after being recalled by the calling function.
>> States marked as a "subroutine state" indicate that they belong to a
>> subroutine, and so the calling function needs to pass them back to that
>> subroutine to allow it to finish where it left off. But they otherwise
>> do not have a role in the calling function other than just passing
>> through.
>>
>> xfs_attr_set_iter()
>> │
>> v
>> ┌──────n── fork has
>> │ only 1 blk?
>
> "Refer to the state machine diagram in xfs_attr.h for exact details of
> how this works."
Sure, that fine
>
>> │ │
>> │ y
>> │ │
>> │ v
>> │ xfs_attr_leaf_try_add()
>> │ │
>> │ v
>> │ had enough
>> ├──────n── space?
>> │ │
>> │ y
>> │ │
>> │ v
>> │ XFS_DAS_FOUND_LBLK ──┐
>> │ │
>> │ XFS_DAS_FLIP_LFLAG ──┤
>> │ (subroutine state) │
>> │ │
>> │ └─>xfs_attr_leaf_addname()
>> │ │
>> │ v
>> │ was this
>> │ a rename? ──n─┐
>> │ │ │
>> │ y │
>> │ │ │
>> │ v │
>> │ flip incomplete │
>> │ flag │
>> │ │ │
>> │ v │
>> │ XFS_DAS_FLIP_LFLAG │
>> │ │ │
>> │ v │
>> │ remove │
>> │ XFS_DAS_RM_LBLK ─> old name │
>> │ ^ │ │
>> │ │ v │
>> │ └──────y── more to │
>> │ remove │
>> │ │ │
>> │ n │
>> │ │ │
>> │ v │
>> │ done <──────┘
>> └────> XFS_DAS_FOUND_NBLK ──┐
>> (subroutine state) │
>> │
>> XFS_DAS_ALLOC_NODE ──┤
>> (subroutine state) │
>> │
>> XFS_DAS_FLIP_NFLAG ──┤
>> (subroutine state) │
>> │
>> └─>xfs_attr_node_addname()
>> │
>> v
>> find space to store
>> attr. Split if needed
>> │
>> v
>> XFS_DAS_FOUND_NBLK
>> │
>> v
>> ┌─────n── need to
>> │ alloc blks?
>> │ │
>> │ y
>> │ │
>> │ v
>> │ ┌─>XFS_DAS_ALLOC_NODE
>> │ │ │
>> │ │ v
>> │ └──y── need to alloc
>> │ more blocks?
>> │ │
>> │ n
>> │ │
>> │ v
>> │ was this
>> └────────> a rename? ──n─┐
>> │ │
>> y │
>> │ │
>> v │
>> flip incomplete │
>> flag │
>> │ │
>> v │
>> XFS_DAS_FLIP_NFLAG │
>> │ │
>> v │
>> remove │
>> XFS_DAS_RM_NBLK ─> old name │
>> ^ │ │
>> │ v │
>> └──────y── more to │
>> remove │
>> │ │
>> n │
>> │ │
>> v │
>> done <──────┘
>>
>> Signed-off-by: Allison Collins <allison.henderson@oracle.com>
>> ---
>> fs/xfs/libxfs/xfs_attr.c | 371 +++++++++++++++++++++++++++-------------
>> fs/xfs/libxfs/xfs_attr.h | 127 +++++++++++++-
>> fs/xfs/libxfs/xfs_attr_remote.c | 110 +++++++-----
>> fs/xfs/libxfs/xfs_attr_remote.h | 4 +
>> fs/xfs/xfs_trace.h | 1 -
>> 5 files changed, 445 insertions(+), 168 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
>> index 7213589..0751231 100644
>> --- a/fs/xfs/libxfs/xfs_attr.c
>> +++ b/fs/xfs/libxfs/xfs_attr.c
>> @@ -44,7 +44,7 @@ STATIC int xfs_attr_shortform_addname(xfs_da_args_t *args);
>> * Internal routines when attribute list is one block.
>> */
>> STATIC int xfs_attr_leaf_get(xfs_da_args_t *args);
>> -STATIC int xfs_attr_leaf_addname(xfs_da_args_t *args);
>> +STATIC int xfs_attr_leaf_addname(struct xfs_delattr_context *dac);
>> STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args);
>> STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
>>
>> @@ -52,12 +52,13 @@ STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
>> * Internal routines when attribute list is more than one block.
>> */
>> STATIC int xfs_attr_node_get(xfs_da_args_t *args);
>> -STATIC int xfs_attr_node_addname(xfs_da_args_t *args);
>> +STATIC int xfs_attr_node_addname(struct xfs_delattr_context *dac);
>> STATIC int xfs_attr_node_removename(struct xfs_delattr_context *dac);
>> 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_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp);
>>
>> void
>> xfs_delattr_context_init(
>> @@ -227,8 +228,11 @@ xfs_attr_is_shortform(
>>
>> /*
>> * Attempts to set an attr in shortform, or converts short form to leaf form if
>> - * there is not enough room. If the attr is set, the transaction is committed
>> - * and set to NULL.
>> + * there is not enough room. This function is meant to operate as a helper
>> + * routine to the delayed attribute functions. It returns -EAGAIN to indicate
>> + * that the calling function should roll the transaction, and then proceed to
>> + * add the attr in leaf form. This subroutine does not expect to be recalled
>> + * again like the other delayed attr routines do.
>> */
>> STATIC int
>> xfs_attr_set_shortform(
>> @@ -236,16 +240,16 @@ xfs_attr_set_shortform(
>> struct xfs_buf **leaf_bp)
>> {
>> struct xfs_inode *dp = args->dp;
>> - int error, error2 = 0;
>> + 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) {
>> - error2 = xfs_trans_commit(args->trans);
>> - args->trans = NULL;
>> - return error ? error : error2;
>> + return error;
>> }
>> /*
>> * It won't fit in the shortform, transform to a leaf block. GROT:
>> @@ -258,20 +262,13 @@ xfs_attr_set_shortform(
>> /*
>> * Prevent the leaf buffer from being unlocked so that a concurrent AIL
>> * push cannot grab the half-baked leaf buffer and run into problems
>> - * with the write verifier. Once we're done rolling the transaction we
>> - * can release the hold and add the attr to the leaf.
>> + * with the write verifier.
>> */
>> xfs_trans_bhold(args->trans, *leaf_bp);
>> - error = xfs_defer_finish(&args->trans);
>> - xfs_trans_bhold_release(args->trans, *leaf_bp);
>> - if (error) {
>> - xfs_trans_brelse(args->trans, *leaf_bp);
>> - return error;
>> - }
>> -
>> - return 0;
>> + return -EAGAIN;
>> }
>>
>> +STATIC
>> int xfs_attr_defer_finish(
>> struct xfs_delattr_context *dac)
>> {
>> @@ -291,60 +288,128 @@ int
>> xfs_attr_set_args(
>> struct xfs_da_args *args)
>> {
>> - struct xfs_inode *dp = args->dp;
>> - struct xfs_buf *leaf_bp = NULL;
>> - int error = 0;
>> + struct xfs_buf *leaf_bp = NULL;
>> + int error = 0;
>> + struct xfs_delattr_context dac;
>> +
>> + xfs_delattr_context_init(&dac, args);
>> +
>> + do {
>> + error = xfs_attr_set_iter(&dac, &leaf_bp);
>> + if (error != -EAGAIN)
>> + break;
>> +
>> + error = xfs_attr_defer_finish(&dac);
>> + if (error)
>> + break;
>> +
>> + error = xfs_trans_roll_inode(&args->trans, args->dp);
>> + if (error)
>> + break;
>
> if (!xfs_attr_roll_again(&dac, &error))
> break;
Yep, ok
>
>> +
>> + if (leaf_bp) {
>> + xfs_trans_bjoin(args->trans, leaf_bp);
>> + xfs_trans_bhold(args->trans, leaf_bp);
>> + }
>> +
>> + } while (true);
>> +
>> + return error;
>> +}
>> +
>> +/*
>> + * 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.
>> + */
>> +int
>> +xfs_attr_set_iter(
>> + struct xfs_delattr_context *dac,
>> + struct xfs_buf **leaf_bp)
>> +{
>> + struct xfs_da_args *args = dac->da_args;
>> + struct xfs_inode *dp = args->dp;
>> + int error = 0;
>> +
>> + /* State machine switch */
>> + switch (dac->dela_state) {
>> + case XFS_DAS_FLIP_LFLAG:
>> + case XFS_DAS_FOUND_LBLK:
>> + goto das_leaf;
>> + case XFS_DAS_FOUND_NBLK:
>> + case XFS_DAS_FLIP_NFLAG:
>> + case XFS_DAS_ALLOC_NODE:
>> + goto das_node;
>> + default:
>> + break;
>> + }
>>
>> /*
>> * If the attribute list is already in leaf format, jump straight to
>> * leaf handling. Otherwise, try to add the attribute to the shortform
>> * list; if there's no room then convert the list to leaf format and try
>> - * again.
>> + * again. No need to set state as we will be in leaf form when we come
>> + * back
>> */
>> if (xfs_attr_is_shortform(dp)) {
>>
>> /*
>> - * If the attr was successfully set in shortform, the
>> - * transaction is committed and set to NULL. Otherwise, is it
>> - * converted from shortform to leaf, and the transaction is
>> - * retained.
>> + * If the attr was successfully set in shortform, no need to
>> + * continue. Otherwise, is it converted from shortform to leaf
>> + * and -EAGAIN is returned.
>> */
>> - error = xfs_attr_set_shortform(args, &leaf_bp);
>> - if (error || !args->trans)
>> - return error;
>> - }
>> + error = xfs_attr_set_shortform(args, leaf_bp);
>> + if (error == -EAGAIN)
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>>
>> - if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
>> - error = xfs_attr_leaf_addname(args);
>> - if (error != -ENOSPC)
>> - return error;
>> + return error;
>> + }
>>
>> - /*
>> - * Promote the attribute list to the Btree format.
>> - */
>> - error = xfs_attr3_leaf_to_node(args);
>> - if (error)
>> - return error;
>> + /*
>> + * After a shortform to leaf conversion, we need to hold the leaf and
>> + * cylce out the transaction. When we get back, we need to release
>> + * the leaf.
>> + */
>> + if (*leaf_bp != NULL) {
>> + xfs_trans_bhold_release(args->trans, *leaf_bp);
>> + *leaf_bp = NULL;
>> + }
>>
>> - /*
>> - * Commit that transaction so that the node_addname()
>> - * call can manage its own transactions.
>> - */
>> - error = xfs_defer_finish(&args->trans);
>> - if (error)
>> - return error;
>> + if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
>> + error = xfs_attr_leaf_try_add(args, *leaf_bp);
>> + switch (error) {
>> + case -ENOSPC:
>> + /*
>> + * Promote the attribute list to the Btree format.
>> + */
>> + error = xfs_attr3_leaf_to_node(args);
>> + if (error)
>> + return error;
>>
>> - /*
>> - * Commit the current trans (including the inode) and
>> - * start a new one.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, dp);
>> - if (error)
>> + /*
>> + * Commit that transaction so that the node_addname()
>> + * call can manage its own transactions.
>> + */
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> + return -EAGAIN;
>> + case 0:
>> + dac->dela_state = XFS_DAS_FOUND_LBLK;
>> + return -EAGAIN;
>> + default:
>> return error;
>> + }
>> +das_leaf:
>> + error = xfs_attr_leaf_addname(dac);
>> + if (error == -ENOSPC)
>> + /* We will be in node form when we return */
>> + return -EAGAIN;
>>
>> + return error;
>> }
>> -
>> - error = xfs_attr_node_addname(args);
>> +das_node:
>> + error = xfs_attr_node_addname(dac);
>> return error;
>> }
>>
>> @@ -711,28 +776,30 @@ xfs_attr_leaf_try_add(
>> *
>> * This leaf block cannot have a "remote" value, we only call this routine
>> * if bmap_one_block() says there is only one block (ie: no remote blks).
>> + *
>> + * 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_leaf_addname(
>> - struct xfs_da_args *args)
>> + struct xfs_delattr_context *dac)
>> {
>> - int error, forkoff;
>> - struct xfs_buf *bp = NULL;
>> - struct xfs_inode *dp = args->dp;
>> -
>> - trace_xfs_attr_leaf_addname(args);
>> -
>> - error = xfs_attr_leaf_try_add(args, bp);
>> - if (error)
>> - return error;
>> + struct xfs_da_args *args = dac->da_args;
>> + struct xfs_buf *bp = NULL;
>> + int error, forkoff;
>> + struct xfs_inode *dp = args->dp;
>>
>> - /*
>> - * Commit the transaction that added the attr name so that
>> - * later routines can manage their own transactions.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, dp);
>> - if (error)
>> - return error;
>> + /* State machine switch */
>> + switch (dac->dela_state) {
>> + case XFS_DAS_FLIP_LFLAG:
>> + goto das_flip_flag;
>> + case XFS_DAS_RM_LBLK:
>> + goto das_rm_lblk;
>> + default:
>> + break;
>> + }
>>
>> /*
>> * If there was an out-of-line value, allocate the blocks we
>> @@ -740,12 +807,34 @@ xfs_attr_leaf_addname(
>> * 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) {
>> - error = xfs_attr_rmtval_set(args);
>> +
>> + /* Open coded xfs_attr_rmtval_set without trans handling */
>> + if ((dac->flags & XFS_DAC_LEAF_ADDNAME_INIT) == 0) {
>> + dac->flags |= XFS_DAC_LEAF_ADDNAME_INIT;
>> + if (args->rmtblkno > 0) {
>> + error = xfs_attr_rmtval_set_init(dac);
>> + if (error)
>> + return error;
>> + }
>> + }
>> +
>> + /*
>> + * Roll through the "value", allocating blocks on disk as
>> + * required.
>> + */
>> + while (dac->blkcnt > 0) {
>
> if() ?
>
>> + error = xfs_attr_rmtval_set_blk(dac);
>> if (error)
>> return error;
>> +
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> + return -EAGAIN;
>> }
>>
>> + error = xfs_attr_rmtval_set_value(args);
>> + if (error)
>> + return error;
>> +
>> if ((args->op_flags & XFS_DA_OP_RENAME) == 0) {
>> /*
>> * Added a "remote" value, just clear the incomplete flag.
>> @@ -765,29 +854,33 @@ xfs_attr_leaf_addname(
>> * In a separate transaction, set the incomplete flag on the "old" attr
>> * and clear the incomplete flag on the "new" attr.
>> */
>> -
>> error = xfs_attr3_leaf_flipflags(args);
>> if (error)
>> return error;
>> /*
>> * Commit the flag value change and start the next trans in series.
>> */
>> - error = xfs_trans_roll_inode(&args->trans, args->dp);
>> - if (error)
>> - return error;
>> -
>> + dac->dela_state = XFS_DAS_FLIP_LFLAG;
>> + return -EAGAIN;
>> +das_flip_flag:
>> /*
>> * 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;
>> +das_rm_lblk:
>> if (args->rmtblkno) {
>> - error = xfs_attr_rmtval_invalidate(args);
>> - if (error)
>> - return error;
>> + error = __xfs_attr_rmtval_remove(dac);
>> +
>> + if (error == -EAGAIN) {
>> + dac->dela_state = XFS_DAS_RM_LBLK;
>> + return -EAGAIN;
>> + }
>>
>> - error = xfs_attr_rmtval_remove(args);
>> if (error)
>> return error;
>> }
>> @@ -957,16 +1050,23 @@ xfs_attr_node_hasname(
>> *
>> * "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_addname(
>> - struct xfs_da_args *args)
>> + struct xfs_delattr_context *dac)
>> {
>> - struct xfs_da_state *state;
>> - struct xfs_da_state_blk *blk;
>> - struct xfs_inode *dp;
>> - struct xfs_mount *mp;
>> - int retval, error;
>> + struct xfs_da_args *args = dac->da_args;
>> + struct xfs_da_state *state = NULL;
>> + struct xfs_da_state_blk *blk;
>> + struct xfs_inode *dp;
>> + struct xfs_mount *mp;
>> + int retval = 0;
>> + int error = 0;
>>
>> trace_xfs_attr_node_addname(args);
>>
>> @@ -975,7 +1075,21 @@ xfs_attr_node_addname(
>> */
>> dp = args->dp;
>> mp = dp->i_mount;
>> -restart:
>> +
>> + /* State machine switch */
>> + switch (dac->dela_state) {
>> + case XFS_DAS_FLIP_NFLAG:
>> + goto das_flip_flag;
>> + case XFS_DAS_FOUND_NBLK:
>> + goto das_found_nblk;
>> + case XFS_DAS_ALLOC_NODE:
>> + goto das_alloc_node;
>> + case XFS_DAS_RM_NBLK:
>> + goto das_rm_nblk;
>> + default:
>> + break;
>> + }
>> +
>> /*
>> * Search to see if name already exists, and get back a pointer
>> * to where it should go.
>> @@ -1021,19 +1135,13 @@ xfs_attr_node_addname(
>> error = xfs_attr3_leaf_to_node(args);
>> if (error)
>> goto out;
>> - error = xfs_defer_finish(&args->trans);
>> - if (error)
>> - goto out;
>>
>> /*
>> - * Commit the node conversion and start the next
>> - * trans in the chain.
>> + * Restart routine from the top. No need to set the
>> + * state
>> */
>> - error = xfs_trans_roll_inode(&args->trans, dp);
>> - if (error)
>> - goto out;
>> -
>> - goto restart;
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> + return -EAGAIN;
>> }
>>
>> /*
>> @@ -1045,9 +1153,7 @@ xfs_attr_node_addname(
>> error = xfs_da3_split(state);
>> if (error)
>> goto out;
>> - error = xfs_defer_finish(&args->trans);
>> - if (error)
>> - goto out;
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> } else {
>> /*
>> * Addition succeeded, update Btree hashvals.
>> @@ -1062,13 +1168,9 @@ xfs_attr_node_addname(
>> xfs_da_state_free(state);
>> state = NULL;
>>
>> - /*
>> - * Commit the leaf addition or btree split and start the next
>> - * trans in the chain.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, dp);
>> - if (error)
>> - goto out;
>> + dac->dela_state = XFS_DAS_FOUND_NBLK;
>> + return -EAGAIN;
>> +das_found_nblk:
>>
>> /*
>> * If there was an out-of-line value, allocate the blocks we
>> @@ -1077,7 +1179,27 @@ xfs_attr_node_addname(
>> * maximum size of a transaction and/or hit a deadlock.
>> */
>> if (args->rmtblkno > 0) {
>> - error = xfs_attr_rmtval_set(args);
>> + /* Open coded xfs_attr_rmtval_set without trans handling */
>> + error = xfs_attr_rmtval_set_init(dac);
>
> Do we need to test/set LEAF_ADDNAME_INIT here too?
>
>> + if (error)
>> + return error;
>> +
>> + /*
>> + * Roll through the "value", allocating blocks on disk as
>> + * required.
>> + */
>> +das_alloc_node:
>> + while (dac->blkcnt > 0) {
>
> if() ?
>
>> + error = xfs_attr_rmtval_set_blk(dac);
>> + if (error)
>> + return error;
>> +
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> + dac->dela_state = XFS_DAS_ALLOC_NODE;
>> + return -EAGAIN;
>> + }
>> +
>> + error = xfs_attr_rmtval_set_value(args);
>> if (error)
>> return error;
>> }
>> @@ -1107,22 +1229,28 @@ xfs_attr_node_addname(
>> /*
>> * Commit the flag value change and start the next trans in series
>> */
>> - error = xfs_trans_roll_inode(&args->trans, args->dp);
>> - if (error)
>> - goto out;
>> -
>> + dac->dela_state = XFS_DAS_FLIP_NFLAG;
>> + return -EAGAIN;
>> +das_flip_flag:
>> /*
>> * 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;
>> +
>> +das_rm_nblk:
>> if (args->rmtblkno) {
>> - error = xfs_attr_rmtval_invalidate(args);
>> - if (error)
>> - return error;
>> + error = __xfs_attr_rmtval_remove(dac);
>> +
>> + if (error == -EAGAIN) {
>> + dac->dela_state = XFS_DAS_RM_NBLK;
>> + return -EAGAIN;
>> + }
>>
>> - error = xfs_attr_rmtval_remove(args);
>> if (error)
>> return error;
>> }
>> @@ -1155,9 +1283,8 @@ xfs_attr_node_addname(
>> error = xfs_da3_join(state);
>> if (error)
>> goto out;
>> - error = xfs_defer_finish(&args->trans);
>> - if (error)
>> - goto out;
>> +
>> + dac->flags |= XFS_DAC_DEFER_FINISH;
>> }
>> retval = error = 0;
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
>> index 0430c79..5cbefa90 100644
>> --- a/fs/xfs/libxfs/xfs_attr.h
>> +++ b/fs/xfs/libxfs/xfs_attr.h
>> @@ -106,6 +106,118 @@ struct xfs_attr_list_context {
>> * v │
>> * done <─────┘
>> *
>> + *
>> + * Below is a state machine diagram for attr set operations.
>> + *
>> + * xfs_attr_set_iter()
>> + * │
>> + * v
>> + * ┌───n── fork has
>> + * │ only 1 blk?
>> + * │ │
>> + * │ y
>> + * │ │
>> + * │ v
>> + * │ xfs_attr_leaf_try_add()
>> + * │ │
>> + * │ v
>> + * │ had enough
>> + * ├───n────space?
>> + * │ │
>> + * │ y
>> + * │ │
>> + * │ v
>> + * │ XFS_DAS_FOUND_LBLK ──┐
>> + * │ │
>> + * │ XFS_DAS_FLIP_LFLAG ──┤
>> + * │ (subroutine state) │
>> + * │ │
>> + * │ └─>xfs_attr_leaf_addname()
>> + * │ │
>> + * │ v
>> + * │ was this
>> + * │ a rename? ──n─┐
>> + * │ │ │
>> + * │ y │
>> + * │ │ │
>> + * │ v │
>> + * │ flip incomplete │
>> + * │ flag │
>> + * │ │ │
>> + * │ v │
>> + * │ XFS_DAS_FLIP_LFLAG │
>> + * │ │ │
>> + * │ v │
>> + * │ remove │
>> + * │ XFS_DAS_RM_LBLK ─> old name │
>> + * │ ^ │ │
>> + * │ │ v │
>> + * │ └──────y── more to │
>> + * │ remove │
>> + * │ │ │
>> + * │ n │
>> + * │ │ │
>> + * │ v │
>> + * │ done <──────┘
>> + * └──> XFS_DAS_FOUND_NBLK ──┐
>> + * (subroutine state) │
>> + * │
>> + * XFS_DAS_ALLOC_NODE ──┤
>> + * (subroutine state) │
>> + * │
>> + * XFS_DAS_FLIP_NFLAG ──┤
>> + * (subroutine state) │
>> + * │
>> + * └─>xfs_attr_node_addname()
>> + * │
>> + * v
>> + * find space to store
>> + * attr. Split if needed
>> + * │
>> + * v
>> + * XFS_DAS_FOUND_NBLK
>> + * │
>> + * v
>> + * ┌─────n── need to
>> + * │ alloc blks?
>> + * │ │
>> + * │ y
>> + * │ │
>> + * │ v
>> + * │ ┌─>XFS_DAS_ALLOC_NODE
>> + * │ │ │
>> + * │ │ v
>> + * │ └──y── need to alloc
>> + * │ more blocks?
>> + * │ │
>> + * │ n
>> + * │ │
>> + * │ v
>> + * │ was this
>> + * └────────> a rename? ──n─┐
>> + * │ │
>> + * y │
>> + * │ │
>> + * v │
>> + * flip incomplete │
>> + * flag │
>> + * │ │
>> + * v │
>> + * XFS_DAS_FLIP_NFLAG │
>> + * │ │
>> + * v │
>> + * remove │
>> + * XFS_DAS_RM_NBLK ─> old name │
>> + * ^ │ │
>> + * │ v │
>> + * └──────y── more to │
>> + * remove │
>> + * │ │
>> + * n │
>> + * │ │
>> + * v │
>> + * done <──────┘
>> + *
>> */
>>
>> /*
>> @@ -120,6 +232,13 @@ struct xfs_attr_list_context {
>> enum xfs_delattr_state {
>> /* Zero is uninitalized */
>> XFS_DAS_RM_SHRINK = 1, /* 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 */
>> + XFS_DAS_RM_LBLK, /* A rename is removing leaf blocks */
>> + 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 */
>> };
>>
>> /*
>> @@ -127,6 +246,7 @@ enum xfs_delattr_state {
>> */
>> #define XFS_DAC_DEFER_FINISH 0x01 /* finish the transaction */
>> #define XFS_DAC_NODE_RMVNAME_INIT 0x02 /* xfs_attr_node_removename init */
>> +#define XFS_DAC_LEAF_ADDNAME_INIT 0x04 /* xfs_attr_leaf_addname init*/
>>
>> /*
>> * Context used for keeping track of delayed attribute operations
>> @@ -134,6 +254,11 @@ enum xfs_delattr_state {
>> struct xfs_delattr_context {
>> struct xfs_da_args *da_args;
>>
>> + /* Used in xfs_attr_rmtval_set_blk to roll through allocating blocks */
>> + struct xfs_bmbt_irec map;
>> + xfs_dablk_t lblkno;
>> + int blkcnt;
>> +
>> /* Used in xfs_attr_node_removename to roll through removing blocks */
>> struct xfs_da_state *da_state;
>> struct xfs_da_state_blk *blk;
>> @@ -158,10 +283,10 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);
>> int xfs_attr_get(struct xfs_da_args *args);
>> int xfs_attr_set(struct xfs_da_args *args);
>> int xfs_attr_set_args(struct xfs_da_args *args);
>> +int xfs_attr_set_iter(struct xfs_delattr_context *dac, struct xfs_buf **leaf_bp);
>> int xfs_has_attr(struct xfs_da_args *args);
>> int xfs_attr_remove_args(struct xfs_da_args *args);
>> int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
>> -int xfs_attr_defer_finish(struct xfs_delattr_context *dac);
>> bool xfs_attr_namecheck(const void *name, size_t length);
>> void xfs_delattr_context_init(struct xfs_delattr_context *dac,
>> struct xfs_da_args *args);
>> diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
>> index f2d46c7..7a342f1 100644
>> --- a/fs/xfs/libxfs/xfs_attr_remote.c
>> +++ b/fs/xfs/libxfs/xfs_attr_remote.c
>> @@ -443,7 +443,7 @@ xfs_attr_rmtval_get(
>> * Find a "hole" in the attribute address space large enough for us to drop the
>> * new attribute's value into
>> */
>> -STATIC int
>> +int
>> xfs_attr_rmt_find_hole(
>> struct xfs_da_args *args)
>> {
>> @@ -470,7 +470,7 @@ xfs_attr_rmt_find_hole(
>> return 0;
>> }
>>
>> -STATIC int
>> +int
>> xfs_attr_rmtval_set_value(
>> struct xfs_da_args *args)
>> {
>> @@ -630,6 +630,70 @@ xfs_attr_rmtval_set(
>> }
>>
>> /*
>> + * Find a hole for the attr and store it in the delayed attr context. This
>> + * initializes the context to roll through allocating an attr extent for a
>> + * delayed attr operation
>> + */
>> +int
>> +xfs_attr_rmtval_set_init(
>
> /me wonders if this ought to be named xfs_attr_rmtval_find_space() ?
>
> That's more or less what it's getting ready to do, right?
This is one Brian had asked for, though I'm not sure how set he is about
names?
>
>> + struct xfs_delattr_context *dac)
>> +{
>> + struct xfs_da_args *args = dac->da_args;
>> + struct xfs_bmbt_irec *map = &dac->map;
>> + int error;
>
> int error;
>
>> +
>> + dac->lblkno = 0;
>> + dac->blkcnt = 0;
>> + args->rmtblkcnt = 0;
>> + args->rmtblkno = 0;
>> + memset(map, 0, sizeof(struct xfs_bmbt_irec));
>> +
>> + error = xfs_attr_rmt_find_hole(args);
>> + if (error)
>> + return error;
>> +
>> + dac->blkcnt = args->rmtblkcnt;
>> + dac->lblkno = args->rmtblkno;
>> +
>> + return error;
>
> This could be return 0;.
Sure
>
>> +}
>> +
>> +/*
>> + * Write one block of the value associated with an attribute into the
>> + * out-of-line buffer that we have defined for it. This is similar to a subset
>> + * of xfs_attr_rmtval_set, but records the current block to the delayed attr
>> + * context, and leaves transaction handling to the caller.
>> + */
>> +int
>> +xfs_attr_rmtval_set_blk(
>> + struct xfs_delattr_context *dac)
>> +{
>> + struct xfs_da_args *args = dac->da_args;
>> + struct xfs_inode *dp = args->dp;
>> + struct xfs_bmbt_irec *map = &dac->map;
>> + int nmap;
>> + int error;
>> +
>> + nmap = 1;
>> + error = xfs_bmapi_write(args->trans, dp,
>> + (xfs_fileoff_t)dac->lblkno,
>> + dac->blkcnt, XFS_BMAPI_ATTRFORK,
>> + args->total, map, &nmap);
>
> The indenting here could be improved.
ok, will fix. Will jump into cont' email now :-)
>
> Whee, ok, it's lunchtime. I'll look at the state machine after eating.
>
> --D
>
>> + if (error)
>> + return error;
>> +
>> + ASSERT(nmap == 1);
>> + ASSERT((map->br_startblock != DELAYSTARTBLOCK) &&
>> + (map->br_startblock != HOLESTARTBLOCK));
>> +
>> + /* roll attribute extent map forwards */
>> + dac->lblkno += map->br_blockcount;
>> + dac->blkcnt -= map->br_blockcount;
>> +
>> + return 0;
>> +}
>> +
>> +/*
>> * Remove the value associated with an attribute by deleting the
>> * out-of-line buffer that it is stored on.
>> */
>> @@ -671,48 +735,6 @@ xfs_attr_rmtval_invalidate(
>> }
>>
>> /*
>> - * Remove the value associated with an attribute by deleting the
>> - * out-of-line buffer that it is stored on.
>> - */
>> -int
>> -xfs_attr_rmtval_remove(
>> - struct xfs_da_args *args)
>> -{
>> - struct xfs_delattr_context dac;
>> - xfs_dablk_t lblkno;
>> - int blkcnt;
>> - int error = 0;
>> - int retval = 0;
>> -
>> - trace_xfs_attr_rmtval_remove(args);
>> - xfs_delattr_context_init(&dac, args);
>> -
>> - /*
>> - * Keep de-allocating extents until the remote-value region is gone.
>> - */
>> - lblkno = args->rmtblkno;
>> - blkcnt = args->rmtblkcnt;
>> - do {
>> - retval = __xfs_attr_rmtval_remove(&dac);
>> - if (retval && retval != EAGAIN)
>> - return retval;
>> -
>> - error = xfs_attr_defer_finish(&dac);
>> - if (error)
>> - break;
>> -
>> - /*
>> - * Close out trans and start the next one in the chain.
>> - */
>> - error = xfs_trans_roll_inode(&args->trans, args->dp);
>> - if (error)
>> - return error;
>> - } while (retval == -EAGAIN);
>> -
>> - return 0;
>> -}
>> -
>> -/*
>> * Remove the value associated with an attribute by deleting the out-of-line
>> * buffer that it is stored on. Returns EAGAIN for the caller to refresh the
>> * transaction and recall the function
>> diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
>> index 351da00..51a1c91 100644
>> --- a/fs/xfs/libxfs/xfs_attr_remote.h
>> +++ b/fs/xfs/libxfs/xfs_attr_remote.h
>> @@ -15,4 +15,8 @@ int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
>> xfs_buf_flags_t incore_flags);
>> int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
>> int __xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
>> +int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
>> +int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
>> +int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);
>> +int xfs_attr_rmtval_set_init(struct xfs_delattr_context *dac);
>> #endif /* __XFS_ATTR_REMOTE_H__ */
>> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
>> index a4323a6..26dc8bf 100644
>> --- a/fs/xfs/xfs_trace.h
>> +++ b/fs/xfs/xfs_trace.h
>> @@ -1784,7 +1784,6 @@ DEFINE_ATTR_EVENT(xfs_attr_refillstate);
>>
>> DEFINE_ATTR_EVENT(xfs_attr_rmtval_get);
>> DEFINE_ATTR_EVENT(xfs_attr_rmtval_set);
>> -DEFINE_ATTR_EVENT(xfs_attr_rmtval_remove);
>>
>> #define DEFINE_DA_EVENT(name) \
>> DEFINE_EVENT(xfs_da_class, name, \
>> --
>> 2.7.4
>>
next prev parent reply other threads:[~2020-05-05 1:31 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 22:49 [PATCH v9 00/24] xfs: Delay Ready Attributes Allison Collins
2020-04-30 22:49 ` [PATCH v9 01/24] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-04-30 22:49 ` [PATCH v9 02/24] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-04-30 22:49 ` [PATCH v9 03/24] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-04-30 22:49 ` [PATCH v9 04/24] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-04-30 22:49 ` [PATCH v9 05/24] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-05-04 17:33 ` Darrick J. Wong
2020-05-04 22:34 ` Allison Collins
2020-04-30 22:49 ` [PATCH v9 06/24] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-04-30 22:49 ` [PATCH v9 07/24] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 08/24] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-04-30 22:50 ` [PATCH v9 09/24] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 10/24] xfs: Add helper function __xfs_attr_rmtval_remove Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:36 ` Allison Collins
2020-05-05 12:03 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:53 ` Allison Collins
2020-05-04 22:57 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 11/24] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 12/24] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:42 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 13/24] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-05-04 13:30 ` Brian Foster
2020-05-04 22:15 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 14/24] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-05-04 18:46 ` Darrick J. Wong
2020-05-05 0:29 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 15/24] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-05-04 18:47 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 16/24] xfs: Add remote block helper functions Allison Collins
2020-05-04 18:55 ` Darrick J. Wong
2020-05-04 23:01 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 17/24] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-05-04 18:58 ` Darrick J. Wong
2020-05-04 23:02 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 18/24] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-05-04 19:00 ` Darrick J. Wong
2020-05-04 23:04 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 19/24] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-05-04 19:03 ` Darrick J. Wong
2020-05-04 23:06 ` Allison Collins
2020-05-05 13:11 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 20/24] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-05-04 19:06 ` Darrick J. Wong
2020-05-04 23:16 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 21/24] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-05-04 19:10 ` Darrick J. Wong
2020-05-04 23:17 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:37 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 22/24] xfs: Add delay ready attr remove routines Allison Collins
2020-05-04 19:33 ` Darrick J. Wong
2020-05-05 0:26 ` Allison Collins
2020-05-05 1:44 ` Darrick J. Wong
2020-05-05 17:35 ` Allison Collins
2020-05-07 11:54 ` Brian Foster
2020-04-30 22:50 ` [PATCH v9 23/24] xfs: Add delay ready attr set routines Allison Collins
2020-05-04 19:49 ` Darrick J. Wong
2020-05-05 1:31 ` Allison Collins [this message]
2020-05-04 22:36 ` Darrick J. Wong
2020-05-05 1:32 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
2020-05-04 19:34 ` Darrick J. Wong
2020-05-05 0:27 ` Allison Collins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43ad33fc-4603-2e15-eb5c-59ee94fcdb49@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).