* [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device
@ 2020-07-28 13:59 colyli
2020-07-28 15:23 ` Coly Li
2020-07-28 15:23 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: colyli @ 2020-07-28 13:59 UTC (permalink / raw)
To: axboe; +Cc: linux-bcache, linux-block, Coly Li, Christoph Hellwig, stable
From: Coly Li <colyli@suse.de>
This patch is a fix to patch "bcache: fix bio_{start,end}_io_acct with
proper device". The previous patch uses a hack to temporarily set
bi_disk to bcache device, which is mistaken too.
As Christoph suggests, this patch uses disk_{start,end}_io_acct() to
count I/O for bcache device in the correct way.
Fixes: 85750aeb748f ("bcache: use bio_{start,end}_io_acct")
Signed-off-by: Coly Li <colyli@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
---
drivers/md/bcache/request.c | 37 +++++++++----------------------------
1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 8ea0f079c1d0..9cc044293acd 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -617,28 +617,6 @@ static void cache_lookup(struct closure *cl)
/* Common code for the make_request functions */
-static inline void bch_bio_start_io_acct(struct gendisk *acct_bi_disk,
- struct bio *bio,
- unsigned long *start_time)
-{
- struct gendisk *saved_bi_disk = bio->bi_disk;
-
- bio->bi_disk = acct_bi_disk;
- *start_time = bio_start_io_acct(bio);
- bio->bi_disk = saved_bi_disk;
-}
-
-static inline void bch_bio_end_io_acct(struct gendisk *acct_bi_disk,
- struct bio *bio,
- unsigned long start_time)
-{
- struct gendisk *saved_bi_disk = bio->bi_disk;
-
- bio->bi_disk = acct_bi_disk;
- bio_end_io_acct(bio, start_time);
- bio->bi_disk = saved_bi_disk;
-}
-
static void request_endio(struct bio *bio)
{
struct closure *cl = bio->bi_private;
@@ -690,7 +668,9 @@ static void backing_request_endio(struct bio *bio)
static void bio_complete(struct search *s)
{
if (s->orig_bio) {
- bch_bio_end_io_acct(s->d->disk, s->orig_bio, s->start_time);
+ /* Count on bcache device */
+ disk_end_io_acct(s->d->disk, bio_op(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);
@@ -750,8 +730,8 @@ 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;
- bch_bio_start_io_acct(d->disk, bio, &s->start_time);
-
+ /* Count on the bcache device */
+ s->start_time = disk_start_io_acct(d->disk, bio_sectors(bio), bio_op(bio));
s->iop.c = d->c;
s->iop.bio = NULL;
s->iop.inode = d->id;
@@ -1102,7 +1082,8 @@ static void detached_dev_end_io(struct bio *bio)
bio->bi_end_io = ddip->bi_end_io;
bio->bi_private = ddip->bi_private;
- bch_bio_end_io_acct(ddip->d->disk, bio, ddip->start_time);
+ /* Count on the bcache device */
+ disk_end_io_acct(ddip->d->disk, bio_op(bio), ddip->start_time);
if (bio->bi_status) {
struct cached_dev *dc = container_of(ddip->d,
@@ -1127,8 +1108,8 @@ 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;
- bch_bio_start_io_acct(d->disk, bio, &ddip->start_time);
-
+ /* Count on the bcache device */
+ ddip->start_time = disk_start_io_acct(d->disk, bio_sectors(bio), bio_op(bio));
ddip->bi_end_io = bio->bi_end_io;
ddip->bi_private = bio->bi_private;
bio->bi_end_io = detached_dev_end_io;
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device
2020-07-28 13:59 [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device colyli
@ 2020-07-28 15:23 ` Coly Li
2020-07-28 15:23 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Coly Li @ 2020-07-28 15:23 UTC (permalink / raw)
To: axboe, Christoph Hellwig; +Cc: linux-bcache, linux-block, stable
On 2020/7/28 21:59, colyli@suse.de wrote:
> From: Coly Li <colyli@suse.de>
>
> This patch is a fix to patch "bcache: fix bio_{start,end}_io_acct with
> proper device". The previous patch uses a hack to temporarily set
> bi_disk to bcache device, which is mistaken too.
>
> As Christoph suggests, this patch uses disk_{start,end}_io_acct() to
> count I/O for bcache device in the correct way.
>
> Fixes: 85750aeb748f ("bcache: use bio_{start,end}_io_acct")
> Signed-off-by: Coly Li <colyli@suse.de>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: stable@vger.kernel.org
Hi Jens and Christoph,
This patch is tested, the I/O counter behavior is displayed by iostat in
expected way.
Please consider to take it for Linux v5.9.
Thanks in advance.
Coly Li
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device
2020-07-28 13:59 [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device colyli
2020-07-28 15:23 ` Coly Li
@ 2020-07-28 15:23 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-07-28 15:23 UTC (permalink / raw)
To: colyli; +Cc: linux-bcache, linux-block, Christoph Hellwig, stable
On 7/28/20 7:59 AM, colyli@suse.de wrote:
> From: Coly Li <colyli@suse.de>
>
> This patch is a fix to patch "bcache: fix bio_{start,end}_io_acct with
> proper device". The previous patch uses a hack to temporarily set
> bi_disk to bcache device, which is mistaken too.
>
> As Christoph suggests, this patch uses disk_{start,end}_io_acct() to
> count I/O for bcache device in the correct way.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-28 15:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 13:59 [PATCH] bcache: use disk_{start,end}_io_acct() to count I/O for bcache device colyli
2020-07-28 15:23 ` Coly Li
2020-07-28 15:23 ` Jens Axboe
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).