On 27 Jul 2021 at 11:50, Allison Henderson wrote:
> This patch adds an error tag that we can use to test delayed attribute
> recovery and replay
>
Looks good to me.
Reviewed-by: Chandan Babu R <chandanrlinux@xxxxxxxxx>
> Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_errortag.h | 4 +++-
> fs/xfs/xfs_attr_item.c | 7 +++++++
> fs/xfs/xfs_error.c | 3 +++
> 3 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
> index a23a52e..46f359c 100644
> --- a/fs/xfs/libxfs/xfs_errortag.h
> +++ b/fs/xfs/libxfs/xfs_errortag.h
> @@ -59,7 +59,8 @@
> #define XFS_ERRTAG_REDUCE_MAX_IEXTENTS 36
> #define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37
> #define XFS_ERRTAG_AG_RESV_FAIL 38
> -#define XFS_ERRTAG_MAX 39
> +#define XFS_ERRTAG_DELAYED_ATTR 39
> +#define XFS_ERRTAG_MAX 40
>
> /*
> * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
> @@ -103,5 +104,6 @@
> #define XFS_RANDOM_REDUCE_MAX_IEXTENTS 1
> #define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1
> #define XFS_RANDOM_AG_RESV_FAIL 1
> +#define XFS_RANDOM_DELAYED_ATTR 1
>
> #endif /* __XFS_ERRORTAG_H_ */
> diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
> index 12a0151..2efd94f 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -34,6 +34,7 @@
> #include "xfs_inode.h"
> #include "xfs_quota.h"
> #include "xfs_trans_space.h"
> +#include "xfs_errortag.h"
> #include "xfs_error.h"
> #include "xfs_log_priv.h"
> #include "xfs_log_recover.h"
> @@ -296,6 +297,11 @@ xfs_trans_attr_finish_update(
> if (error)
> return error;
>
> + if (XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_DELAYED_ATTR)) {
> + error = -EIO;
> + goto out;
> + }
> +
> switch (op) {
> case XFS_ATTR_OP_FLAGS_SET:
> args->op_flags |= XFS_DA_OP_ADDNAME;
> @@ -310,6 +316,7 @@ xfs_trans_attr_finish_update(
> break;
> }
>
> +out:
> /*
> * Mark the transaction dirty, even on error. This ensures the
> * transaction is aborted, which:
> diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
> index ce3bc1b..eca5e34 100644
> --- a/fs/xfs/xfs_error.c
> +++ b/fs/xfs/xfs_error.c
> @@ -57,6 +57,7 @@ static unsigned int xfs_errortag_random_default[] = {
> XFS_RANDOM_REDUCE_MAX_IEXTENTS,
> XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT,
> XFS_RANDOM_AG_RESV_FAIL,
> + XFS_RANDOM_DELAYED_ATTR,
> };
>
> struct xfs_errortag_attr {
> @@ -170,6 +171,7 @@ XFS_ERRORTAG_ATTR_RW(buf_ioerror, XFS_ERRTAG_BUF_IOERROR);
> XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);
> XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT);
> XFS_ERRORTAG_ATTR_RW(ag_resv_fail, XFS_ERRTAG_AG_RESV_FAIL);
> +XFS_ERRORTAG_ATTR_RW(delayed_attr, XFS_ERRTAG_DELAYED_ATTR);
>
> static struct attribute *xfs_errortag_attrs[] = {
> XFS_ERRORTAG_ATTR_LIST(noerror),
> @@ -211,6 +213,7 @@ static struct attribute *xfs_errortag_attrs[] = {
> XFS_ERRORTAG_ATTR_LIST(reduce_max_iextents),
> XFS_ERRORTAG_ATTR_LIST(bmap_alloc_minlen_extent),
> XFS_ERRORTAG_ATTR_LIST(ag_resv_fail),
> + XFS_ERRORTAG_ATTR_LIST(delayed_attr),
> NULL,
> };
--
chandan
