| Message ID | 20231027180302.418676-9-kartilak@cisco.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce support for multiqueue (MQ) in fnic | expand |
On 10/27/23 20:02, Karan Tilak Kumar wrote: > Define an array to track IOs for the different queues, > print the IO stats in fnic get stats data. > > Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com> > Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com> > Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com> > --- > drivers/scsi/fnic/fnic_stats.h | 2 ++ > drivers/scsi/fnic/fnic_trace.c | 11 +++++++++++ > 2 files changed, 13 insertions(+) > > diff --git a/drivers/scsi/fnic/fnic_stats.h b/drivers/scsi/fnic/fnic_stats.h > index 07d1556e3c32..9d7f98c452dd 100644 > --- a/drivers/scsi/fnic/fnic_stats.h > +++ b/drivers/scsi/fnic/fnic_stats.h > @@ -2,6 +2,7 @@ > /* Copyright 2013 Cisco Systems, Inc. All rights reserved. */ > #ifndef _FNIC_STATS_H_ > #define _FNIC_STATS_H_ > +#define FNIC_MQ_MAX_QUEUES 64 > > struct stats_timestamps { > struct timespec64 last_reset_time; > @@ -26,6 +27,7 @@ struct io_path_stats { > atomic64_t io_btw_10000_to_30000_msec; > atomic64_t io_greater_than_30000_msec; > atomic64_t current_max_io_time; > + atomic64_t ios[FNIC_MQ_MAX_QUEUES]; > }; > > struct abort_stats { > diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c > index be0d7c57b242..aaa4ea02fb7c 100644 > --- a/drivers/scsi/fnic/fnic_trace.c > +++ b/drivers/scsi/fnic/fnic_trace.c > @@ -204,6 +204,7 @@ int fnic_get_stats_data(struct stats_debug_info *debug, > int len = 0; > int buf_size = debug->buf_size; > struct timespec64 val1, val2; > + int i = 0; > > ktime_get_real_ts64(&val1); > len = scnprintf(debug->debug_buffer + len, buf_size - len, > @@ -266,6 +267,16 @@ int fnic_get_stats_data(struct stats_debug_info *debug, > (u64)atomic64_read(&stats->io_stats.io_btw_10000_to_30000_msec), > (u64)atomic64_read(&stats->io_stats.io_greater_than_30000_msec)); > > + len += scnprintf(debug->debug_buffer + len, buf_size - len, > + "------------------------------------------\n" > + "\t\tIO Queues and cumulative IOs\n" > + "------------------------------------------\n"); > + > + for (i = 0; i < FNIC_MQ_MAX_QUEUES; i++) { > + len += scnprintf(debug->debug_buffer + len, buf_size - len, > + "Q:%d -> %lld\n", i, (u64)atomic64_read(&stats->io_stats.ios[i])); > + } > + > len += scnprintf(debug->debug_buffer + len, buf_size - len, > "\nCurrent Max IO time : %lld\n", > (u64)atomic64_read(&stats->io_stats.current_max_io_time)); Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/drivers/scsi/fnic/fnic_stats.h b/drivers/scsi/fnic/fnic_stats.h index 07d1556e3c32..9d7f98c452dd 100644 --- a/drivers/scsi/fnic/fnic_stats.h +++ b/drivers/scsi/fnic/fnic_stats.h @@ -2,6 +2,7 @@ /* Copyright 2013 Cisco Systems, Inc. All rights reserved. */ #ifndef _FNIC_STATS_H_ #define _FNIC_STATS_H_ +#define FNIC_MQ_MAX_QUEUES 64 struct stats_timestamps { struct timespec64 last_reset_time; @@ -26,6 +27,7 @@ struct io_path_stats { atomic64_t io_btw_10000_to_30000_msec; atomic64_t io_greater_than_30000_msec; atomic64_t current_max_io_time; + atomic64_t ios[FNIC_MQ_MAX_QUEUES]; }; struct abort_stats { diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index be0d7c57b242..aaa4ea02fb7c 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -204,6 +204,7 @@ int fnic_get_stats_data(struct stats_debug_info *debug, int len = 0; int buf_size = debug->buf_size; struct timespec64 val1, val2; + int i = 0; ktime_get_real_ts64(&val1); len = scnprintf(debug->debug_buffer + len, buf_size - len, @@ -266,6 +267,16 @@ int fnic_get_stats_data(struct stats_debug_info *debug, (u64)atomic64_read(&stats->io_stats.io_btw_10000_to_30000_msec), (u64)atomic64_read(&stats->io_stats.io_greater_than_30000_msec)); + len += scnprintf(debug->debug_buffer + len, buf_size - len, + "------------------------------------------\n" + "\t\tIO Queues and cumulative IOs\n" + "------------------------------------------\n"); + + for (i = 0; i < FNIC_MQ_MAX_QUEUES; i++) { + len += scnprintf(debug->debug_buffer + len, buf_size - len, + "Q:%d -> %lld\n", i, (u64)atomic64_read(&stats->io_stats.ios[i])); + } + len += scnprintf(debug->debug_buffer + len, buf_size - len, "\nCurrent Max IO time : %lld\n", (u64)atomic64_read(&stats->io_stats.current_max_io_time));