Skip to content

Commit

Permalink
RDMA/rtrs-clt: Follow "one entry one value" rule for IO migration stats
Browse files Browse the repository at this point in the history
This commit divides the sysfs entry cpu_migration into 2 different entries
One for "from cpus" and the other for "to cpus".

Link: https://lore.kernel.org/r/20210922125333.351454-8-haris.iqbal@ionos.com
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Reviewed-by: Gioh Kim <gi-oh.kim@ionos.com>
Reviewed-by: Aleksei Marov <aleksei.marov@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
  • Loading branch information
Md Haris Iqbal authored and Jason Gunthorpe committed Oct 4, 2021
1 parent dea7bb3 commit 3f3fe68
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
27 changes: 18 additions & 9 deletions drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,38 @@ void rtrs_clt_inc_failover_cnt(struct rtrs_clt_stats *stats)
s->rdma.failover_cnt++;
}

int rtrs_clt_stats_migration_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
int rtrs_clt_stats_migration_from_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
{
struct rtrs_clt_stats_pcpu *s;

size_t used;
int cpu;

used = sysfs_emit(buf, " ");
for_each_possible_cpu(cpu)
used += sysfs_emit_at(buf, used, " CPU%u", cpu);

used += sysfs_emit_at(buf, used, "\nfrom:");
used = 0;
for_each_possible_cpu(cpu) {
s = per_cpu_ptr(stats->pcpu_stats, cpu);
used += sysfs_emit_at(buf, used, " %d",
used += sysfs_emit_at(buf, used, "%d ",
atomic_read(&s->cpu_migr.from));
}

used += sysfs_emit_at(buf, used, "\nto :");
used += sysfs_emit_at(buf, used, "\n");

return used;
}

int rtrs_clt_stats_migration_to_cnt_to_str(struct rtrs_clt_stats *stats, char *buf)
{
struct rtrs_clt_stats_pcpu *s;

size_t used;
int cpu;

used = 0;
for_each_possible_cpu(cpu) {
s = per_cpu_ptr(stats->pcpu_stats, cpu);
used += sysfs_emit_at(buf, used, " %d", s->cpu_migr.to);
used += sysfs_emit_at(buf, used, "%d ", s->cpu_migr.to);
}

used += sysfs_emit_at(buf, used, "\n");

return used;
Expand Down
11 changes: 8 additions & 3 deletions drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,12 @@ static struct kobj_attribute rtrs_clt_remove_path_attr =
__ATTR(remove_path, 0644, rtrs_clt_remove_path_show,
rtrs_clt_remove_path_store);

STAT_ATTR(struct rtrs_clt_stats, cpu_migration,
rtrs_clt_stats_migration_cnt_to_str,
STAT_ATTR(struct rtrs_clt_stats, cpu_migration_from,
rtrs_clt_stats_migration_from_cnt_to_str,
rtrs_clt_reset_cpu_migr_stats);

STAT_ATTR(struct rtrs_clt_stats, cpu_migration_to,
rtrs_clt_stats_migration_to_cnt_to_str,
rtrs_clt_reset_cpu_migr_stats);

STAT_ATTR(struct rtrs_clt_stats, reconnects,
Expand All @@ -313,7 +317,8 @@ STAT_ATTR(struct rtrs_clt_stats, reset_all,
rtrs_clt_reset_all_stats);

static struct attribute *rtrs_clt_stats_attrs[] = {
&cpu_migration_attr.attr,
&cpu_migration_from_attr.attr,
&cpu_migration_to_attr.attr,
&reconnects_attr.attr,
&rdma_attr.attr,
&reset_all_attr.attr,
Expand Down
3 changes: 2 additions & 1 deletion drivers/infiniband/ulp/rtrs/rtrs-clt.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ int rtrs_clt_reset_rdma_lat_distr_stats(struct rtrs_clt_stats *stats,
ssize_t rtrs_clt_stats_rdma_lat_distr_to_str(struct rtrs_clt_stats *stats,
char *page);
int rtrs_clt_reset_cpu_migr_stats(struct rtrs_clt_stats *stats, bool enable);
int rtrs_clt_stats_migration_cnt_to_str(struct rtrs_clt_stats *stats, char *buf);
int rtrs_clt_stats_migration_from_cnt_to_str(struct rtrs_clt_stats *stats, char *buf);
int rtrs_clt_stats_migration_to_cnt_to_str(struct rtrs_clt_stats *stats, char *buf);
int rtrs_clt_reset_reconnects_stat(struct rtrs_clt_stats *stats, bool enable);
int rtrs_clt_stats_reconnects_to_str(struct rtrs_clt_stats *stats, char *buf);
int rtrs_clt_reset_rdma_stats(struct rtrs_clt_stats *stats, bool enable);
Expand Down

0 comments on commit 3f3fe68

Please sign in to comment.