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

Commit b226e5c4 authored by Vivek Goyal's avatar Vivek Goyal Committed by Tejun Heo
Browse files

cfq-iosched: Print sync-noidle information in blktrace messages 



Currently we attach a character "S" or "A" to the cfqq<pid>, to represent
whether queues is sync or async. Add one more character "N" to represent
whether it is sync-noidle queue or sync queue. So now three different
type of queues will look as follows.

cfq1234S   --> sync queus
cfq1234SN  --> sync noidle queue
cfq1234A   --> Async queue

Previously S/A classification was being printed only if group scheduling
was enabled. This patch also makes sure that this classification is
displayed even if group idling is disabled.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1f23f121

block/cfq-iosched.c

+7 −3
Original line number Diff line number Diff line
@@ -586,8 +586,9 @@ static inline void cfqg_put(struct cfq_group *cfqg) 
	char __pbuf[128];						\

									\

	blkg_path(cfqg_to_blkg((cfqq)->cfqg), __pbuf, sizeof(__pbuf));	\

	blk_add_trace_msg((cfqd)->queue, "cfq%d%c %s " fmt, (cfqq)->pid, \

	blk_add_trace_msg((cfqd)->queue, "cfq%d%c%c %s " fmt, (cfqq)->pid, \

			cfq_cfqq_sync((cfqq)) ? 'S' : 'A',		\

			cfqq_type((cfqq)) == SYNC_NOIDLE_WORKLOAD ? 'N' : ' ',\

			  __pbuf, ##args);				\

} while (0)
@@ -675,7 +676,10 @@ static inline void cfqg_get(struct cfq_group *cfqg) { } 
static inline void cfqg_put(struct cfq_group *cfqg) { }



#define cfq_log_cfqq(cfqd, cfqq, fmt, args...)	\

	blk_add_trace_msg((cfqd)->queue, "cfq%d " fmt, (cfqq)->pid, ##args)

	blk_add_trace_msg((cfqd)->queue, "cfq%d%c%c " fmt, (cfqq)->pid,	\

			cfq_cfqq_sync((cfqq)) ? 'S' : 'A',		\

			cfqq_type((cfqq)) == SYNC_NOIDLE_WORKLOAD ? 'N' : ' ',\

				##args)

#define cfq_log_cfqg(cfqd, cfqg, fmt, args...)		do {} while (0)



static inline void cfqg_stats_update_io_add(struct cfq_group *cfqg,