On Fri, May 22, 2020 at 10:41:21AM +0300, Amir Goldstein wrote:
> On Fri, May 22, 2020 at 6:51 AM Dave Chinner <david@xxxxxxxxxxxxx> wrote:
> >
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > Log recovery has it's own buffer write completion handler for
> > buffers that it directly recovers. Convert these to direct calls by
> > flagging these buffers as being log recovery buffers. The flag will
> > get cleared by the log recovery IO completion routine, so it will
> > never leak out of log recovery.
> >
> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > ---
> > fs/xfs/xfs_buf.c | 10 ++++++++++
> > fs/xfs/xfs_buf.h | 2 ++
> > fs/xfs/xfs_buf_item_recover.c | 5 ++---
> > fs/xfs/xfs_dquot_item_recover.c | 2 +-
> > fs/xfs/xfs_inode_item_recover.c | 2 +-
> > fs/xfs/xfs_log_recover.c | 5 ++---
> > 6 files changed, 18 insertions(+), 8 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> > index 77d40eb4a11db..b89685ce8519d 100644
> > --- a/fs/xfs/xfs_buf.c
> > +++ b/fs/xfs/xfs_buf.c
> > @@ -14,6 +14,7 @@
> > #include "xfs_mount.h"
> > #include "xfs_trace.h"
> > #include "xfs_log.h"
> > +#include "xfs_log_recover.h"
> > #include "xfs_trans.h"
> > #include "xfs_buf_item.h"
> > #include "xfs_errortag.h"
> > @@ -1207,6 +1208,15 @@ xfs_buf_ioend(
> > if (read)
> > goto out_finish;
> >
> > + /*
> > + * If this is a log recovery buffer, we aren't doing transactional IO
> > + * yet so we need to let it handle IO completions.
> > + */
> > + if (bp->b_flags & _XBF_LOGRCVY) {
> > + xlog_recover_iodone(bp);
> > + return;
> > + }
> > +
> > /* inodes always have a callback on write */
> > if (bp->b_flags & _XBF_INODES) {
> > xfs_buf_inode_iodone(bp);
>
> This turns out to be a "static calls" pattern.
Yes, that was one of the intents of this set of changes - to remove
a function pointer that is largely unnecessary. The main point of it
was to clearly separate out the different completions that need to
be run.
> I think it would look nicer as a switch statement on
> (bp->b_flags & _XBF_BUFFER_TYPE_MASK)
> It would be also nicer to document near flag definition
> that the type flags are mutually exclusive.
That doesn't actually make the code any more compact.
case _XBF_LOGRCVY:
/*
* If this is a log recovery buffer, we aren't doing
* transactional IO yet so we need to let it handle IO
* completions.
*/
xlog_recover_iodone(bp);
return;
Is actually more lines of additional code than just a set of if()
based flag checks. So adding a mask just to make this handling a
switch statement is largely marginal as to it's benefit here.
> > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> > index ec015df55b77a..0aa823aeafca9 100644
> > --- a/fs/xfs/xfs_log_recover.c
> > +++ b/fs/xfs/xfs_log_recover.c
> > @@ -287,9 +287,8 @@ xlog_recover_iodone(
> > if (bp->b_log_item)
> > xfs_buf_item_relse(bp);
> > ASSERT(bp->b_log_item == NULL);
> > -
> > - bp->b_iodone = NULL;
> > - xfs_buf_ioend(bp);
> > + bp->b_flags &= ~_XBF_LOGRCVY;
> > + xfs_buf_ioend_finish(bp);
>
>
> For someone like me who does not know all the assumptions
> about buffers, why is this fag leak prevention needed for log recovery
> buffers and not for inode/dquote buffers?
>
> Wouldn't it be better to have:
> bp->b_flags &= ~_XBF_BUFFER_TYPE_MASK;
>
> inside xfs_buf_ioend_finish()?
No. The flag indicates there is a completion to run on the buffer;
having the completion run does not mean the next time the buffer is
written the completion doesn't need to run. i.e. for writes during
log recovery, the flag is a one-shot. It will be set before each
write, and cleared afterwards. For something like inode cluster
buffers, it will be set when the inode is attached to the buffer,
and cleared when there are no more inodes attached to it. There may
be hundreds of IO completions run on the buffer between attach and
detatch, so clearing the _XBF_INODES flag in xfs_buf_ioend_finish()
is completely wrong.
i.e. the flag is not managed by the buffer cache infrastructure; it's
owned by the subsystem that is attaching things to the buffer...
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
