@@ -1256,14 +1256,14 @@ unsigned int blk_rq_err_bytes(const struct request *rq)
}
EXPORT_SYMBOL_GPL(blk_rq_err_bytes);
-static void update_io_ticks(struct hd_struct *part, unsigned long now, bool end)
+static void update_io_ticks(struct hd_struct *part, unsigned long now, bool inflight)
{
unsigned long stamp;
again:
stamp = READ_ONCE(part->stamp);
if (unlikely(stamp != now)) {
- if (likely(cmpxchg(&part->stamp, stamp, now) == stamp))
- __part_stat_add(part, io_ticks, end ? now - stamp : 1);
+ if (likely(cmpxchg(&part->stamp, stamp, now) == stamp) && inflight)
+ __part_stat_add(part, io_ticks, now - stamp);
}
if (part->partno) {
part = &part_to_disk(part)->part0;
@@ -1310,13 +1310,20 @@ void blk_account_io_done(struct request *req, u64 now)
void blk_account_io_start(struct request *rq)
{
+ struct hd_struct *part;
+ struct request_queue *q;
+ bool inflight;
+
if (!blk_do_io_stat(rq))
return;
rq->part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));
part_stat_lock();
- update_io_ticks(rq->part, jiffies, false);
+ part = rq->part;
+ q = part_to_disk(part)->queue;
+ inflight = blk_mq_part_is_in_flight(q, part);
+ update_io_ticks(part, jiffies, inflight);
part_stat_unlock();
}
@@ -1325,12 +1332,14 @@ static unsigned long __part_start_io_acct(struct hd_struct *part,
{
const int sgrp = op_stat_group(op);
unsigned long now = READ_ONCE(jiffies);
+ bool inflight;
part_stat_lock();
- update_io_ticks(part, now, false);
part_stat_inc(part, ios[sgrp]);
part_stat_add(part, sectors[sgrp], sectors);
part_stat_local_inc(part, in_flight[op_is_write(op)]);
+ inflight = part_is_in_flight(part);
+ update_io_ticks(part, now, inflight);
part_stat_unlock();
return now;
@@ -130,6 +130,51 @@ void blk_mq_in_flight_rw(struct request_queue *q, struct hd_struct *part,
inflight[1] = mi.inflight[1];
}
+bool blk_mq_part_is_in_flight(struct request_queue *q, struct hd_struct *part)
+{
+ struct blk_mq_hw_ctx *hctx;
+ int i;
+ bool is_inflight;
+
+ /*
+ * __blk_mq_update_nr_hw_queues() updates nr_hw_queues and queue_hw_ctx
+ * while the queue is frozen. So we can use q_usage_counter to avoid
+ * racing with it. __blk_mq_update_nr_hw_queues() uses
+ * synchronize_rcu() to ensure this function left the critical section
+ * below.
+ */
+ if (!percpu_ref_tryget(&q->q_usage_counter))
+ return false;
+
+ is_inflight = false;
+ queue_for_each_hw_ctx(q, hctx, i) {
+ struct blk_mq_tags *tags = hctx->tags;
+
+ /*
+ * If no software queues are currently mapped to this
+ * hardware queue, there's nothing to check
+ */
+ if (!blk_mq_hw_queue_mapped(hctx))
+ continue;
+
+ if (tags->nr_reserved_tags) {
+ if (sbitmap_any_bit_set(&tags->breserved_tags->sb)) {
+ is_inflight = true;
+ goto out;
+ }
+ }
+ if (sbitmap_any_bit_set(&tags->bitmap_tags->sb)) {
+ is_inflight = true;
+ goto out;
+ }
+ }
+
+out:
+ blk_queue_exit(q);
+
+ return is_inflight;
+}
+
void blk_freeze_queue_start(struct request_queue *q)
{
mutex_lock(&q->mq_freeze_lock);
@@ -76,6 +76,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx,
blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last);
void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
struct list_head *list);
+bool blk_mq_part_is_in_flight(struct request_queue *q, struct hd_struct *part);
/*
* CPU -> queue mappings
@@ -443,5 +443,6 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)
int bio_add_hw_page(struct request_queue *q, struct bio *bio,
struct page *page, unsigned int len, unsigned int offset,
unsigned int max_sectors, bool *same_page);
+bool part_is_in_flight(struct hd_struct *part);
#endif /* BLK_INTERNAL_H */
@@ -109,6 +109,19 @@ static void part_stat_read_all(struct hd_struct *part, struct disk_stats *stat)
}
}
+bool part_is_in_flight(struct hd_struct *part)
+{
+ int cpu;
+
+ for_each_possible_cpu(cpu) {
+ if (part_stat_local_read_cpu(part, in_flight[0], cpu) ||
+ part_stat_local_read_cpu(part, in_flight[1], cpu))
+ return true;
+ }
+
+ return false;
+}
+
static unsigned int part_in_flight(struct hd_struct *part)
{
unsigned int inflight = 0;
Do not add io_ticks if there is no infligh io when start a new IO, otherwise an extra 1 jiffy will be add to this IO. I run the following command on a host, with different kernel version. fio -name=test -ioengine=sync -bs=4K -rw=write -filename=/home/test.fio.log -size=100M -time_based=1 -direct=1 -runtime=300 -rate=2m,2m If we run fio in a sync direct io mode, IO will be proccessed one by one, you can see that there are 512 IOs completed in one second. kernel: 4.19.0 Device: rrqm/s wrqm/s r/s w/s rMB/s wMB/s avgrq-sz avgqu-sz await r_await w_await svctm %util vda 0.00 0.00 0.00 512.00 0.00 2.00 8.00 0.21 0.40 0.00 0.40 0.40 20.60 The averate io.latency is 0.4ms, so the disk time cost in one second should be 0.4 * 512 = 204.8 ms, that means, %util should be 20%. Becase update_io_ticks will add a extra 1 jiffy(1ms) for every IO, the io.latency will be 1 + 0.4 = 1.4ms, 1.4 * 512 = 716.8ms, so the %util show it about 72%. Device r/s w/s rMB/s wMB/s rrqm/s wrqm/s %rrqm %wrqm r_await w_await aqu-sz rareq-sz wareq-sz svctm %util vda 0.00 512.00 0.00 2.00 0.00 0.00 0.00 0.00 0.00 0.40 0.20 0.00 4.00 1.41 72.10 After this patch: Device r/s w/s rMB/s wMB/s rrqm/s wrqm/s %rrqm %wrqm r_await w_await aqu-sz rareq-sz wareq-sz svctm %util vda 0.00 512.00 0.00 2.00 0.00 0.00 0.00 0.00 0.00 0.40 0.20 0.00 4.00 0.39 20.00 Fixes: 5b18b5a73760 ("block: delete part_round_stats and switch to less precise counting") Signed-off-by: Weiping Zhang <zhangweiping@didiglobal.com> --- Changes since v1: * avoid iterate all tagset, return directly if find a set bit. * fix some typo in commit message block/blk-core.c | 19 ++++++++++++++----- block/blk-mq.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-mq.h | 1 + block/blk.h | 1 + block/genhd.c | 13 +++++++++++++ 5 files changed, 74 insertions(+), 5 deletions(-)