iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/rtrs: Use sysfs_emit instead of s*printf function for sysfs show

Browse Source 
sysfs_emit function was added to be aware of the PAGE_SIZE maximum of the
temporary buffer used for outputting sysfs content, so there is no
possible overruns. So replace the uses of any s*printf functions for the
sysfs show functions with sysfs_emit.

Link: https://lore.kernel.org/r/20210922125333.351454-2-haris.iqbal@ionos.com
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Md Haris Iqbal 2021-09-22 14:53:27 +02:00 committed by Jason Gunthorpe
parent 99cfddb8a8
commit 2f232912fe
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c
View File

@ -45,24 +45,23 @@ int rtrs_clt_stats_migration_cnt_to_str(struct rtrs_clt_stats *stats,
size_t used;
int cpu;
used = scnprintf(buf, len, " ");
used = sysfs_emit(buf, " ");
for_each_possible_cpu(cpu)
used += scnprintf(buf + used, len - used, " CPU%u", cpu);
used += sysfs_emit_at(buf, used, " CPU%u", cpu);
used += scnprintf(buf + used, len - used, "\nfrom:");
used += sysfs_emit_at(buf, used, "\nfrom:");
for_each_possible_cpu(cpu) {
s = per_cpu_ptr(stats->pcpu_stats, cpu);
used += scnprintf(buf + used, len - used, " %d",
used += sysfs_emit_at(buf, used, " %d",
atomic_read(&s->cpu_migr.from));
}
used += scnprintf(buf + used, len - used, "\nto :");
used += sysfs_emit_at(buf, used, "\nto :");
for_each_possible_cpu(cpu) {
s = per_cpu_ptr(stats->pcpu_stats, cpu);
used += scnprintf(buf + used, len - used, " %d",
s->cpu_migr.to);
used += sysfs_emit_at(buf, used, " %d", s->cpu_migr.to);
}
used += scnprintf(buf + used, len - used, "\n");
used += sysfs_emit_at(buf, used, "\n");
return used;
}
@ -70,9 +69,8 @@ int rtrs_clt_stats_migration_cnt_to_str(struct rtrs_clt_stats *stats,
int rtrs_clt_stats_reconnects_to_str(struct rtrs_clt_stats *stats, char *buf,
size_t len)
{
return scnprintf(buf, len, "%d %d\n",
stats->reconnects.successful_cnt,
stats->reconnects.fail_cnt);
return sysfs_emit(buf, "%d %d\n", stats->reconnects.successful_cnt,
stats->reconnects.fail_cnt);
}
ssize_t rtrs_clt_stats_rdma_to_str(struct rtrs_clt_stats *stats,
@ -94,7 +92,7 @@ ssize_t rtrs_clt_stats_rdma_to_str(struct rtrs_clt_stats *stats,
sum.failover_cnt += r->failover_cnt;
}
return scnprintf(page, len, "%llu %llu %llu %llu %u %llu\n",
return sysfs_emit(page, "%llu %llu %llu %llu %u %llu\n",
sum.dir[READ].cnt, sum.dir[READ].size_total,
sum.dir[WRITE].cnt, sum.dir[WRITE].size_total,
atomic_read(&stats->inflight), sum.failover_cnt);
@ -103,7 +101,7 @@ ssize_t rtrs_clt_stats_rdma_to_str(struct rtrs_clt_stats *stats,
ssize_t rtrs_clt_reset_all_help(struct rtrs_clt_stats *s,
char *page, size_t len)
{
return scnprintf(page, len, "echo 1 to reset all statistics\n");
return sysfs_emit(page, "echo 1 to reset all statistics\n");
}
int rtrs_clt_reset_rdma_stats(struct rtrs_clt_stats *stats, bool enable)

2
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c
View File

@ -102,7 +102,7 @@ static ssize_t rtrs_srv_src_addr_show(struct kobject *kobj,
sess = container_of(kobj, struct rtrs_srv_sess, kobj);
cnt = sockaddr_to_str((struct sockaddr *)&sess->s.dst_addr,
page, PAGE_SIZE);
return cnt + scnprintf(page + cnt, PAGE_SIZE - cnt, "\n");
return cnt + sysfs_emit_at(page, cnt, "\n");
}
static struct kobj_attribute rtrs_srv_src_addr_attr =