From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Christoph Hellwig <hch@lst.de>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>, Qu Wenruo <wqu@suse.com>
Cc: Naohiro Aota <naohiro.aota@wdc.com>,
linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 37/40] btrfs: add a btrfs_get_stripe_info helper
Date: Wed, 23 Mar 2022 09:23:00 +0800 [thread overview]
Message-ID: <1341dbf4-3552-12e4-9e8d-0d4e58fdb821@gmx.com> (raw)
In-Reply-To: <20220322155606.1267165-38-hch@lst.de>
On 2022/3/22 23:56, Christoph Hellwig wrote:
> ---
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
> fs/btrfs/compression.c | 26 ++++++++-----------------
> fs/btrfs/extent_io.c | 24 ++++++++---------------
> fs/btrfs/inode.c | 32 ++++++++++--------------------
> fs/btrfs/volumes.c | 44 +++++++++++++++++++++++++++++++++++++++---
> fs/btrfs/volumes.h | 20 ++-----------------
> 5 files changed, 69 insertions(+), 77 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index ae6f986058c75..fca025c327a7e 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -445,10 +445,9 @@ static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_byte
> u64 *next_stripe_start)
> {
> struct btrfs_fs_info *fs_info = btrfs_sb(cb->inode->i_sb);
> - struct btrfs_io_geometry geom;
> - struct extent_map *em;
> + struct block_device *bdev;
> struct bio *bio;
> - int ret;
> + u64 len;
>
> bio = btrfs_bio_alloc(cb->inode, BIO_MAX_VECS, opf);
> bio->bi_iter.bi_sector = disk_bytenr >> SECTOR_SHIFT;
> @@ -459,23 +458,14 @@ static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_byte
> else
> btrfs_bio(bio)->end_io_type = BTRFS_ENDIO_WQ_DATA_READ;
>
> - em = btrfs_get_chunk_map(fs_info, disk_bytenr, fs_info->sectorsize);
> - if (IS_ERR(em)) {
> - bio_put(bio);
> - return ERR_CAST(em);
> - }
> + bdev = btrfs_get_stripe_info(fs_info, btrfs_op(bio), disk_bytenr,
> + fs_info->sectorsize, &len);
> + if (IS_ERR(bdev))
> + return ERR_CAST(bdev);
>
> if (bio_op(bio) == REQ_OP_ZONE_APPEND)
> - bio_set_dev(bio, em->map_lookup->stripes[0].dev->bdev);
> -
> - ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(bio), disk_bytenr, &geom);
> - free_extent_map(em);
> - if (ret < 0) {
> - bio_put(bio);
> - return ERR_PTR(ret);
> - }
> - *next_stripe_start = disk_bytenr + geom.len;
> -
> + bio_set_dev(bio, bdev);
> + *next_stripe_start = disk_bytenr + len;
> return bio;
> }
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index bfd91ed27bd14..10fc5e4dd14a3 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -3235,11 +3235,10 @@ static int calc_bio_boundaries(struct btrfs_bio_ctrl *bio_ctrl,
> struct btrfs_inode *inode, u64 file_offset)
> {
> struct btrfs_fs_info *fs_info = inode->root->fs_info;
> - struct btrfs_io_geometry geom;
> struct btrfs_ordered_extent *ordered;
> - struct extent_map *em;
> u64 logical = (bio_ctrl->bio->bi_iter.bi_sector << SECTOR_SHIFT);
> - int ret;
> + struct block_device *bdev;
> + u64 len;
>
> /*
> * Pages for compressed extent are never submitted to disk directly,
> @@ -3253,19 +3252,12 @@ static int calc_bio_boundaries(struct btrfs_bio_ctrl *bio_ctrl,
> bio_ctrl->len_to_stripe_boundary = U32_MAX;
> return 0;
> }
> - em = btrfs_get_chunk_map(fs_info, logical, fs_info->sectorsize);
> - if (IS_ERR(em))
> - return PTR_ERR(em);
> - ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(bio_ctrl->bio),
> - logical, &geom);
> - free_extent_map(em);
> - if (ret < 0) {
> - return ret;
> - }
> - if (geom.len > U32_MAX)
> - bio_ctrl->len_to_stripe_boundary = U32_MAX;
> - else
> - bio_ctrl->len_to_stripe_boundary = (u32)geom.len;
> +
> + bdev = btrfs_get_stripe_info(fs_info, btrfs_op(bio_ctrl->bio), logical,
> + fs_info->sectorsize, &len);
> + if (IS_ERR(bdev))
> + return PTR_ERR(bdev);
> + bio_ctrl->len_to_stripe_boundary = min(len, (u64)U32_MAX);
>
> if (bio_op(bio_ctrl->bio) != REQ_OP_ZONE_APPEND) {
> bio_ctrl->len_to_oe_boundary = U32_MAX;
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index d4faed31d36a4..3f7e1779ff19f 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -7944,12 +7944,9 @@ static void btrfs_submit_direct(const struct iomap_iter *iter,
> u64 submit_len;
> u64 clone_offset = 0;
> u64 clone_len;
> - u64 logical;
> - int ret;
> blk_status_t status;
> - struct btrfs_io_geometry geom;
> struct btrfs_dio_data *dio_data = iter->private;
> - struct extent_map *em = NULL;
> + u64 len;
>
> dip = btrfs_create_dio_private(dio_bio, inode, file_offset);
> if (!dip) {
> @@ -7978,21 +7975,16 @@ static void btrfs_submit_direct(const struct iomap_iter *iter,
> submit_len = dio_bio->bi_iter.bi_size;
>
> do {
> - logical = start_sector << 9;
> - em = btrfs_get_chunk_map(fs_info, logical, submit_len);
> - if (IS_ERR(em)) {
> - status = errno_to_blk_status(PTR_ERR(em));
> - em = NULL;
> - goto out_err_em;
> - }
> - ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(dio_bio),
> - logical, &geom);
> - if (ret) {
> - status = errno_to_blk_status(ret);
> - goto out_err_em;
> + struct block_device *bdev;
> +
> + bdev = btrfs_get_stripe_info(fs_info, btrfs_op(dio_bio),
> + start_sector << 9, submit_len, &len);
> + if (IS_ERR(bdev)) {
> + status = errno_to_blk_status(PTR_ERR(bdev));
> + goto out_err;
> }
>
> - clone_len = min(submit_len, geom.len);
> + clone_len = min(submit_len, len);
> ASSERT(clone_len <= UINT_MAX);
>
> /*
> @@ -8044,20 +8036,16 @@ static void btrfs_submit_direct(const struct iomap_iter *iter,
> bio_put(bio);
> if (submit_len > 0)
> refcount_dec(&dip->refs);
> - goto out_err_em;
> + goto out_err;
> }
>
> dio_data->submitted += clone_len;
> clone_offset += clone_len;
> start_sector += clone_len >> 9;
> file_offset += clone_len;
> -
> - free_extent_map(em);
> } while (submit_len > 0);
> return;
>
> -out_err_em:
> - free_extent_map(em);
> out_err:
> dip->dio_bio->bi_status = status;
> btrfs_dio_private_put(dip);
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 7392b9f2a3323..f70bb3569a7ae 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -6301,6 +6301,21 @@ static bool need_full_stripe(enum btrfs_map_op op)
> return (op == BTRFS_MAP_WRITE || op == BTRFS_MAP_GET_READ_MIRRORS);
> }
>
> +struct btrfs_io_geometry {
> + /* remaining bytes before crossing a stripe */
> + u64 len;
> + /* offset of logical address in chunk */
> + u64 offset;
> + /* length of single IO stripe */
> + u64 stripe_len;
> + /* number of stripe where address falls */
> + u64 stripe_nr;
> + /* offset of address in stripe */
> + u64 stripe_offset;
> + /* offset of raid56 stripe into the chunk */
> + u64 raid56_stripe_offset;
> +};
> +
> /*
> * Calculate the geometry of a particular (address, len) tuple. This
> * information is used to calculate how big a particular bio can get before it
> @@ -6315,9 +6330,10 @@ static bool need_full_stripe(enum btrfs_map_op op)
> * Returns < 0 in case a chunk for the given logical address cannot be found,
> * usually shouldn't happen unless @logical is corrupted, 0 otherwise.
> */
> -int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *em,
> - enum btrfs_map_op op, u64 logical,
> - struct btrfs_io_geometry *io_geom)
> +static int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info,
> + struct extent_map *em,
> + enum btrfs_map_op op, u64 logical,
> + struct btrfs_io_geometry *io_geom)
> {
> struct map_lookup *map;
> u64 len;
> @@ -6394,6 +6410,28 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *em,
> return 0;
> }
>
> +struct block_device *btrfs_get_stripe_info(struct btrfs_fs_info *fs_info,
> + enum btrfs_map_op op, u64 logical, u64 len, u64 *lenp)
> +{
> + struct btrfs_io_geometry geom;
> + struct block_device *bdev;
> + struct extent_map *em;
> + int ret;
> +
> + em = btrfs_get_chunk_map(fs_info, logical, len);
> + if (IS_ERR(em))
> + return ERR_CAST(em);
> +
> + bdev = em->map_lookup->stripes[0].dev->bdev;
> +
> + ret = btrfs_get_io_geometry(fs_info, em, op, logical, &geom);
> + free_extent_map(em);
> + if (ret < 0)
> + return ERR_PTR(ret);
> + *lenp = geom.len;
> + return bdev;
> +}
> +
> static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
> enum btrfs_map_op op, u64 logical, u64 *length,
> struct btrfs_io_context **bioc_ret, struct btrfs_bio *bbio,
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index 5b0e7602434b0..c6425760f69da 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -17,21 +17,6 @@ extern struct mutex uuid_mutex;
>
> #define BTRFS_STRIPE_LEN SZ_64K
>
> -struct btrfs_io_geometry {
> - /* remaining bytes before crossing a stripe */
> - u64 len;
> - /* offset of logical address in chunk */
> - u64 offset;
> - /* length of single IO stripe */
> - u64 stripe_len;
> - /* number of stripe where address falls */
> - u64 stripe_nr;
> - /* offset of address in stripe */
> - u64 stripe_offset;
> - /* offset of raid56 stripe into the chunk */
> - u64 raid56_stripe_offset;
> -};
> -
> /*
> * Use sequence counter to get consistent device stat data on
> * 32-bit processors.
> @@ -520,9 +505,8 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
> int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
> u64 logical, u64 *length,
> struct btrfs_io_context **bioc_ret);
> -int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *map,
> - enum btrfs_map_op op, u64 logical,
> - struct btrfs_io_geometry *io_geom);
> +struct block_device *btrfs_get_stripe_info(struct btrfs_fs_info *fs_info,
> + enum btrfs_map_op op, u64 logical, u64 length, u64 *lenp);
> int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);
> int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);
> struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,
next prev parent reply other threads:[~2022-03-23 1:23 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 15:55 RFC: cleanup btrfs bio handling Christoph Hellwig
2022-03-22 15:55 ` [PATCH 01/40] btrfs: fix submission hook error handling in btrfs_repair_one_sector Christoph Hellwig
2022-03-22 15:55 ` [PATCH 02/40] btrfs: fix direct I/O read repair for split bios Christoph Hellwig
2022-03-22 23:59 ` Qu Wenruo
2022-03-23 6:03 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 03/40] btrfs: fix direct I/O writes for split bios on zoned devices Christoph Hellwig
2022-03-23 0:00 ` Qu Wenruo
2022-03-23 6:04 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 04/40] btrfs: fix and document the zoned device choice in alloc_new_bio Christoph Hellwig
2022-03-22 15:55 ` [PATCH 05/40] btrfs: refactor __btrfsic_submit_bio Christoph Hellwig
2022-03-22 15:55 ` [PATCH 06/40] btrfs: split submit_bio from btrfsic checking Christoph Hellwig
2022-03-23 0:04 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 07/40] btrfs: simplify btrfsic_read_block Christoph Hellwig
2022-03-22 15:55 ` [PATCH 08/40] btrfs: simplify repair_io_failure Christoph Hellwig
2022-03-23 0:06 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 09/40] btrfs: simplify scrub_recheck_block Christoph Hellwig
2022-03-23 0:10 ` Qu Wenruo
2022-03-23 6:05 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 10/40] btrfs: simplify scrub_repair_page_from_good_copy Christoph Hellwig
2022-03-23 0:12 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 11/40] btrfs: move the call to bio_set_dev out of submit_stripe_bio Christoph Hellwig
2022-03-22 15:55 ` [PATCH 12/40] btrfs: pass a block_device to btrfs_bio_clone Christoph Hellwig
2022-03-22 15:55 ` [PATCH 13/40] btrfs: initialize ->bi_opf and ->bi_private in rbio_add_io_page Christoph Hellwig
2022-03-22 15:55 ` [PATCH 14/40] btrfs: don't allocate a btrfs_bio for raid56 per-stripe bios Christoph Hellwig
2022-03-23 0:16 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 15/40] btrfs: don't allocate a btrfs_bio for scrub bios Christoph Hellwig
2022-03-23 0:18 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 16/40] btrfs: stop using the btrfs_bio saved iter in index_rbio_pages Christoph Hellwig
2022-03-22 15:55 ` [PATCH 17/40] btrfs: remove the submit_bio_hook argument to submit_read_repair Christoph Hellwig
2022-03-23 0:20 ` Qu Wenruo
2022-03-23 6:06 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 18/40] btrfs: move more work into btrfs_end_bioc Christoph Hellwig
2022-03-23 0:29 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 19/40] btrfs: defer I/O completion based on the btrfs_raid_bio Christoph Hellwig
2022-03-22 15:55 ` [PATCH 20/40] btrfs: cleanup btrfs_submit_metadata_bio Christoph Hellwig
2022-03-23 0:34 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 21/40] btrfs: cleanup btrfs_submit_data_bio Christoph Hellwig
2022-03-23 0:44 ` Qu Wenruo
2022-03-23 6:08 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 22/40] btrfs: cleanup btrfs_submit_dio_bio Christoph Hellwig
2022-03-23 0:50 ` Qu Wenruo
2022-03-23 6:09 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 23/40] btrfs: store an inode pointer in struct btrfs_bio Christoph Hellwig
2022-03-23 0:54 ` Qu Wenruo
2022-03-23 6:11 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 24/40] btrfs: remove btrfs_end_io_wq Christoph Hellwig
2022-03-23 0:57 ` Qu Wenruo
2022-03-23 6:11 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 25/40] btrfs: remove btrfs_wq_submit_bio Christoph Hellwig
2022-03-22 15:55 ` [PATCH 26/40] btrfs: refactor btrfs_map_bio Christoph Hellwig
2022-03-23 1:03 ` Qu Wenruo
2022-03-22 15:55 ` [PATCH 27/40] btrfs: clean up the raid map handling __btrfs_map_block Christoph Hellwig
2022-03-23 1:08 ` Qu Wenruo
2022-03-23 6:13 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 28/40] btrfs: do not allocate a btrfs_io_context in btrfs_map_bio Christoph Hellwig
2022-03-23 1:14 ` Qu Wenruo
2022-03-23 6:13 ` Christoph Hellwig
2022-03-23 6:59 ` Qu Wenruo
2022-03-23 7:10 ` Christoph Hellwig
2022-03-22 15:55 ` [PATCH 29/40] btrfs: do not allocate a btrfs_bio for low-level bios Christoph Hellwig
2022-03-22 15:55 ` [PATCH 30/40] iomap: add per-iomap_iter private data Christoph Hellwig
2022-03-22 15:55 ` [PATCH 31/40] iomap: add a new ->iomap_iter operation Christoph Hellwig
2022-03-22 15:55 ` [PATCH 32/40] iomap: optionally allocate dio bios from a file system bio_set Christoph Hellwig
2022-03-22 15:55 ` [PATCH 33/40] iomap: add a hint to ->submit_io if there is more I/O coming Christoph Hellwig
2022-03-22 15:56 ` [PATCH 34/40] btrfs: add a btrfs_dio_rw wrapper Christoph Hellwig
2022-03-22 15:56 ` [PATCH 35/40] btrfs: allocate dio_data on stack Christoph Hellwig
2022-03-22 15:56 ` [PATCH 36/40] btrfs: implement ->iomap_iter Christoph Hellwig
2022-03-22 15:56 ` [PATCH 37/40] btrfs: add a btrfs_get_stripe_info helper Christoph Hellwig
2022-03-23 1:23 ` Qu Wenruo [this message]
2022-03-22 15:56 ` [PATCH 38/40] btrfs: return a blk_status_t from btrfs_repair_one_sector Christoph Hellwig
2022-03-22 15:56 ` [PATCH 39/40] btrfs: pass private data end end_io handler to btrfs_repair_one_sector Christoph Hellwig
2022-03-23 1:28 ` Qu Wenruo
2022-03-23 6:15 ` Christoph Hellwig
2022-03-24 0:57 ` Sweet Tea Dorminy
2022-03-22 15:56 ` [PATCH 40/40] btrfs: use the iomap direct I/O bio directly Christoph Hellwig
2022-03-23 1:39 ` Qu Wenruo
2022-03-23 6:17 ` Christoph Hellwig
2022-03-23 8:02 ` Qu Wenruo
2022-03-23 8:11 ` Christoph Hellwig
2022-03-23 8:36 ` Qu Wenruo
2022-03-22 17:46 ` RFC: cleanup btrfs bio handling 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=1341dbf4-3552-12e4-9e8d-0d4e58fdb821@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=dsterba@suse.com \
--cc=hch@lst.de \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=naohiro.aota@wdc.com \
--cc=wqu@suse.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