From: Luca Stefani <luca.stefani.ge1@gmail.com>
Cc: Luca Stefani <luca.stefani.ge1@gmail.com>,
Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/3] btrfs: Split remaining space to discard in chunks
Date: Tue, 3 Sep 2024 09:16:11 +0200 [thread overview]
Message-ID: <20240903071625.957275-3-luca.stefani.ge1@gmail.com> (raw)
In-Reply-To: <20240903071625.957275-1-luca.stefani.ge1@gmail.com>
Per Qu Wenruo in case we have a very large disk, e.g. 8TiB device,
mostly empty although we will do the split according to our super block
locations, the last super block ends at 256G, we can submit a huge
discard for the range [256G, 8T), causing a super large delay.
We now split the space left to discard based the block discard limit
in preparation of introduction of cancellation signals handling.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219180
Link: https://bugzilla.suse.com/show_bug.cgi?id=1229737
Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
---
fs/btrfs/extent-tree.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a5966324607d..9c1ddf13659e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1301,12 +1301,26 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
}
if (bytes_left) {
- ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
- bytes_left >> SECTOR_SHIFT,
- GFP_NOFS);
- if (!ret)
- *discarded_bytes += bytes_left;
+ u64 bytes_to_discard;
+ struct bio *bio = NULL;
+ sector_t sector = start >> SECTOR_SHIFT;
+ sector_t nr_sects = bytes_left >> SECTOR_SHIFT;
+
+ while ((bio = blk_alloc_discard_bio(bdev, §or, &nr_sects,
+ GFP_NOFS))) {
+ ret = submit_bio_wait(bio);
+ bio_put(bio);
+
+ if (!ret)
+ bytes_to_discard = bio->bi_iter.bi_size;
+ else if (ret != -EOPNOTSUPP)
+ return ret;
+
+ start += bytes_to_discard;
+ bytes_left -= bytes_to_discard;
+ }
}
+
return ret;
}
--
2.46.0
next prev parent reply other threads:[~2024-09-03 7:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-03 7:16 [PATCH v3 0/2] btrfs: Don't block suspend during fstrim Luca Stefani
2024-09-03 7:16 ` [PATCH v3 1/3] btrfs: Always update fstrim_range on failure Luca Stefani
2024-09-03 7:16 ` Luca Stefani [this message]
2024-09-03 7:27 ` [PATCH v3 2/3] btrfs: Split remaining space to discard in chunks Christoph Hellwig
2024-09-03 9:43 ` Qu Wenruo
2024-09-04 4:13 ` Christoph Hellwig
2024-09-04 5:34 ` Qu Wenruo
2024-09-03 10:39 ` Luca Stefani
2024-09-03 19:39 ` David Sterba
2024-09-06 20:10 ` kernel test robot
2024-09-03 7:16 ` [PATCH v3 3/3] btrfs: Don't block system suspend during fstrim Luca Stefani
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=20240903071625.957275-3-luca.stefani.ge1@gmail.com \
--to=luca.stefani.ge1@gmail.com \
--cc=clm@fb.com \
--cc=dsterba@suse.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