redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

block: account statistics for passthrough requests 

Presently, passthrough requests are not accounted for because
blk_do_io_stat() expressly rejects them. Based on some digging
in the history, this doesn't seem like a concious decision but
one that evolved from the change from blk_fs_request() to
blk_rq_is_passthrough().

To support this, call blk_account_io_start() in blk_execute_rq_nowait()
and remove the passthrough check in blk_do_io_stat().

Link: https://lore.kernel.org/linux-block/20191010100526.GA27209@lst.de/
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
alistair/sunxi64-5.5-dsi
Logan Gunthorpe 2019-10-10 17:36:26 -06:00 committed by Jens Axboe
parent 8148f0b564
commit 48d9b0d431
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-exec.c
View File

@ -55,6 +55,8 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
rq->rq_disk = bd_disk; rq->rq_disk = bd_disk;
rq->end_io = done; rq->end_io = done;
blk_account_io_start(rq, true);
/* /*
* don't check dying flag for MQ because the request won't * don't check dying flag for MQ because the request won't
* be reused after dying flag is set * be reused after dying flag is set

7
block/blk.h
View File

@ -242,14 +242,11 @@ int blk_dev_init(void);
* Contribute to IO statistics IFF: * Contribute to IO statistics IFF:
* *
* a) it's attached to a gendisk, and * a) it's attached to a gendisk, and
* b) the queue had IO stats enabled when this request was started, and * b) the queue had IO stats enabled when this request was started
* c) it's a file system request
*/ */
static inline bool blk_do_io_stat(struct request *rq) static inline bool blk_do_io_stat(struct request *rq)
{ {
return rq->rq_disk && return rq->rq_disk && (rq->rq_flags & RQF_IO_STAT);
(rq->rq_flags & RQF_IO_STAT) &&
!blk_rq_is_passthrough(rq);
} }
static inline void req_set_nomerge(struct request_queue *q, struct request *req) static inline void req_set_nomerge(struct request_queue *q, struct request *req)