From: Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
To: Qu Wenruo <quwenruo.btrfs@gmx.com>,
Johannes Thumshirn <jth@kernel.org>, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 1/7] btrfs: replace stripe extents
Date: Mon, 8 Jul 2024 11:43:28 +0000 [thread overview]
Message-ID: <9d7f7acf-8077-481c-926e-d29b4b90d46f@wdc.com> (raw)
In-Reply-To: <e51d0042-ec10-4a50-bd76-3d3d3cbc9bfc@gmx.com>
On 06.07.24 01:19, Qu Wenruo wrote:
>
>
> 在 2024/7/6 00:43, Johannes Thumshirn 写道:
>> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>>
>> If we can't insert a stripe extent in the RAID stripe tree, because
>> the key that points to the specific position in the stripe tree is
>> already existing, we have to remove the item and then replace it by a
>> new item.
>>
>> This can happen for example on device replace operations.
>
> In that case, can we just modify the targeted dev stripe?
>
> Or do we have other call sites that can lead to such conflicts?
>
> As I'm not that confident if such replace behavior would mask some real
> problems.
I've just tested the following patch and it looks like it's working:
diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
index e6f7a234b8f6..7bfd8654c110 100644
--- a/fs/btrfs/raid-stripe-tree.c
+++ b/fs/btrfs/raid-stripe-tree.c
@@ -73,6 +73,53 @@ int btrfs_delete_raid_extent(struct
btrfs_trans_handle *trans, u64 start, u64 le
return ret;
}
+static int update_raid_extent_item(struct btrfs_trans_handle *trans,
+ struct btrfs_key *key,
+ struct btrfs_io_context *bioc)
+{
+ struct btrfs_path *path;
+ struct extent_buffer *leaf;
+ struct btrfs_stripe_extent *stripe_extent;
+ int num_stripes;
+ int ret;
+ int slot;
+
+ path = btrfs_alloc_path();
+ if (!path)
+ return -ENOMEM;
+
+ ret = btrfs_search_slot(trans, trans->fs_info->stripe_root, key, path,
+ 0, 1);
+ if (ret)
+ return ret == 1 ? ret : -EINVAL;
+
+ leaf = path->nodes[0];
+ slot = path->slots[0];
+
+ btrfs_item_key_to_cpu(leaf, key, slot);
+ 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++) {
+ u64 devid = bioc->stripes[i].dev->devid;
+ u64 physical = bioc->stripes[i].physical;
+ u64 length = bioc->stripes[i].length;
+ struct btrfs_raid_stride *raid_stride =
+ &stripe_extent->strides[i];
+
+ if (length == 0)
+ length = bioc->size;
+
+ btrfs_set_raid_stride_devid(leaf, raid_stride, devid);
+ btrfs_set_raid_stride_physical(leaf, raid_stride, physical);
+ }
+
+ btrfs_mark_buffer_dirty(trans, leaf);
+ btrfs_free_path(path);
+
+ return ret;
+}
+
static int btrfs_insert_one_raid_extent(struct btrfs_trans_handle *trans,
struct btrfs_io_context *bioc)
{
@@ -112,6 +159,8 @@ static int btrfs_insert_one_raid_extent(struct
btrfs_trans_handle *trans,
ret = btrfs_insert_item(trans, stripe_root, &stripe_key, stripe_extent,
item_size);
+ if (ret == -EEXIST)
+ ret = update_raid_extent_item(trans, &stripe_key, bioc);
if (ret)
btrfs_abort_transaction(trans, ret);
next prev parent reply other threads:[~2024-07-08 11:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 15:13 [PATCH v4 0/7] btrfs: rst: updates for RAID stripe tree Johannes Thumshirn
2024-07-05 15:13 ` [PATCH v4 1/7] btrfs: replace stripe extents Johannes Thumshirn
2024-07-05 23:19 ` Qu Wenruo
2024-07-08 11:43 ` Johannes Thumshirn [this message]
2024-07-08 22:14 ` Qu Wenruo
2024-07-09 5:49 ` Johannes Thumshirn
2024-07-09 5:36 ` Qu Wenruo
2024-07-05 15:13 ` [PATCH v4 2/7] btrfs: rst: don't print tree dump in case lookup fails Johannes Thumshirn
2024-07-05 23:20 ` Qu Wenruo
2024-07-05 15:13 ` [PATCH v4 3/7] btrfs: split RAID stripes on deletion Johannes Thumshirn
2024-07-05 23:26 ` Qu Wenruo
2024-07-08 4:56 ` Johannes Thumshirn
2024-07-08 5:20 ` Qu Wenruo
2024-07-08 5:25 ` Johannes Thumshirn
2024-07-08 10:52 ` Johannes Thumshirn
2024-07-08 23:02 ` Qu Wenruo
2024-07-09 5:51 ` Johannes Thumshirn
2024-07-05 15:13 ` [PATCH v4 4/7] btrfs: stripe-tree: add selftests Johannes Thumshirn
2024-07-05 15:13 ` [PATCH v4 5/7] btrfs: don't hold dev_replace rwsem over whole of btrfs_map_block Johannes Thumshirn
2024-07-05 23:28 ` Qu Wenruo
2024-07-05 15:13 ` [PATCH v4 6/7] btrfs: rename brtfs_io_stripe::is_scrub to commit_root Johannes Thumshirn
2024-07-05 23:32 ` Qu Wenruo
2024-07-05 15:13 ` [PATCH v4 7/7] btrfs: stripe-tree: also look at commit root on relocation 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=9d7f7acf-8077-481c-926e-d29b4b90d46f@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=jth@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.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
all inboxes | Powered by JetHome®