From: Chandan Babu R <chandan.babu@oracle.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: chandanrlinux@gmail.com, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 05/14] xfs: stricter btree height checking when scanning for btree roots
Date: Mon, 20 Sep 2021 15:24:26 +0530 [thread overview]
Message-ID: <87pmt37est.fsf@debian-BULLSEYE-live-builder-AMD64> (raw)
In-Reply-To: <163192857728.416199.11679791890386351921.stgit@magnolia>
On 18 Sep 2021 at 06:59, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> When we're scanning for btree roots to rebuild the AG headers, make sure
> that the proposed tree does not exceed the maximum height for that btree
> type (and not just XFS_BTREE_MAXLEVELS).
>
Looks good.
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> fs/xfs/scrub/agheader_repair.c | 8 +++++++-
> fs/xfs/scrub/repair.h | 3 +++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
>
> diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
> index 0f8deee66f15..05c27149b65d 100644
> --- a/fs/xfs/scrub/agheader_repair.c
> +++ b/fs/xfs/scrub/agheader_repair.c
> @@ -122,7 +122,7 @@ xrep_check_btree_root(
> xfs_agnumber_t agno = sc->sm->sm_agno;
>
> return xfs_verify_agbno(mp, agno, fab->root) &&
> - fab->height <= XFS_BTREE_MAXLEVELS;
> + fab->height <= fab->maxlevels;
> }
>
> /*
> @@ -339,18 +339,22 @@ xrep_agf(
> [XREP_AGF_BNOBT] = {
> .rmap_owner = XFS_RMAP_OWN_AG,
> .buf_ops = &xfs_bnobt_buf_ops,
> + .maxlevels = sc->mp->m_ag_maxlevels,
> },
> [XREP_AGF_CNTBT] = {
> .rmap_owner = XFS_RMAP_OWN_AG,
> .buf_ops = &xfs_cntbt_buf_ops,
> + .maxlevels = sc->mp->m_ag_maxlevels,
> },
> [XREP_AGF_RMAPBT] = {
> .rmap_owner = XFS_RMAP_OWN_AG,
> .buf_ops = &xfs_rmapbt_buf_ops,
> + .maxlevels = sc->mp->m_rmap_maxlevels,
> },
> [XREP_AGF_REFCOUNTBT] = {
> .rmap_owner = XFS_RMAP_OWN_REFC,
> .buf_ops = &xfs_refcountbt_buf_ops,
> + .maxlevels = sc->mp->m_refc_maxlevels,
> },
> [XREP_AGF_END] = {
> .buf_ops = NULL,
> @@ -881,10 +885,12 @@ xrep_agi(
> [XREP_AGI_INOBT] = {
> .rmap_owner = XFS_RMAP_OWN_INOBT,
> .buf_ops = &xfs_inobt_buf_ops,
> + .maxlevels = M_IGEO(sc->mp)->inobt_maxlevels,
> },
> [XREP_AGI_FINOBT] = {
> .rmap_owner = XFS_RMAP_OWN_INOBT,
> .buf_ops = &xfs_finobt_buf_ops,
> + .maxlevels = M_IGEO(sc->mp)->inobt_maxlevels,
> },
> [XREP_AGI_END] = {
> .buf_ops = NULL
> diff --git a/fs/xfs/scrub/repair.h b/fs/xfs/scrub/repair.h
> index 3bb152d52a07..840f74ec431c 100644
> --- a/fs/xfs/scrub/repair.h
> +++ b/fs/xfs/scrub/repair.h
> @@ -44,6 +44,9 @@ struct xrep_find_ag_btree {
> /* in: buffer ops */
> const struct xfs_buf_ops *buf_ops;
>
> + /* in: maximum btree height */
> + unsigned int maxlevels;
> +
> /* out: the highest btree block found and the tree height */
> xfs_agblock_t root;
> unsigned int height;
--
chandan
next prev parent reply other threads:[~2021-09-20 10:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 1:29 [PATCHSET RFC chandan 00/14] xfs: support dynamic btree cursor height Darrick J. Wong
2021-09-18 1:29 ` [PATCH 01/14] xfs: remove xfs_btree_cur_t typedef Darrick J. Wong
2021-09-20 9:53 ` Chandan Babu R
2021-09-21 8:36 ` Christoph Hellwig
2021-09-18 1:29 ` [PATCH 02/14] xfs: don't allocate scrub contexts on the stack Darrick J. Wong
2021-09-20 9:53 ` Chandan Babu R
2021-09-20 17:39 ` Darrick J. Wong
2021-09-21 8:39 ` Christoph Hellwig
2021-09-18 1:29 ` [PATCH 03/14] xfs: dynamically allocate btree scrub context structure Darrick J. Wong
2021-09-20 9:53 ` Chandan Babu R
2021-09-21 8:43 ` Christoph Hellwig
2021-09-22 16:17 ` Darrick J. Wong
2021-09-18 1:29 ` [PATCH 04/14] xfs: stricter btree height checking when looking for errors Darrick J. Wong
2021-09-20 9:54 ` Chandan Babu R
2021-09-18 1:29 ` [PATCH 05/14] xfs: stricter btree height checking when scanning for btree roots Darrick J. Wong
2021-09-20 9:54 ` Chandan Babu R [this message]
2021-09-18 1:29 ` [PATCH 06/14] xfs: check that bc_nlevels never overflows Darrick J. Wong
2021-09-20 9:54 ` Chandan Babu R
2021-09-21 8:44 ` Christoph Hellwig
2021-09-18 1:29 ` [PATCH 07/14] xfs: support dynamic btree cursor heights Darrick J. Wong
2021-09-20 9:55 ` Chandan Babu R
2021-09-21 8:49 ` Christoph Hellwig
2021-09-18 1:29 ` [PATCH 08/14] xfs: refactor btree cursor allocation function Darrick J. Wong
2021-09-20 9:55 ` Chandan Babu R
2021-09-21 8:53 ` Christoph Hellwig
2021-09-18 1:29 ` [PATCH 09/14] xfs: fix maxlevels comparisons in the btree staging code Darrick J. Wong
2021-09-20 9:55 ` Chandan Babu R
2021-09-21 8:56 ` Christoph Hellwig
2021-09-22 15:59 ` Darrick J. Wong
2021-09-18 1:30 ` [PATCH 10/14] xfs: encode the max btree height in the cursor Darrick J. Wong
2021-09-20 9:55 ` Chandan Babu R
2021-09-21 8:57 ` Christoph Hellwig
2021-09-18 1:30 ` [PATCH 11/14] xfs: dynamically allocate cursors based on maxlevels Darrick J. Wong
2021-09-20 9:56 ` Chandan Babu R
2021-09-20 23:06 ` Dave Chinner
2021-09-20 23:36 ` Dave Chinner
2021-09-21 9:03 ` Christoph Hellwig
2021-09-22 18:55 ` Darrick J. Wong
2021-09-22 17:38 ` Darrick J. Wong
2021-09-22 23:10 ` Dave Chinner
2021-09-23 1:58 ` Darrick J. Wong
2021-09-23 5:56 ` Chandan Babu R
2021-09-18 1:30 ` [PATCH 12/14] xfs: compute actual maximum btree height for critical reservation calculation Darrick J. Wong
2021-09-20 9:56 ` Chandan Babu R
2021-09-18 1:30 ` [PATCH 13/14] xfs: compute the maximum height of the rmap btree when reflink enabled Darrick J. Wong
2021-09-20 9:56 ` Chandan Babu R
2021-09-18 1:30 ` [PATCH 14/14] xfs: kill XFS_BTREE_MAXLEVELS Darrick J. Wong
2021-09-20 9:57 ` 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=87pmt37est.fsf@debian-BULLSEYE-live-builder-AMD64 \
--to=chandan.babu@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=djwong@kernel.org \
--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).