From: Nikolay Borisov <nborisov@suse.com>
To: Qu Wenruo <wqu@suse.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v3 7/9] btrfs: extent-tree: Use btrfs_ref to refactor btrfs_inc_extent_ref()
Date: Mon, 11 Feb 2019 15:04:38 +0200 [thread overview]
Message-ID: <15a41104-eb91-2a90-3237-0234da65c260@suse.com> (raw)
In-Reply-To: <20190211051653.3167-8-wqu@suse.com>
On 11.02.19 г. 7:16 ч., Qu Wenruo wrote:
> Now we don't need to play the dirty game of reusing @owner for tree block
> level.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/ctree.h | 5 ++--
> fs/btrfs/extent-tree.c | 57 ++++++++++++++++++++++++------------------
> fs/btrfs/file.c | 17 +++++++++----
> fs/btrfs/inode.c | 10 +++++---
> fs/btrfs/ioctl.c | 15 ++++++-----
> fs/btrfs/relocation.c | 42 ++++++++++++++++++++-----------
> fs/btrfs/tree-log.c | 11 +++++---
> 7 files changed, 96 insertions(+), 61 deletions(-)
>
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index 9306925b6790..cd90f7cbc8f2 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -41,6 +41,7 @@ extern struct kmem_cache *btrfs_bit_radix_cachep;
> extern struct kmem_cache *btrfs_path_cachep;
> extern struct kmem_cache *btrfs_free_space_cachep;
> struct btrfs_ordered_sum;
> +struct btrfs_ref;
>
> #define BTRFS_MAGIC 0x4D5F53665248425FULL /* ascii _BHRfS_M, no null */
>
> @@ -2755,9 +2756,7 @@ int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,
> void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info);
> int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
> int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
> - struct btrfs_root *root,
> - u64 bytenr, u64 num_bytes, u64 parent,
> - u64 root_objectid, u64 owner, u64 offset);
> + struct btrfs_ref *generic_ref);
>
> int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans);
> int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 5419266d3e5d..d08186ec6410 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -2044,35 +2044,28 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,
>
> /* Can return -ENOMEM */
> int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
> - struct btrfs_root *root,
> - u64 bytenr, u64 num_bytes, u64 parent,
> - u64 root_objectid, u64 owner, u64 offset)
> + struct btrfs_ref *generic_ref)
> {
> - struct btrfs_fs_info *fs_info = root->fs_info;
> - struct btrfs_ref generic_ref = { 0 };
> + struct btrfs_fs_info *fs_info = trans->fs_info;
> int old_ref_mod, new_ref_mod;
> int ret;
>
> - BUG_ON(owner < BTRFS_FIRST_FREE_OBJECTID &&
> - root_objectid == BTRFS_TREE_LOG_OBJECTID);
> + ASSERT(generic_ref->type != BTRFS_REF_NOT_SET &&
> + generic_ref->action);
> + BUG_ON(generic_ref->type == BTRFS_REF_METADATA &&
> + generic_ref->tree_ref.root == BTRFS_TREE_LOG_OBJECTID);
>
> - btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_REF, bytenr,
> - num_bytes, parent);
> - generic_ref.real_root = root->root_key.objectid;
> - if (owner < BTRFS_FIRST_FREE_OBJECTID) {
> - btrfs_init_tree_ref(&generic_ref, (int)owner, root_objectid);
> - ret = btrfs_add_delayed_tree_ref(trans, &generic_ref,
> + if (generic_ref->type == BTRFS_REF_METADATA)
> + ret = btrfs_add_delayed_tree_ref(trans, generic_ref,
> NULL, &old_ref_mod, &new_ref_mod);
> - } else {
> - btrfs_init_data_ref(&generic_ref, root_objectid, owner, offset);
> - ret = btrfs_add_delayed_data_ref(trans, &generic_ref, 0,
> + else
> + ret = btrfs_add_delayed_data_ref(trans, generic_ref, 0,
> &old_ref_mod, &new_ref_mod);
> - }
>
> - btrfs_ref_tree_mod(fs_info, &generic_ref);
> + btrfs_ref_tree_mod(fs_info, generic_ref);
>
> if (ret == 0 && old_ref_mod < 0 && new_ref_mod >= 0)
> - add_pinned_bytes(fs_info, &generic_ref);
> + add_pinned_bytes(fs_info, generic_ref);
>
> return ret;
> }
> @@ -3246,7 +3239,10 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
> u32 nritems;
> struct btrfs_key key;
> struct btrfs_file_extent_item *fi;
> + struct btrfs_ref generic_ref = { 0 };
> + bool for_reloc = btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC);
> int i;
> + int action;
> int level;
> int ret = 0;
>
> @@ -3264,6 +3260,10 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
> parent = buf->start;
> else
> parent = 0;
> + if (inc)
> + action = BTRFS_ADD_DELAYED_REF;
> + else
> + action = BTRFS_DROP_DELAYED_REF;
>
> for (i = 0; i < nritems; i++) {
> if (level == 0) {
> @@ -3281,10 +3281,14 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
>
> num_bytes = btrfs_file_extent_disk_num_bytes(buf, fi);
> key.offset -= btrfs_file_extent_offset(buf, fi);
> + btrfs_init_generic_ref(&generic_ref, action, bytenr,
> + num_bytes, parent);
> + generic_ref.real_root = root->root_key.objectid;
> + btrfs_init_data_ref(&generic_ref, ref_root, key.objectid,
> + key.offset);
> + generic_ref.skip_qgroup = for_reloc;
> if (inc)
> - ret = btrfs_inc_extent_ref(trans, root, bytenr,
> - num_bytes, parent, ref_root,
> - key.objectid, key.offset);
> + ret = btrfs_inc_extent_ref(trans, &generic_ref);
> else
> ret = btrfs_free_extent(trans, root, bytenr,
> num_bytes, parent, ref_root,
> @@ -3294,10 +3298,13 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
> } else {
> bytenr = btrfs_node_blockptr(buf, i);
> num_bytes = fs_info->nodesize;
> + btrfs_init_generic_ref(&generic_ref, action, bytenr,
> + num_bytes, parent);
> + generic_ref.real_root = root->root_key.objectid;
> + btrfs_init_tree_ref(&generic_ref, level - 1, ref_root);
> + generic_ref.skip_qgroup = for_reloc;
> if (inc)
> - ret = btrfs_inc_extent_ref(trans, root, bytenr,
> - num_bytes, parent, ref_root,
> - level - 1, 0);
> + ret = btrfs_inc_extent_ref(trans, &generic_ref);
> else
> ret = btrfs_free_extent(trans, root, bytenr,
> num_bytes, parent, ref_root,
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 34fe8a58b0e9..2aba5980f522 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -754,6 +754,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
> struct btrfs_fs_info *fs_info = root->fs_info;
> struct extent_buffer *leaf;
> struct btrfs_file_extent_item *fi;
> + struct btrfs_ref ref = { 0 };
> struct btrfs_key key;
> struct btrfs_key new_key;
> u64 ino = btrfs_ino(BTRFS_I(inode));
> @@ -909,11 +910,14 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans,
> btrfs_mark_buffer_dirty(leaf);
>
> if (update_refs && disk_bytenr > 0) {
> - ret = btrfs_inc_extent_ref(trans, root,
> - disk_bytenr, num_bytes, 0,
> + btrfs_init_generic_ref(&ref,
> + BTRFS_ADD_DELAYED_REF,
> + disk_bytenr, num_bytes, 0);
> + btrfs_init_data_ref(&ref,
> root->root_key.objectid,
> new_key.objectid,
> start - extent_offset);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> BUG_ON(ret); /* -ENOMEM */
> }
> key.offset = start;
> @@ -1142,6 +1146,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
> struct extent_buffer *leaf;
> struct btrfs_path *path;
> struct btrfs_file_extent_item *fi;
> + struct btrfs_ref ref = { 0 };
> struct btrfs_key key;
> struct btrfs_key new_key;
> u64 bytenr;
> @@ -1287,9 +1292,11 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,
> extent_end - split);
> btrfs_mark_buffer_dirty(leaf);
>
> - ret = btrfs_inc_extent_ref(trans, root, bytenr, num_bytes,
> - 0, root->root_key.objectid,
> - ino, orig_offset);
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, bytenr,
> + num_bytes, 0);
> + btrfs_init_data_ref(&ref, root->root_key.objectid, ino,
> + orig_offset);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> if (ret) {
> btrfs_abort_transaction(trans, ret);
> goto out;
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 3f180b857e20..95535ba375f8 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -2531,6 +2531,7 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
> struct btrfs_file_extent_item *item;
> struct btrfs_ordered_extent *ordered;
> struct btrfs_trans_handle *trans;
> + struct btrfs_ref ref = { 0 };
> struct btrfs_root *root;
> struct btrfs_key key;
> struct extent_buffer *leaf;
> @@ -2701,10 +2702,11 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
> inode_add_bytes(inode, len);
> btrfs_release_path(path);
>
> - ret = btrfs_inc_extent_ref(trans, root, new->bytenr,
> - new->disk_len, 0,
> - backref->root_id, backref->inum,
> - new->file_pos); /* start - extent_offset */
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new->bytenr,
> + new->disk_len, 0);
> + btrfs_init_data_ref(&ref, backref->root_id, backref->inum,
> + new->file_pos); /* start - extent_offset */
> + ret = btrfs_inc_extent_ref(trans, &ref);
> if (ret) {
> btrfs_abort_transaction(trans, ret);
> goto out_free_path;
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 3f9d7be30bf4..f5d49a92f53c 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -3755,13 +3755,16 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
> datal);
>
> if (disko) {
> + struct btrfs_ref ref = { 0 };
> inode_add_bytes(inode, datal);
> - ret = btrfs_inc_extent_ref(trans,
> - root,
> - disko, diskl, 0,
> - root->root_key.objectid,
> - btrfs_ino(BTRFS_I(inode)),
> - new_key.offset - datao);
> + btrfs_init_generic_ref(&ref,
> + BTRFS_ADD_DELAYED_REF, disko,
> + diskl, 0);
> + btrfs_init_data_ref(&ref,
> + root->root_key.objectid,
> + btrfs_ino(BTRFS_I(inode)),
> + new_key.offset - datao);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> if (ret) {
> btrfs_abort_transaction(trans,
> ret);
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 70b85a593b7b..b82d532d8e5e 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -1643,6 +1643,8 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
>
> nritems = btrfs_header_nritems(leaf);
> for (i = 0; i < nritems; i++) {
> + struct btrfs_ref ref = { 0 };
> +
> cond_resched();
> btrfs_item_key_to_cpu(leaf, &key, i);
> if (key.type != BTRFS_EXTENT_DATA_KEY)
> @@ -1703,10 +1705,12 @@ int replace_file_extents(struct btrfs_trans_handle *trans,
> dirty = 1;
>
> key.offset -= btrfs_file_extent_offset(leaf, fi);
> - ret = btrfs_inc_extent_ref(trans, root, new_bytenr,
> - num_bytes, parent,
> - btrfs_header_owner(leaf),
> - key.objectid, key.offset);
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new_bytenr,
> + num_bytes, parent);
> + ref.real_root = root->root_key.objectid;
> + btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),
> + key.objectid, key.offset);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> if (ret) {
> btrfs_abort_transaction(trans, ret);
> break;
> @@ -1756,6 +1760,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
> struct btrfs_fs_info *fs_info = dest->fs_info;
> struct extent_buffer *eb;
> struct extent_buffer *parent;
> + struct btrfs_ref ref = { 0 };
> struct btrfs_key key;
> u64 old_bytenr;
> u64 new_bytenr;
> @@ -1914,13 +1919,17 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
> path->slots[level], old_ptr_gen);
> btrfs_mark_buffer_dirty(path->nodes[level]);
>
> - ret = btrfs_inc_extent_ref(trans, src, old_bytenr,
> - blocksize, path->nodes[level]->start,
> - src->root_key.objectid, level - 1, 0);
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, old_bytenr,
> + blocksize, path->nodes[level]->start);
> + ref.skip_qgroup = true;
> + btrfs_init_tree_ref(&ref, level - 1, src->root_key.objectid);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> BUG_ON(ret);
> - ret = btrfs_inc_extent_ref(trans, dest, new_bytenr,
> - blocksize, 0, dest->root_key.objectid,
> - level - 1, 0);
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF, new_bytenr,
> + blocksize, 0);
> + ref.skip_qgroup = true;
> + btrfs_init_tree_ref(&ref, level - 1, dest->root_key.objectid);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> BUG_ON(ret);
>
> ret = btrfs_free_extent(trans, src, new_bytenr, blocksize,
> @@ -2719,6 +2728,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
> rc->backref_cache.path[node->level] = node;
> list_for_each_entry(edge, &node->upper, list[LOWER]) {
> struct btrfs_key first_key;
> + struct btrfs_ref ref = { 0 };
>
> cond_resched();
>
> @@ -2816,11 +2826,13 @@ static int do_relocation(struct btrfs_trans_handle *trans,
> trans->transid);
> btrfs_mark_buffer_dirty(upper->eb);
>
> - ret = btrfs_inc_extent_ref(trans, root,
> - node->eb->start, blocksize,
> - upper->eb->start,
> - btrfs_header_owner(upper->eb),
> - node->level, 0);
> + btrfs_init_generic_ref(&ref, BTRFS_ADD_DELAYED_REF,
> + node->eb->start, blocksize,
> + upper->eb->start);
> + ref.real_root = root->root_key.objectid;
> + btrfs_init_tree_ref(&ref, node->level,
> + btrfs_header_owner(upper->eb));
> + ret = btrfs_inc_extent_ref(trans, &ref);
> BUG_ON(ret);
>
> ret = btrfs_drop_subtree(trans, root, eb, upper->eb);
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 1a69a45ae926..2e62f275ae5b 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -693,9 +693,11 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
> goto out;
>
> if (ins.objectid > 0) {
> + struct btrfs_ref ref = { 0 };
> u64 csum_start;
> u64 csum_end;
> LIST_HEAD(ordered_sums);
> +
> /*
> * is this extent already allocated in the extent
> * allocation tree? If so, just add a reference
> @@ -703,10 +705,13 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
> ret = btrfs_lookup_data_extent(fs_info, ins.objectid,
> ins.offset);
> if (ret == 0) {
> - ret = btrfs_inc_extent_ref(trans, root,
> - ins.objectid, ins.offset,
> - 0, root->root_key.objectid,
> + btrfs_init_generic_ref(&ref,
> + BTRFS_ADD_DELAYED_REF,
> + ins.objectid, ins.offset, 0);
> + btrfs_init_data_ref(&ref,
> + root->root_key.objectid,
> key->objectid, offset);
> + ret = btrfs_inc_extent_ref(trans, &ref);
> if (ret)
> goto out;
> } else {
>
next prev parent reply other threads:[~2019-02-11 13:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 5:16 [PATCH v3 0/9] btrfs: Refactor delayed ref parameter list Qu Wenruo
2019-02-11 5:16 ` [PATCH v3 1/9] btrfs: delayed-ref: Introduce better documented delayed ref structures Qu Wenruo
2019-02-11 12:55 ` Nikolay Borisov
2019-02-11 13:23 ` Qu Wenruo
2019-02-11 14:20 ` Nikolay Borisov
2019-02-11 14:23 ` Qu Wenruo
2019-02-18 5:00 ` Qu Wenruo
2019-02-18 6:59 ` Su Yue
2019-02-11 5:16 ` [PATCH v3 2/9] btrfs: extent-tree: Open-code process_func in __btrfs_mod_ref Qu Wenruo
2019-02-11 5:16 ` [PATCH v3 3/9] btrfs: delayed-ref: Use btrfs_ref to refactor btrfs_add_delayed_tree_ref() Qu Wenruo
2019-02-11 12:58 ` Nikolay Borisov
2019-02-11 5:16 ` [PATCH v3 4/9] btrfs: delayed-ref: Use btrfs_ref to refactor btrfs_add_delayed_data_ref() Qu Wenruo
2019-02-11 12:59 ` Nikolay Borisov
2019-02-11 5:16 ` [PATCH v3 5/9] btrfs: ref-verify: Use btrfs_ref to refactor btrfs_ref_tree_mod() Qu Wenruo
2019-02-11 13:00 ` Nikolay Borisov
2019-02-11 5:16 ` [PATCH v3 6/9] btrfs: extent-tree: Use btrfs_ref to refactor add_pinned_bytes() Qu Wenruo
2019-02-11 5:16 ` [PATCH v3 7/9] btrfs: extent-tree: Use btrfs_ref to refactor btrfs_inc_extent_ref() Qu Wenruo
2019-02-11 13:04 ` Nikolay Borisov [this message]
2019-02-11 5:16 ` [PATCH v3 8/9] btrfs: extent-tree: Use btrfs_ref to refactor btrfs_free_extent() Qu Wenruo
2019-02-11 13:05 ` Nikolay Borisov
2019-02-11 5:16 ` [PATCH v3 9/9] btrfs: qgroup: Don't scan leaf if we're modifying reloc tree Qu Wenruo
2019-04-03 16:29 ` [PATCH v3 0/9] btrfs: Refactor delayed ref parameter list David Sterba
2019-04-04 1:12 ` Qu Wenruo
2019-04-04 6:44 ` Qu Wenruo
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=15a41104-eb91-2a90-3237-0234da65c260@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.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).