From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Johannes Thumshirn <johannes.thumshirn@wdc.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [RFC ONLY 5/8] btrfs: add code to delete raid extent
Date: Tue, 17 May 2022 16:06:28 +0800 [thread overview]
Message-ID: <d16c5465-2c24-1ce1-9b51-be85cd96259b@gmx.com> (raw)
In-Reply-To: <b018704727883c27c3368f1cd3ba84daf682b733.1652711187.git.johannes.thumshirn@wdc.com>
On 2022/5/16 22:31, Johannes Thumshirn wrote:
> Add boilerplate code to delete entries from the raid-stripe-tree if the
> corresponding file extent got deleted.
>
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> ---
> fs/btrfs/ctree.c | 1 +
> fs/btrfs/extent-tree.c | 9 +++
> fs/btrfs/file.c | 1 -
> fs/btrfs/raid-stripe-tree.c | 111 ++++++++++++++++++++++++++++++++++++
> fs/btrfs/raid-stripe-tree.h | 8 +++
> 5 files changed, 129 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 1e24695ede0a..b7b4e421e9b8 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -3623,6 +3623,7 @@ static noinline int setup_leaf_for_split(struct btrfs_trans_handle *trans,
> btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
>
> BUG_ON(key.type != BTRFS_EXTENT_DATA_KEY &&
> + key.type != BTRFS_RAID_STRIPE_KEY &&
> key.type != BTRFS_EXTENT_CSUM_KEY);
>
> if (btrfs_leaf_free_space(leaf) >= ins_len)
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index f477035a2ac2..00af3e469881 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -36,6 +36,7 @@
> #include "rcu-string.h"
> #include "zoned.h"
> #include "dev-replace.h"
> +#include "raid-stripe-tree.h"
>
> #undef SCRAMBLE_DELAYED_REFS
>
> @@ -3199,6 +3200,14 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
> }
> }
Considering we're already in __btrfs_free_extents(), and the branch
we're in is already for refs == 1 case, which means we're already the
last one owning the file extent (and its stripe tree entry).
>
> + if (is_data) {
> + ret = btrfs_delete_raid_extent(trans, bytenr, num_bytes);
> + if (ret) {
> + btrfs_abort_transaction(trans, ret);
> + return ret;
> + }
> + }
> +
> ret = btrfs_del_items(trans, extent_root, path, path->slots[0],
> num_to_del);
> if (ret) {
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index bd329316945f..6021188dcb9a 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -1009,7 +1009,6 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,
> btrfs_release_path(path);
> out:
> args->drop_end = found ? min(args->end, last_end) : args->end;
> -
> return ret;
> }
>
> diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
> index 426066bd7c0d..370ea68fe343 100644
> --- a/fs/btrfs/raid-stripe-tree.c
> +++ b/fs/btrfs/raid-stripe-tree.c
> @@ -6,6 +6,117 @@
> #include "raid-stripe-tree.h"
> #include "volumes.h"
>
> +int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start,
> + u64 length)
> +{
> + struct btrfs_fs_info *fs_info = trans->fs_info;
> + struct btrfs_root *stripe_root = fs_info->stripe_root;
> + struct btrfs_path *path;
> + struct btrfs_key stripe_key;
> + struct btrfs_key found_key;
> + struct extent_buffer *leaf;
> + u64 end = start + length;
> + u64 found_start;
> + u64 found_end;
> + int slot;
> + int ret;
> +
> + if (!stripe_root)
> + return 0;
> +
> + stripe_key.objectid = start;
> + stripe_key.type = BTRFS_RAID_STRIPE_KEY;
> + stripe_key.offset = end;
> +
> + path = btrfs_alloc_path();
> + if (!path)
> + return -ENOMEM;
> +
> + ret = btrfs_search_slot(trans, stripe_root, &stripe_key, path, -1, 1);
> + if (ret < 0)
> + goto out;
> + if (ret == 0)
> + goto delete;
> +
> + leaf = path->nodes[0];
> + slot = path->slots[0];
> + btrfs_item_key_to_cpu(leaf, &found_key, slot);
> + found_start = found_key.objectid;
> + found_end = found_start + found_key.offset;
> +
> + /*
> + * | -- range to drop --|
> + * | ---------- extent ---------- |
> + */
Thus I believe we don't need those complex checking.
The call site has make sure we're the last one owning the file extent,
and since raid stripe is 1:1 mapped to the full extent (not just part of
a data extent, like btrfs_file_extent_item can do), we should be safe to
just do an ASSERT() without the complex split.
Thus, I guess to be extra accurate, the 1:1 mapping is between an (data)
EXTENT_ITEM and a raid stripe?
Thanks,
Qu
> +front_split:
> + if (start > found_start) {
> + struct btrfs_key front_key;
> + struct btrfs_dp_stripe *raid_stripe;
> + struct extent_buffer *front_leaf;
> + struct btrfs_stripe_extent *stripe_extent;
> + int num_stripes;
> + int i;
> +
> + front_key.objectid = found_start + length;
> + front_key.type = BTRFS_RAID_STRIPE_KEY;
> + front_key.offset = found_end - length;
> +
> + num_stripes = btrfs_num_raid_stripes(btrfs_item_size(leaf, slot));
> +
> + ret = btrfs_duplicate_item(trans, stripe_root, path, &front_key);
> + if (ret == -EAGAIN) {
> + btrfs_release_path(path);
> + goto front_split;
> + }
> + if (ret < 0)
> + goto out;
> + front_leaf = path->nodes[0];
> +
> + raid_stripe = btrfs_item_ptr(leaf, slot, struct btrfs_dp_stripe);
> + stripe_extent = &raid_stripe->extents;
> + for (i = 0; i < num_stripes; i++) {
> + u64 physical;
> +
> + physical = btrfs_stripe_extent_offset(leaf, stripe_extent);
> + btrfs_set_stripe_extent_offset(front_leaf, stripe_extent,
> + physical + length);
> + stripe_extent++;
> + }
> +
> + btrfs_mark_buffer_dirty(front_leaf);
> + }
> +
> + /*
> + * | -- range to drop --|
> + * | ---------- extent ---------- |
> + */
> +tail_split:
> + if (end < found_end) {
> + struct btrfs_key tail_key;
> +
> +
> + tail_key.objectid = start;
> + tail_key.type = BTRFS_RAID_STRIPE_KEY;
> + tail_key.offset = found_end - end;
> +
> + ret = btrfs_duplicate_item(trans, stripe_root, path, &tail_key);
> + if (ret == -EAGAIN) {
> + btrfs_release_path(path);
> + goto tail_split;
> + }
> + if (ret < 0)
> + goto out;
> + btrfs_mark_buffer_dirty(path->nodes[0]);
> + }
> +
> +delete:
> + ret = btrfs_del_item(trans, stripe_root, path);
> +out:
> + btrfs_free_path(path);
> + return ret;
> +
> +}
> +
> static void btrfs_insert_raid_extent(struct btrfs_trans_handle *trans,
> struct btrfs_io_context *bioc)
> {
> diff --git a/fs/btrfs/raid-stripe-tree.h b/fs/btrfs/raid-stripe-tree.h
> index 320a110ecc66..766634df8601 100644
> --- a/fs/btrfs/raid-stripe-tree.h
> +++ b/fs/btrfs/raid-stripe-tree.h
> @@ -5,8 +5,16 @@
>
> #include "volumes.h"
>
> +int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start,
> + u64 length);
> void btrfs_raid_stripe_tree_fn(struct work_struct *work);
>
> +static inline int btrfs_num_raid_stripes(u32 item_size)
> +{
> + return item_size - offsetof(struct btrfs_dp_stripe, extents) /
> + sizeof(struct btrfs_stripe_extent);
> +}
> +
> static inline bool btrfs_need_stripe_tree_update(struct btrfs_io_context *bioc)
> {
> u64 type = bioc->map_type & BTRFS_BLOCK_GROUP_TYPE_MASK;
next prev parent reply other threads:[~2022-05-17 8:06 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 14:31 [RFC ONLY 0/8] btrfs: introduce raid-stripe-tree Johannes Thumshirn
2022-05-16 14:31 ` [RFC ONLY 1/8] btrfs: add raid stripe tree definitions Johannes Thumshirn
2022-05-17 7:39 ` Qu Wenruo
2022-05-17 7:45 ` Johannes Thumshirn
2022-05-17 7:56 ` Qu Wenruo
2022-05-16 14:31 ` [RFC ONLY 2/8] btrfs: move btrfs_io_context to volumes.h Johannes Thumshirn
2022-05-17 7:42 ` Qu Wenruo
2022-05-17 7:51 ` Johannes Thumshirn
2022-05-17 7:58 ` Qu Wenruo
2022-05-17 8:01 ` Johannes Thumshirn
2022-05-16 14:31 ` [RFC ONLY 3/8] btrfs: read raid-stripe-tree from disk Johannes Thumshirn
2022-05-17 8:09 ` Qu Wenruo
2022-05-17 8:13 ` Johannes Thumshirn
2022-05-17 8:28 ` Qu Wenruo
2022-05-18 11:29 ` Johannes Thumshirn
2022-05-19 8:36 ` Qu Wenruo
2022-05-19 8:39 ` Johannes Thumshirn
2022-05-19 10:37 ` Qu Wenruo
2022-05-19 11:44 ` Johannes Thumshirn
2022-05-19 11:48 ` Qu Wenruo
2022-05-19 11:53 ` Johannes Thumshirn
2022-05-19 13:26 ` Qu Wenruo
2022-05-19 13:49 ` Johannes Thumshirn
2022-05-19 22:56 ` Qu Wenruo
2022-05-20 8:27 ` Johannes Thumshirn
2022-05-16 14:31 ` [RFC ONLY 4/8] btrfs: add boilerplate code to insert raid extent Johannes Thumshirn
2022-05-17 7:53 ` Qu Wenruo
2022-05-17 8:00 ` Qu Wenruo
2022-05-17 8:05 ` Johannes Thumshirn
2022-05-17 8:09 ` Qu Wenruo
2022-05-16 14:31 ` [RFC ONLY 5/8] btrfs: add code to delete " Johannes Thumshirn
2022-05-17 8:06 ` Qu Wenruo [this message]
2022-05-17 8:10 ` Johannes Thumshirn
2022-05-17 8:14 ` Qu Wenruo
2022-05-17 8:20 ` Johannes Thumshirn
2022-05-17 8:31 ` Qu Wenruo
2022-05-16 14:31 ` [RFC ONLY 6/8] btrfs: add code to read " Johannes Thumshirn
2022-05-16 14:55 ` Josef Bacik
2022-05-16 14:31 ` [RFC ONLY 7/8] btrfs: zoned: allow zoned RAID1 Johannes Thumshirn
2022-05-16 14:31 ` [RFC ONLY 8/8] btrfs: add raid stripe tree pretty printer Johannes Thumshirn
2022-05-16 14:58 ` [RFC ONLY 0/8] btrfs: introduce raid-stripe-tree Josef Bacik
2022-05-16 15:04 ` Johannes Thumshirn
2022-05-16 15:10 ` Josef Bacik
2022-05-16 15:47 ` Johannes Thumshirn
2022-05-17 7:23 ` Nikolay Borisov
2022-05-17 7:31 ` Qu Wenruo
2022-05-17 7:41 ` Johannes Thumshirn
2022-05-17 7:32 ` Johannes Thumshirn
2022-07-13 10:54 ` RAID56 discussion related to RST. (Was "Re: [RFC ONLY 0/8] btrfs: introduce raid-stripe-tree") Qu Wenruo
2022-07-13 11:43 ` Johannes Thumshirn
2022-07-13 12:01 ` Qu Wenruo
2022-07-13 12:42 ` Johannes Thumshirn
2022-07-13 13:47 ` Qu Wenruo
2022-07-13 14:01 ` Johannes Thumshirn
2022-07-13 15:24 ` Lukas Straub
2022-07-13 15:28 ` Johannes Thumshirn
2022-07-14 1:08 ` Qu Wenruo
2022-07-14 7:08 ` Johannes Thumshirn
2022-07-14 7:32 ` Qu Wenruo
2022-07-14 7:46 ` Johannes Thumshirn
2022-07-14 7:53 ` Qu Wenruo
2022-07-15 17:54 ` Goffredo Baroncelli
2022-07-15 19:08 ` Thiago Ramon
2022-07-16 0:34 ` Qu Wenruo
2022-07-16 11:11 ` Qu Wenruo
2022-07-16 13:52 ` Thiago Ramon
2022-07-16 14:26 ` Goffredo Baroncelli
2022-07-17 17:58 ` Goffredo Baroncelli
2022-07-17 0:30 ` Qu Wenruo
2022-07-17 15:18 ` Thiago Ramon
2022-07-17 22:01 ` Qu Wenruo
2022-07-17 23:00 ` Zygo Blaxell
2022-07-18 1:04 ` Qu Wenruo
2022-07-15 20:14 ` Chris Murphy
2022-07-18 7:33 ` Johannes Thumshirn
2022-07-18 8:03 ` Qu Wenruo
2022-07-18 21:49 ` Forza
2022-07-19 1:19 ` Qu Wenruo
2022-07-21 14:51 ` Forza
2022-07-24 11:27 ` Qu Wenruo
2022-07-25 0:00 ` Zygo Blaxell
2022-07-25 0:25 ` Qu Wenruo
2022-07-25 5:41 ` Zygo Blaxell
2022-07-25 7:49 ` Qu Wenruo
2022-07-25 19:58 ` Goffredo Baroncelli
2022-07-25 21:29 ` Qu Wenruo
2022-07-18 7:30 ` Johannes Thumshirn
2022-07-19 18:58 ` Goffredo Baroncelli
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=d16c5465-2c24-1ce1-9b51-be85cd96259b@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-btrfs@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