From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents
Date: Fri, 29 May 2020 15:19:42 -0700 [thread overview]
Message-ID: <20200529221942.GV8230@magnolia> (raw)
In-Reply-To: <20200528170012.GE17794@bfoster>
On Thu, May 28, 2020 at 01:00:12PM -0400, Brian Foster wrote:
> On Tue, May 19, 2020 at 06:51:40PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Use extent records (not just raw fsbs) to track blocks that were lost
> > during btree construction. This makes it somewhat more efficient.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > repair/phase5.c | 61 ++++++++++++++++++++++++++++++++-----------------------
> > 1 file changed, 35 insertions(+), 26 deletions(-)
> >
> >
> > diff --git a/repair/phase5.c b/repair/phase5.c
> > index 72c6908a..22007275 100644
> > --- a/repair/phase5.c
> > +++ b/repair/phase5.c
> > @@ -45,6 +45,12 @@ struct bt_rebuild {
> > };
> > };
> >
> > +struct lost_fsb {
> > + xfs_fsblock_t fsbno;
> > + xfs_extlen_t len;
> > +};
> > +
>
> Looks reasonable at a glance, but could we call the above structure an
> extent and rename lost_fsbs to lost_extents or some such?
Ok. I suspect this ought to be converted to libfrog/bitmap from the
slab cursors and whatnot that it uses now.
--D
> Brian
>
> > +
> > /*
> > * extra metadata for the agi
> > */
> > @@ -314,21 +320,24 @@ static void
> > finish_rebuild(
> > struct xfs_mount *mp,
> > struct bt_rebuild *btr,
> > - struct xfs_slab *lost_fsb)
> > + struct xfs_slab *lost_fsbs)
> > {
> > struct xrep_newbt_resv *resv, *n;
> >
> > for_each_xrep_newbt_reservation(&btr->newbt, resv, n) {
> > - while (resv->used < resv->len) {
> > - xfs_fsblock_t fsb = resv->fsbno + resv->used;
> > - int error;
> > + struct lost_fsb lost;
> > + int error;
> >
> > - error = slab_add(lost_fsb, &fsb);
> > - if (error)
> > - do_error(
> > + if (resv->used == resv->len)
> > + continue;
> > +
> > + lost.fsbno = resv->fsbno + resv->used;
> > + lost.len = resv->len - resv->used;
> > + error = slab_add(lost_fsbs, &lost);
> > + if (error)
> > + do_error(
> > _("Insufficient memory saving lost blocks.\n"));
> > - resv->used++;
> > - }
> > + resv->used = resv->len;
> > }
> >
> > xrep_newbt_destroy(&btr->newbt, 0);
> > @@ -1036,7 +1045,7 @@ build_agf_agfl(
> > int lostblocks, /* # blocks that will be lost */
> > struct bt_rebuild *btr_rmap,
> > struct bt_rebuild *btr_refc,
> > - struct xfs_slab *lost_fsb)
> > + struct xfs_slab *lost_fsbs)
> > {
> > struct extent_tree_node *ext_ptr;
> > struct xfs_buf *agf_buf, *agfl_buf;
> > @@ -1253,7 +1262,7 @@ static void
> > phase5_func(
> > struct xfs_mount *mp,
> > xfs_agnumber_t agno,
> > - struct xfs_slab *lost_fsb)
> > + struct xfs_slab *lost_fsbs)
> > {
> > struct repair_ctx sc = { .mp = mp, };
> > struct agi_stat agi_stat = {0,};
> > @@ -1372,7 +1381,7 @@ _("unable to rebuild AG %u. Not enough free space in on-disk AG.\n"),
> > * set up agf and agfl
> > */
> > build_agf_agfl(mp, agno, &btr_bno, &btr_cnt, freeblks1, extra_blocks,
> > - &btr_rmap, &btr_refc, lost_fsb);
> > + &btr_rmap, &btr_refc, lost_fsbs);
> >
> > /*
> > * build inode allocation trees.
> > @@ -1387,15 +1396,15 @@ _("unable to rebuild AG %u. Not enough free space in on-disk AG.\n"),
> > /*
> > * tear down cursors
> > */
> > - finish_rebuild(mp, &btr_bno, lost_fsb);
> > - finish_rebuild(mp, &btr_cnt, lost_fsb);
> > - finish_rebuild(mp, &btr_ino, lost_fsb);
> > + finish_rebuild(mp, &btr_bno, lost_fsbs);
> > + finish_rebuild(mp, &btr_cnt, lost_fsbs);
> > + finish_rebuild(mp, &btr_ino, lost_fsbs);
> > if (xfs_sb_version_hasfinobt(&mp->m_sb))
> > - finish_rebuild(mp, &btr_fino, lost_fsb);
> > + finish_rebuild(mp, &btr_fino, lost_fsbs);
> > if (xfs_sb_version_hasrmapbt(&mp->m_sb))
> > - finish_rebuild(mp, &btr_rmap, lost_fsb);
> > + finish_rebuild(mp, &btr_rmap, lost_fsbs);
> > if (xfs_sb_version_hasreflink(&mp->m_sb))
> > - finish_rebuild(mp, &btr_refc, lost_fsb);
> > + finish_rebuild(mp, &btr_refc, lost_fsbs);
> >
> > /*
> > * release the incore per-AG bno/bcnt trees so the extent nodes
> > @@ -1414,19 +1423,19 @@ inject_lost_blocks(
> > {
> > struct xfs_trans *tp = NULL;
> > struct xfs_slab_cursor *cur = NULL;
> > - xfs_fsblock_t *fsb;
> > + struct lost_fsb *lost;
> > int error;
> >
> > error = init_slab_cursor(lost_fsbs, NULL, &cur);
> > if (error)
> > return error;
> >
> > - while ((fsb = pop_slab_cursor(cur)) != NULL) {
> > + while ((lost = pop_slab_cursor(cur)) != NULL) {
> > error = -libxfs_trans_alloc_rollable(mp, 16, &tp);
> > if (error)
> > goto out_cancel;
> >
> > - error = -libxfs_free_extent(tp, *fsb, 1,
> > + error = -libxfs_free_extent(tp, lost->fsbno, lost->len,
> > &XFS_RMAP_OINFO_ANY_OWNER, XFS_AG_RESV_NONE);
> > if (error)
> > goto out_cancel;
> > @@ -1447,7 +1456,7 @@ inject_lost_blocks(
> > void
> > phase5(xfs_mount_t *mp)
> > {
> > - struct xfs_slab *lost_fsb;
> > + struct xfs_slab *lost_fsbs;
> > xfs_agnumber_t agno;
> > int error;
> >
> > @@ -1490,12 +1499,12 @@ phase5(xfs_mount_t *mp)
> > if (sb_fdblocks_ag == NULL)
> > do_error(_("cannot alloc sb_fdblocks_ag buffers\n"));
> >
> > - error = init_slab(&lost_fsb, sizeof(xfs_fsblock_t));
> > + error = init_slab(&lost_fsbs, sizeof(struct lost_fsb));
> > if (error)
> > do_error(_("cannot alloc lost block slab\n"));
> >
> > for (agno = 0; agno < mp->m_sb.sb_agcount; agno++)
> > - phase5_func(mp, agno, lost_fsb);
> > + phase5_func(mp, agno, lost_fsbs);
> >
> > print_final_rpt();
> >
> > @@ -1538,10 +1547,10 @@ _("unable to add AG %u reverse-mapping data to btree.\n"), agno);
> > * Put blocks that were unnecessarily reserved for btree
> > * reconstruction back into the filesystem free space data.
> > */
> > - error = inject_lost_blocks(mp, lost_fsb);
> > + error = inject_lost_blocks(mp, lost_fsbs);
> > if (error)
> > do_error(_("Unable to reinsert lost blocks into filesystem.\n"));
> > - free_slab(&lost_fsb);
> > + free_slab(&lost_fsbs);
> >
> > bad_ino_btree = 0;
> >
> >
>
next prev parent reply other threads:[~2020-05-29 22:19 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 1:50 [PATCH v5 0/9] xfs_repair: use btree bulk loading Darrick J. Wong
2020-05-20 1:50 ` [PATCH 1/9] xfs_repair: port the online repair newbt structure Darrick J. Wong
2020-05-27 12:15 ` Brian Foster
2020-05-27 22:34 ` Darrick J. Wong
2020-05-28 15:08 ` Brian Foster
2020-05-29 21:01 ` Darrick J. Wong
2020-06-01 12:03 ` Brian Foster
2020-06-02 0:12 ` Darrick J. Wong
2020-05-20 1:50 ` [PATCH 2/9] xfs_repair: remove gratuitous code block in phase5 Darrick J. Wong
2020-05-27 12:15 ` Brian Foster
2020-05-20 1:51 ` [PATCH 3/9] xfs_repair: create a new class of btree rebuild cursors Darrick J. Wong
2020-05-27 12:18 ` Brian Foster
2020-05-27 22:07 ` Darrick J. Wong
2020-05-28 15:09 ` Brian Foster
2020-05-29 21:08 ` Darrick J. Wong
2020-05-20 1:51 ` [PATCH 4/9] xfs_repair: rebuild free space btrees with bulk loader Darrick J. Wong
2020-05-28 15:10 ` Brian Foster
2020-05-29 21:39 ` Darrick J. Wong
2020-06-01 12:05 ` Brian Foster
2020-06-02 0:21 ` Darrick J. Wong
2020-05-20 1:51 ` [PATCH 5/9] xfs_repair: rebuild inode " Darrick J. Wong
2020-05-28 15:11 ` Brian Foster
2020-05-29 22:18 ` Darrick J. Wong
2020-05-29 22:32 ` Darrick J. Wong
2020-05-20 1:51 ` [PATCH 6/9] xfs_repair: rebuild reverse mapping " Darrick J. Wong
2020-05-20 1:51 ` [PATCH 7/9] xfs_repair: rebuild refcount " Darrick J. Wong
2020-05-20 1:51 ` [PATCH 8/9] xfs_repair: remove old btree rebuild support code Darrick J. Wong
2020-05-20 1:51 ` [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents Darrick J. Wong
2020-05-28 17:00 ` Brian Foster
2020-05-29 22:19 ` Darrick J. Wong [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-09 16:31 [PATCH v4 0/9] xfs_repair: use btree bulk loading Darrick J. Wong
2020-05-09 16:32 ` [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents Darrick J. Wong
2020-03-04 3:29 [PATCH v3 0/9] xfs_repair: use btree bulk loading Darrick J. Wong
2020-03-04 3:30 ` [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents Darrick J. Wong
2020-01-01 1:21 [PATCH v2 0/9] xfs_repair: use btree bulk loading Darrick J. Wong
2020-01-01 1:22 ` [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents Darrick J. Wong
2019-10-29 23:45 [PATCH RFC 0/9] xfs_repair: use btree bulk loading Darrick J. Wong
2019-10-29 23:46 ` [PATCH 9/9] xfs_repair: track blocks lost during btree construction via extents 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=20200529221942.GV8230@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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).