From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: david@fromorbit.com, linux-fsdevel@vger.kernel.org,
vishal.l.verma@intel.com, xfs@oss.sgi.com
Subject: Re: [PATCH 06/47] xfs: during btree split, save new block key & ptr for future insertion
Date: Tue, 26 Jul 2016 12:36:16 -0400 [thread overview]
Message-ID: <20160726163615.GD31917@bfoster.bfoster> (raw)
In-Reply-To: <146907699965.25461.15978861148226786001.stgit@birch.djwong.org>
On Wed, Jul 20, 2016 at 09:56:39PM -0700, Darrick J. Wong wrote:
> When a btree block has to be split, we pass the new block's ptr from
> xfs_btree_split() back to xfs_btree_insert() via a pointer parameter;
> however, we pass the block's key through the cursor's record. It is a
> little weird to "initialize" a record from a key since the non-key
> attributes will have garbage values.
>
> When we go to add support for interval queries, we have to be able to
> pass the lowest and highest keys accessible via a pointer. There's no
> clean way to pass this back through the cursor's record field.
> Therefore, pass the key directly back to xfs_btree_insert() the same
> way that we pass the btree_ptr.
>
> As a bonus, we no longer need init_rec_from_key and can drop it from the
> codebase.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_alloc_btree.c | 12 -----------
> fs/xfs/libxfs/xfs_bmap_btree.c | 12 -----------
> fs/xfs/libxfs/xfs_btree.c | 40 +++++++++++++++++++-------------------
> fs/xfs/libxfs/xfs_btree.h | 2 --
> fs/xfs/libxfs/xfs_ialloc_btree.c | 10 ----------
> 5 files changed, 20 insertions(+), 56 deletions(-)
>
>
...
> diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
> index f5ff95a..8d8e362 100644
> --- a/fs/xfs/libxfs/xfs_btree.c
> +++ b/fs/xfs/libxfs/xfs_btree.c
...
> @@ -2945,7 +2943,7 @@ xfs_btree_insrec(
> #endif
>
> XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
> - XFS_BTREE_TRACE_ARGIPR(cur, level, *ptrp, recp);
> + XFS_BTREE_TRACE_ARGIPR(cur, level, *ptrp, &rec);
>
We haven't changed the type between recp and rec, but now we're passing
a reference (not that it really matters here). Otherwise looks good:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> ncur = NULL;
>
> @@ -2970,9 +2968,6 @@ xfs_btree_insrec(
> return 0;
> }
>
> - /* Make a key out of the record data to be inserted, and save it. */
> - cur->bc_ops->init_key_from_rec(&key, recp);
> -
> optr = ptr;
>
> XFS_BTREE_STATS_INC(cur, insrec);
> @@ -2989,10 +2984,10 @@ xfs_btree_insrec(
> /* Check that the new entry is being inserted in the right place. */
> if (ptr <= numrecs) {
> if (level == 0) {
> - ASSERT(cur->bc_ops->recs_inorder(cur, recp,
> + ASSERT(cur->bc_ops->recs_inorder(cur, rec,
> xfs_btree_rec_addr(cur, ptr, block)));
> } else {
> - ASSERT(cur->bc_ops->keys_inorder(cur, &key,
> + ASSERT(cur->bc_ops->keys_inorder(cur, key,
> xfs_btree_key_addr(cur, ptr, block)));
> }
> }
> @@ -3005,7 +3000,7 @@ xfs_btree_insrec(
> xfs_btree_set_ptr_null(cur, &nptr);
> if (numrecs == cur->bc_ops->get_maxrecs(cur, level)) {
> error = xfs_btree_make_block_unfull(cur, level, numrecs,
> - &optr, &ptr, &nptr, &ncur, &nrec, stat);
> + &optr, &ptr, &nptr, &ncur, &nkey, stat);
> if (error || *stat == 0)
> goto error0;
> }
> @@ -3055,7 +3050,7 @@ xfs_btree_insrec(
> #endif
>
> /* Now put the new data in, bump numrecs and log it. */
> - xfs_btree_copy_keys(cur, kp, &key, 1);
> + xfs_btree_copy_keys(cur, kp, key, 1);
> xfs_btree_copy_ptrs(cur, pp, ptrp, 1);
> numrecs++;
> xfs_btree_set_numrecs(block, numrecs);
> @@ -3076,7 +3071,7 @@ xfs_btree_insrec(
> xfs_btree_shift_recs(cur, rp, 1, numrecs - ptr + 1);
>
> /* Now put the new data in, bump numrecs and log it. */
> - xfs_btree_copy_recs(cur, rp, recp, 1);
> + xfs_btree_copy_recs(cur, rp, rec, 1);
> xfs_btree_set_numrecs(block, ++numrecs);
> xfs_btree_log_recs(cur, bp, ptr, numrecs);
> #ifdef DEBUG
> @@ -3092,7 +3087,7 @@ xfs_btree_insrec(
>
> /* If we inserted at the start of a block, update the parents' keys. */
> if (optr == 1) {
> - error = xfs_btree_updkey(cur, &key, level + 1);
> + error = xfs_btree_updkey(cur, key, level + 1);
> if (error)
> goto error0;
> }
> @@ -3102,7 +3097,7 @@ xfs_btree_insrec(
> * we are at the far right edge of the tree, update it.
> */
> if (xfs_btree_is_lastrec(cur, block, level)) {
> - cur->bc_ops->update_lastrec(cur, block, recp,
> + cur->bc_ops->update_lastrec(cur, block, rec,
> ptr, LASTREC_INSREC);
> }
>
> @@ -3112,7 +3107,7 @@ xfs_btree_insrec(
> */
> *ptrp = nptr;
> if (!xfs_btree_ptr_is_null(cur, &nptr)) {
> - *recp = nrec;
> + *key = nkey;
> *curp = ncur;
> }
>
> @@ -3143,6 +3138,7 @@ xfs_btree_insert(
> union xfs_btree_ptr nptr; /* new block number (split result) */
> struct xfs_btree_cur *ncur; /* new cursor (split result) */
> struct xfs_btree_cur *pcur; /* previous level's cursor */
> + union xfs_btree_key key; /* key of block to insert */
> union xfs_btree_rec rec; /* record to insert */
>
> level = 0;
> @@ -3150,7 +3146,10 @@ xfs_btree_insert(
> pcur = cur;
>
> xfs_btree_set_ptr_null(cur, &nptr);
> +
> + /* Make a key out of the record data to be inserted, and save it. */
> cur->bc_ops->init_rec_from_cur(cur, &rec);
> + cur->bc_ops->init_key_from_rec(&key, &rec);
>
> /*
> * Loop going up the tree, starting at the leaf level.
> @@ -3162,7 +3161,8 @@ xfs_btree_insert(
> * Insert nrec/nptr into this level of the tree.
> * Note if we fail, nptr will be null.
> */
> - error = xfs_btree_insrec(pcur, level, &nptr, &rec, &ncur, &i);
> + error = xfs_btree_insrec(pcur, level, &nptr, &rec, &key,
> + &ncur, &i);
> if (error) {
> if (pcur != cur)
> xfs_btree_del_cursor(pcur, XFS_BTREE_ERROR);
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 785a996..b4f3035 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -158,8 +158,6 @@ struct xfs_btree_ops {
> /* init values of btree structures */
> void (*init_key_from_rec)(union xfs_btree_key *key,
> union xfs_btree_rec *rec);
> - void (*init_rec_from_key)(union xfs_btree_key *key,
> - union xfs_btree_rec *rec);
> void (*init_rec_from_cur)(struct xfs_btree_cur *cur,
> union xfs_btree_rec *rec);
> void (*init_ptr_from_cur)(struct xfs_btree_cur *cur,
> diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
> index 89c21d7..88da2ad 100644
> --- a/fs/xfs/libxfs/xfs_ialloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
> @@ -146,14 +146,6 @@ xfs_inobt_init_key_from_rec(
> }
>
> STATIC void
> -xfs_inobt_init_rec_from_key(
> - union xfs_btree_key *key,
> - union xfs_btree_rec *rec)
> -{
> - rec->inobt.ir_startino = key->inobt.ir_startino;
> -}
> -
> -STATIC void
> xfs_inobt_init_rec_from_cur(
> struct xfs_btree_cur *cur,
> union xfs_btree_rec *rec)
> @@ -314,7 +306,6 @@ static const struct xfs_btree_ops xfs_inobt_ops = {
> .get_minrecs = xfs_inobt_get_minrecs,
> .get_maxrecs = xfs_inobt_get_maxrecs,
> .init_key_from_rec = xfs_inobt_init_key_from_rec,
> - .init_rec_from_key = xfs_inobt_init_rec_from_key,
> .init_rec_from_cur = xfs_inobt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_inobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
> @@ -336,7 +327,6 @@ static const struct xfs_btree_ops xfs_finobt_ops = {
> .get_minrecs = xfs_inobt_get_minrecs,
> .get_maxrecs = xfs_inobt_get_maxrecs,
> .init_key_from_rec = xfs_inobt_init_key_from_rec,
> - .init_rec_from_key = xfs_inobt_init_rec_from_key,
> .init_rec_from_cur = xfs_inobt_init_rec_from_cur,
> .init_ptr_from_cur = xfs_finobt_init_ptr_from_cur,
> .key_diff = xfs_inobt_key_diff,
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-07-26 16:36 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 4:55 [PATCH v7 00/47] xfs: add reverse mapping support Darrick J. Wong
2016-07-21 4:56 ` [PATCH 01/47] vfs: fix return type of ioctl_file_dedupe_range Darrick J. Wong
2016-08-01 6:33 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 02/47] vfs: support FS_XFLAG_REFLINK and FS_XFLAG_COWEXTSIZE Darrick J. Wong
2016-08-01 6:33 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 03/47] xfs: fix attr shortform structure alignment on cris Darrick J. Wong
2016-07-26 16:36 ` Brian Foster
2016-08-01 6:34 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 04/47] xfs: fix locking of the rt bitmap/summary inodes Darrick J. Wong
2016-07-26 16:36 ` Brian Foster
2016-07-28 18:58 ` Darrick J. Wong
2016-08-01 6:34 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 05/47] xfs: set *stat=1 after iroot realloc Darrick J. Wong
2016-07-26 16:36 ` Brian Foster
2016-08-01 6:35 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 06/47] xfs: during btree split, save new block key & ptr for future insertion Darrick J. Wong
2016-07-26 16:36 ` Brian Foster [this message]
2016-08-01 6:37 ` Christoph Hellwig
2016-07-21 4:56 ` [PATCH 07/47] xfs: add function pointers for get/update keys to the btree Darrick J. Wong
2016-07-26 19:09 ` Brian Foster
2016-07-28 19:13 ` Darrick J. Wong
2016-07-28 19:46 ` [PATCH v2 " Darrick J. Wong
2016-08-01 15:57 ` Brian Foster
2016-08-01 17:54 ` Darrick J. Wong
2016-08-01 6:39 ` [PATCH " Christoph Hellwig
2016-08-01 17:33 ` Darrick J. Wong
2016-08-02 12:23 ` Christoph Hellwig
2016-08-03 0:12 ` Darrick J. Wong
2016-07-21 4:56 ` [PATCH 08/47] xfs: support btrees with overlapping intervals for keys Darrick J. Wong
2016-08-01 6:48 ` Christoph Hellwig
2016-08-01 19:11 ` Darrick J. Wong
2016-08-02 12:03 ` Christoph Hellwig
2016-08-03 3:29 ` Darrick J. Wong
2016-08-02 14:04 ` Brian Foster
2016-08-03 1:06 ` Dave Chinner
2016-08-01 17:47 ` Brian Foster
2016-08-01 19:18 ` Darrick J. Wong
2016-07-21 4:56 ` [PATCH 09/47] xfs: introduce interval queries on btrees Darrick J. Wong
2016-08-01 8:00 ` Christoph Hellwig
2016-07-21 4:57 ` [PATCH 10/47] xfs: refactor btree owner change into a separate visit-blocks function Darrick J. Wong
2016-08-01 6:50 ` Christoph Hellwig
2016-07-21 4:57 ` [PATCH 11/47] xfs: move deferred operations into a separate file Darrick J. Wong
2016-08-01 7:08 ` Christoph Hellwig
2016-08-01 8:02 ` Christoph Hellwig
2016-08-02 22:39 ` Dave Chinner
2016-08-03 9:16 ` Christoph Hellwig
2016-08-03 22:57 ` Dave Chinner
2016-08-04 16:00 ` Christoph Hellwig
2016-08-04 23:44 ` Dave Chinner
2016-08-02 17:30 ` Brian Foster
2016-07-21 4:57 ` [PATCH 12/47] xfs: add tracepoints for the deferred ops mechanism Darrick J. Wong
2016-07-21 4:57 ` [PATCH 13/47] xfs: clean up typedef usage in the EFI/EFD handling code Darrick J. Wong
2016-08-01 7:09 ` Christoph Hellwig
2016-07-21 4:57 ` [PATCH 14/47] xfs: enable the xfs_defer mechanism to process extents to free Darrick J. Wong
2016-08-01 7:09 ` Christoph Hellwig
2016-08-02 17:30 ` Brian Foster
2016-07-21 4:57 ` [PATCH 15/47] xfs: rework xfs_bmap_free callers to use xfs_defer_ops Darrick J. Wong
2016-08-02 17:30 ` Brian Foster
2016-07-21 4:57 ` [PATCH 16/47] xfs: change xfs_bmap_{finish, cancel, init, free} -> xfs_defer_* Darrick J. Wong
2016-08-02 17:30 ` Brian Foster
2016-08-02 20:47 ` Darrick J. Wong
2016-07-21 4:57 ` [PATCH 17/47] xfs: rename flist/free_list to dfops Darrick J. Wong
2016-08-02 17:30 ` Brian Foster
2016-07-21 4:58 ` [PATCH 18/47] xfs: refactor redo intent item processing Darrick J. Wong
2016-08-01 8:10 ` Christoph Hellwig
2016-08-02 20:35 ` Darrick J. Wong
2016-08-02 18:47 ` Brian Foster
2016-07-21 4:58 ` [PATCH 19/47] xfs: add tracepoints and error injection for deferred extent freeing Darrick J. Wong
2016-08-02 18:48 ` Brian Foster
2016-08-02 20:24 ` Darrick J. Wong
2016-08-02 21:38 ` Brian Foster
2016-08-02 22:43 ` Darrick J. Wong
2016-07-21 4:58 ` [PATCH 20/47] xfs: increase XFS_BTREE_MAXLEVELS to fit the rmapbt Darrick J. Wong
2016-08-02 18:48 ` Brian Foster
2016-08-02 20:06 ` Darrick J. Wong
2016-08-02 21:38 ` Brian Foster
2016-07-21 4:58 ` [PATCH 21/47] xfs: introduce rmap btree definitions Darrick J. Wong
2016-07-21 4:58 ` [PATCH 22/47] xfs: add rmap btree stats infrastructure Darrick J. Wong
2016-07-21 4:58 ` [PATCH 23/47] xfs: rmap btree add more reserved blocks Darrick J. Wong
2016-07-21 4:58 ` [PATCH 24/47] xfs: add owner field to extent allocation and freeing Darrick J. Wong
2016-07-21 4:58 ` [PATCH 25/47] xfs: introduce rmap extent operation stubs Darrick J. Wong
2016-07-21 4:58 ` [PATCH 26/47] xfs: define the on-disk rmap btree format Darrick J. Wong
2016-07-21 4:59 ` [PATCH 27/47] xfs: add rmap btree growfs support Darrick J. Wong
2016-07-21 4:59 ` [PATCH 28/47] xfs: rmap btree transaction reservations Darrick J. Wong
2016-07-21 4:59 ` [PATCH 29/47] xfs: rmap btree requires more reserved free space Darrick J. Wong
2016-07-21 4:59 ` [PATCH 30/47] xfs: add rmap btree operations Darrick J. Wong
2016-07-21 4:59 ` [PATCH 31/47] xfs: support overlapping intervals in the rmap btree Darrick J. Wong
2016-07-21 4:59 ` [PATCH 32/47] xfs: teach rmapbt to support interval queries Darrick J. Wong
2016-07-21 4:59 ` [PATCH 33/47] xfs: add tracepoints for the rmap functions Darrick J. Wong
2016-07-21 4:59 ` [PATCH 34/47] xfs: add an extent to the rmap btree Darrick J. Wong
2016-07-21 4:59 ` [PATCH 35/47] xfs: remove an extent from " Darrick J. Wong
2016-07-21 5:00 ` [PATCH 36/47] xfs: convert unwritten status of reverse mappings Darrick J. Wong
2016-08-03 2:00 ` Dave Chinner
2016-07-21 5:00 ` [PATCH 37/47] xfs: add rmap btree insert and delete helpers Darrick J. Wong
2016-07-21 5:00 ` [PATCH 38/47] xfs: create rmap update intent log items Darrick J. Wong
2016-08-01 7:12 ` Christoph Hellwig
2016-08-01 18:08 ` Darrick J. Wong
2016-07-21 5:00 ` [PATCH 39/47] xfs: log rmap intent items Darrick J. Wong
2016-07-21 5:00 ` [PATCH 40/47] xfs: enable the xfs_defer mechanism to process rmaps to update Darrick J. Wong
2016-07-21 5:00 ` [PATCH 41/47] xfs: propagate bmap updates to rmapbt Darrick J. Wong
2016-07-21 5:00 ` [PATCH 42/47] xfs: add rmap btree geometry feature flag Darrick J. Wong
2016-07-21 5:00 ` [PATCH 43/47] xfs: add rmap btree block detection to log recovery Darrick J. Wong
2016-07-21 5:00 ` [PATCH 44/47] xfs: disable XFS_IOC_SWAPEXT when rmap btree is enabled Darrick J. Wong
2016-07-21 5:01 ` [PATCH 45/47] xfs: don't update rmapbt when fixing agfl Darrick J. Wong
2016-07-21 5:01 ` [PATCH 46/47] xfs: enable the rmap btree functionality Darrick J. Wong
2016-07-21 5:01 ` [PATCH 47/47] xfs: introduce the XFS_IOC_GETFSMAP ioctl Darrick J. Wong
2016-07-23 4:28 ` [PATCH v2 " Darrick J. Wong
2016-08-03 19:45 ` [PATCH v7 00/47] xfs: add reverse mapping support Mark Fasheh
2016-08-03 20:55 ` Darrick J. Wong
2016-08-04 0:58 ` Darrick J. Wong
2016-08-04 2:18 ` Mark Fasheh
2016-08-04 15:48 ` Darrick J. Wong
2016-08-04 23:50 ` Dave Chinner
2016-08-05 0:49 ` Darrick J. Wong
2016-08-05 7:01 ` Artem Bityutskiy
2016-08-05 7:22 ` Darrick J. Wong
2016-08-05 10:49 ` Dave Chinner
2016-08-05 11:57 ` Artem Bityutskiy
2016-08-05 22:26 ` Dave Chinner
2016-08-05 18:36 ` Mark Fasheh
2016-08-05 22:39 ` Dave Chinner
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=20160726163615.GD31917@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
--cc=xfs@oss.sgi.com \
/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).