hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4STNX?from=project-issue
CVE: NA

--------------------------------

When the inflight IOs are slow and no new IOs are issued, we expect
iostat could manifest the IO hang problem. However after
commit 5b18b5a73760 ("block: delete part_round_stats and switch to less
precise counting"), io_tick and time_in_queue will not be updated until
the end of IO, and the avgqu-sz and %util columns of iostat will be zero.

Because it has using stat.nsecs accumulation to express time_in_queue
which is not suitable to change, and may %util will express the status
better when io hang occur. To fix io_ticks, we use update_io_ticks and
inflight to update io_ticks when diskstats_show and part_stat_show
been called.

Fixes: 5b18b5a73760 ("block: delete part_round_stats and switch to less precise counting")
Signed-off-by: Zhang Wensheng <zhangwensheng5@huawei.com>

 {
 	req->cmd_flags |= REQ_NOMERGE;
diff --git a/block/genhd.c b/block/genhd.c
index 6566eacc807d..a2b247b12baf 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1301,12 +1301,14 @@ ssize_t part_stat_show(struct device *dev,
 	struct disk_stats stat;
 	unsigned int inflight;
 
-	part_stat_read_all(p, &stat);
 	if (queue_is_mq(q))
 		inflight = blk_mq_in_flight(q, p);
 	else
 		inflight = part_in_flight(p);
 
+	if (inflight)
+		update_io_ticks(p, jiffies, true);

+	part_stat_read_all(p, &stat);
 	return sprintf(buf,
 		"%8lu %8lu %8llu %8u "
 		"%8lu %8lu %8llu %8u "
@@ -1623,12 +1625,14 @@ static int diskstats_show(struct seq_file *seqf, void *v)
 
 	disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0);
 	while ((hd = disk_part_iter_next(&piter))) {
-		part_stat_read_all(hd, &stat);
 		if (queue_is_mq(gp->queue))
 			inflight = blk_mq_in_flight(gp->queue, hd);
 		else
 			inflight = part_in_flight(hd);
 
+		if (inflight)
+			update_io_ticks(hd, jiffies, true);
+		part_stat_read_all(hd, &stat);
 		seq_printf(seqf, "%4d %7d %s "
 			   "%lu %lu %lu %u "
 			   "%lu %lu %lu %u "