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 23/40] btrfs: store an inode pointer in struct btrfs_bio
Date: Wed, 23 Mar 2022 08:54:21 +0800 [thread overview]
Message-ID: <35f1ef04-53b4-83ec-2f2f-be8893ffd258@gmx.com> (raw)
In-Reply-To: <20220322155606.1267165-24-hch@lst.de>
On 2022/3/22 23:55, Christoph Hellwig wrote:
> All the I/O going through the btrfs_bio based path are associated with an
> inode. Add a pointer to it to simplify a few things soon. Also pass the
> bio operation to btrfs_bio_alloc given that we have to touch it anyway.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Something I want to avoid is to futher increasing the size of btrfs_bio.
For buffered uncompressed IO, we can grab the inode from the first page.
For direct IO we have bio->bi_private (btrfs_dio_private).
For compressed IO, it's bio->bi_private again (compressed_bio).
Do the saved code lines really validate the memory usage for all bios?
Thanks,
Qu
> ---
> fs/btrfs/compression.c | 4 +---
> fs/btrfs/extent_io.c | 23 ++++++++++++-----------
> fs/btrfs/extent_io.h | 6 ++++--
> fs/btrfs/inode.c | 3 ++-
> fs/btrfs/volumes.h | 2 ++
> 5 files changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index 71e5b2e9a1ba8..419a09d924290 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -464,10 +464,8 @@ static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_byte
> struct bio *bio;
> int ret;
>
> - bio = btrfs_bio_alloc(BIO_MAX_VECS);
> -
> + bio = btrfs_bio_alloc(cb->inode, BIO_MAX_VECS, opf);
> bio->bi_iter.bi_sector = disk_bytenr >> SECTOR_SHIFT;
> - bio->bi_opf = opf;
> bio->bi_private = cb;
> bio->bi_end_io = endio_func;
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 58ef0f4fca361..116a65787e314 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2657,10 +2657,9 @@ int btrfs_repair_one_sector(struct inode *inode,
> return -EIO;
> }
>
> - repair_bio = btrfs_bio_alloc(1);
> + repair_bio = btrfs_bio_alloc(inode, 1, REQ_OP_READ);
> repair_bbio = btrfs_bio(repair_bio);
> repair_bbio->file_offset = start;
> - repair_bio->bi_opf = REQ_OP_READ;
> repair_bio->bi_end_io = failed_bio->bi_end_io;
> repair_bio->bi_iter.bi_sector = failrec->logical >> 9;
> repair_bio->bi_private = failed_bio->bi_private;
> @@ -3128,9 +3127,10 @@ static void end_bio_extent_readpage(struct bio *bio)
> * new bio by bio_alloc_bioset as it does not initialize the bytes outside of
> * 'bio' because use of __GFP_ZERO is not supported.
> */
> -static inline void btrfs_bio_init(struct btrfs_bio *bbio)
> +static inline void btrfs_bio_init(struct btrfs_bio *bbio, struct inode *inode)
> {
> memset(bbio, 0, offsetof(struct btrfs_bio, bio));
> + bbio->inode = inode;
> }
>
> /*
> @@ -3138,13 +3138,14 @@ static inline void btrfs_bio_init(struct btrfs_bio *bbio)
> *
> * The bio allocation is backed by bioset and does not fail.
> */
> -struct bio *btrfs_bio_alloc(unsigned int nr_iovecs)
> +struct bio *btrfs_bio_alloc(struct inode *inode, unsigned int nr_iovecs,
> + unsigned int opf)
> {
> struct bio *bio;
>
> ASSERT(0 < nr_iovecs && nr_iovecs <= BIO_MAX_VECS);
> - bio = bio_alloc_bioset(NULL, nr_iovecs, 0, GFP_NOFS, &btrfs_bioset);
> - btrfs_bio_init(btrfs_bio(bio));
> + bio = bio_alloc_bioset(NULL, nr_iovecs, opf, GFP_NOFS, &btrfs_bioset);
> + btrfs_bio_init(btrfs_bio(bio), inode);
> return bio;
> }
>
> @@ -3156,12 +3157,13 @@ struct bio *btrfs_bio_clone(struct block_device *bdev, struct bio *bio)
> /* Bio allocation backed by a bioset does not fail */
> new = bio_alloc_clone(bdev, bio, GFP_NOFS, &btrfs_bioset);
> bbio = btrfs_bio(new);
> - btrfs_bio_init(bbio);
> + btrfs_bio_init(btrfs_bio(new), btrfs_bio(bio)->inode);
> bbio->iter = bio->bi_iter;
> return new;
> }
>
> -struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
> +struct bio *btrfs_bio_clone_partial(struct inode *inode, struct bio *orig,
> + u64 offset, u64 size)
> {
> struct bio *bio;
> struct btrfs_bio *bbio;
> @@ -3173,7 +3175,7 @@ struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
> ASSERT(bio);
>
> bbio = btrfs_bio(bio);
> - btrfs_bio_init(bbio);
> + btrfs_bio_init(btrfs_bio(bio), inode);
>
> bio_trim(bio, offset >> 9, size >> 9);
> bbio->iter = bio->bi_iter;
> @@ -3308,7 +3310,7 @@ static int alloc_new_bio(struct btrfs_inode *inode,
> struct bio *bio;
> int ret;
>
> - bio = btrfs_bio_alloc(BIO_MAX_VECS);
> + bio = btrfs_bio_alloc(&inode->vfs_inode, BIO_MAX_VECS, opf);
> /*
> * For compressed page range, its disk_bytenr is always @disk_bytenr
> * passed in, no matter if we have added any range into previous bio.
> @@ -3321,7 +3323,6 @@ static int alloc_new_bio(struct btrfs_inode *inode,
> bio_ctrl->bio_flags = bio_flags;
> bio->bi_end_io = end_io_func;
> bio->bi_private = &inode->io_tree;
> - bio->bi_opf = opf;
> ret = calc_bio_boundaries(bio_ctrl, inode, file_offset);
> if (ret < 0)
> goto error;
> diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
> index 72d86f228c56e..d5f3d9692ea29 100644
> --- a/fs/btrfs/extent_io.h
> +++ b/fs/btrfs/extent_io.h
> @@ -277,9 +277,11 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end);
> void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
> struct page *locked_page,
> u32 bits_to_clear, unsigned long page_ops);
> -struct bio *btrfs_bio_alloc(unsigned int nr_iovecs);
> +struct bio *btrfs_bio_alloc(struct inode *inode, unsigned int nr_iovecs,
> + unsigned int opf);
> struct bio *btrfs_bio_clone(struct block_device *bdev, struct bio *bio);
> -struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);
> +struct bio *btrfs_bio_clone_partial(struct inode *inode, struct bio *orig,
> + u64 offset, u64 size);
>
> void end_extent_writepage(struct page *page, int err, u64 start, u64 end);
> int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, int mirror_num);
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 5c9d8e8a98466..18d54cfedf829 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -7987,7 +7987,8 @@ static void btrfs_submit_direct(const struct iomap_iter *iter,
> * This will never fail as it's passing GPF_NOFS and
> * the allocation is backed by btrfs_bioset.
> */
> - bio = btrfs_bio_clone_partial(dio_bio, clone_offset, clone_len);
> + bio = btrfs_bio_clone_partial(inode, dio_bio, clone_offset,
> + clone_len);
> bio->bi_private = dip;
> bio->bi_end_io = btrfs_end_dio_bio;
> btrfs_bio(bio)->file_offset = file_offset;
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index c22148bebc2f5..a4f942547002e 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -321,6 +321,8 @@ struct btrfs_fs_devices {
> * Mostly for btrfs specific features like csum and mirror_num.
> */
> struct btrfs_bio {
> + struct inode *inode;
> +
> unsigned int mirror_num;
>
> /* for direct I/O */
next prev parent reply other threads:[~2022-03-23 0:54 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 [this message]
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
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=35f1ef04-53b4-83ec-2f2f-be8893ffd258@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