From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 04/30] xfs: mark inode buffers in cache
Date: Thu, 4 Jun 2020 10:04:15 -0400 [thread overview]
Message-ID: <20200604140415.GC17815@bfoster> (raw)
In-Reply-To: <20200604074606.266213-5-david@fromorbit.com>
On Thu, Jun 04, 2020 at 05:45:40PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Inode buffers always have write IO callbacks, so by marking them
> directly we can avoid needing to attach ->b_iodone functions to
> them. This avoids an indirect call, and makes future modifications
> much simpler.
>
> While this is largely a refactor of existing functionality, we
> broaden the scope of the flag to beyond where inodes are explicitly
> attached because future changes need to know what type of log items
> are attached to the buffer. Adding this buffer flag may invoke the
> inode iodone callback in cases where it wouldn't have been
> previously, but this is not a functional change because the callback
> is identical to the normal buffer write iodone callback when inodes
> are not attached.
>
Better.. I'm still not clear on why the association with where the bli
flags are set, but perhaps that's just convenience and/or it will make
more sense later. Code seems fine, regardless:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/xfs_buf.c | 21 ++++++++++++++++-----
> fs/xfs/xfs_buf.h | 38 +++++++++++++++++++++++++-------------
> fs/xfs/xfs_buf_item.c | 42 +++++++++++++++++++++++++++++++-----------
> fs/xfs/xfs_buf_item.h | 1 +
> fs/xfs/xfs_inode.c | 2 +-
> fs/xfs/xfs_trans_buf.c | 3 +++
> 6 files changed, 77 insertions(+), 30 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 9c2fbb6bbf89d..fcf650575be61 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -14,6 +14,8 @@
> #include "xfs_mount.h"
> #include "xfs_trace.h"
> #include "xfs_log.h"
> +#include "xfs_trans.h"
> +#include "xfs_buf_item.h"
> #include "xfs_errortag.h"
> #include "xfs_error.h"
>
> @@ -1202,12 +1204,21 @@ xfs_buf_ioend(
> bp->b_flags |= XBF_DONE;
> }
>
> - if (bp->b_iodone)
> + if (read)
> + goto out_finish;
> +
> + if (bp->b_flags & _XBF_INODES) {
> + xfs_buf_inode_iodone(bp);
> + return;
> + }
> +
> + if (bp->b_iodone) {
> (*(bp->b_iodone))(bp);
> - else if (bp->b_flags & XBF_ASYNC)
> - xfs_buf_relse(bp);
> - else
> - complete(&bp->b_iowait);
> + return;
> + }
> +
> +out_finish:
> + xfs_buf_ioend_finish(bp);
> }
>
> static void
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 050c53b739e24..2400cb90a04c6 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -30,15 +30,18 @@
> #define XBF_STALE (1 << 6) /* buffer has been staled, do not find it */
> #define XBF_WRITE_FAIL (1 << 7) /* async writes have failed on this buffer */
>
> -/* flags used only as arguments to access routines */
> -#define XBF_TRYLOCK (1 << 16)/* lock requested, but do not wait */
> -#define XBF_UNMAPPED (1 << 17)/* do not map the buffer */
> +/* buffer type flags for write callbacks */
> +#define _XBF_INODES (1 << 16)/* inode buffer */
>
> /* flags used only internally */
> #define _XBF_PAGES (1 << 20)/* backed by refcounted pages */
> #define _XBF_KMEM (1 << 21)/* backed by heap memory */
> #define _XBF_DELWRI_Q (1 << 22)/* buffer on a delwri queue */
>
> +/* flags used only as arguments to access routines */
> +#define XBF_TRYLOCK (1 << 30)/* lock requested, but do not wait */
> +#define XBF_UNMAPPED (1 << 31)/* do not map the buffer */
> +
> typedef unsigned int xfs_buf_flags_t;
>
> #define XFS_BUF_FLAGS \
> @@ -50,12 +53,13 @@ typedef unsigned int xfs_buf_flags_t;
> { XBF_DONE, "DONE" }, \
> { XBF_STALE, "STALE" }, \
> { XBF_WRITE_FAIL, "WRITE_FAIL" }, \
> - { XBF_TRYLOCK, "TRYLOCK" }, /* should never be set */\
> - { XBF_UNMAPPED, "UNMAPPED" }, /* ditto */\
> + { _XBF_INODES, "INODES" }, \
> { _XBF_PAGES, "PAGES" }, \
> { _XBF_KMEM, "KMEM" }, \
> - { _XBF_DELWRI_Q, "DELWRI_Q" }
> -
> + { _XBF_DELWRI_Q, "DELWRI_Q" }, \
> + /* The following interface flags should never be set */ \
> + { XBF_TRYLOCK, "TRYLOCK" }, \
> + { XBF_UNMAPPED, "UNMAPPED" }
>
> /*
> * Internal state flags.
> @@ -257,9 +261,23 @@ extern void xfs_buf_unlock(xfs_buf_t *);
> #define xfs_buf_islocked(bp) \
> ((bp)->b_sema.count <= 0)
>
> +static inline void xfs_buf_relse(xfs_buf_t *bp)
> +{
> + xfs_buf_unlock(bp);
> + xfs_buf_rele(bp);
> +}
> +
> /* Buffer Read and Write Routines */
> extern int xfs_bwrite(struct xfs_buf *bp);
> extern void xfs_buf_ioend(struct xfs_buf *bp);
> +static inline void xfs_buf_ioend_finish(struct xfs_buf *bp)
> +{
> + if (bp->b_flags & XBF_ASYNC)
> + xfs_buf_relse(bp);
> + else
> + complete(&bp->b_iowait);
> +}
> +
> extern void __xfs_buf_ioerror(struct xfs_buf *bp, int error,
> xfs_failaddr_t failaddr);
> #define xfs_buf_ioerror(bp, err) __xfs_buf_ioerror((bp), (err), __this_address)
> @@ -324,12 +342,6 @@ static inline int xfs_buf_ispinned(struct xfs_buf *bp)
> return atomic_read(&bp->b_pin_count);
> }
>
> -static inline void xfs_buf_relse(xfs_buf_t *bp)
> -{
> - xfs_buf_unlock(bp);
> - xfs_buf_rele(bp);
> -}
> -
> static inline int
> xfs_buf_verify_cksum(struct xfs_buf *bp, unsigned long cksum_offset)
> {
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 9e75e8d6042ec..8659cf4282a64 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -1158,20 +1158,15 @@ xfs_buf_iodone_callback_error(
> return false;
> }
>
> -/*
> - * This is the iodone() function for buffers which have had callbacks attached
> - * to them by xfs_buf_attach_iodone(). We need to iterate the items on the
> - * callback list, mark the buffer as having no more callbacks and then push the
> - * buffer through IO completion processing.
> - */
> -void
> -xfs_buf_iodone_callbacks(
> +static void
> +xfs_buf_run_callbacks(
> struct xfs_buf *bp)
> {
> +
> /*
> - * If there is an error, process it. Some errors require us
> - * to run callbacks after failure processing is done so we
> - * detect that and take appropriate action.
> + * If there is an error, process it. Some errors require us to run
> + * callbacks after failure processing is done so we detect that and take
> + * appropriate action.
> */
> if (bp->b_error && xfs_buf_iodone_callback_error(bp))
> return;
> @@ -1188,9 +1183,34 @@ xfs_buf_iodone_callbacks(
> bp->b_log_item = NULL;
> list_del_init(&bp->b_li_list);
> bp->b_iodone = NULL;
> +}
> +
> +/*
> + * This is the iodone() function for buffers which have had callbacks attached
> + * to them by xfs_buf_attach_iodone(). We need to iterate the items on the
> + * callback list, mark the buffer as having no more callbacks and then push the
> + * buffer through IO completion processing.
> + */
> +void
> +xfs_buf_iodone_callbacks(
> + struct xfs_buf *bp)
> +{
> + xfs_buf_run_callbacks(bp);
> xfs_buf_ioend(bp);
> }
>
> +/*
> + * Inode buffer iodone callback function.
> + */
> +void
> +xfs_buf_inode_iodone(
> + struct xfs_buf *bp)
> +{
> + xfs_buf_run_callbacks(bp);
> + xfs_buf_ioend_finish(bp);
> +}
> +
> +
> /*
> * This is the iodone() function for buffers which have been
> * logged. It is called when they are eventually flushed out.
> diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
> index c9c57e2da9327..a342933ad9b8d 100644
> --- a/fs/xfs/xfs_buf_item.h
> +++ b/fs/xfs/xfs_buf_item.h
> @@ -59,6 +59,7 @@ void xfs_buf_attach_iodone(struct xfs_buf *,
> struct xfs_log_item *);
> void xfs_buf_iodone_callbacks(struct xfs_buf *);
> void xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *);
> +void xfs_buf_inode_iodone(struct xfs_buf *);
> bool xfs_buf_log_check_iovec(struct xfs_log_iovec *iovec);
>
> extern kmem_zone_t *xfs_buf_item_zone;
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index ac3c8af8c9a14..d5dee57f914a9 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3860,13 +3860,13 @@ xfs_iflush_int(
> * completion on the buffer to remove the inode from the AIL and release
> * the flush lock.
> */
> + bp->b_flags |= _XBF_INODES;
> xfs_buf_attach_iodone(bp, xfs_iflush_done, &iip->ili_item);
>
> /* generate the checksum. */
> xfs_dinode_calc_crc(mp, dip);
>
> ASSERT(!list_empty(&bp->b_li_list));
> - ASSERT(bp->b_iodone != NULL);
> return error;
> }
>
> diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
> index 08174ffa21189..552d0869aa0fe 100644
> --- a/fs/xfs/xfs_trans_buf.c
> +++ b/fs/xfs/xfs_trans_buf.c
> @@ -626,6 +626,7 @@ xfs_trans_inode_buf(
> ASSERT(atomic_read(&bip->bli_refcount) > 0);
>
> bip->bli_flags |= XFS_BLI_INODE_BUF;
> + bp->b_flags |= _XBF_INODES;
> xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DINO_BUF);
> }
>
> @@ -651,6 +652,7 @@ xfs_trans_stale_inode_buf(
>
> bip->bli_flags |= XFS_BLI_STALE_INODE;
> bip->bli_item.li_cb = xfs_buf_iodone;
> + bp->b_flags |= _XBF_INODES;
> xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DINO_BUF);
> }
>
> @@ -675,6 +677,7 @@ xfs_trans_inode_alloc_buf(
> ASSERT(atomic_read(&bip->bli_refcount) > 0);
>
> bip->bli_flags |= XFS_BLI_INODE_ALLOC_BUF;
> + bp->b_flags |= _XBF_INODES;
> xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DINO_BUF);
> }
>
> --
> 2.26.2.761.g0e0b3e54be
>
next prev parent reply other threads:[~2020-06-04 14:04 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-04 7:45 [PATCH 00/30] xfs: rework inode flushing to make inode reclaim fully asynchronous Dave Chinner
2020-06-04 7:45 ` [PATCH 01/30] xfs: Don't allow logging of XFS_ISTALE inodes Dave Chinner
2020-06-04 7:45 ` [PATCH 02/30] xfs: remove logged flag from inode log item Dave Chinner
2020-06-04 7:45 ` [PATCH 03/30] xfs: add an inode item lock Dave Chinner
2020-06-09 13:13 ` Brian Foster
2020-06-04 7:45 ` [PATCH 04/30] xfs: mark inode buffers in cache Dave Chinner
2020-06-04 14:04 ` Brian Foster [this message]
2020-06-04 7:45 ` [PATCH 05/30] xfs: mark dquot " Dave Chinner
2020-06-04 7:45 ` [PATCH 06/30] xfs: mark log recovery buffers for completion Dave Chinner
2020-06-04 7:45 ` [PATCH 07/30] xfs: call xfs_buf_iodone directly Dave Chinner
2020-06-04 7:45 ` [PATCH 08/30] xfs: clean up whacky buffer log item list reinit Dave Chinner
2020-06-04 7:45 ` [PATCH 09/30] xfs: make inode IO completion buffer centric Dave Chinner
2020-06-04 7:45 ` [PATCH 10/30] xfs: use direct calls for dquot IO completion Dave Chinner
2020-06-04 7:45 ` [PATCH 11/30] xfs: clean up the buffer iodone callback functions Dave Chinner
2020-06-04 7:45 ` [PATCH 12/30] xfs: get rid of log item callbacks Dave Chinner
2020-06-04 7:45 ` [PATCH 13/30] xfs: handle buffer log item IO errors directly Dave Chinner
2020-06-04 14:05 ` Brian Foster
2020-06-05 0:59 ` Dave Chinner
2020-06-05 1:32 ` [PATCH 13/30 V2] " Dave Chinner
2020-06-05 16:24 ` Brian Foster
2020-06-04 7:45 ` [PATCH 14/30] xfs: unwind log item error flagging Dave Chinner
2020-06-04 7:45 ` [PATCH 15/30] xfs: move xfs_clear_li_failed out of xfs_ail_delete_one() Dave Chinner
2020-06-04 7:45 ` [PATCH 16/30] xfs: pin inode backing buffer to the inode log item Dave Chinner
2020-06-04 14:05 ` Brian Foster
2020-06-04 7:45 ` [PATCH 17/30] xfs: make inode reclaim almost non-blocking Dave Chinner
2020-06-04 18:06 ` Brian Foster
2020-06-04 7:45 ` [PATCH 18/30] xfs: remove IO submission from xfs_reclaim_inode() Dave Chinner
2020-06-04 18:08 ` Brian Foster
2020-06-04 22:53 ` Dave Chinner
2020-06-05 16:25 ` Brian Foster
2020-06-04 7:45 ` [PATCH 19/30] xfs: allow multiple reclaimers per AG Dave Chinner
2020-06-05 16:26 ` Brian Foster
2020-06-05 21:07 ` Dave Chinner
2020-06-08 16:44 ` Brian Foster
2020-06-04 7:45 ` [PATCH 20/30] xfs: don't block inode reclaim on the ILOCK Dave Chinner
2020-06-05 16:26 ` Brian Foster
2020-06-04 7:45 ` [PATCH 21/30] xfs: remove SYNC_TRYLOCK from inode reclaim Dave Chinner
2020-06-05 16:26 ` Brian Foster
2020-06-04 7:45 ` [PATCH 22/30] xfs: remove SYNC_WAIT from xfs_reclaim_inodes() Dave Chinner
2020-06-05 16:26 ` Brian Foster
2020-06-05 21:09 ` Dave Chinner
2020-06-04 7:45 ` [PATCH 23/30] xfs: clean up inode reclaim comments Dave Chinner
2020-06-05 16:26 ` Brian Foster
2020-06-04 7:46 ` [PATCH 24/30] xfs: rework stale inodes in xfs_ifree_cluster Dave Chinner
2020-06-05 18:27 ` Brian Foster
2020-06-05 21:32 ` Dave Chinner
2020-06-08 16:44 ` Brian Foster
2020-06-04 7:46 ` [PATCH 25/30] xfs: attach inodes to the cluster buffer when dirtied Dave Chinner
2020-06-08 16:45 ` Brian Foster
2020-06-08 21:05 ` Dave Chinner
2020-06-04 7:46 ` [PATCH 26/30] xfs: xfs_iflush() is no longer necessary Dave Chinner
2020-06-08 16:45 ` Brian Foster
2020-06-08 21:37 ` Dave Chinner
2020-06-08 22:26 ` [PATCH 26/30 V2] " Dave Chinner
2020-06-09 13:11 ` Brian Foster
2020-06-04 7:46 ` [PATCH 27/30] xfs: rename xfs_iflush_int() Dave Chinner
2020-06-08 17:37 ` Brian Foster
2020-06-04 7:46 ` [PATCH 28/30] xfs: rework xfs_iflush_cluster() dirty inode iteration Dave Chinner
2020-06-09 13:11 ` Brian Foster
2020-06-09 22:01 ` Dave Chinner
2020-06-10 13:06 ` Brian Foster
2020-06-10 23:40 ` Dave Chinner
2020-06-11 13:56 ` Brian Foster
2020-06-15 1:01 ` Dave Chinner
2020-06-15 14:21 ` Brian Foster
2020-06-16 14:41 ` Brian Foster
2020-06-11 1:56 ` [PATCH 28/30 V2] " Dave Chinner
2020-06-04 7:46 ` [PATCH 29/30] xfs: factor xfs_iflush_done Dave Chinner
2020-06-09 13:12 ` Brian Foster
2020-06-09 22:14 ` Dave Chinner
2020-06-10 13:08 ` Brian Foster
2020-06-11 0:16 ` Dave Chinner
2020-06-11 14:07 ` Brian Foster
2020-06-15 1:49 ` Dave Chinner
2020-06-15 5:20 ` Amir Goldstein
2020-06-15 14:31 ` Brian Foster
2020-06-11 1:58 ` [PATCH 29/30 V2] " Dave Chinner
2020-06-04 7:46 ` [PATCH 30/30] xfs: remove xfs_inobp_check() Dave Chinner
2020-06-09 13:12 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2020-06-22 8:15 [PATCH 00/30] xfs: rework inode flushing to make inode reclaim fully asynchronous Dave Chinner
2020-06-22 8:15 ` [PATCH 04/30] xfs: mark inode buffers in cache Dave Chinner
2020-06-23 2:32 ` Darrick J. Wong
2020-06-01 21:42 [PATCH 00/30] xfs: rework inode flushing to make inode reclaim fully asynchronous Dave Chinner
2020-06-01 21:42 ` [PATCH 04/30] xfs: mark inode buffers in cache Dave Chinner
2020-06-02 16:45 ` Brian Foster
2020-06-02 19:22 ` Darrick J. Wong
2020-06-02 21:29 ` Dave Chinner
2020-06-03 14:57 ` Brian Foster
2020-06-03 21:21 ` Dave Chinner
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=20200604140415.GC17815@bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.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).