Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf0ddaba authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

blk-mq: fix sysfs inflight counter 



When the blk-mq inflight implementation was added, /proc/diskstats was
converted to use it, but /sys/block/$dev/inflight was not. Fix it by
adding another helper to count in-flight requests by data direction.

Fixes: f299b7c7 ("blk-mq: provide internal in-flight variant")
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6131837b

block/blk-mq.c

+19 −0
Original line number Diff line number Diff line
@@ -115,6 +115,25 @@ void blk_mq_in_flight(struct request_queue *q, struct hd_struct *part, 
	blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight, &mi);

}



static void blk_mq_check_inflight_rw(struct blk_mq_hw_ctx *hctx,

				     struct request *rq, void *priv,

				     bool reserved)

{

	struct mq_inflight *mi = priv;



	if (rq->part == mi->part)

		mi->inflight[rq_data_dir(rq)]++;

}



void blk_mq_in_flight_rw(struct request_queue *q, struct hd_struct *part,

			 unsigned int inflight[2])

{

	struct mq_inflight mi = { .part = part, .inflight = inflight, };



	inflight[0] = inflight[1] = 0;

	blk_mq_queue_tag_busy_iter(q, blk_mq_check_inflight_rw, &mi);

}



void blk_freeze_queue_start(struct request_queue *q)

{

	int freeze_depth;

block/blk-mq.h

+3 −1
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx) 


void blk_mq_in_flight(struct request_queue *q, struct hd_struct *part,

		      unsigned int inflight[2]);

void blk_mq_in_flight_rw(struct request_queue *q, struct hd_struct *part,

			 unsigned int inflight[2]);



static inline void blk_mq_put_dispatch_budget(struct blk_mq_hw_ctx *hctx)

{

block/genhd.c

+12 −0
Original line number Diff line number Diff line
@@ -82,6 +82,18 @@ void part_in_flight(struct request_queue *q, struct hd_struct *part, 
	}

}



void part_in_flight_rw(struct request_queue *q, struct hd_struct *part,

		       unsigned int inflight[2])

{

	if (q->mq_ops) {

		blk_mq_in_flight_rw(q, part, inflight);

		return;

	}



	inflight[0] = atomic_read(&part->in_flight[0]);

	inflight[1] = atomic_read(&part->in_flight[1]);

}



struct hd_struct *__disk_get_part(struct gendisk *disk, int partno)

{

	struct disk_part_tbl *ptbl = rcu_dereference(disk->part_tbl);

block/partition-generic.c

+6 −4
Original line number Diff line number Diff line
@@ -145,13 +145,15 @@ ssize_t part_stat_show(struct device *dev, 
		jiffies_to_msecs(part_stat_read(p, time_in_queue)));

}



ssize_t part_inflight_show(struct device *dev,

			struct device_attribute *attr, char *buf)

ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,

			   char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = part_to_disk(p)->queue;

	unsigned int inflight[2];



	return sprintf(buf, "%8u %8u\n", atomic_read(&p->in_flight[0]),

		atomic_read(&p->in_flight[1]));

	part_in_flight_rw(q, p, inflight);

	return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]);

}



#ifdef CONFIG_FAIL_MAKE_REQUEST

include/linux/genhd.h

+3 −1
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ static inline void free_part_stats(struct hd_struct *part) 


void part_in_flight(struct request_queue *q, struct hd_struct *part,

		    unsigned int inflight[2]);

void part_in_flight_rw(struct request_queue *q, struct hd_struct *part,

		       unsigned int inflight[2]);

void part_dec_in_flight(struct request_queue *q, struct hd_struct *part,

			int rw);

void part_inc_in_flight(struct request_queue *q, struct hd_struct *part,