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
Subject: [PATCH 07/16] nvdimm: use bio_{start,end}_io_acct
Date: Mon, 25 May 2020 13:30:05 +0200 [thread overview]
Message-ID: <20200525113014.345997-8-hch@lst.de> (raw)
In-Reply-To: <20200525113014.345997-1-hch@lst.de>
Switch dm to use the nicer bio accounting helpers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvdimm/blk.c | 6 ++++--
drivers/nvdimm/btt.c | 6 ++++--
drivers/nvdimm/nd.h | 19 -------------------
drivers/nvdimm/pmem.c | 6 ++++--
4 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 43751fab9d36a..036e23aef9b04 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -178,7 +178,9 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
bip = bio_integrity(bio);
nsblk = q->queuedata;
rw = bio_data_dir(bio);
- do_acct = nd_iostat_start(bio, &start);
+ do_acct = blk_queue_io_stat(bio->bi_disk->queue);
+ if (do_acct)
+ start = bio_start_io_acct(bio);
bio_for_each_segment(bvec, bio, iter) {
unsigned int len = bvec.bv_len;
@@ -195,7 +197,7 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
}
}
if (do_acct)
- nd_iostat_end(bio, start);
+ bio_end_io_acct(bio, start);
bio_endio(bio);
return BLK_QC_T_NONE;
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 3b09419218d6f..90c0c4bbe77b9 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1452,7 +1452,9 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
if (!bio_integrity_prep(bio))
return BLK_QC_T_NONE;
- do_acct = nd_iostat_start(bio, &start);
+ do_acct = blk_queue_io_stat(bio->bi_disk->queue);
+ if (do_acct)
+ start = bio_start_io_acct(bio);
bio_for_each_segment(bvec, bio, iter) {
unsigned int len = bvec.bv_len;
@@ -1477,7 +1479,7 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
}
}
if (do_acct)
- nd_iostat_end(bio, start);
+ bio_end_io_acct(bio, start);
bio_endio(bio);
return BLK_QC_T_NONE;
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 85dbb2a322b9b..85c1ae813ea31 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -396,25 +396,6 @@ static inline int nvdimm_setup_pfn(struct nd_pfn *nd_pfn,
#endif
int nd_blk_region_init(struct nd_region *nd_region);
int nd_region_activate(struct nd_region *nd_region);
-void __nd_iostat_start(struct bio *bio, unsigned long *start);
-static inline bool nd_iostat_start(struct bio *bio, unsigned long *start)
-{
- struct gendisk *disk = bio->bi_disk;
-
- if (!blk_queue_io_stat(disk->queue))
- return false;
-
- *start = jiffies;
- generic_start_io_acct(disk->queue, bio_op(bio), bio_sectors(bio),
- &disk->part0);
- return true;
-}
-static inline void nd_iostat_end(struct bio *bio, unsigned long start)
-{
- struct gendisk *disk = bio->bi_disk;
-
- generic_end_io_acct(disk->queue, bio_op(bio), &disk->part0, start);
-}
static inline bool is_bad_pmem(struct badblocks *bb, sector_t sector,
unsigned int len)
{
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 2df6994acf836..97f948f8f4e62 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -202,7 +202,9 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
if (bio->bi_opf & REQ_PREFLUSH)
ret = nvdimm_flush(nd_region, bio);
- do_acct = nd_iostat_start(bio, &start);
+ do_acct = blk_queue_io_stat(bio->bi_disk->queue);
+ if (do_acct)
+ start = bio_start_io_acct(bio);
bio_for_each_segment(bvec, bio, iter) {
if (op_is_write(bio_op(bio)))
rc = pmem_do_write(pmem, bvec.bv_page, bvec.bv_offset,
@@ -216,7 +218,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
}
}
if (do_acct)
- nd_iostat_end(bio, start);
+ bio_end_io_acct(bio, start);
if (bio->bi_opf & REQ_FUA)
ret = nvdimm_flush(nd_region, bio);
--
2.26.2
next prev parent reply other threads:[~2020-05-25 11:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 11:29 block I/O accounting improvements Christoph Hellwig
2020-05-25 11:29 ` [PATCH 01/16] block: add disk/bio-based accounting helpers Christoph Hellwig
2020-05-25 12:28 ` Konstantin Khlebnikov
[not found] ` <fafb94a9-cdce-5ea0-e73f-9463766a9f19-XoJtRXgx1JseBXzfvpsJ4g@public.gmane.org>
2020-05-27 5:23 ` Christoph Hellwig
2020-05-27 5:23 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 02/16] drbd: use bio_{start,end}_io_acct Christoph Hellwig
2020-05-25 11:30 ` [PATCH 03/16] rsxx: " Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 04/16] lightnvm/pblk: " Christoph Hellwig
2020-05-25 11:30 ` [PATCH 05/16] bcache: " Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 13:03 ` Coly Li
2020-05-25 13:03 ` Coly Li
2020-05-25 11:30 ` [PATCH 06/16] dm: " Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig [this message]
2020-05-25 11:30 ` [PATCH 07/16] nvdimm: " Christoph Hellwig
2020-05-25 11:30 ` [PATCH 08/16] zram: nvdimm: use bio_{start,end}_io_acct and disk_{start,end}_io_acct Christoph Hellwig
2020-05-25 11:30 ` [PATCH 09/16] block: remove generic_{start,end}_io_acct Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 10/16] block: move update_io_ticks to blk-core.c Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 11/16] block: always use a percpu variable for disk stats Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 12/16] block: account merge of two requests Christoph Hellwig
2020-05-25 11:30 ` [PATCH 13/16] block: add a blk_account_io_merge_bio helper Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 14/16] block: remove rcu_read_lock() from part_stat_lock() Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 15/16] block: use __this_cpu_add() instead of access by smp_processor_id() Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 11:30 ` [PATCH 16/16] block: reduce part_stat_lock() scope Christoph Hellwig
2020-05-25 11:30 ` Christoph Hellwig
2020-05-25 12:34 ` block I/O accounting improvements Konstantin Khlebnikov
2020-05-25 12:34 ` Konstantin Khlebnikov
2020-05-27 5:24 block I/O accounting improvements v2 Christoph Hellwig
2020-05-27 5:24 ` [PATCH 07/16] nvdimm: use bio_{start,end}_io_acct Christoph Hellwig
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=20200525113014.345997-8-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--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: 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).