From: Chandan Babu R <chandanrlinux@gmail.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: sandeen@sandeen.net, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/4] xfs_scrub: detect infinite loops when scanning inodes
Date: Mon, 18 Jan 2021 10:27:11 +0530 [thread overview]
Message-ID: <87ft2yn8pk.fsf@garuda> (raw)
In-Reply-To: <161076032453.3386689.17554565086009869010.stgit@magnolia>
On 16 Jan 2021 at 06:55, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> During an inode scan (aka phase 3) when we're scanning the inode btree
> to find files to check, make sure that each invocation of inumbers
> actually gives us an inobt record with a startino that's at least as
> large as what we asked for so that we always make forward progress.
>
Looks good to me,
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> scrub/inodes.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>
> diff --git a/scrub/inodes.c b/scrub/inodes.c
> index 63865113..cc73da7f 100644
> --- a/scrub/inodes.c
> +++ b/scrub/inodes.c
> @@ -119,6 +119,7 @@ scan_ag_inodes(
> struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx;
> struct xfs_bulkstat *bs;
> struct xfs_inumbers *inumbers;
> + uint64_t nextino = cvt_agino_to_ino(&ctx->mnt, agno, 0);
> int i;
> int error;
> int stale_count = 0;
> @@ -153,6 +154,21 @@ scan_ag_inodes(
> /* Find the inode chunk & alloc mask */
> error = -xfrog_inumbers(&ctx->mnt, ireq);
> while (!error && !si->aborted && ireq->hdr.ocount > 0) {
> + /*
> + * Make sure that we always make forward progress while we
> + * scan the inode btree.
> + */
> + if (nextino > inumbers->xi_startino) {
> + str_corrupt(ctx, descr,
> + _("AG %u inode btree is corrupt near agino %lu, got %lu"), agno,
> + cvt_ino_to_agino(&ctx->mnt, nextino),
> + cvt_ino_to_agino(&ctx->mnt,
> + ireq->inumbers[0].xi_startino));
> + si->aborted = true;
> + break;
> + }
> + nextino = ireq->hdr.ino;
> +
> /*
> * We can have totally empty inode chunks on filesystems where
> * there are more than 64 inodes per block. Skip these.
--
chandan
next prev parent reply other threads:[~2021-01-18 4:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 1:25 [PATCHSET v2 0/4] various: random fixes Darrick J. Wong
2021-01-16 1:25 ` [PATCH 1/4] misc: fix valgrind complaints Darrick J. Wong
2021-01-18 4:33 ` Chandan Babu R
2021-01-19 2:55 ` Chaitanya Kulkarni
2021-01-16 1:25 ` [PATCH 2/4] xfs_scrub: detect infinite loops when scanning inodes Darrick J. Wong
2021-01-18 4:57 ` Chandan Babu R [this message]
2021-01-16 1:25 ` [PATCH 3/4] xfs_scrub: load and unload libicu properly Darrick J. Wong
2021-01-18 4:45 ` Chandan Babu R
2021-01-18 19:19 ` [PATCH v2.1 " Darrick J. Wong
2021-01-16 1:25 ` [PATCH 4/4] xfs_scrub: handle concurrent directory updates during name scan Darrick J. Wong
2021-01-18 4:47 ` Chandan Babu R
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=87ft2yn8pk.fsf@garuda \
--to=chandanrlinux@gmail.com \
--cc=djwong@kernel.org \
--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).