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 10/14] xfs: encode the max btree height in the cursor
Date: Mon, 20 Sep 2021 15:25:50 +0530 [thread overview]
Message-ID: <87bl4n7eqh.fsf@debian-BULLSEYE-live-builder-AMD64> (raw)
In-Reply-To: <163192860467.416199.3157992669504614921.stgit@magnolia>
On 18 Sep 2021 at 07:00, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Encode the maximum btree height in the cursor, since we're soon going to
> allow smaller cursors for AG btrees and larger cursors for file btrees.
>
Looks good.
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 2 +-
> fs/xfs/libxfs/xfs_btree.c | 5 +++--
> fs/xfs/libxfs/xfs_btree.h | 3 ++-
> fs/xfs/libxfs/xfs_btree_staging.c | 10 +++++-----
> 4 files changed, 11 insertions(+), 9 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 644b956301b6..2ae5bf9a74e7 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -239,7 +239,7 @@ xfs_bmap_get_bp(
> if (!cur)
> return NULL;
>
> - for (i = 0; i < XFS_BTREE_MAXLEVELS; i++) {
> + for (i = 0; i < cur->bc_maxlevels; i++) {
> if (!cur->bc_levels[i].bp)
> break;
> if (xfs_buf_daddr(cur->bc_levels[i].bp) == bno)
> diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
> index 70785004414e..2486ba22c01d 100644
> --- a/fs/xfs/libxfs/xfs_btree.c
> +++ b/fs/xfs/libxfs/xfs_btree.c
> @@ -2933,7 +2933,7 @@ xfs_btree_new_iroot(
> be16_add_cpu(&block->bb_level, 1);
> xfs_btree_set_numrecs(block, 1);
> cur->bc_nlevels++;
> - ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS);
> + ASSERT(cur->bc_nlevels <= cur->bc_maxlevels);
> cur->bc_levels[level + 1].ptr = 1;
>
> kp = xfs_btree_key_addr(cur, 1, block);
> @@ -3097,7 +3097,7 @@ xfs_btree_new_root(
> xfs_btree_setbuf(cur, cur->bc_nlevels, nbp);
> cur->bc_levels[cur->bc_nlevels].ptr = nptr;
> cur->bc_nlevels++;
> - ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS);
> + ASSERT(cur->bc_nlevels <= cur->bc_maxlevels);
> *stat = 1;
> return 0;
> error0:
> @@ -4941,6 +4941,7 @@ xfs_btree_alloc_cursor(
> cur->bc_mp = mp;
> cur->bc_btnum = btnum;
> cur->bc_blocklog = mp->m_sb.sb_blocklog;
> + cur->bc_maxlevels = XFS_BTREE_MAXLEVELS;
>
> return cur;
> }
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 6540c4957c36..6075918efa0c 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -235,9 +235,10 @@ struct xfs_btree_cur
> struct xfs_mount *bc_mp; /* file system mount struct */
> const struct xfs_btree_ops *bc_ops;
> uint bc_flags; /* btree features - below */
> - union xfs_btree_irec bc_rec; /* current insert/search record value */
> + uint8_t bc_maxlevels; /* maximum levels for this btree type */
> uint8_t bc_nlevels; /* number of levels in the tree */
> uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */
> + union xfs_btree_irec bc_rec; /* current insert/search record value */
> xfs_btnum_t bc_btnum; /* identifies which btree type */
> int bc_statoff; /* offset of btre stats array */
>
> diff --git a/fs/xfs/libxfs/xfs_btree_staging.c b/fs/xfs/libxfs/xfs_btree_staging.c
> index cc56efc2b90a..dd75e208b543 100644
> --- a/fs/xfs/libxfs/xfs_btree_staging.c
> +++ b/fs/xfs/libxfs/xfs_btree_staging.c
> @@ -657,12 +657,12 @@ xfs_btree_bload_compute_geometry(
> * checking levels 0 and 1 here, so set bc_nlevels such that the btree
> * code doesn't interpret either as the root level.
> */
> - cur->bc_nlevels = XFS_BTREE_MAXLEVELS - 1;
> + cur->bc_nlevels = cur->bc_maxlevels - 1;
> xfs_btree_bload_ensure_slack(cur, &bbl->leaf_slack, 0);
> xfs_btree_bload_ensure_slack(cur, &bbl->node_slack, 1);
>
> bbl->nr_records = nr_this_level = nr_records;
> - for (cur->bc_nlevels = 1; cur->bc_nlevels <= XFS_BTREE_MAXLEVELS;) {
> + for (cur->bc_nlevels = 1; cur->bc_nlevels <= cur->bc_maxlevels;) {
> uint64_t level_blocks;
> uint64_t dontcare64;
> unsigned int level = cur->bc_nlevels - 1;
> @@ -703,7 +703,7 @@ xfs_btree_bload_compute_geometry(
> * block-based btree level.
> */
> cur->bc_nlevels++;
> - ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS);
> + ASSERT(cur->bc_nlevels <= cur->bc_maxlevels);
> xfs_btree_bload_level_geometry(cur, bbl, level,
> nr_this_level, &avg_per_block,
> &level_blocks, &dontcare64);
> @@ -719,14 +719,14 @@ xfs_btree_bload_compute_geometry(
>
> /* Otherwise, we need another level of btree. */
> cur->bc_nlevels++;
> - ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS);
> + ASSERT(cur->bc_nlevels <= cur->bc_maxlevels);
> }
>
> nr_blocks += level_blocks;
> nr_this_level = level_blocks;
> }
>
> - if (cur->bc_nlevels > XFS_BTREE_MAXLEVELS)
> + if (cur->bc_nlevels > cur->bc_maxlevels)
> return -EOVERFLOW;
>
> bbl->btree_height = cur->bc_nlevels;
--
chandan
next prev parent reply other threads:[~2021-09-20 10:11 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
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 [this message]
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=87bl4n7eqh.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.