From: Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
To: Filipe Manana <fdmanana@kernel.org>, Johannes Thumshirn <jth@kernel.org>
Cc: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
"linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Filipe Manana <fdmanana@suse.com>
Subject: Re: [PATCH v2 06/14] btrfs: fix deletion of a range spanning parts two RAID stripe extents
Date: Fri, 10 Jan 2025 11:33:31 +0000 [thread overview]
Message-ID: <e277500a-41dd-4f3e-be74-c23ad692a540@wdc.com> (raw)
In-Reply-To: <CAL3q7H6=EVN9PokKxsf6MiOo2DRt3N=t2ikm9H7U1FxB+4udCg@mail.gmail.com>
On 09.01.25 16:24, Filipe Manana wrote:
> On Tue, Jan 7, 2025 at 12:50 PM Johannes Thumshirn <jth@kernel.org> wrote:
>>
>> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>>
>> When a user requests the deletion of a range that spans multiple stripe
>> extents and btrfs_search_slot() returns us the second RAID stripe extent,
>> we need to pick the previous item and truncate it, if there's still a
>> range to delete left, move on to the next item.
>>
>> The following diagram illustrates the operation:
>>
>> |--- RAID Stripe Extent ---||--- RAID Stripe Extent ---|
>> |--- keep ---|--- drop ---|
>>
>> While at it, comment the trivial case of a whole item delete as well.
>>
>> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>> ---
>> fs/btrfs/raid-stripe-tree.c | 28 ++++++++++++++++++++++++++++
>> 1 file changed, 28 insertions(+)
>>
>> diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c
>> index 79f8f692aaa8f6df2c9482fbd7777c2812528f65..893d963951315abfc734e1ca232b3087b7889431 100644
>> --- a/fs/btrfs/raid-stripe-tree.c
>> +++ b/fs/btrfs/raid-stripe-tree.c
>> @@ -103,6 +103,31 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
>> found_end = found_start + key.offset;
>> ret = 0;
>>
>> + /*
>> + * The stripe extent starts before the range we want to delete,
>> + * but the range spans more than one stripe extent:
>> + *
>> + * |--- RAID Stripe Extent ---||--- RAID Stripe Extent ---|
>> + * |--- keep ---|--- drop ---|
>> + *
>> + * This means we have to get the previous item, truncate its
>> + * length and then restart the search.
>> + */
>> + if (found_start > start) {
>> +
>> + ret = btrfs_previous_item(stripe_root, path, start,
>> + BTRFS_RAID_STRIPE_KEY);
>> + if (ret < 0)
>> + break;
>> + ret = 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;
>
> Hum, this isn't safe, ignoring the case where btrfs_previous_item()
> returns 1, meaning there's no previous item.
>
> In that case previous_item() returns pointing to the same leaf and
> slot, and then below we delete the item instead of trimming it
> (increasing its range start and decreasing its length).
Good catch!
But what should we do when we end up in this situation? Doesn't that
mean that either do_free_extent_accounting() passed in a bogus range or
btrfs_previous_item() should've done one more call to btrfs_pref_leaf()?
next prev parent reply other threads:[~2025-01-10 11:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 12:47 [PATCH v2 00/14] btrfs: more RST delete fixes Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 01/14] btrfs: don't try to delete RAID stripe-extents if we don't need to Johannes Thumshirn
2025-01-09 10:37 ` David Sterba
2025-01-09 12:35 ` Filipe Manana
2025-01-09 14:39 ` Johannes Thumshirn
2025-01-09 15:14 ` Filipe Manana
2025-01-09 15:27 ` Johannes Thumshirn
2025-01-10 11:29 ` Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 02/14] btrfs: assert RAID stripe-extent length is always greater than 0 Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 03/14] btrfs: fix search when deleting a RAID stripe-extent Johannes Thumshirn
2025-01-09 10:42 ` David Sterba
2025-01-09 12:42 ` Filipe Manana
2025-01-09 14:13 ` Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 04/14] btrfs: fix front delete range calculation for RAID stripe extents Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 05/14] btrfs: fix tail delete of RAID stripe-extents Johannes Thumshirn
2025-01-09 12:45 ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 06/14] btrfs: fix deletion of a range spanning parts two RAID stripe extents Johannes Thumshirn
2025-01-09 15:24 ` Filipe Manana
2025-01-10 11:33 ` Johannes Thumshirn [this message]
2025-01-10 16:20 ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 07/14] btrfs: implement hole punching for " Johannes Thumshirn
2025-01-09 15:32 ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 08/14] btrfs: don't use btrfs_set_item_key_safe on RAID stripe-extents Johannes Thumshirn
2025-01-09 10:50 ` David Sterba
2025-01-09 15:44 ` Filipe Manana
2025-01-09 16:00 ` Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 09/14] btrfs: selftests: check for correct return value of failed lookup Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 10/14] btrfs: selftests: don't split RAID extents in half Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 11/14] btrfs: selftests: test RAID stripe-tree deletion spanning two items Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 12/14] btrfs: selftests: add selftest for punching holes into the RAID stripe extents Johannes Thumshirn
2025-01-09 15:50 ` Filipe Manana
2025-01-07 12:47 ` [PATCH v2 13/14] btrfs: selftests: add test for punching a hole into 3 RAID stripe-extents Johannes Thumshirn
2025-01-07 12:47 ` [PATCH v2 14/14] btrfs: selftests: add a selftest for deleting two out of three extents Johannes Thumshirn
2025-01-07 15:20 ` [PATCH v2 00/14] btrfs: more RST delete fixes David Sterba
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=e277500a-41dd-4f3e-be74-c23ad692a540@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@kernel.org \
--cc=fdmanana@suse.com \
--cc=josef@toxicpanda.com \
--cc=jth@kernel.org \
--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
all inboxes | Powered by JetHome®