From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v2 16/21] xfs: cross-reference inode btrees during scrub
Date: Mon, 15 Jan 2018 22:30:18 -0800 [thread overview]
Message-ID: <20180116063018.GG5602@magnolia> (raw)
In-Reply-To: <20180115221711.GB16421@dastard>
On Tue, Jan 16, 2018 at 09:17:11AM +1100, Dave Chinner wrote:
> On Tue, Jan 09, 2018 at 01:22:18PM -0800, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Cross-reference the inode btrees with the other metadata when we
> > scrub the filesystem.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > v2: streamline scrubber arguments, remove stack allocated objects
> > ---
> > fs/xfs/scrub/agheader.c | 19 +++++++++++++
> > fs/xfs/scrub/alloc.c | 1 +
> > fs/xfs/scrub/bmap.c | 1 +
> > fs/xfs/scrub/ialloc.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
> > fs/xfs/scrub/inode.c | 49 +++++++++++++++++++++++++++++++++
> > fs/xfs/scrub/refcount.c | 1 +
> > fs/xfs/scrub/rmap.c | 4 +++
> > fs/xfs/scrub/scrub.h | 4 +++
> > 8 files changed, 149 insertions(+)
> >
> > diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
> > index 3b66cd4..4d4ce1f 100644
> > --- a/fs/xfs/scrub/agheader.c
> > +++ b/fs/xfs/scrub/agheader.c
> > @@ -122,6 +122,7 @@ xfs_scrub_superblock_xref(
> > return;
> >
> > xfs_scrub_xref_is_used_space(sc, agbno, 1);
> > + xfs_scrub_xref_not_inodes(sc, agbno, 1);
>
> Seems a bit strange to have "is" in "_is_used_space" and then don't
> put it in "_is_not_inodes"....
It does now. :)
> > @@ -752,6 +760,17 @@ xfs_scrub_agi_xref(
> > return;
> >
> > xfs_scrub_xref_is_used_space(sc, agbno, 1);
> > + xfs_scrub_xref_not_inodes(sc, agbno, 1);
>
> Hmmm, what this actually means is "_is_not_inode_chunk", right?
> Kinda obscure to have the inode index checking it's "not inodes" :P
<nod>
> > + if (sc->sa.ino_cur) {
> > + error = xfs_ialloc_count_inodes(sc->sa.ino_cur, &icount,
> > + &freecount);
> > + if (xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur) &&
> > + (be32_to_cpu(agi->agi_count) != icount ||
> > + be32_to_cpu(agi->agi_freecount) != freecount))
> > + xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agi_bp);
> > + }
>
> Reduce the indent by doing:
>
> if (!sc->sa.ino_cur)
> return;
>
> ?
The downside is that later patches add more stuff after that, and we
don't necessarily want to abort the other xref checks just because we
failed to get/bombed out of getting the ino_cur.
<shrug> OTOH I guess that hunk could just be a(nother) static inline
function, which would make the _xref functions less messy.
> > diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
> > index 4526894..34c133e 100644
> > --- a/fs/xfs/scrub/ialloc.c
> > +++ b/fs/xfs/scrub/ialloc.c
> > @@ -67,10 +67,32 @@ xfs_scrub_iallocbt_chunk_xref(
> > xfs_agblock_t agbno,
> > xfs_extlen_t len)
> > {
> > + struct xfs_btree_cur **pcur;
> > + bool has_irec;
> > + int error;
> > +
> > if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
> > return;
> >
> > xfs_scrub_xref_is_used_space(sc, agbno, len);
> > +
> > + /*
> > + * If we're checking the finobt, cross-reference with the inobt.
> > + * Otherwise we're checking the inobt; if there is an finobt,
> > + * make sure we have a record or not depending on freecount.
> > + */
> > + if (sc->sm->sm_type == XFS_SCRUB_TYPE_FINOBT)
> > + pcur = &sc->sa.ino_cur;
> > + else
> > + pcur = &sc->sa.fino_cur;
> > + if (*pcur) {
> > + error = xfs_ialloc_has_inode_record(*pcur,
> > + agino, agino, &has_irec);
> > + if (xfs_scrub_should_check_xref(sc, &error, pcur) &&
> > + ((irec->ir_freecount > 0 && !has_irec) ||
> > + (irec->ir_freecount == 0 && has_irec)))
> > + xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);
> > + }
>
> Same here?
<nod>
> > }
> >
> > /* Is this chunk worth checking? */
> > @@ -352,3 +374,51 @@ xfs_scrub_finobt(
> > {
> > return xfs_scrub_iallocbt(sc, XFS_BTNUM_FINO);
> > }
> > +
> > +/* xref check that the extent is not covered by inodes */
> > +void
> > +xfs_scrub_xref_not_inodes(
> > + struct xfs_scrub_context *sc,
> > + xfs_agblock_t bno,
> > + xfs_extlen_t len)
> > +{
> > + bool has_inodes;
> > + int error;
> > +
> > + if (sc->sa.ino_cur) {
> > + error = xfs_ialloc_has_inodes_at_extent(sc->sa.ino_cur, bno,
> > + len, &has_inodes);
> > + if (xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur) &&
> > + has_inodes)
> > + xfs_scrub_btree_xref_set_corrupt(sc, sc->sa.ino_cur, 0);
> > + }
> > +
> > + if (sc->sa.fino_cur) {
> > + error = xfs_ialloc_has_inodes_at_extent(sc->sa.fino_cur, bno,
> > + len, &has_inodes);
> > + if (xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur) &&
> > + has_inodes)
> > + xfs_scrub_btree_xref_set_corrupt(sc, sc->sa.fino_cur,
> > + 0);
> > + }
> > +}
> > +
> > +/* xref check that the extent is covered by inodes */
> > +void
> > +xfs_scrub_xref_are_inodes(
> > + struct xfs_scrub_context *sc,
> > + xfs_agblock_t bno,
> > + xfs_extlen_t len)
> > +{
> > + bool has_inodes;
> > + int error;
> > +
> > + if (!sc->sa.ino_cur)
> > + return;
> > +
> > + error = xfs_ialloc_has_inodes_at_extent(sc->sa.ino_cur, bno,
> > + len, &has_inodes);
> > + if (xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur) &&
> > + !has_inodes)
> > + xfs_scrub_btree_xref_set_corrupt(sc, sc->sa.ino_cur, 0);
> > +}
>
> That's 3 copies of that check and error handling.
>
> xfs_scrub_xref_inode_check(
> struct xfs_scrub_context *sc,
> xfs_agblock_t bno,
> xfs_extlen_t len,
> struct xfs_btree_cursor **icur))
> {
> error = xfs_ialloc_has_inodes_at_extent(*icur, bno, len, &has_inodes);
> if (xfs_scrub_should_check_xref(sc, &error, icur) &&
> !has_inodes)
> xfs_scrub_btree_xref_set_corrupt(sc, *icur, 0);
> }
>
> And the callers become:
>
> if (sc->sa.ino_cur)
> xfs_scrub_xref_inode_check(sc, bno, len, &sc->sa.ino_cur);
>
> I find that much easier to read...
<nod>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-01-16 6:35 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-23 0:42 [PATCH v11 00/21] xfs: online scrub xref support Darrick J. Wong
2017-12-23 0:42 ` [PATCH 01/21] xfs: ignore agfl read errors when not scrubbing agfl Darrick J. Wong
2018-01-05 1:12 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 02/21] xfs: catch a few more error codes when scrubbing secondary sb Darrick J. Wong
2018-01-05 1:17 ` Dave Chinner
2018-01-05 1:24 ` Darrick J. Wong
2018-01-05 2:10 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 03/21] xfs: xfs_scrub_bmap should use for_each_xfs_iext Darrick J. Wong
2018-01-05 1:17 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 04/21] xfs: always grab transaction when scrubbing inode Darrick J. Wong
2018-01-05 1:18 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 05/21] xfs: distinguish between corrupt inode and invalid inum in xfs_scrub_get_inode Darrick J. Wong
2018-01-05 1:23 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 06/21] xfs: add scrub cross-referencing helpers for the free space btrees Darrick J. Wong
2018-01-05 1:29 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 07/21] xfs: add scrub cross-referencing helpers for the inode btrees Darrick J. Wong
2018-01-05 1:36 ` Dave Chinner
2018-01-05 2:19 ` Darrick J. Wong
2018-01-05 21:51 ` [PATCH v2 " Darrick J. Wong
2018-01-16 23:05 ` Darrick J. Wong
2018-01-17 0:36 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 08/21] xfs: add scrub cross-referencing helpers for the rmap btrees Darrick J. Wong
2018-01-05 1:40 ` Dave Chinner
2018-01-05 2:49 ` Darrick J. Wong
2018-01-05 3:38 ` Dave Chinner
2018-01-05 21:53 ` [PATCH v2 " Darrick J. Wong
2018-01-06 20:46 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 09/21] xfs: add scrub cross-referencing helpers for the refcount btrees Darrick J. Wong
2018-01-05 1:41 ` Dave Chinner
2017-12-23 0:43 ` [PATCH 10/21] xfs: set up scrub cross-referencing helpers Darrick J. Wong
2018-01-05 2:08 ` Dave Chinner
2018-01-05 3:05 ` Darrick J. Wong
2018-01-05 21:54 ` [PATCH v2 " Darrick J. Wong
2018-01-16 23:06 ` Darrick J. Wong
2018-01-17 0:41 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 11/21] xfs: fix a few erroneous process_error calls in the scrubbers Darrick J. Wong
2018-01-05 2:11 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 12/21] xfs: check btree block ownership with bnobt/rmapbt when scrubbing btree Darrick J. Wong
2018-01-05 2:24 ` Dave Chinner
2018-01-05 2:53 ` Darrick J. Wong
2018-01-05 3:39 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 13/21] xfs: introduce scrubber cross-referencing stubs Darrick J. Wong
2018-01-08 23:36 ` Dave Chinner
2018-01-08 23:59 ` Darrick J. Wong
2018-01-09 21:00 ` [PATCH v2 " Darrick J. Wong
2018-01-10 0:12 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 14/21] xfs: cross-reference with the bnobt Darrick J. Wong
2018-01-08 23:51 ` Dave Chinner
2018-01-09 0:34 ` Darrick J. Wong
2018-01-09 0:57 ` Dave Chinner
2018-01-09 21:15 ` [PATCH v2 " Darrick J. Wong
2018-01-10 0:15 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 15/21] xfs: cross-reference bnobt records with cntbt Darrick J. Wong
2018-01-08 23:55 ` Dave Chinner
2018-01-09 0:37 ` Darrick J. Wong
2018-01-09 21:20 ` [PATCH v2 " Darrick J. Wong
2018-01-10 0:19 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 16/21] xfs: cross-reference inode btrees during scrub Darrick J. Wong
2018-01-09 21:22 ` [PATCH v2 " Darrick J. Wong
2018-01-15 22:17 ` Dave Chinner
2018-01-16 6:30 ` Darrick J. Wong [this message]
2018-01-16 23:23 ` [PATCH v3 " Darrick J. Wong
2018-01-17 0:44 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 17/21] xfs: cross-reference reverse-mapping btree Darrick J. Wong
2018-01-09 21:24 ` [PATCH v2 " Darrick J. Wong
2018-01-15 23:04 ` Dave Chinner
2018-01-16 6:38 ` Darrick J. Wong
2018-01-16 23:25 ` [PATCH v3 " Darrick J. Wong
2018-01-17 0:52 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 18/21] xfs: cross-reference the rmapbt data with the refcountbt Darrick J. Wong
2018-01-09 21:25 ` [PATCH v2 " Darrick J. Wong
2018-01-15 23:49 ` Dave Chinner
2018-01-16 6:49 ` Darrick J. Wong
2018-01-16 19:47 ` Darrick J. Wong
2018-01-16 23:26 ` [PATCH v3 " Darrick J. Wong
2018-01-17 1:00 ` Dave Chinner
2018-01-17 1:11 ` Darrick J. Wong
2017-12-23 0:44 ` [PATCH 19/21] xfs: cross-reference refcount btree during scrub Darrick J. Wong
2018-01-09 21:25 ` [PATCH v2 " Darrick J. Wong
2018-01-16 2:44 ` Dave Chinner
2018-01-16 6:52 ` Darrick J. Wong
2018-01-16 20:26 ` Darrick J. Wong
2018-01-16 23:27 ` [PATCH v3 " Darrick J. Wong
2018-01-17 1:02 ` Dave Chinner
2017-12-23 0:44 ` [PATCH 20/21] xfs: cross-reference the realtime bitmap Darrick J. Wong
2018-01-09 21:26 ` [PATCH v2 " Darrick J. Wong
2018-01-16 2:57 ` Dave Chinner
2018-01-16 6:55 ` Darrick J. Wong
2018-01-16 23:27 ` [PATCH v3 " Darrick J. Wong
2018-01-17 1:03 ` Dave Chinner
2017-12-23 0:45 ` [PATCH 21/21] xfs: cross-reference the block mappings when possible Darrick J. Wong
2018-01-09 21:26 ` [PATCH v2 " Darrick J. Wong
2018-01-16 2:58 ` Dave Chinner
2018-01-16 6:55 ` Darrick J. Wong
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=20180116063018.GG5602@magnolia \
--to=darrick.wong@oracle.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).