Skip to content

Commit d937279

Browse files
Vaishali Thakkarjgunthorpe
Vaishali Thakkar
authored and
jgunthorpe
committed
RDMA/rtrs: Rename rtrs_sess to rtrs_path
rtrs_sess is in fact a path. This makes it confusing and difficult to get into the code. So let's rename the structure and related use cases of it. Coccinelle was used to do the transformation for most of the occurrences and remaining ones were handled manually. Link: https://lore.kernel.org/r/20220105180708.7774-2-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 8a3fa72 commit d937279

8 files changed

Lines changed: 120 additions & 120 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
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.sess);
16+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
1717
struct rtrs_clt_stats *stats = sess->stats;
1818
struct rtrs_clt_stats_pcpu *s;
1919
int cpu;
@@ -180,7 +180,7 @@ 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.sess);
183+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
184184
struct rtrs_clt_stats *stats = sess->stats;
185185
unsigned int len;
186186

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static bool rtrs_clt_change_state_from_to(struct rtrs_clt_sess *sess,
298298

299299
static void rtrs_rdma_error_recovery(struct rtrs_clt_con *con)
300300
{
301-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
301+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
302302

303303
if (rtrs_clt_change_state_from_to(sess,
304304
RTRS_CLT_CONNECTED,
@@ -330,7 +330,7 @@ static void rtrs_clt_fast_reg_done(struct ib_cq *cq, struct ib_wc *wc)
330330
struct rtrs_clt_con *con = to_clt_con(wc->qp->qp_context);
331331

332332
if (wc->status != IB_WC_SUCCESS) {
333-
rtrs_err(con->c.sess, "Failed IB_WR_REG_MR: %s\n",
333+
rtrs_err(con->c.path, "Failed IB_WR_REG_MR: %s\n",
334334
ib_wc_status_msg(wc->status));
335335
rtrs_rdma_error_recovery(con);
336336
}
@@ -350,7 +350,7 @@ static void rtrs_clt_inv_rkey_done(struct ib_cq *cq, struct ib_wc *wc)
350350
struct rtrs_clt_con *con = to_clt_con(wc->qp->qp_context);
351351

352352
if (wc->status != IB_WC_SUCCESS) {
353-
rtrs_err(con->c.sess, "Failed IB_WR_LOCAL_INV: %s\n",
353+
rtrs_err(con->c.path, "Failed IB_WR_LOCAL_INV: %s\n",
354354
ib_wc_status_msg(wc->status));
355355
rtrs_rdma_error_recovery(con);
356356
}
@@ -387,7 +387,7 @@ static void complete_rdma_req(struct rtrs_clt_io_req *req, int errno,
387387
return;
388388
if (WARN_ON(!req->con))
389389
return;
390-
sess = to_clt_sess(con->c.sess);
390+
sess = to_clt_sess(con->c.path);
391391

392392
if (req->sg_cnt) {
393393
if (req->dir == DMA_FROM_DEVICE && req->need_inv) {
@@ -417,7 +417,7 @@ static void complete_rdma_req(struct rtrs_clt_io_req *req, int errno,
417417
refcount_inc(&req->ref);
418418
err = rtrs_inv_rkey(req);
419419
if (err) {
420-
rtrs_err(con->c.sess, "Send INV WR key=%#x: %d\n",
420+
rtrs_err(con->c.path, "Send INV WR key=%#x: %d\n",
421421
req->mr->rkey, err);
422422
} else if (can_wait) {
423423
wait_for_completion(&req->inv_comp);
@@ -445,7 +445,7 @@ static void complete_rdma_req(struct rtrs_clt_io_req *req, int errno,
445445
req->con = NULL;
446446

447447
if (errno) {
448-
rtrs_err_rl(con->c.sess, "IO request failed: error=%d path=%s [%s:%u] notify=%d\n",
448+
rtrs_err_rl(con->c.path, "IO request failed: error=%d path=%s [%s:%u] notify=%d\n",
449449
errno, kobject_name(&sess->kobj), sess->hca_name,
450450
sess->hca_port, notify);
451451
}
@@ -459,12 +459,12 @@ static int rtrs_post_send_rdma(struct rtrs_clt_con *con,
459459
struct rtrs_rbuf *rbuf, u32 off,
460460
u32 imm, struct ib_send_wr *wr)
461461
{
462-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
462+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
463463
enum ib_send_flags flags;
464464
struct ib_sge sge;
465465

466466
if (!req->sg_size) {
467-
rtrs_wrn(con->c.sess,
467+
rtrs_wrn(con->c.path,
468468
"Doing RDMA Write failed, no data supplied\n");
469469
return -EINVAL;
470470
}
@@ -507,21 +507,21 @@ static void rtrs_clt_recv_done(struct rtrs_clt_con *con, struct ib_wc *wc)
507507
{
508508
struct rtrs_iu *iu;
509509
int err;
510-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
510+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
511511

512512
WARN_ON((sess->flags & RTRS_MSG_NEW_RKEY_F) == 0);
513513
iu = container_of(wc->wr_cqe, struct rtrs_iu,
514514
cqe);
515515
err = rtrs_iu_post_recv(&con->c, iu);
516516
if (err) {
517-
rtrs_err(con->c.sess, "post iu failed %d\n", err);
517+
rtrs_err(con->c.path, "post iu failed %d\n", err);
518518
rtrs_rdma_error_recovery(con);
519519
}
520520
}
521521

522522
static void rtrs_clt_rkey_rsp_done(struct rtrs_clt_con *con, struct ib_wc *wc)
523523
{
524-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
524+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
525525
struct rtrs_msg_rkey_rsp *msg;
526526
u32 imm_type, imm_payload;
527527
bool w_inval = false;
@@ -534,7 +534,7 @@ static void rtrs_clt_rkey_rsp_done(struct rtrs_clt_con *con, struct ib_wc *wc)
534534
iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe);
535535

536536
if (wc->byte_len < sizeof(*msg)) {
537-
rtrs_err(con->c.sess, "rkey response is malformed: size %d\n",
537+
rtrs_err(con->c.path, "rkey response is malformed: size %d\n",
538538
wc->byte_len);
539539
goto out;
540540
}
@@ -600,7 +600,7 @@ static int rtrs_post_recv_empty_x2(struct rtrs_con *con, struct ib_cqe *cqe)
600600
static void rtrs_clt_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
601601
{
602602
struct rtrs_clt_con *con = to_clt_con(wc->qp->qp_context);
603-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
603+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
604604
u32 imm_type, imm_payload;
605605
bool w_inval = false;
606606
int err;
@@ -646,7 +646,7 @@ static void rtrs_clt_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
646646
if (sess->flags & RTRS_MSG_NEW_RKEY_F)
647647
return rtrs_clt_recv_done(con, wc);
648648
} else {
649-
rtrs_wrn(con->c.sess, "Unknown IMM type %u\n",
649+
rtrs_wrn(con->c.path, "Unknown IMM type %u\n",
650650
imm_type);
651651
}
652652
if (w_inval)
@@ -658,7 +658,7 @@ static void rtrs_clt_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
658658
else
659659
err = rtrs_post_recv_empty(&con->c, &io_comp_cqe);
660660
if (err) {
661-
rtrs_err(con->c.sess, "rtrs_post_recv_empty(): %d\n",
661+
rtrs_err(con->c.path, "rtrs_post_recv_empty(): %d\n",
662662
err);
663663
rtrs_rdma_error_recovery(con);
664664
}
@@ -693,7 +693,7 @@ static void rtrs_clt_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
693693
static int post_recv_io(struct rtrs_clt_con *con, size_t q_size)
694694
{
695695
int err, i;
696-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
696+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
697697

698698
for (i = 0; i < q_size; i++) {
699699
if (sess->flags & RTRS_MSG_NEW_RKEY_F) {
@@ -1013,7 +1013,7 @@ static int rtrs_post_rdma_write_sg(struct rtrs_clt_con *con,
10131013
u32 size, u32 imm, struct ib_send_wr *wr,
10141014
struct ib_send_wr *tail)
10151015
{
1016-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1016+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
10171017
struct ib_sge *sge = req->sge;
10181018
enum ib_send_flags flags;
10191019
struct scatterlist *sg;
@@ -1074,7 +1074,7 @@ static int rtrs_map_sg_fr(struct rtrs_clt_io_req *req, size_t count)
10741074
static int rtrs_clt_write_req(struct rtrs_clt_io_req *req)
10751075
{
10761076
struct rtrs_clt_con *con = req->con;
1077-
struct rtrs_sess *s = con->c.sess;
1077+
struct rtrs_path *s = con->c.path;
10781078
struct rtrs_clt_sess *sess = to_clt_sess(s);
10791079
struct rtrs_msg_rdma_write *msg;
10801080

@@ -1168,7 +1168,7 @@ static int rtrs_clt_write_req(struct rtrs_clt_io_req *req)
11681168
static int rtrs_clt_read_req(struct rtrs_clt_io_req *req)
11691169
{
11701170
struct rtrs_clt_con *con = req->con;
1171-
struct rtrs_sess *s = con->c.sess;
1171+
struct rtrs_path *s = con->c.path;
11721172
struct rtrs_clt_sess *sess = to_clt_sess(s);
11731173
struct rtrs_msg_rdma_read *msg;
11741174
struct rtrs_ib_dev *dev = sess->s.dev;
@@ -1601,7 +1601,7 @@ static int create_con(struct rtrs_clt_sess *sess, unsigned int cid)
16011601
/* Map first two connections to the first CPU */
16021602
con->cpu = (cid ? cid - 1 : 0) % nr_cpu_ids;
16031603
con->c.cid = cid;
1604-
con->c.sess = &sess->s;
1604+
con->c.path = &sess->s;
16051605
/* Align with srv, init as 1 */
16061606
atomic_set(&con->c.wr_cnt, 1);
16071607
mutex_init(&con->con_mutex);
@@ -1613,7 +1613,7 @@ static int create_con(struct rtrs_clt_sess *sess, unsigned int cid)
16131613

16141614
static void destroy_con(struct rtrs_clt_con *con)
16151615
{
1616-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1616+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
16171617

16181618
sess->s.con[con->c.cid] = NULL;
16191619
mutex_destroy(&con->con_mutex);
@@ -1622,7 +1622,7 @@ static void destroy_con(struct rtrs_clt_con *con)
16221622

16231623
static int create_con_cq_qp(struct rtrs_clt_con *con)
16241624
{
1625-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1625+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
16261626
u32 max_send_wr, max_recv_wr, cq_num, max_send_sge, wr_limit;
16271627
int err, cq_vector;
16281628
struct rtrs_msg_rkey_rsp *rsp;
@@ -1711,7 +1711,7 @@ static int create_con_cq_qp(struct rtrs_clt_con *con)
17111711

17121712
static void destroy_con_cq_qp(struct rtrs_clt_con *con)
17131713
{
1714-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1714+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
17151715

17161716
/*
17171717
* Be careful here: destroy_con_cq_qp() can be called even
@@ -1745,7 +1745,7 @@ static void destroy_cm(struct rtrs_clt_con *con)
17451745

17461746
static int rtrs_rdma_addr_resolved(struct rtrs_clt_con *con)
17471747
{
1748-
struct rtrs_sess *s = con->c.sess;
1748+
struct rtrs_path *s = con->c.path;
17491749
int err;
17501750

17511751
mutex_lock(&con->con_mutex);
@@ -1764,7 +1764,7 @@ static int rtrs_rdma_addr_resolved(struct rtrs_clt_con *con)
17641764

17651765
static int rtrs_rdma_route_resolved(struct rtrs_clt_con *con)
17661766
{
1767-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1767+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
17681768
struct rtrs_clt *clt = sess->clt;
17691769
struct rtrs_msg_conn_req msg;
17701770
struct rdma_conn_param param;
@@ -1799,7 +1799,7 @@ static int rtrs_rdma_route_resolved(struct rtrs_clt_con *con)
17991799
static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
18001800
struct rdma_cm_event *ev)
18011801
{
1802-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1802+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
18031803
struct rtrs_clt *clt = sess->clt;
18041804
const struct rtrs_msg_conn_rsp *msg;
18051805
u16 version, queue_depth;
@@ -1887,7 +1887,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,
18871887

18881888
static inline void flag_success_on_conn(struct rtrs_clt_con *con)
18891889
{
1890-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
1890+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
18911891

18921892
atomic_inc(&sess->connected_cnt);
18931893
con->cm_err = 1;
@@ -1896,7 +1896,7 @@ static inline void flag_success_on_conn(struct rtrs_clt_con *con)
18961896
static int rtrs_rdma_conn_rejected(struct rtrs_clt_con *con,
18971897
struct rdma_cm_event *ev)
18981898
{
1899-
struct rtrs_sess *s = con->c.sess;
1899+
struct rtrs_path *s = con->c.path;
19001900
const struct rtrs_msg_conn_rsp *msg;
19011901
const char *rej_msg;
19021902
int status, errno;
@@ -1937,7 +1937,7 @@ static inline void flag_error_on_conn(struct rtrs_clt_con *con, int cm_err)
19371937
if (con->cm_err == 1) {
19381938
struct rtrs_clt_sess *sess;
19391939

1940-
sess = to_clt_sess(con->c.sess);
1940+
sess = to_clt_sess(con->c.path);
19411941
if (atomic_dec_and_test(&sess->connected_cnt))
19421942

19431943
wake_up(&sess->state_wq);
@@ -1949,7 +1949,7 @@ static int rtrs_clt_rdma_cm_handler(struct rdma_cm_id *cm_id,
19491949
struct rdma_cm_event *ev)
19501950
{
19511951
struct rtrs_clt_con *con = cm_id->context;
1952-
struct rtrs_sess *s = con->c.sess;
1952+
struct rtrs_path *s = con->c.path;
19531953
struct rtrs_clt_sess *sess = to_clt_sess(s);
19541954
int cm_err = 0;
19551955

@@ -2020,7 +2020,7 @@ static int rtrs_clt_rdma_cm_handler(struct rdma_cm_id *cm_id,
20202020

20212021
static int create_cm(struct rtrs_clt_con *con)
20222022
{
2023-
struct rtrs_sess *s = con->c.sess;
2023+
struct rtrs_path *s = con->c.path;
20242024
struct rtrs_clt_sess *sess = to_clt_sess(s);
20252025
struct rdma_cm_id *cm_id;
20262026
int err;
@@ -2375,7 +2375,7 @@ static int init_conns(struct rtrs_clt_sess *sess)
23752375
static void rtrs_clt_info_req_done(struct ib_cq *cq, struct ib_wc *wc)
23762376
{
23772377
struct rtrs_clt_con *con = to_clt_con(wc->qp->qp_context);
2378-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
2378+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
23792379
struct rtrs_iu *iu;
23802380

23812381
iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe);
@@ -2456,7 +2456,7 @@ static int process_info_rsp(struct rtrs_clt_sess *sess,
24562456
static void rtrs_clt_info_rsp_done(struct ib_cq *cq, struct ib_wc *wc)
24572457
{
24582458
struct rtrs_clt_con *con = to_clt_con(wc->qp->qp_context);
2459-
struct rtrs_clt_sess *sess = to_clt_sess(con->c.sess);
2459+
struct rtrs_clt_sess *sess = to_clt_sess(con->c.path);
24602460
struct rtrs_msg_info_rsp *msg;
24612461
enum rtrs_clt_state state;
24622462
struct rtrs_iu *iu;

‎drivers/infiniband/ulp/rtrs/rtrs-clt.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ struct rtrs_rbuf {
125125
};
126126

127127
struct rtrs_clt_sess {
128-
struct rtrs_sess s;
128+
struct rtrs_path s;
129129
struct rtrs_clt *clt;
130130
wait_queue_head_t state_wq;
131131
enum rtrs_clt_state state;
@@ -186,7 +186,7 @@ static inline struct rtrs_clt_con *to_clt_con(struct rtrs_con *c)
186186
return container_of(c, struct rtrs_clt_con, c);
187187
}
188188

189-
static inline struct rtrs_clt_sess *to_clt_sess(struct rtrs_sess *s)
189+
static inline struct rtrs_clt_sess *to_clt_sess(struct rtrs_path *s)
190190
{
191191
return container_of(s, struct rtrs_clt_sess, s);
192192
}

‎drivers/infiniband/ulp/rtrs/rtrs-pri.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ struct rtrs_ib_dev {
9090
};
9191

9292
struct rtrs_con {
93-
struct rtrs_sess *sess;
93+
struct rtrs_path *path;
9494
struct ib_qp *qp;
9595
struct ib_cq *cq;
9696
struct rdma_cm_id *cm_id;
@@ -100,7 +100,7 @@ struct rtrs_con {
100100
atomic_t sq_wr_avail;
101101
};
102102

103-
struct rtrs_sess {
103+
struct rtrs_path {
104104
struct list_head entry;
105105
struct sockaddr_storage dst_addr;
106106
struct sockaddr_storage src_addr;
@@ -313,19 +313,19 @@ int rtrs_iu_post_rdma_write_imm(struct rtrs_con *con, struct rtrs_iu *iu,
313313

314314
int rtrs_post_recv_empty(struct rtrs_con *con, struct ib_cqe *cqe);
315315

316-
int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,
316+
int rtrs_cq_qp_create(struct rtrs_path *path, struct rtrs_con *con,
317317
u32 max_send_sge, int cq_vector, int nr_cqe,
318318
u32 max_send_wr, u32 max_recv_wr,
319319
enum ib_poll_context poll_ctx);
320320
void rtrs_cq_qp_destroy(struct rtrs_con *con);
321321

322-
void rtrs_init_hb(struct rtrs_sess *sess, struct ib_cqe *cqe,
322+
void rtrs_init_hb(struct rtrs_path *path, struct ib_cqe *cqe,
323323
unsigned int interval_ms, unsigned int missed_max,
324324
void (*err_handler)(struct rtrs_con *con),
325325
struct workqueue_struct *wq);
326-
void rtrs_start_hb(struct rtrs_sess *sess);
327-
void rtrs_stop_hb(struct rtrs_sess *sess);
328-
void rtrs_send_hb_ack(struct rtrs_sess *sess);
326+
void rtrs_start_hb(struct rtrs_path *path);
327+
void rtrs_stop_hb(struct rtrs_path *path);
328+
void rtrs_send_hb_ack(struct rtrs_path *path);
329329

330330
void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags,
331331
struct rtrs_rdma_dev_pd *pool);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj,
3737
const char *buf, size_t count)
3838
{
3939
struct rtrs_srv_sess *sess;
40-
struct rtrs_sess *s;
40+
struct rtrs_path *s;
4141
char str[MAXHOSTNAMELEN];
4242

4343
sess = container_of(kobj, struct rtrs_srv_sess, kobj);
@@ -230,7 +230,7 @@ static struct kobj_type ktype_stats = {
230230
static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)
231231
{
232232
int err;
233-
struct rtrs_sess *s = &sess->s;
233+
struct rtrs_path *s = &sess->s;
234234

235235
err = kobject_init_and_add(&sess->stats->kobj_stats, &ktype_stats,
236236
&sess->kobj, "stats");
@@ -258,7 +258,7 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)
258258
int rtrs_srv_create_sess_files(struct rtrs_srv_sess *sess)
259259
{
260260
struct rtrs_srv *srv = sess->srv;
261-
struct rtrs_sess *s = &sess->s;
261+
struct rtrs_path *s = &sess->s;
262262
char str[NAME_MAX];
263263
int err;
264264
struct rtrs_addr path = {

0 commit comments

Comments
 (0)