Skip to content

Commit caa84d9

Browse files
Vaishali Thakkarjgunthorpe
Vaishali Thakkar
authored and
jgunthorpe
committed
RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path
rtrs_clt_sess is used for paths and not sessions on the client side. This creates confusion so let's rename it to rtrs_clt_path. Also, rename related variables and functions. Coccinelle is used to do the transformations for most of the occurrences and remaining ones were handled manually. Link: https://lore.kernel.org/r/20220105180708.7774-4-jinpu.wang@ionos.com Signed-off-by: Vaishali Thakkar <vaishali.thakkar@ionos.com> Signed-off-by: Jack Wang <jinpu.wang@ionos.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent ae4c816 commit caa84d9

6 files changed

Lines changed: 586 additions & 568 deletions

File tree

‎drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
void rtrs_clt_update_wc_stats(struct rtrs_clt_con *con)
1515
{
16-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
17-
struct rtrs_clt_stats *stats = sess->stats;
16+
struct rtrs_clt_path *clt_path = to_clt_path(con->c.path);
17+
struct rtrs_clt_stats *stats = clt_path->stats;
1818
struct rtrs_clt_stats_pcpu *s;
1919
int cpu;
2020

@@ -180,8 +180,8 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,
180180
void rtrs_clt_update_all_stats(struct rtrs_clt_io_req *req, int dir)
181181
{
182182
struct rtrs_clt_con *con = req->con;
183-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
184-
struct rtrs_clt_stats *stats = sess->stats;
183+
struct rtrs_clt_path *clt_path = to_clt_path(con->c.path);
184+
struct rtrs_clt_stats *stats = clt_path->stats;
185185
unsigned int len;
186186

187187
len = req->usr_len + req->data_len;

‎drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c‎

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
#define MIN_MAX_RECONN_ATT -1
1717
#define MAX_MAX_RECONN_ATT 9999
1818

19-
static void rtrs_clt_sess_release(struct kobject *kobj)
19+
static void rtrs_clt_path_release(struct kobject *kobj)
2020
{
21-
struct rtrs_clt_sess *sess;
21+
struct rtrs_clt_path *clt_path;
2222

23-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
23+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
2424

25-
free_sess(sess);
25+
free_path(clt_path);
2626
}
2727

2828
static struct kobj_type ktype_sess = {
2929
.sysfs_ops = &kobj_sysfs_ops,
30-
.release = rtrs_clt_sess_release
30+
.release = rtrs_clt_path_release
3131
};
3232

33-
static void rtrs_clt_sess_stats_release(struct kobject *kobj)
33+
static void rtrs_clt_path_stats_release(struct kobject *kobj)
3434
{
3535
struct rtrs_clt_stats *stats;
3636

@@ -43,7 +43,7 @@ static void rtrs_clt_sess_stats_release(struct kobject *kobj)
4343

4444
static struct kobj_type ktype_stats = {
4545
.sysfs_ops = &kobj_sysfs_ops,
46-
.release = rtrs_clt_sess_stats_release,
46+
.release = rtrs_clt_path_stats_release,
4747
};
4848

4949
static ssize_t max_reconnect_attempts_show(struct device *dev,
@@ -197,10 +197,10 @@ static DEVICE_ATTR_RW(add_path);
197197
static ssize_t rtrs_clt_state_show(struct kobject *kobj,
198198
struct kobj_attribute *attr, char *page)
199199
{
200-
struct rtrs_clt_sess *sess;
200+
struct rtrs_clt_path *clt_path;
201201

202-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
203-
if (sess->state == RTRS_CLT_CONNECTED)
202+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
203+
if (clt_path->state == RTRS_CLT_CONNECTED)
204204
return sysfs_emit(page, "connected\n");
205205

206206
return sysfs_emit(page, "disconnected\n");
@@ -219,16 +219,16 @@ static ssize_t rtrs_clt_reconnect_store(struct kobject *kobj,
219219
struct kobj_attribute *attr,
220220
const char *buf, size_t count)
221221
{
222-
struct rtrs_clt_sess *sess;
222+
struct rtrs_clt_path *clt_path;
223223
int ret;
224224

225-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
225+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
226226
if (!sysfs_streq(buf, "1")) {
227-
rtrs_err(sess->clt, "%s: unknown value: '%s'\n",
227+
rtrs_err(clt_path->clt, "%s: unknown value: '%s'\n",
228228
attr->attr.name, buf);
229229
return -EINVAL;
230230
}
231-
ret = rtrs_clt_reconnect_from_sysfs(sess);
231+
ret = rtrs_clt_reconnect_from_sysfs(clt_path);
232232
if (ret)
233233
return ret;
234234

@@ -249,15 +249,15 @@ static ssize_t rtrs_clt_disconnect_store(struct kobject *kobj,
249249
struct kobj_attribute *attr,
250250
const char *buf, size_t count)
251251
{
252-
struct rtrs_clt_sess *sess;
252+
struct rtrs_clt_path *clt_path;
253253

254-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
254+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
255255
if (!sysfs_streq(buf, "1")) {
256-
rtrs_err(sess->clt, "%s: unknown value: '%s'\n",
256+
rtrs_err(clt_path->clt, "%s: unknown value: '%s'\n",
257257
attr->attr.name, buf);
258258
return -EINVAL;
259259
}
260-
rtrs_clt_close_conns(sess, true);
260+
rtrs_clt_close_conns(clt_path, true);
261261

262262
return count;
263263
}
@@ -276,16 +276,16 @@ static ssize_t rtrs_clt_remove_path_store(struct kobject *kobj,
276276
struct kobj_attribute *attr,
277277
const char *buf, size_t count)
278278
{
279-
struct rtrs_clt_sess *sess;
279+
struct rtrs_clt_path *clt_path;
280280
int ret;
281281

282-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
282+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
283283
if (!sysfs_streq(buf, "1")) {
284-
rtrs_err(sess->clt, "%s: unknown value: '%s'\n",
284+
rtrs_err(clt_path->clt, "%s: unknown value: '%s'\n",
285285
attr->attr.name, buf);
286286
return -EINVAL;
287287
}
288-
ret = rtrs_clt_remove_path_from_sysfs(sess, &attr->attr);
288+
ret = rtrs_clt_remove_path_from_sysfs(clt_path, &attr->attr);
289289
if (ret)
290290
return ret;
291291

@@ -333,11 +333,11 @@ static ssize_t rtrs_clt_hca_port_show(struct kobject *kobj,
333333
struct kobj_attribute *attr,
334334
char *page)
335335
{
336-
struct rtrs_clt_sess *sess;
336+
struct rtrs_clt_path *clt_path;
337337

338-
sess = container_of(kobj, typeof(*sess), kobj);
338+
clt_path = container_of(kobj, typeof(*clt_path), kobj);
339339

340-
return sysfs_emit(page, "%u\n", sess->hca_port);
340+
return sysfs_emit(page, "%u\n", clt_path->hca_port);
341341
}
342342

343343
static struct kobj_attribute rtrs_clt_hca_port_attr =
@@ -347,11 +347,11 @@ static ssize_t rtrs_clt_hca_name_show(struct kobject *kobj,
347347
struct kobj_attribute *attr,
348348
char *page)
349349
{
350-
struct rtrs_clt_sess *sess;
350+
struct rtrs_clt_path *clt_path;
351351

352-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
352+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
353353

354-
return sysfs_emit(page, "%s\n", sess->hca_name);
354+
return sysfs_emit(page, "%s\n", clt_path->hca_name);
355355
}
356356

357357
static struct kobj_attribute rtrs_clt_hca_name_attr =
@@ -361,12 +361,12 @@ static ssize_t rtrs_clt_cur_latency_show(struct kobject *kobj,
361361
struct kobj_attribute *attr,
362362
char *page)
363363
{
364-
struct rtrs_clt_sess *sess;
364+
struct rtrs_clt_path *clt_path;
365365

366-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
366+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
367367

368368
return sysfs_emit(page, "%lld ns\n",
369-
ktime_to_ns(sess->s.hb_cur_latency));
369+
ktime_to_ns(clt_path->s.hb_cur_latency));
370370
}
371371

372372
static struct kobj_attribute rtrs_clt_cur_latency_attr =
@@ -376,11 +376,11 @@ static ssize_t rtrs_clt_src_addr_show(struct kobject *kobj,
376376
struct kobj_attribute *attr,
377377
char *page)
378378
{
379-
struct rtrs_clt_sess *sess;
379+
struct rtrs_clt_path *clt_path;
380380
int len;
381381

382-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
383-
len = sockaddr_to_str((struct sockaddr *)&sess->s.src_addr, page,
382+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
383+
len = sockaddr_to_str((struct sockaddr *)&clt_path->s.src_addr, page,
384384
PAGE_SIZE);
385385
len += sysfs_emit_at(page, len, "\n");
386386
return len;
@@ -393,11 +393,11 @@ static ssize_t rtrs_clt_dst_addr_show(struct kobject *kobj,
393393
struct kobj_attribute *attr,
394394
char *page)
395395
{
396-
struct rtrs_clt_sess *sess;
396+
struct rtrs_clt_path *clt_path;
397397
int len;
398398

399-
sess = container_of(kobj, struct rtrs_clt_sess, kobj);
400-
len = sockaddr_to_str((struct sockaddr *)&sess->s.dst_addr, page,
399+
clt_path = container_of(kobj, struct rtrs_clt_path, kobj);
400+
len = sockaddr_to_str((struct sockaddr *)&clt_path->s.dst_addr, page,
401401
PAGE_SIZE);
402402
len += sysfs_emit_at(page, len, "\n");
403403
return len;
@@ -406,7 +406,7 @@ static ssize_t rtrs_clt_dst_addr_show(struct kobject *kobj,
406406
static struct kobj_attribute rtrs_clt_dst_addr_attr =
407407
__ATTR(dst_addr, 0444, rtrs_clt_dst_addr_show, NULL);
408408

409-
static struct attribute *rtrs_clt_sess_attrs[] = {
409+
static struct attribute *rtrs_clt_path_attrs[] = {
410410
&rtrs_clt_hca_name_attr.attr,
411411
&rtrs_clt_hca_port_attr.attr,
412412
&rtrs_clt_src_addr_attr.attr,
@@ -419,42 +419,43 @@ static struct attribute *rtrs_clt_sess_attrs[] = {
419419
NULL,
420420
};
421421

422-
static const struct attribute_group rtrs_clt_sess_attr_group = {
423-
.attrs = rtrs_clt_sess_attrs,
422+
static const struct attribute_group rtrs_clt_path_attr_group = {
423+
.attrs = rtrs_clt_path_attrs,
424424
};
425425

426-
int rtrs_clt_create_sess_files(struct rtrs_clt_sess *sess)
426+
int rtrs_clt_create_path_files(struct rtrs_clt_path *clt_path)
427427
{
428-
struct rtrs_clt *clt = sess->clt;
428+
struct rtrs_clt *clt = clt_path->clt;
429429
char str[NAME_MAX];
430430
int err;
431431
struct rtrs_addr path = {
432-
.src = &sess->s.src_addr,
433-
.dst = &sess->s.dst_addr,
432+
.src = &clt_path->s.src_addr,
433+
.dst = &clt_path->s.dst_addr,
434434
};
435435

436436
rtrs_addr_to_str(&path, str, sizeof(str));
437-
err = kobject_init_and_add(&sess->kobj, &ktype_sess, clt->kobj_paths,
437+
err = kobject_init_and_add(&clt_path->kobj, &ktype_sess,
438+
clt->kobj_paths,
438439
"%s", str);
439440
if (err) {
440441
pr_err("kobject_init_and_add: %d\n", err);
441-
kobject_put(&sess->kobj);
442+
kobject_put(&clt_path->kobj);
442443
return err;
443444
}
444-
err = sysfs_create_group(&sess->kobj, &rtrs_clt_sess_attr_group);
445+
err = sysfs_create_group(&clt_path->kobj, &rtrs_clt_path_attr_group);
445446
if (err) {
446447
pr_err("sysfs_create_group(): %d\n", err);
447448
goto put_kobj;
448449
}
449-
err = kobject_init_and_add(&sess->stats->kobj_stats, &ktype_stats,
450-
&sess->kobj, "stats");
450+
err = kobject_init_and_add(&clt_path->stats->kobj_stats, &ktype_stats,
451+
&clt_path->kobj, "stats");
451452
if (err) {
452453
pr_err("kobject_init_and_add: %d\n", err);
453-
kobject_put(&sess->stats->kobj_stats);
454+
kobject_put(&clt_path->stats->kobj_stats);
454455
goto remove_group;
455456
}
456457

457-
err = sysfs_create_group(&sess->stats->kobj_stats,
458+
err = sysfs_create_group(&clt_path->stats->kobj_stats,
458459
&rtrs_clt_stats_attr_group);
459460
if (err) {
460461
pr_err("failed to create stats sysfs group, err: %d\n", err);
@@ -464,25 +465,25 @@ int rtrs_clt_create_sess_files(struct rtrs_clt_sess *sess)
464465
return 0;
465466

466467
put_kobj_stats:
467-
kobject_del(&sess->stats->kobj_stats);
468-
kobject_put(&sess->stats->kobj_stats);
468+
kobject_del(&clt_path->stats->kobj_stats);
469+
kobject_put(&clt_path->stats->kobj_stats);
469470
remove_group:
470-
sysfs_remove_group(&sess->kobj, &rtrs_clt_sess_attr_group);
471+
sysfs_remove_group(&clt_path->kobj, &rtrs_clt_path_attr_group);
471472
put_kobj:
472-
kobject_del(&sess->kobj);
473-
kobject_put(&sess->kobj);
473+
kobject_del(&clt_path->kobj);
474+
kobject_put(&clt_path->kobj);
474475

475476
return err;
476477
}
477478

478-
void rtrs_clt_destroy_sess_files(struct rtrs_clt_sess *sess,
479+
void rtrs_clt_destroy_path_files(struct rtrs_clt_path *clt_path,
479480
const struct attribute *sysfs_self)
480481
{
481-
kobject_del(&sess->stats->kobj_stats);
482-
kobject_put(&sess->stats->kobj_stats);
482+
kobject_del(&clt_path->stats->kobj_stats);
483+
kobject_put(&clt_path->stats->kobj_stats);
483484
if (sysfs_self)
484-
sysfs_remove_file_self(&sess->kobj, sysfs_self);
485-
kobject_del(&sess->kobj);
485+
sysfs_remove_file_self(&clt_path->kobj, sysfs_self);
486+
kobject_del(&clt_path->kobj);
486487
}
487488

488489
static struct attribute *rtrs_clt_attrs[] = {

0 commit comments

Comments
 (0)