On Wed, Aug 26, 2020 at 05:35:18PM -0700, Allison Collins wrote:
> This patch adds an error tag that we can use to test delayed attribute
> recovery and replay
>
> Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
FWIW the subject line for this patch ought to start with 'xfs:', not
'xfs_io:'.
--D
> ---
> fs/xfs/libxfs/xfs_errortag.h | 4 +++-
> fs/xfs/xfs_attr_item.c | 8 ++++++++
> fs/xfs/xfs_error.c | 3 +++
> 3 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
> index 53b305d..cb38cbf 100644
> --- a/fs/xfs/libxfs/xfs_errortag.h
> +++ b/fs/xfs/libxfs/xfs_errortag.h
> @@ -56,7 +56,8 @@
> #define XFS_ERRTAG_FORCE_SUMMARY_RECALC 33
> #define XFS_ERRTAG_IUNLINK_FALLBACK 34
> #define XFS_ERRTAG_BUF_IOERROR 35
> -#define XFS_ERRTAG_MAX 36
> +#define XFS_ERRTAG_DELAYED_ATTR 36
> +#define XFS_ERRTAG_MAX 37
>
> /*
> * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
> @@ -97,5 +98,6 @@
> #define XFS_RANDOM_FORCE_SUMMARY_RECALC 1
> #define XFS_RANDOM_IUNLINK_FALLBACK (XFS_RANDOM_DEFAULT/10)
> #define XFS_RANDOM_BUF_IOERROR XFS_RANDOM_DEFAULT
> +#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 923c288..ed71003 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -35,6 +35,8 @@
> #include "xfs_quota.h"
> #include "xfs_log_priv.h"
> #include "xfs_log_recover.h"
> +#include "xfs_error.h"
> +#include "xfs_errortag.h"
>
> static const struct xfs_item_ops xfs_attri_item_ops;
> static const struct xfs_item_ops xfs_attrd_item_ops;
> @@ -310,6 +312,11 @@ xfs_trans_attr(
> if (error)
> return error;
>
> + if (XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_DELAYED_ATTR)) {
> + error = -EIO;
> + goto out;
> + }
> +
> switch (op_flags) {
> case XFS_ATTR_OP_FLAGS_SET:
> args->op_flags |= XFS_DA_OP_ADDNAME;
> @@ -324,6 +331,7 @@ xfs_trans_attr(
> 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 7f6e208..fc551cb 100644
> --- a/fs/xfs/xfs_error.c
> +++ b/fs/xfs/xfs_error.c
> @@ -54,6 +54,7 @@ static unsigned int xfs_errortag_random_default[] = {
> XFS_RANDOM_FORCE_SUMMARY_RECALC,
> XFS_RANDOM_IUNLINK_FALLBACK,
> XFS_RANDOM_BUF_IOERROR,
> + XFS_RANDOM_DELAYED_ATTR,
> };
>
> struct xfs_errortag_attr {
> @@ -164,6 +165,7 @@ XFS_ERRORTAG_ATTR_RW(force_repair, XFS_ERRTAG_FORCE_SCRUB_REPAIR);
> XFS_ERRORTAG_ATTR_RW(bad_summary, XFS_ERRTAG_FORCE_SUMMARY_RECALC);
> XFS_ERRORTAG_ATTR_RW(iunlink_fallback, XFS_ERRTAG_IUNLINK_FALLBACK);
> XFS_ERRORTAG_ATTR_RW(buf_ioerror, XFS_ERRTAG_BUF_IOERROR);
> +XFS_ERRORTAG_ATTR_RW(delayed_attr, XFS_ERRTAG_DELAYED_ATTR);
>
> static struct attribute *xfs_errortag_attrs[] = {
> XFS_ERRORTAG_ATTR_LIST(noerror),
> @@ -202,6 +204,7 @@ static struct attribute *xfs_errortag_attrs[] = {
> XFS_ERRORTAG_ATTR_LIST(bad_summary),
> XFS_ERRORTAG_ATTR_LIST(iunlink_fallback),
> XFS_ERRORTAG_ATTR_LIST(buf_ioerror),
> + XFS_ERRORTAG_ATTR_LIST(delayed_attr),
> NULL,
> };
>
> --
> 2.7.4
>
