From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 6/8] xfs: hoist unlinked list search and mapping to a separate function
Date: Mon, 4 Feb 2019 08:18:45 -0500 [thread overview]
Message-ID: <20190204131845.GA45457@bfoster> (raw)
In-Reply-To: <20190202204600.GU5761@magnolia>
On Sat, Feb 02, 2019 at 12:46:00PM -0800, Darrick J. Wong wrote:
> On Fri, Feb 01, 2019 at 02:01:38PM -0500, Brian Foster wrote:
> > On Thu, Jan 31, 2019 at 03:18:27PM -0800, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > >
> > > There's a loop that searches an unlinked bucket list to find the inode
> > > that points to a given inode. Hoist this into a separate function;
> > > later we'll use our iunlink backref cache to bypass the slow list
> > > operation. No functional changes.
> > >
> > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > > ---
> > > fs/xfs/xfs_inode.c | 136 ++++++++++++++++++++++++++++++++++++++--------------
> > > 1 file changed, 99 insertions(+), 37 deletions(-)
> > >
> > >
> > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > > index ea38b66fbc59..d5b3f8fdac7e 100644
> > > --- a/fs/xfs/xfs_inode.c
> > > +++ b/fs/xfs/xfs_inode.c
> > > @@ -2084,6 +2084,100 @@ xfs_iunlink(
> > > return error;
> > > }
> > >
> > > +/* Return the imap, dinode pointer, and buffer for an inode. */
> > > +STATIC int
> > > +xfs_iunlink_map_ino(
> > > + struct xfs_trans *tp,
> > > + xfs_ino_t next_ino,
> >
> > Might be good to clean up some of these variable names as this code gets
> > factored out. E.g., "next_ino" doesn't mean much more than "ino" in the
> > context of this helper.
>
> Ok.
>
> > > + struct xfs_imap *imap,
> > > + struct xfs_dinode **dipp,
> > > + struct xfs_buf **bpp)
> > > +{
> > > + struct xfs_mount *mp = tp->t_mountp;
> > > + int error;
> > > +
> > > + imap->im_blkno = 0;
> > > + error = xfs_imap(mp, tp, next_ino, imap, 0);
> > > + if (error) {
> > > + xfs_warn(mp, "%s: xfs_imap returned error %d.",
> > > + __func__, error);
> > > + return error;
> > > + }
> > > +
> > > + error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0, 0);
> > > + if (error) {
> > > + xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.",
> > > + __func__, error);
> > > + return error;
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +/*
> > > + * Walk the unlinked chain from @head_agino until we find the inode that
> > > + * points to @target_ino. Return the inode number, map, dinode pointer,
> > > + * and inode cluster buffer of that inode as @ino, @imap, @dipp, and @bpp.
> > > + *
> > > + * Do not call this function if @target_agino is the head of the list.
> > > + */
> > > +STATIC int
> > > +xfs_iunlink_map_prev(
> > > + struct xfs_trans *tp,
> > > + struct xfs_perag *pag,
> > > + xfs_agino_t head_agino,
> > > + xfs_agino_t target_agino,
> > > + xfs_ino_t *ino,
> > > + struct xfs_imap *imap,
> > > + struct xfs_dinode **dipp,
> > > + struct xfs_buf **bpp)
> > > +{
> >
> > It would also be nice to have some oneline comments next to the params
> > of some of these functions.
>
> In addition to the description given above the function?
>
I missed the header comment.. perhaps just a one liner that indicates
ino and everything after are output params would be helpful here. BTW,
s/@target_ino/@target_agino/ in the header comment?
Brian
> > > + struct xfs_imap last_imap;
> > > + struct xfs_mount *mp = tp->t_mountp;
> > > + struct xfs_buf *last_ibp = NULL;
> > > + struct xfs_dinode *last_dip;
> > > + xfs_ino_t next_ino = NULLFSINO;
> > > + xfs_agino_t next_agino;
> > > + int error;
> > > +
> > > + ASSERT(head_agino != target_agino);
> > > +
> > > + next_agino = head_agino;
> > > + while (next_agino != target_agino) {
> > > + xfs_agino_t unlinked_agino;
> > > +
> > > + if (last_ibp)
> > > + xfs_trans_brelse(tp, last_ibp);
> > > +
> > > + next_ino = XFS_AGINO_TO_INO(mp, pag->pag_agno, next_agino);
> > > + error = xfs_iunlink_map_ino(tp, next_ino, &last_imap,
> > > + &last_dip, &last_ibp);
> > > + if (error)
> > > + return error;
> > > +
> > > + unlinked_agino = be32_to_cpu(last_dip->di_next_unlinked);
> > > + if (!xfs_verify_agino(mp, pag->pag_agno, next_agino) ||
> >
> > Should the next_agino above be unlinked_agino? Also is the == check
> > below a loop check (comment pls)?
>
> Yes, fixed.
>
> /*
> * Make sure this pointer is valid and isn't an obvious
> * infinite loop.
> */
>
>
> > > + next_agino == unlinked_agino) {
> > > + XFS_CORRUPTION_ERROR(__func__,
> > > + XFS_ERRLEVEL_LOW, mp,
> > > + last_dip, sizeof(*last_dip));
> > > + error = -EFSCORRUPTED;
> > > + return error;
> > > + }
> > > + next_agino = unlinked_agino;
> > > + }
> > > +
> > > + /* Should never happen, but don't return garbage. */
> > > + if (next_ino == NULLFSINO)
> > > + return -EFSCORRUPTED;
> > > +
> > > + *ino = next_ino;
> > > + memcpy(imap, &last_imap, sizeof(last_imap));
> > > + *dipp = last_dip;
> > > + *bpp = last_ibp;
> > > + return 0;
> > > +}
> > > +
> > > /*
> > > * Pull the on-disk inode from the AGI unlinked list.
> > > */
> > > @@ -2153,43 +2247,11 @@ xfs_iunlink_remove(
> > > } else {
> > > struct xfs_imap imap;
> > >
> > > - /*
> > > - * We need to search the list for the inode being freed.
> > > - */
> > > - last_ibp = NULL;
> > > - while (next_agino != agino) {
> > > - if (last_ibp)
> > > - xfs_trans_brelse(tp, last_ibp);
> > > -
> > > - imap.im_blkno = 0;
> > > - next_ino = XFS_AGINO_TO_INO(mp, agno, next_agino);
> > > -
> > > - error = xfs_imap(mp, tp, next_ino, &imap, 0);
> > > - if (error) {
> > > - xfs_warn(mp,
> > > - "%s: xfs_imap returned error %d.",
> > > - __func__, error);
> > > - goto out_unlock;
> > > - }
> > > -
> > > - error = xfs_imap_to_bp(mp, tp, &imap, &last_dip,
> > > - &last_ibp, 0, 0);
> > > - if (error) {
> > > - xfs_warn(mp,
> > > - "%s: xfs_imap_to_bp returned error %d.",
> > > - __func__, error);
> > > - goto out_unlock;
> > > - }
> > > -
> > > - next_agino = be32_to_cpu(last_dip->di_next_unlinked);
> > > - if (!xfs_verify_agino(mp, agno, next_agino)) {
> > > - XFS_CORRUPTION_ERROR(__func__,
> > > - XFS_ERRLEVEL_LOW, mp,
> > > - last_dip, sizeof(*last_dip));
> > > - error = -EFSCORRUPTED;
> > > - goto out_unlock;
> > > - }
> > > - }
> > > + /* We need to search the list for the inode being freed. */
> > > + error = xfs_iunlink_map_prev(tp, pag, next_agino, agino,
> > > + &next_ino, &imap, &last_dip, &last_ibp);
> >
> > Another variable nit... next_ino is kind of confusing here, particularly
> > where we still use next_agino as well. The former is actually the "prev"
> > ino output, right?
>
> Yep, will fix.
>
> --D
>
> > Brian
> >
> > > + if (error)
> > > + goto out_unlock;
> > >
> > > /*
> > > * Now last_ibp points to the buffer previous to us on the
> > >
next prev parent reply other threads:[~2019-02-04 13:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 23:17 [PATCH 0/8] xfs: incore unlinked list Darrick J. Wong
2019-01-31 23:17 ` [PATCH 1/8] xfs: clean up iunlink functions Darrick J. Wong
2019-02-01 8:01 ` Christoph Hellwig
2019-02-02 19:15 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 2/8] xfs: track unlinked inode counts in per-ag data Darrick J. Wong
2019-02-01 18:59 ` Brian Foster
2019-02-01 19:33 ` Darrick J. Wong
2019-02-02 16:14 ` Christoph Hellwig
2019-02-02 19:28 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 3/8] xfs: refactor AGI unlinked bucket updates Darrick J. Wong
2019-02-01 19:00 ` Brian Foster
2019-02-02 19:50 ` Darrick J. Wong
2019-02-02 16:21 ` Christoph Hellwig
2019-02-02 19:51 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 4/8] xfs: strengthen AGI unlinked inode bucket pointer checks Darrick J. Wong
2019-02-01 19:00 ` Brian Foster
2019-02-02 16:22 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 5/8] xfs: refactor inode unlinked pointer update functions Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 22:00 ` Darrick J. Wong
2019-02-02 16:27 ` Christoph Hellwig
2019-02-02 20:29 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 6/8] xfs: hoist unlinked list search and mapping to a separate function Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 20:46 ` Darrick J. Wong
2019-02-04 13:18 ` Brian Foster [this message]
2019-02-04 16:31 ` Darrick J. Wong
2019-02-02 16:30 ` Christoph Hellwig
2019-02-02 20:42 ` Darrick J. Wong
2019-02-02 16:51 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 7/8] xfs: add tracepoints for high level iunlink operations Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-01 19:14 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 8/8] xfs: cache unlinked pointers in an rhashtable Darrick J. Wong
2019-02-01 8:03 ` Christoph Hellwig
2019-02-01 23:59 ` Dave Chinner
2019-02-02 4:31 ` Darrick J. Wong
2019-02-02 16:07 ` Christoph Hellwig
2019-02-01 19:29 ` Brian Foster
2019-02-01 19:40 ` Darrick J. Wong
2019-02-02 17:01 ` Christoph Hellwig
2019-02-01 7:57 ` [PATCH 0/8] xfs: incore unlinked list Christoph Hellwig
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=20190204131845.GA45457@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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).