Further block iostat cleanups
Jens Axboe
maintainercover Further block iostat cleanups
Hi,
1) Drop unnecessary ->part check, RQF_IO_STAT should always be the only gating factor for if the request is accounted or not.
2) Kill blk_do_io_stat() helper, as now the only thing being checked is RQF_IO_STAT and hence it serves no purpose.
block/blk-merge.c | 13 ++++++------- block/blk-mq.c | 7 +++---- block/blk.h | 11 ----------- 3 files changed, 9 insertions(+), 22 deletions(-)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 block: remove 'req->part' check for stats accounting
If RQF_IO_STAT is set, then accounting is enabled. There's no need to further gate this on req->part being set or not, RQF_IO_STAT should never be set if accounting is not being done for this request.
--- block/blk-mq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
block/blk-mq.c +3 -4
@@ -92,7 +92,7 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv) {struct mq_inflight *mi = priv; -if (rq->part &&blk_do_io_stat (rq) && +if (blk_do_io_stat (rq) && (!bdev_is_partition (mi->part) || rq->part == mi->part) &&blk_mq_rq_state (rq) ==MQ_RQ_IN_FLIGHT ) mi->inflight[rq_data_dir (rq)]++;
@@ -762,7 +762,7 @@ EXPORT_SYMBOL(blk_dump_rq_flags);static void blk_account_io_completion (struct request *req,unsigned int bytes) { -if (req->part &&blk_do_io_stat (req)) { +if (blk_do_io_stat (req)) {const int sgrp =op_stat_group (req_op (req));part_stat_lock ();
@@ -980,8 +980,7 @@ static inline void blk_account_io_done(struct request *req, u64 now)* normal IO on queueing nor completion. Accounting the * containing request is enough. */ -if (blk_do_io_stat (req) && req->part && - !(req->rq_flags &RQF_FLUSH_SEQ )) { +if (blk_do_io_stat (req) && !(req->rq_flags &RQF_FLUSH_SEQ )) {const int sgrp =op_stat_group (req_op (req));part_stat_lock ();
Signature · 1 line
2.45.2
Re: [PATCH 1/2] block: remove 'req->part' check for stats accounting
Looks good:
Jens Axboe
maintainerPATCH 2/2 block: kill blk_do_io_stat() helper
In reply to Jens AxboeIt's now just checking whether or not RQF_IO_STAT is set, so let's get rid of it and just open-code the specific flag that is being checked.
--- block/blk-merge.c | 13 ++++++------- block/blk-mq.c | 6 +++--- block/blk.h | 11 ----------- 3 files changed, 9 insertions(+), 21 deletions(-)
block/blk-merge.c +6 -7
@@ -797,7 +797,7 @@ static inline void blk_update_mixed_merge(struct request *req,static void blk_account_io_merge_request (struct request *req) { -if (blk_do_io_stat (req)) { +if (req->rq_flags &RQF_IO_STAT ) {part_stat_lock ();part_stat_inc (req->part, merges[op_stat_group (req_op (req))]); part_stat_local_dec(req->part,
@@ -1005,12 +1005,11 @@ enum elv_merge blk_try_merge(struct request *rq, struct bio *bio)static void blk_account_io_merge_bio (struct request *req) { -if (!blk_do_io_stat (req)) -return ; - -part_stat_lock (); -part_stat_inc (req->part, merges[op_stat_group (req_op (req))]); -part_stat_unlock (); +if (req->rq_flags &RQF_IO_STAT ) { +part_stat_lock (); +part_stat_inc (req->part, merges[op_stat_group (req_op (req))]); +part_stat_unlock (); + } } enum bio_merge_status bio_attempt_back_merge(struct request *req,
block/blk-mq.c +3 -3
@@ -92,7 +92,7 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv) {struct mq_inflight *mi = priv; -if (blk_do_io_stat (rq) && +if (rq->rq_flags &RQF_IO_STAT && (!bdev_is_partition (mi->part) || rq->part == mi->part) &&blk_mq_rq_state (rq) ==MQ_RQ_IN_FLIGHT ) mi->inflight[rq_data_dir (rq)]++;
@@ -762,7 +762,7 @@ EXPORT_SYMBOL(blk_dump_rq_flags);static void blk_account_io_completion (struct request *req,unsigned int bytes) { -if (blk_do_io_stat (req)) { +if (req->rq_flags &RQF_IO_STAT ) {const int sgrp =op_stat_group (req_op (req));part_stat_lock ();
@@ -980,7 +980,7 @@ static inline void blk_account_io_done(struct request *req, u64 now)* normal IO on queueing nor completion. Accounting the * containing request is enough. */ -if (blk_do_io_stat (req) && !(req->rq_flags &RQF_FLUSH_SEQ )) { +if ((req->rq_flags & (RQF_IO_STAT |RQF_FLUSH_SEQ )) ==RQF_IO_STAT ) {const int sgrp =op_stat_group (req_op (req));part_stat_lock ();
block/blk.h +0 -11
@@ -405,17 +405,6 @@ void blk_apply_bdi_limits(struct backing_dev_info *bdi, struct queue_limits *lim);int blk_dev_init (void ); -/* -* Contribute to IO statistics IFF: -* -* a) it's attached to a gendisk, and -* b) the queue had IO stats enabled when this request was started -*/ -static inline bool blk_do_io_stat (struct request *rq) -{ -return rq->rq_flags &RQF_IO_STAT ; -} -void update_io_ticks (struct block_device *part,unsigned long now,bool end);unsigned int part_in_flight (struct block_device *part);
Signature · 1 line
2.45.2
Re: [PATCH 2/2] block: kill blk_do_io_stat() helper
Looks good: