@@ -105,7 +105,7 @@ static struct per_process_info *ppi_list;
static int ppi_list_entries;
static struct option l_opts[] = {
- {
+ {
.name = "act-mask",
.has_arg = required_argument,
.flag = NULL,
@@ -177,6 +177,26 @@ static struct option l_opts[] = {
.flag = NULL,
.val = 'O'
},
+#ifdef CONFIG_BLKTRACE_EXT
+ {
+ .name = "track-priority",
+ .has_arg = no_argument,
+ .flag = NULL,
+ .val = 'p'
+ },
+ {
+ .name = "prio-mask",
+ .has_arg = required_argument,
+ .flag = NULL,
+ .val = 'x'
+ },
+ {
+ .name = "prio-set-mask",
+ .has_arg = required_argument,
+ .flag = NULL,
+ .val = 'X'
+ },
+#endif /* CONFIG_BLKTRACE_EXT */
{
.name = "quiet",
.has_arg = no_argument,
@@ -273,9 +293,21 @@ static int per_device_and_cpu_stats = 1;
static int track_ios;
static int ppi_hash_by_pid = 1;
static int verbose;
+
+#ifdef CONFIG_BLKTRACE_EXT
+static uint64_t act_mask = -1ULL;
+/* by default don't trace priority */
+uint32_t blkparse_prio_mask;
+#else
static unsigned int act_mask = -1U;
+#endif /* CONFIG_BLKTRACE_EXT */
+
static int stats_printed;
static int bin_output_msgs = 1;
+
+#ifdef CONFIG_BLKTRACE_EXT
+int bparse_track_prio;
+#endif /* CONFIG_BLKTRACE_EXT */
int data_is_native = -1;
static FILE *dump_fp;
@@ -1614,7 +1646,11 @@ static void dump_trace_fs(struct blk_io_trace *t, struct per_dev_info *pdi,
/* dump to binary file only */
break;
default:
+#ifdef CONFIG_BLKTRACE_EXT
+ fprintf(stderr, "Bad fs action %llx\n", t->action);
+#else
fprintf(stderr, "Bad fs action %x\n", t->action);
+#endif /* CONFIG_BLKTRACE_EXT */
break;
}
}
@@ -2730,7 +2766,11 @@ static int is_pipe(const char *str)
return 0;
}
+#ifdef CONFIG_BLKTRACE_EXT
+#define S_OPTS "a:A:b:D:d:f:F:hi:o:Oqstw:vVMpx:X:"
+#else
#define S_OPTS "a:A:b:D:d:f:F:hi:o:Oqstw:vVM"
+#endif /* CONFIG_BLKTRACE_EXT */
static char usage_str[] = "\n\n" \
"-i <file> | --input=<file>\n" \
"[ -a <action field> | --act-mask=<action field> ]\n" \
@@ -2746,6 +2786,9 @@ static char usage_str[] = "\n\n" \
"[ -q | --quiet ]\n" \
"[ -s | --per-program-stats ]\n" \
"[ -t | --track-ios ]\n" \
+ "[ -p | --track-prio ]\n" \
+ "[ -x <ioprio field> | --act-mask=<ioprio field> ]\n" \
+ "[ -X <ioprio mask> | --set-mask=<ioprio mask> ]\n" \
"[ -w <time> | --stopwatch=<time> ]\n" \
"[ -M | --no-msgs\n" \
"[ -v | --verbose ]\n" \
@@ -2762,6 +2805,9 @@ static char usage_str[] = "\n\n" \
"\t-i Input file containing trace data, or '-' for stdin\n" \
"\t-o Output file. If not given, output is stdout\n" \
"\t-O Do NOT output text data\n" \
+ "\t-p Track indivisual I/Os priority.\n" \
+ "\t-x Only trace specified priority.\n" \
+ "\t-X Give priority class mask as a single value.\n" \
"\t-q Quiet. Don't display any stats at the end of the trace\n" \
"\t-s Show per-program io statistics\n" \
"\t-t Track individual ios. Will tell you the time a request took\n" \
@@ -2780,9 +2826,9 @@ static void usage(char *prog)
int main(int argc, char *argv[])
{
int i, c, ret, mode;
- int act_mask_tmp = 0;
char *ofp_buffer = NULL;
char *bin_ofp_buffer = NULL;
+ unsigned int act_mask_tmp = 0;
while ((c = getopt_long(argc, argv, S_OPTS, l_opts, NULL)) != -1) {
switch (c) {
@@ -2797,7 +2843,7 @@ int main(int argc, char *argv[])
break;
case 'A':
- if ((sscanf(optarg, "%x", &i) != 1) ||
+ if ((sscanf(optarg, "%x", &i) != 1) ||
!valid_act_opt(i)) {
fprintf(stderr,
"Invalid set action mask %s/0x%x\n",
@@ -2833,6 +2879,31 @@ int main(int argc, char *argv[])
case 't':
track_ios = 1;
break;
+#ifdef CONFIG_BLKTRACE_EXT
+ case 'p':
+ bparse_track_prio = 1;
+ break;
+ case 'x':
+ i = find_prio_mask_map(optarg);
+ if (i < 0) {
+ fprintf(stderr,"Invalid priority mask %s\n",
+ optarg);
+ return 1;
+ }
+ blkparse_prio_mask |= i;
+ break;
+
+ case 'X':
+ if ((sscanf(optarg, "%x", &i) != 1) ||
+ !valid_prio_opt(i)) {
+ fprintf(stderr,
+ "Invalid set priority mask %s/0x%x\n",
+ optarg, i);
+ return 1;
+ }
+ blkparse_prio_mask = i;
+ break;
+#endif /* CONFIG_BLKTRACE_EXT */
case 'q':
per_device_and_cpu_stats = 0;
break;
@@ -2884,6 +2955,14 @@ int main(int argc, char *argv[])
if (act_mask_tmp != 0)
act_mask = act_mask_tmp;
+#ifdef CONFIG_BLKTRACE_EXT
+ /*
+ * When track-priority is on and user didn't specify prio_mask then trace
+ * all the ioprio classes.
+ */
+ if (bparse_track_prio && !blkparse_prio_mask)
+ blkparse_prio_mask = TRACE_ALL_IOPRIO;
+#endif /* CONFIG_BLKTRACE_EXT */
memset(&rb_sort_root, 0, sizeof(rb_sort_root));
@@ -57,6 +57,7 @@ enum {
#define TRACE_ALL_IOPRIO ((1 << IOPRIO_CLASS_NONE) | (1 << IOPRIO_CLASS_RT) | \
(1 << IOPRIO_CLASS_BE) | (1 << IOPRIO_CLASS_IDLE))
+extern int bparse_track_prior;
#endif /* CONFIG_BLKTRACE_EXT */
typedef __u32 u32;
This patch adds support for blkparse tool to use the blktrace extension. Here we also add the support for priority tracking and using priority mask from the command line just like action mask. Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- blkparse.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- blktrace.h | 1 + 2 files changed, 83 insertions(+), 3 deletions(-)