From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>, Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>, dm-devel@redhat.com, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Coly Li <colyli@suse.de> Subject: [PATCH 05/16] bcache: use bio_{start,end}_io_acct Date: Wed, 27 May 2020 07:24:08 +0200 [thread overview] Message-ID: <20200527052419.403583-6-hch@lst.de> (raw) In-Reply-To: <20200527052419.403583-1-hch@lst.de> Switch bcache to use the nicer bio accounting helpers, and call the routines where we also sample the start time to give coherent accounting results. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Acked-by: Coly Li <colyli@suse.de> --- drivers/md/bcache/request.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 77d1a26975174..22b483527176b 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -668,9 +668,7 @@ static void backing_request_endio(struct bio *bio) static void bio_complete(struct search *s) { if (s->orig_bio) { - generic_end_io_acct(s->d->disk->queue, bio_op(s->orig_bio), - &s->d->disk->part0, s->start_time); - + bio_end_io_acct(s->orig_bio, s->start_time); trace_bcache_request_end(s->d, s->orig_bio); s->orig_bio->bi_status = s->iop.status; bio_endio(s->orig_bio); @@ -730,7 +728,7 @@ static inline struct search *search_alloc(struct bio *bio, s->recoverable = 1; s->write = op_is_write(bio_op(bio)); s->read_dirty_data = 0; - s->start_time = jiffies; + s->start_time = bio_start_io_acct(bio); s->iop.c = d->c; s->iop.bio = NULL; @@ -1082,8 +1080,7 @@ static void detached_dev_end_io(struct bio *bio) bio->bi_end_io = ddip->bi_end_io; bio->bi_private = ddip->bi_private; - generic_end_io_acct(ddip->d->disk->queue, bio_op(bio), - &ddip->d->disk->part0, ddip->start_time); + bio_end_io_acct(bio, ddip->start_time); if (bio->bi_status) { struct cached_dev *dc = container_of(ddip->d, @@ -1108,7 +1105,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) */ ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); ddip->d = d; - ddip->start_time = jiffies; + ddip->start_time = bio_start_io_acct(bio); ddip->bi_end_io = bio->bi_end_io; ddip->bi_private = bio->bi_private; bio->bi_end_io = detached_dev_end_io; @@ -1190,11 +1187,6 @@ blk_qc_t cached_dev_make_request(struct request_queue *q, struct bio *bio) } } - generic_start_io_acct(q, - bio_op(bio), - bio_sectors(bio), - &d->disk->part0); - bio_set_dev(bio, dc->bdev); bio->bi_iter.bi_sector += dc->sb.data_offset; @@ -1311,8 +1303,6 @@ blk_qc_t flash_dev_make_request(struct request_queue *q, struct bio *bio) return BLK_QC_T_NONE; } - generic_start_io_acct(q, bio_op(bio), bio_sectors(bio), &d->disk->part0); - s = search_alloc(bio, d); cl = &s->cl; bio = &s->bio.bio; -- 2.26.2 _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>, Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>, dm-devel@redhat.com, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Coly Li <colyli@suse.de> Subject: [PATCH 05/16] bcache: use bio_{start,end}_io_acct Date: Wed, 27 May 2020 07:24:08 +0200 [thread overview] Message-ID: <20200527052419.403583-6-hch@lst.de> (raw) In-Reply-To: <20200527052419.403583-1-hch@lst.de> Switch bcache to use the nicer bio accounting helpers, and call the routines where we also sample the start time to give coherent accounting results. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Acked-by: Coly Li <colyli@suse.de> --- drivers/md/bcache/request.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 77d1a26975174..22b483527176b 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -668,9 +668,7 @@ static void backing_request_endio(struct bio *bio) static void bio_complete(struct search *s) { if (s->orig_bio) { - generic_end_io_acct(s->d->disk->queue, bio_op(s->orig_bio), - &s->d->disk->part0, s->start_time); - + bio_end_io_acct(s->orig_bio, s->start_time); trace_bcache_request_end(s->d, s->orig_bio); s->orig_bio->bi_status = s->iop.status; bio_endio(s->orig_bio); @@ -730,7 +728,7 @@ static inline struct search *search_alloc(struct bio *bio, s->recoverable = 1; s->write = op_is_write(bio_op(bio)); s->read_dirty_data = 0; - s->start_time = jiffies; + s->start_time = bio_start_io_acct(bio); s->iop.c = d->c; s->iop.bio = NULL; @@ -1082,8 +1080,7 @@ static void detached_dev_end_io(struct bio *bio) bio->bi_end_io = ddip->bi_end_io; bio->bi_private = ddip->bi_private; - generic_end_io_acct(ddip->d->disk->queue, bio_op(bio), - &ddip->d->disk->part0, ddip->start_time); + bio_end_io_acct(bio, ddip->start_time); if (bio->bi_status) { struct cached_dev *dc = container_of(ddip->d, @@ -1108,7 +1105,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) */ ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); ddip->d = d; - ddip->start_time = jiffies; + ddip->start_time = bio_start_io_acct(bio); ddip->bi_end_io = bio->bi_end_io; ddip->bi_private = bio->bi_private; bio->bi_end_io = detached_dev_end_io; @@ -1190,11 +1187,6 @@ blk_qc_t cached_dev_make_request(struct request_queue *q, struct bio *bio) } } - generic_start_io_acct(q, - bio_op(bio), - bio_sectors(bio), - &d->disk->part0); - bio_set_dev(bio, dc->bdev); bio->bi_iter.bi_sector += dc->sb.data_offset; @@ -1311,8 +1303,6 @@ blk_qc_t flash_dev_make_request(struct request_queue *q, struct bio *bio) return BLK_QC_T_NONE; } - generic_start_io_acct(q, bio_op(bio), bio_sectors(bio), &d->disk->part0); - s = search_alloc(bio, d); cl = &s->cl; bio = &s->bio.bio; -- 2.26.2
next prev parent reply other threads:[~2020-05-27 5:24 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-27 5:24 block I/O accounting improvements v2 Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 01/16] block: add disk/bio-based accounting helpers Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 02/16] drbd: use bio_{start,end}_io_acct Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 03/16] rsxx: " Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 04/16] lightnvm/pblk: " Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig [this message] 2020-05-27 5:24 ` [PATCH 05/16] bcache: " Christoph Hellwig 2020-05-27 5:24 ` [PATCH 06/16] dm: " Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 07/16] nvdimm: " Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 08/16] zram: nvdimm: use bio_{start,end}_io_acct and disk_{start,end}_io_acct Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 09/16] block: remove generic_{start,end}_io_acct Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 10/16] block: move update_io_ticks to blk-core.c Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 11/16] block: always use a percpu variable for disk stats Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 12/16] block: account merge of two requests Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 13/16] block: add a blk_account_io_merge_bio helper Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 14/16] block: remove rcu_read_lock() from part_stat_lock() Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 15/16] block: use __this_cpu_add() instead of access by smp_processor_id() Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 5:24 ` [PATCH 16/16] block: reduce part_stat_lock() scope Christoph Hellwig 2020-05-27 5:24 ` Christoph Hellwig 2020-05-27 11:22 ` block I/O accounting improvements v2 Jens Axboe 2020-05-27 11:22 ` Jens Axboe -- strict thread matches above, loose matches on Subject: below -- 2020-05-25 11:29 block I/O accounting improvements Christoph Hellwig 2020-05-25 11:30 ` [PATCH 05/16] bcache: use bio_{start,end}_io_acct Christoph Hellwig 2020-05-25 11:30 ` Christoph Hellwig 2020-05-25 13:03 ` Coly Li 2020-05-25 13:03 ` Coly Li
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=20200527052419.403583-6-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=colyli@suse.de \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=khlebnikov@yandex-team.ru \ --cc=linux-bcache@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.