From: Omar Sandoval <osandov@osandov.com>
To: Ming Lei <ming.lei@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, Theodore Ts'o <tytso@mit.edu>,
Omar Sandoval <osandov@fb.com>, Sagi Grimberg <sagi@grimberg.me>,
Dave Chinner <dchinner@redhat.com>,
Kent Overstreet <kent.overstreet@gmail.com>,
Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, Shaohua Li <shli@kernel.org>,
linux-raid@vger.kernel.org, David Sterba <dsterba@suse.com>,
linux-btrfs@vger.kernel.org,
"Darrick J . Wong" <darrick.wong@oracle.com>,
linux-xfs@vger.kernel.org, Gao Xiang <gaoxiang25@huawei.com>,
Christoph Hellwig <hch@lst.de>,
linux-ext4@vger.kernel.org, Coly Li <colyli@suse.de>,
linux-bcache@vger.kernel.org, Boaz Harrosh <ooo@electrozaur.com>,
Bob Peterson <rpeterso@redhat.com>,
cluster-devel@redhat.com
Subject: Re: [PATCH V12 01/20] btrfs: remove various bio_offset arguments
Date: Mon, 26 Nov 2018 14:28:51 -0800 [thread overview]
Message-ID: <20181126222851.GH30411@vader> (raw)
In-Reply-To: <20181126021720.19471-2-ming.lei@redhat.com>
On Mon, Nov 26, 2018 at 10:17:01AM +0800, Ming Lei wrote:
> From: Christoph Hellwig <hch@lst.de>
>
> The btrfs write path passes a bio_offset argument through some deep
> callchains including async offloading. In the end this is easily
> calculatable using page_offset plus the bvec offset for the first
> page in the bio, and only actually used by by a single function.
> Just move the calculation of the offset there.
>
> Reviewed-by: David Sterba <dsterba@suse.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/btrfs/disk-io.c | 21 +++++----------------
> fs/btrfs/disk-io.h | 2 +-
> fs/btrfs/extent_io.c | 9 ++-------
> fs/btrfs/extent_io.h | 5 ++---
> fs/btrfs/inode.c | 17 ++++++++---------
> 5 files changed, 18 insertions(+), 36 deletions(-)
[snip]
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 9ea4c6f0352f..c576b3fcaea7 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -1920,8 +1920,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
> * At IO completion time the cums attached on the ordered extent record
> * are inserted into the btree
> */
> -static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
> - u64 bio_offset)
> +static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio)
> {
> struct inode *inode = private_data;
> blk_status_t ret = 0;
> @@ -1973,8 +1972,7 @@ blk_status_t btrfs_submit_bio_done(void *private_data, struct bio *bio,
> * c-3) otherwise: async submit
> */
> static blk_status_t btrfs_submit_bio_hook(void *private_data, struct bio *bio,
> - int mirror_num, unsigned long bio_flags,
> - u64 bio_offset)
> + int mirror_num, unsigned long bio_flags)
> {
> struct inode *inode = private_data;
> struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
> @@ -2011,8 +2009,7 @@ static blk_status_t btrfs_submit_bio_hook(void *private_data, struct bio *bio,
> goto mapit;
> /* we're doing a write, do the async checksumming */
> ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, bio_flags,
> - bio_offset, inode,
> - btrfs_submit_bio_start);
> + inode, btrfs_submit_bio_start);
> goto out;
> } else if (!skip_sum) {
> ret = btrfs_csum_one_bio(inode, bio, 0, 0);
> @@ -8123,10 +8120,13 @@ static void btrfs_endio_direct_write(struct bio *bio)
> }
>
> static blk_status_t btrfs_submit_bio_start_direct_io(void *private_data,
> - struct bio *bio, u64 offset)
> + struct bio *bio)
> {
> struct inode *inode = private_data;
> + struct bio_vec *bvec = bio_first_bvec_all(bio);
> + u64 offset = page_offset(bvec->bv_page) + bvec->bv_offset;
Hm, but for direct I/O, these will be user pages (or the zero page), so
page_offset() won't be valid?
> blk_status_t ret;
> +
> ret = btrfs_csum_one_bio(inode, bio, offset, 1);
> BUG_ON(ret); /* -ENOMEM */
> return 0;
next prev parent reply other threads:[~2018-11-26 22:28 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 2:17 [PATCH V12 00/20] block: support multi-page bvec Ming Lei
2018-11-26 2:17 ` [PATCH V12 01/20] btrfs: remove various bio_offset arguments Ming Lei
2018-11-26 22:28 ` Omar Sandoval [this message]
2018-11-26 2:17 ` [PATCH V12 02/20] btrfs: look at bi_size for repair decisions Ming Lei
2018-11-26 22:46 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 03/20] block: remove the "cluster" flag Ming Lei
2018-11-26 22:12 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 04/20] block: don't use bio->bi_vcnt to figure out segment number Ming Lei
2018-11-26 22:14 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 05/20] block: remove bvec_iter_rewind() Ming Lei
2018-11-26 12:53 ` Christoph Hellwig
2018-11-26 22:16 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 06/20] block: rename bvec helpers Ming Lei
2018-11-26 8:17 ` Miguel Ojeda
2018-11-26 12:54 ` Christoph Hellwig
2018-11-26 22:18 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 07/20] block: introduce multi-page " Ming Lei
2018-11-26 12:55 ` Christoph Hellwig
2018-11-26 2:17 ` [PATCH V12 08/20] block: introduce bio_for_each_bvec() and rq_for_each_bvec() Ming Lei
2018-11-26 12:55 ` Christoph Hellwig
2018-11-26 2:17 ` [PATCH V12 09/20] block: use bio_for_each_bvec() to compute multi-page bvec count Ming Lei
2018-11-26 13:11 ` Christoph Hellwig
2018-11-26 22:37 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 10/20] block: use bio_for_each_bvec() to map sg Ming Lei
2018-11-26 13:11 ` Christoph Hellwig
2018-11-26 2:17 ` [PATCH V12 11/20] block: introduce bvec_last_segment() Ming Lei
2018-11-26 2:17 ` [PATCH V12 12/20] fs/buffer.c: use bvec iterator to truncate the bio Ming Lei
2018-11-26 2:17 ` [PATCH V12 13/20] block: loop: pass multi-page bvec to iov_iter Ming Lei
2018-11-26 22:39 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 14/20] bcache: avoid to use bio_for_each_segment_all() in bch_bio_alloc_pages() Ming Lei
2018-11-26 22:40 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 15/20] block: allow bio_for_each_segment_all() to iterate over multi-page bvec Ming Lei
2018-11-26 22:42 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 16/20] block: enable multipage bvecs Ming Lei
2018-11-26 12:58 ` Christoph Hellwig
2018-11-27 2:25 ` Ming Lei
2018-11-26 22:56 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 17/20] block: always define BIO_MAX_PAGES as 256 Ming Lei
2018-11-26 22:44 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 18/20] block: document usage of bio iterator helpers Ming Lei
2018-11-26 12:59 ` Christoph Hellwig
2018-11-26 22:43 ` Omar Sandoval
2018-11-26 2:17 ` [PATCH V12 19/20] block: kill QUEUE_FLAG_NO_SG_MERGE Ming Lei
2018-11-26 2:17 ` [PATCH V12 20/20] block: kill BLK_MQ_F_SG_MERGE Ming Lei
2018-11-28 13:44 ` [PATCH V12 00/20] block: support multi-page bvec Jens Axboe
2018-11-29 1:30 ` Ming Lei
2018-11-29 2:20 ` Jens Axboe
2018-11-29 3:30 ` Ming Lei
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=20181126222851.GH30411@vader \
--to=osandov@osandov.com \
--cc=axboe@kernel.dk \
--cc=cluster-devel@redhat.com \
--cc=colyli@suse.de \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=gaoxiang25@huawei.com \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=ooo@electrozaur.com \
--cc=osandov@fb.com \
--cc=rpeterso@redhat.com \
--cc=sagi@grimberg.me \
--cc=shli@kernel.org \
--cc=snitzer@redhat.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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).