From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 13/17] btrfs: allow btrfs_map_bio() to split bio according to chunk stripe boundaries
Date: Mon, 6 Dec 2021 10:29:33 +0800 [thread overview]
Message-ID: <20211206022937.26465-14-wqu@suse.com> (raw)
In-Reply-To: <20211206022937.26465-1-wqu@suse.com>
With the new btrfs_bio_split() helper, we are able to split bio
according to chunk stripe boundaries at btrfs_map_bio() time.
Although currently due bio split at buffered/compressed/direct IO time,
this ability is not yet utilized.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/volumes.c | 50 +++++++++++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 6d962450e355..301fc34320ed 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6879,30 +6879,44 @@ static int submit_one_mapped_range(struct btrfs_fs_info *fs_info, struct bio *bi
blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
int mirror_num)
{
- u64 logical = bio->bi_iter.bi_sector << 9;
- u64 length = 0;
- u64 map_length;
+ const u64 orig_logical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
+ const unsigned int orig_length = bio->bi_iter.bi_size;
+ const enum btrfs_map_op op = btrfs_op(bio);
+ u64 cur_logical = orig_logical;
int ret;
- struct btrfs_io_context *bioc = NULL;
- length = bio->bi_iter.bi_size;
- map_length = length;
+ while (cur_logical < orig_logical + orig_length) {
+ u64 map_length = orig_logical + orig_length - cur_logical;
+ struct btrfs_io_context *bioc = NULL;
+ struct bio *cur_bio;
- btrfs_bio_counter_inc_blocked(fs_info);
- btrfs_bio_save_iter(btrfs_bio(bio));
- ret = __btrfs_map_block(fs_info, btrfs_op(bio), logical,
- &map_length, &bioc, mirror_num, 1);
- if (ret) {
- btrfs_bio_counter_dec(fs_info);
- return errno_to_blk_status(ret);
- }
+ btrfs_bio_save_iter(btrfs_bio(bio));
+ ret = __btrfs_map_block(fs_info, op, cur_logical, &map_length,
+ &bioc, mirror_num, 1);
+ if (ret)
+ return errno_to_blk_status(ret);
- ret = submit_one_mapped_range(fs_info, bio, bioc, map_length, mirror_num);
- if (ret < 0) {
+ if (cur_logical + map_length < orig_logical + orig_length) {
+ /*
+ * For now zoned write should never cross stripe
+ * boundary
+ */
+ ASSERT(bio_op(bio) != REQ_OP_ZONE_APPEND);
+
+ /* Split the bio */
+ cur_bio = btrfs_bio_split(fs_info, bio, map_length);
+ } else {
+ /* Use the existing bio directly */
+ cur_bio = bio;
+ }
+ btrfs_bio_counter_inc_blocked(fs_info);
+ ret = submit_one_mapped_range(fs_info, cur_bio, bioc,
+ map_length, mirror_num);
btrfs_bio_counter_dec(fs_info);
- return errno_to_blk_status(ret);
+ if (ret < 0)
+ return errno_to_blk_status(ret);
+ cur_logical += map_length;
}
- btrfs_bio_counter_dec(fs_info);
return BLK_STS_OK;
}
--
2.34.1
next prev parent reply other threads:[~2021-12-06 2:30 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 2:29 [PATCH v2 00/17] btrfs: split bio at btrfs_map_bio() time Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 01/17] btrfs: update an stale comment on btrfs_submit_bio_hook() Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 02/17] btrfs: save bio::bi_iter into btrfs_bio::iter before any endio Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 03/17] btrfs: use correct bio size for error message in btrfs_end_dio_bio() Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 04/17] btrfs: refactor btrfs_map_bio() Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 05/17] btrfs: move btrfs_bio_wq_end_io() calls into submit_stripe_bio() Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 06/17] btrfs: replace btrfs_dio_private::refs with btrfs_dio_private::pending_bytes Qu Wenruo
2021-12-09 10:02 ` Johannes Thumshirn
2021-12-09 10:35 ` Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 07/17] btrfs: introduce btrfs_bio_split() helper Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 08/17] btrfs: make data buffered read path to handle split bio properly Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 09/17] btrfs: make data buffered write endio function to be split bio compatible Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 10/17] btrfs: make metadata write endio functions " Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 11/17] btrfs: make dec_and_test_compressed_bio() " Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 12/17] btrfs: return proper mapped length for RAID56 profiles in __btrfs_map_block() Qu Wenruo
2021-12-06 2:29 ` Qu Wenruo [this message]
2021-12-06 2:29 ` [PATCH v2 14/17] btrfs: remove buffered IO stripe boundary calculation Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 15/17] btrfs: remove stripe boundary calculation for compressed IO Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 16/17] btrfs: remove the stripe boundary calculation for direct IO Qu Wenruo
2021-12-06 2:29 ` [PATCH v2 17/17] btrfs: unexport btrfs_get_io_geometry() Qu Wenruo
2021-12-09 10:06 ` [PATCH v2 00/17] btrfs: split bio at btrfs_map_bio() time Johannes Thumshirn
2021-12-09 10:52 ` Johannes Thumshirn
2021-12-09 11:08 ` Qu Wenruo
2021-12-09 11:13 ` Johannes Thumshirn
2022-01-12 0:33 ` Qu Wenruo
2022-01-12 9:00 ` 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=20211206022937.26465-14-wqu@suse.com \
--to=wqu@suse.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;
as well as URLs for NNTP newsgroup(s).