From: Johannes Thumshirn <jth@kernel.org>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v3 2/5] btrfs: split RAID stripes on deletion
Date: Mon, 01 Jul 2024 12:25:16 +0200 [thread overview]
Message-ID: <20240701-b4-rst-updates-v3-2-e0437e1e04a6@kernel.org> (raw)
In-Reply-To: <20240701-b4-rst-updates-v3-0-e0437e1e04a6@kernel.org>
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
The current RAID stripe code assumes, that we will always remove a
whole stripe entry.
But if we're only removing a part of a RAID stripe we're hitting the
ASSERT()ion checking for this condition.
Instead of assuming the complete deletion of a RAID stripe, split the
stripe if we need to.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/ctree.c | 1 +
fs/btrfs/raid-stripe-tree.c | 100 +++++++++++++++++++++++++++++++++-----------
2 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index e33f9f5a228d..16f9cf6360a4 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3863,6 +3863,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/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
index 3020820dd6e2..64e36b46cbab 100644
--- a/fs/btrfs/raid-stripe-tree.c
+++ b/fs/btrfs/raid-stripe-tree.c
@@ -33,42 +33,94 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
if (!path)
return -ENOMEM;
- while (1) {
- key.objectid = start;
- key.type = BTRFS_RAID_STRIPE_KEY;
- key.offset = length;
+again:
+ key.objectid = start;
+ key.type = BTRFS_RAID_STRIPE_KEY;
+ key.offset = length;
- ret = btrfs_search_slot(trans, stripe_root, &key, path, -1, 1);
- if (ret < 0)
- break;
- if (ret > 0) {
- ret = 0;
- if (path->slots[0] == 0)
- break;
- path->slots[0]--;
- }
+ ret = btrfs_search_slot(trans, stripe_root, &key, path, -1, 1);
+ if (ret < 0)
+ goto out;
+ if (ret > 0) {
+ ret = 0;
+ if (path->slots[0] == 0)
+ goto out;
+ path->slots[0]--;
+ }
+
+ leaf = path->nodes[0];
+ slot = path->slots[0];
+ btrfs_item_key_to_cpu(leaf, &key, slot);
+ found_start = key.objectid;
+ found_end = found_start + key.offset;
+
+ /* That stripe ends before we start, we're done. */
+ if (found_end <= start)
+ goto out;
+
+ trace_btrfs_raid_extent_delete(fs_info, start, end,
+ found_start, found_end);
+
+ if (found_start < start) {
+ u64 diff = start - found_start;
+ struct btrfs_key new_key;
+ int num_stripes;
+ struct btrfs_stripe_extent *stripe_extent;
+
+ new_key.objectid = start;
+ new_key.type = BTRFS_RAID_STRIPE_KEY;
+ new_key.offset = length - diff;
+
+ ret = btrfs_duplicate_item(trans, stripe_root, path,
+ &new_key);
+ if (ret)
+ goto out;
leaf = path->nodes[0];
slot = path->slots[0];
- btrfs_item_key_to_cpu(leaf, &key, slot);
- found_start = key.objectid;
- found_end = found_start + key.offset;
- /* That stripe ends before we start, we're done. */
- if (found_end <= start)
- break;
+ num_stripes =
+ btrfs_num_raid_stripes(btrfs_item_size(leaf, slot));
+ stripe_extent =
+ btrfs_item_ptr(leaf, slot, struct btrfs_stripe_extent);
+
+ for (int i = 0; i < num_stripes; i++) {
+ struct btrfs_raid_stride *raid_stride =
+ &stripe_extent->strides[i];
+ u64 physical =
+ btrfs_raid_stride_physical(leaf, raid_stride);
+
+ btrfs_set_raid_stride_physical(leaf, raid_stride,
+ physical + diff);
+ }
+
+ btrfs_mark_buffer_dirty(trans, leaf);
+ btrfs_release_path(path);
+ goto again;
+ }
+
+ if (found_end > end) {
+ u64 diff = found_end - end;
+ struct btrfs_key new_key;
- trace_btrfs_raid_extent_delete(fs_info, start, end,
- found_start, found_end);
+ new_key.objectid = found_start;
+ new_key.type = BTRFS_RAID_STRIPE_KEY;
+ new_key.offset = length - diff;
- ASSERT(found_start >= start && found_end <= end);
- ret = btrfs_del_item(trans, stripe_root, path);
+ ret = btrfs_duplicate_item(trans, stripe_root, path,
+ &new_key);
if (ret)
- break;
+ goto out;
+ btrfs_mark_buffer_dirty(trans, leaf);
btrfs_release_path(path);
+ goto again;
+
}
+ ret = btrfs_del_item(trans, stripe_root, path);
+
+ out:
btrfs_free_path(path);
return ret;
}
--
2.43.0
next prev parent reply other threads:[~2024-07-01 10:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 10:25 [PATCH v3 0/5] btrfs: rst: updates for RAID stripe tree Johannes Thumshirn
2024-07-01 10:25 ` [PATCH v3 1/5] btrfs: replace stripe extents Johannes Thumshirn
2024-07-01 13:57 ` Josef Bacik
2024-07-01 15:08 ` Johannes Thumshirn
2024-07-01 20:34 ` Josef Bacik
2024-07-01 20:37 ` Josef Bacik
2024-07-02 5:41 ` Johannes Thumshirn
2024-07-01 10:25 ` Johannes Thumshirn [this message]
2024-07-01 14:07 ` [PATCH v3 2/5] btrfs: split RAID stripes on deletion Josef Bacik
2024-07-03 15:47 ` Johannes Thumshirn
2024-07-01 10:25 ` [PATCH v3 3/5] btrfs: stripe-tree: add selftests Johannes Thumshirn
2024-07-01 14:08 ` Josef Bacik
2024-07-01 15:09 ` Johannes Thumshirn
2024-07-01 10:25 ` [PATCH v3 4/5] btrfs: don't hold dev_replace rwsem over whole of btrfs_map_block Johannes Thumshirn
2024-07-01 14:13 ` Josef Bacik
2024-07-01 10:25 ` [PATCH v3 5/5] btrfs: rst: don't print tree dump in case lookup fails Johannes Thumshirn
2024-07-01 14:12 ` Josef Bacik
2024-07-01 15:03 ` Johannes Thumshirn
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=20240701-b4-rst-updates-v3-2-e0437e1e04a6@kernel.org \
--to=jth@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=johannes.thumshirn@wdc.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@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