Re: [PATCH 4/8] xfs: tag transactions that contain intent done items

Darrick J. Wong
2022-04-27T03:07:14Z

On Wed, Apr 27, 2022 at 12:22:55PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Intent whiteouts will require extra work to be done during
> transaction commit if the transaction contains an intent done item.
>
> To determine if a transaction contains an intent done item, we want
> to avoid having to walk all the items in the transaction to check if
> they are intent done items. Hence when we add an intent done item to
> a transaction, tag the transaction to indicate that it contains such
> an item.
>
> We don't tag the transaction when the defer ops is relogging an
> intent to move it forward in the log. Whiteouts will never apply to
> these cases, so we don't need to bother looking for them.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_shared.h | 24 +++++++++++++++++-------
> fs/xfs/xfs_bmap_item.c | 2 +-
> fs/xfs/xfs_extfree_item.c | 2 +-
> fs/xfs/xfs_refcount_item.c | 2 +-
> fs/xfs/xfs_rmap_item.c | 2 +-
> 5 files changed, 21 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h
> index 25c4cab58851..c4381388c0c1 100644
> --- a/fs/xfs/libxfs/xfs_shared.h
> +++ b/fs/xfs/libxfs/xfs_shared.h
> @@ -54,13 +54,23 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp,
> /*
> * Values for t_flags.
> */
> -#define XFS_TRANS_DIRTY 0x01 /* something needs to be logged */
> -#define XFS_TRANS_SB_DIRTY 0x02 /* superblock is modified */
> -#define XFS_TRANS_PERM_LOG_RES 0x04 /* xact took a permanent log res */
> -#define XFS_TRANS_SYNC 0x08 /* make commit synchronous */
> -#define XFS_TRANS_RESERVE 0x20 /* OK to use reserved data blocks */
> -#define XFS_TRANS_NO_WRITECOUNT 0x40 /* do not elevate SB writecount */
> -#define XFS_TRANS_RES_FDBLKS 0x80 /* reserve newly freed blocks */
> +/* Transaction needs to be logged */
> +#define XFS_TRANS_DIRTY (1u << 0)
> +/* Superblock is dirty and needs to be logged */
> +#define XFS_TRANS_SB_DIRTY (1u << 1)
> +/* Transaction took a permanent log reservation */
> +#define XFS_TRANS_PERM_LOG_RES (1u << 2)
> +/* Synchronous transaction commit needed */
> +#define XFS_TRANS_SYNC (1u << 3)
> +/* Transaction can use reserve block pool */
> +#define XFS_TRANS_RESERVE (1u << 4)
> +/* Transaction should avoid VFS level superblock write accounting */
> +#define XFS_TRANS_NO_WRITECOUNT (1u << 5)
> +/* Transaction has freed blocks returned to it's reservation */
> +#define XFS_TRANS_RES_FDBLKS (1u << 6)

Yesssss documentation finally!

> +/* Transaction contains an intent done log item */
> +#define XFS_TRANS_HAS_INTENT_DONE (1u << 7)

I guess I'll see what this one does in the next few patches.

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> +
> /*
> * LOWMODE is used by the allocator to activate the lowspace algorithm - when
> * free space is running low the extent allocator may choose to allocate an
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index ed67c0028a68..3b968b31911b 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -255,7 +255,7 @@ xfs_trans_log_finish_bmap_update(
> * 1.) releases the BUI and frees the BUD
> * 2.) shuts down the filesystem
> */
> - tp->t_flags |= XFS_TRANS_DIRTY;
> + tp->t_flags |= XFS_TRANS_DIRTY | XFS_TRANS_HAS_INTENT_DONE;
> set_bit(XFS_LI_DIRTY, &budp->bud_item.li_flags);
>
> return error;
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index 21a159f9d8c5..96735f23d12d 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -381,7 +381,7 @@ xfs_trans_free_extent(
> * 1.) releases the EFI and frees the EFD
> * 2.) shuts down the filesystem
> */
> - tp->t_flags |= XFS_TRANS_DIRTY;
> + tp->t_flags |= XFS_TRANS_DIRTY | XFS_TRANS_HAS_INTENT_DONE;
> set_bit(XFS_LI_DIRTY, &efdp->efd_item.li_flags);
>
> next_extent = efdp->efd_next_extent;
> diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
> index 6536eea4c6ea..b523ce2c775b 100644
> --- a/fs/xfs/xfs_refcount_item.c
> +++ b/fs/xfs/xfs_refcount_item.c
> @@ -260,7 +260,7 @@ xfs_trans_log_finish_refcount_update(
> * 1.) releases the CUI and frees the CUD
> * 2.) shuts down the filesystem
> */
> - tp->t_flags |= XFS_TRANS_DIRTY;
> + tp->t_flags |= XFS_TRANS_DIRTY | XFS_TRANS_HAS_INTENT_DONE;
> set_bit(XFS_LI_DIRTY, &cudp->cud_item.li_flags);
>
> return error;
> diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
> index c2bb8cfc231e..b269e68407b9 100644
> --- a/fs/xfs/xfs_rmap_item.c
> +++ b/fs/xfs/xfs_rmap_item.c
> @@ -328,7 +328,7 @@ xfs_trans_log_finish_rmap_update(
> * 1.) releases the RUI and frees the RUD
> * 2.) shuts down the filesystem
> */
> - tp->t_flags |= XFS_TRANS_DIRTY;
> + tp->t_flags |= XFS_TRANS_DIRTY | XFS_TRANS_HAS_INTENT_DONE;
> set_bit(XFS_LI_DIRTY, &rudp->rud_item.li_flags);
>
> return error;
> --
> 2.35.1
>