RTRS renaming
Subsystems (4)
Jack Wang
maintainerv3 cover RTRS renaming
Hi Jason, hi Leon,
This patchset from Vaishali, renames a few internal structures to make the code easier to understand.
rtrs_sess is in fact a path. rtrs_clt/_srv is in fact a session. This is a mess and makes it difficult to get into the code.
The patchset is based on rdma/for-next:c8f476da84ad ("Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
v3: rename a few more variables in log/comments. (Thanks Guoqing) more detailed changelog in patch 2/3/5
v2: merge first 3 patches to one to be bisectable. (Thanks Guoqing)
https://lore.kernel.org/linux-rdma/[email protected]/T/#t
v1: https://lore.kernel.org/linux-rdma/[email protected]/T/#md5be427877cbfcb1741cccea4d081df09ae18561
Thanks!
Vaishali Thakkar (5):
RDMA/rtrs: Rename rtrs_sess to rtrs_path RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/block/rnbd/rnbd-srv.c | 16 +- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 8 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 145 +-- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 1087 +++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 41 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 18 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 121 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 684 +++++------ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 16 +- drivers/infiniband/ulp/rtrs/rtrs.c | 98 +- drivers/infiniband/ulp/rtrs/rtrs.h | 34 +- 14 files changed, 1156 insertions(+), 1120 deletions(-)
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v3 1/5 RDMA/rtrs: Rename rtrs_sess to rtrs_path
From: Vaishali Thakkar <[email protected]>
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.
--- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 4 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 66 ++++++------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 4 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 14 +-- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 46 ++++----- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs.c | 98 ++++++++++---------- 8 files changed, 120 insertions(+), 120 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -2
@@ -13,7 +13,7 @@void rtrs_clt_update_wc_stats (struct rtrs_clt_con *con) { -struct rtrs_clt_sess *sess =to_clt_sess (con->c.sess); +struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);struct rtrs_clt_stats *stats = sess->stats;struct rtrs_clt_stats_pcpu *s;int cpu;
@@ -180,7 +180,7 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,void rtrs_clt_update_all_stats (struct rtrs_clt_io_req *req,int dir) {struct rtrs_clt_con *con = req->con; -struct rtrs_clt_sess *sess =to_clt_sess (con->c.sess); +struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);struct rtrs_clt_stats *stats = sess->stats;unsigned int len;
drivers/infiniband/ulp/rtrs/rtrs-clt.c +33 -33
262 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +2 -2
@@ -125,7 +125,7 @@ struct rtrs_rbuf { };struct rtrs_clt_sess { -struct rtrs_sess s; +struct rtrs_path s;struct rtrs_clt *clt;wait_queue_head_t state_wq;enum rtrs_clt_state state;
@@ -186,7 +186,7 @@ static inline struct rtrs_clt_con *to_clt_con(struct rtrs_con *c) return container_of(c, struct rtrs_clt_con, c); } -static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_sess *s) +static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_path *s) { return container_of(s, struct rtrs_clt_sess, s); }
drivers/infiniband/ulp/rtrs/rtrs-pri.h +7 -7
@@ -90,7 +90,7 @@ struct rtrs_ib_dev { };struct rtrs_con { -struct rtrs_sess *sess; +struct rtrs_path *path;struct ib_qp *qp;struct ib_cq *cq;struct rdma_cm_id *cm_id;
@@ -100,7 +100,7 @@ struct rtrs_con {atomic_t sq_wr_avail; }; -struct rtrs_sess { +struct rtrs_path {struct list_head entry;struct sockaddr_storage dst_addr;struct sockaddr_storage src_addr;
@@ -313,19 +313,19 @@ int rtrs_iu_post_rdma_write_imm(struct rtrs_con *con, struct rtrs_iu *iu,int rtrs_post_recv_empty (struct rtrs_con *con,struct ib_cqe *cqe); -int rtrs_cq_qp_create (struct rtrs_sess *sess,struct rtrs_con *con, +int rtrs_cq_qp_create (struct rtrs_path *path,struct rtrs_con *con,u32 max_send_sge,int cq_vector,int nr_cqe,u32 max_send_wr,u32 max_recv_wr,enum ib_poll_context poll_ctx);void rtrs_cq_qp_destroy (struct rtrs_con *con); -void rtrs_init_hb (struct rtrs_sess *sess,struct ib_cqe *cqe, +void rtrs_init_hb (struct rtrs_path *path,struct ib_cqe *cqe,unsigned int interval_ms,unsigned int missed_max,void (*err_handler)(struct rtrs_con *con),struct workqueue_struct *wq); -void rtrs_start_hb (struct rtrs_sess *sess); -void rtrs_stop_hb (struct rtrs_sess *sess); -void rtrs_send_hb_ack (struct rtrs_sess *sess); +void rtrs_start_hb (struct rtrs_path *path); +void rtrs_stop_hb (struct rtrs_path *path); +void rtrs_send_hb_ack (struct rtrs_path *path);void rtrs_rdma_dev_pd_init (enum ib_pd_flags pd_flags,struct rtrs_rdma_dev_pd *pool);
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +3 -3
@@ -37,7 +37,7 @@ static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj, const char *buf, size_t count) {struct rtrs_srv_sess *sess; -struct rtrs_sess *s; +struct rtrs_path *s;char str[MAXHOSTNAMELEN ]; sess = container_of(kobj, struct rtrs_srv_sess, kobj);
@@ -230,7 +230,7 @@ static struct kobj_type ktype_stats = {static int rtrs_srv_create_stats_files (struct rtrs_srv_sess *sess) {int err; -struct rtrs_sess *s = &sess->s; +struct rtrs_path *s = &sess->s; err =kobject_init_and_add (&sess->stats->kobj_stats, &ktype_stats, &sess->kobj,"stats" );
@@ -258,7 +258,7 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)int rtrs_srv_create_sess_files (struct rtrs_srv_sess *sess) {struct rtrs_srv *srv = sess->srv; -struct rtrs_sess *s = &sess->s; +struct rtrs_path *s = &sess->s;char str[NAME_MAX ];int err;struct rtrs_addr path = {
drivers/infiniband/ulp/rtrs/rtrs-srv.c +23 -23
182 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +1 -1
@@ -72,7 +72,7 @@ struct rtrs_srv_mr { };struct rtrs_srv_sess { -struct rtrs_sess s; +struct rtrs_path s;struct rtrs_srv *srv;struct work_struct close_work;enum rtrs_srv_state state;
drivers/infiniband/ulp/rtrs/rtrs.c +49 -49
230 lines not on this page · raw message
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v3 2/5 RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
rtrs_srv_sess is used for paths and not sessions on the server side. This creates confusion so let's rename it to rtrs_srv_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.
---
Changes since v2:
- Fixe missed spots of renaming sess->path in comments/ error messages
- Rename sessname->pathname when applicable
- Rename exist_sessname, post_recv_sess
--- drivers/block/rnbd/rnbd-srv.c | 12 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 119 ++-- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 627 ++++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 10 +- drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- 6 files changed, 392 insertions(+), 381 deletions(-)
drivers/block/rnbd/rnbd-srv.c +6 -6
@@ -266,12 +266,12 @@ static void destroy_sess(struct rnbd_srv_session *srv_sess)static int create_sess (struct rtrs_srv *rtrs) {struct rnbd_srv_session *srv_sess; -char sessname[NAME_MAX ]; +char pathname[NAME_MAX ];int err; - err =rtrs_srv_get_sess_name (rtrs, sessname,sizeof (sessname)); + err =rtrs_srv_get_path_name (rtrs, pathname,sizeof (pathname));if (err) { -pr_err ("rtrs_srv_get_sess_name(%s): %d\n" , sessname, err); +pr_err ("rtrs_srv_get_path_name(%s): %d\n" , pathname, err);return err; }
@@ -284,8 +284,8 @@ static int create_sess(struct rtrs_srv *rtrs) offsetof(struct rnbd_dev_blk_io , bio), BIOSET_NEED_BVECS);if (err) { -pr_err ("Allocating srv_session for session %s failed\n" , - sessname); +pr_err ("Allocating srv_session for path %s failed\n" , + pathname);kfree (srv_sess);return err; }
@@ -298,7 +298,7 @@ static int create_sess(struct rtrs_srv *rtrs)mutex_unlock (&sess_lock); srv_sess->rtrs = rtrs; -strscpy (srv_sess->sessname, sessname,sizeof (srv_sess->sessname)); +strscpy (srv_sess->sessname, pathname,sizeof (srv_sess->sessname));rtrs_srv_set_sess_priv (rtrs, srv_sess);
drivers/infiniband/ulp/rtrs/rtrs-pri.h +1 -1
@@ -233,7 +233,7 @@ struct rtrs_msg_conn_rsp {*/ struct rtrs_msg_info_req {__le16 type; -u8 sessname[NAME_MAX ]; +u8 pathname[NAME_MAX ];u8 reserved[15 ]; };
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +60 -59
271 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.c +318 -309
1,432 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +5 -5
@@ -37,7 +37,7 @@ struct rtrs_srv_stats_rdma_stats {struct rtrs_srv_stats {struct kobject kobj_stats;struct rtrs_srv_stats_rdma_stats rdma_stats; -struct rtrs_srv_sess *sess; +struct rtrs_srv_path *srv_path; };struct rtrs_srv_con {
@@ -71,7 +71,7 @@ struct rtrs_srv_mr {struct rtrs_iu *iu;/* send buffer for new rkey msg */ }; -struct rtrs_srv_sess { +struct rtrs_srv_path {struct rtrs_path s;struct rtrs_srv *srv;struct work_struct close_work;
@@ -125,7 +125,7 @@ struct rtrs_srv_ib_ctx {extern struct class *rtrs_dev_class; -void close_sess (struct rtrs_srv_sess *sess); +void close_path (struct rtrs_srv_path *srv_path);static inline void rtrs_srv_update_rdma_stats (struct rtrs_srv_stats *s,size_t size,int d)
@@ -142,7 +142,7 @@ ssize_t rtrs_srv_reset_all_help(struct rtrs_srv_stats *stats, char *page, size_t len);/* functions which are implemented in rtrs-srv-sysfs.c */ -int rtrs_srv_create_sess_files (struct rtrs_srv_sess *sess); -void rtrs_srv_destroy_sess_files (struct rtrs_srv_sess *sess); +int rtrs_srv_create_path_files (struct rtrs_srv_path *srv_path); +void rtrs_srv_destroy_path_files (struct rtrs_srv_path *srv_path);#endif /* RTRS_SRV_H */
drivers/infiniband/ulp/rtrs/rtrs.h +2 -1
@@ -175,7 +175,8 @@ bool rtrs_srv_resp_rdma(struct rtrs_srv_op *id, int errno);void rtrs_srv_set_sess_priv (struct rtrs_srv *sess,void *priv); -int rtrs_srv_get_sess_name (struct rtrs_srv *sess,char *sessname,size_t len); +int rtrs_srv_get_path_name (struct rtrs_srv *sess,char *pathname, +size_t len);int rtrs_srv_get_queue_depth (struct rtrs_srv *sess);
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v3 3/5 RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
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.
---
Changes since v2:
- Rename local variable sessname->pathname when applicable
- Fix missed spots for renaming sess->path in comments/error messages
- Rename xchg_sessions->xchg_paths
--- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 8 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 123 +-- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 997 ++++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 20 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs.h | 4 +- 6 files changed, 586 insertions(+), 568 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +4 -4
@@ -13,8 +13,8 @@void rtrs_clt_update_wc_stats (struct rtrs_clt_con *con) { -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path); -struct rtrs_clt_stats *stats = sess->stats; +struct rtrs_clt_path *clt_path =to_clt_path (con->c.path); +struct rtrs_clt_stats *stats = clt_path->stats;struct rtrs_clt_stats_pcpu *s;int cpu;
@@ -180,8 +180,8 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,void rtrs_clt_update_all_stats (struct rtrs_clt_io_req *req,int dir) {struct rtrs_clt_con *con = req->con; -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path); -struct rtrs_clt_stats *stats = sess->stats; +struct rtrs_clt_path *clt_path =to_clt_path (con->c.path); +struct rtrs_clt_stats *stats = clt_path->stats;unsigned int len; len = req->usr_len + req->data_len;
drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c +62 -61
277 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.c +507 -490
2,259 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +10 -10
@@ -124,7 +124,7 @@ struct rtrs_rbuf {u32 rkey; }; -struct rtrs_clt_sess { +struct rtrs_clt_path {struct rtrs_path s;struct rtrs_clt *clt;wait_queue_head_t state_wq;
@@ -156,7 +156,7 @@ struct rtrs_clt_sess {struct rtrs_clt {struct list_head paths_list;/* rcu protected list */ size_t paths_num; -struct rtrs_clt_sess +struct rtrs_clt_path __rcu *__percpu *pcpu_path;uuid_t paths_uuid;int paths_up;
@@ -186,9 +186,9 @@ static inline struct rtrs_clt_con *to_clt_con(struct rtrs_con *c) return container_of(c, struct rtrs_clt_con, c); } -static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_path *s) +static inline struct rtrs_clt_path *to_clt_path (struct rtrs_path *s) { - return container_of(s, struct rtrs_clt_sess, s); + return container_of(s, struct rtrs_clt_path, s); }static inline int permit_size (struct rtrs_clt *clt)
@@ -201,16 +201,16 @@ static inline struct rtrs_permit *get_permit(struct rtrs_clt *clt, int idx)return (struct rtrs_permit *)(clt->permits +permit_size (clt) * idx); } -int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_sess *sess); -void rtrs_clt_close_conns (struct rtrs_clt_sess *sess,bool wait); +int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_path *path); +void rtrs_clt_close_conns (struct rtrs_clt_path *clt_path,bool wait);int rtrs_clt_create_path_from_sysfs (struct rtrs_clt *clt,struct rtrs_addr *addr); -int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_sess *sess, +int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_path *path,const struct attribute *sysfs_self);void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt *clt,int value);int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt *clt); -void free_sess (struct rtrs_clt_sess *sess); +void free_path (struct rtrs_clt_path *clt_path);/* rtrs-clt-stats.c */
@@ -242,8 +242,8 @@ ssize_t rtrs_clt_reset_all_help(struct rtrs_clt_stats *stats,int rtrs_clt_create_sysfs_root_files (struct rtrs_clt *clt);void rtrs_clt_destroy_sysfs_root (struct rtrs_clt *clt); -int rtrs_clt_create_sess_files (struct rtrs_clt_sess *sess); -void rtrs_clt_destroy_sess_files (struct rtrs_clt_sess *sess, +int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path); +void rtrs_clt_destroy_path_files (struct rtrs_clt_path *clt_path,const struct attribute *sysfs_self);#endif /* RTRS_CLT_H */
drivers/infiniband/ulp/rtrs/rtrs-pri.h +1 -1
@@ -229,7 +229,7 @@ struct rtrs_msg_conn_rsp {/** * struct rtrs_msg_info_req * @type: @RTRS_MSG_INFO_REQ -* @sessname: Session name chosen by client +* @pathname: Path name chosen by client */ struct rtrs_msg_info_req {__le16 type;
drivers/infiniband/ulp/rtrs/rtrs.h +2 -2
@@ -53,13 +53,13 @@ struct rtrs_clt_ops { };struct rtrs_clt *rtrs_clt_open (struct rtrs_clt_ops *ops, -const char *sessname, +const char *pathname,const struct rtrs_addr *paths,size_t path_cnt,u16 port,size_t pdu_sz,u8 reconnect_delay_sec,s16 max_reconnect_attempts,u32 nr_poll_queues); -void rtrs_clt_close (struct rtrs_clt *sess); +void rtrs_clt_close (struct rtrs_clt *clt_path);enum wait_type {RTRS_PERMIT_NOWAIT =0 ,
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v3 4/5 RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
Structure rtrs_srv is used for sessions so in order to avoid confusions rename it to rtrs_srv_sess.
All changes were done with the help of following
Coccinelle script:
@@
@@
struct
- rtrs_srv
+ rtrs_srv_sess
--- drivers/block/rnbd/rnbd-srv.c | 4 +- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 59 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 4 +- drivers/infiniband/ulp/rtrs/rtrs.h | 10 ++-- 6 files changed, 43 insertions(+), 42 deletions(-)
drivers/block/rnbd/rnbd-srv.c +2 -2
@@ -263,7 +263,7 @@ static void destroy_sess(struct rnbd_srv_session *srv_sess)kfree (srv_sess); } -static int create_sess (struct rtrs_srv *rtrs) +static int create_sess (struct rtrs_srv_sess *rtrs) {struct rnbd_srv_session *srv_sess;char pathname[NAME_MAX ];
@@ -305,7 +305,7 @@ static int create_sess(struct rtrs_srv *rtrs)return 0 ; } -static int rnbd_srv_link_ev (struct rtrs_srv *rtrs, +static int rnbd_srv_link_ev (struct rtrs_srv_sess *rtrs,enum rtrs_srv_link_ev ev,void *priv) {struct rnbd_srv_session *srv_sess = priv;
drivers/block/rnbd/rnbd-srv.h +1 -1
@@ -20,7 +20,7 @@struct rnbd_srv_session {/* Entry inside global sess_list */ struct list_head list; -struct rtrs_srv *rtrs; +struct rtrs_srv_sess *rtrs;char sessname[NAME_MAX ];int queue_depth;struct bio_set sess_bio_set;
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +3 -3
@@ -154,7 +154,7 @@ static const struct attribute_group rtrs_srv_stats_attr_group = {static int rtrs_srv_create_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;int err =0 ;mutex_lock (&srv->paths_mutex);
@@ -199,7 +199,7 @@ static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_path *srv_patstatic void rtrs_srv_destroy_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;mutex_lock (&srv->paths_mutex);if (!--srv->dev_ref) {
@@ -258,7 +258,7 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_path *srv_path)int rtrs_srv_create_path_files (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;struct rtrs_path *s = &srv_path->s;char str[NAME_MAX ];int err;
drivers/infiniband/ulp/rtrs/rtrs-srv.c +30 -29
228 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +2 -2
@@ -73,7 +73,7 @@ struct rtrs_srv_mr {struct rtrs_srv_path {struct rtrs_path s; -struct rtrs_srv *srv; +struct rtrs_srv_sess *srv;struct work_struct close_work;enum rtrs_srv_state state;spinlock_t state_lock;
@@ -90,7 +90,7 @@ struct rtrs_srv_path {struct rtrs_srv_stats *stats; }; -struct rtrs_srv { +struct rtrs_srv_sess {struct list_head paths_list;int paths_up;struct mutex paths_ev_mutex;
drivers/infiniband/ulp/rtrs/rtrs.h +5 -5
@@ -15,7 +15,7 @@struct rtrs_permit ;struct rtrs_clt ;struct rtrs_srv_ctx ; -struct rtrs_srv ; +struct rtrs_srv_sess ;struct rtrs_srv_op ;/*
@@ -163,7 +163,7 @@ struct rtrs_srv_ops {* @priv: Private data from user if previously set with * rtrs_srv_set_sess_priv() */ -int (*link_ev)(struct rtrs_srv *sess,enum rtrs_srv_link_ev ev, +int (*link_ev)(struct rtrs_srv_sess *sess,enum rtrs_srv_link_ev ev,void *priv); };
@@ -173,12 +173,12 @@ void rtrs_srv_close(struct rtrs_srv_ctx *ctx);bool rtrs_srv_resp_rdma (struct rtrs_srv_op *id,int errno); -void rtrs_srv_set_sess_priv (struct rtrs_srv *sess,void *priv); +void rtrs_srv_set_sess_priv (struct rtrs_srv_sess *sess,void *priv); -int rtrs_srv_get_path_name (struct rtrs_srv *sess,char *pathname, +int rtrs_srv_get_path_name (struct rtrs_srv_sess *sess,char *pathname,size_t len); -int rtrs_srv_get_queue_depth (struct rtrs_srv *sess); +int rtrs_srv_get_queue_depth (struct rtrs_srv_sess *sess);int rtrs_addr_to_sockaddr (const char *str,size_t len,u16 port,struct rtrs_addr *addr);
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v3 5/5 RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
Structure rtrs_clt is used for sessions. So to
avoid confusions rename it to rtrs_clt_sess.
Transformations are done with the help of
following coccinelle script.
@@
@@
struct
- rtrs_clt
+ rtrs_clt_sess
---
Changes since v2:
- fix the variable name in rtrs_clt_close
--- drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 24 +++--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 78 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 19 ++--- drivers/infiniband/ulp/rtrs/rtrs.h | 21 +++--- 6 files changed, 77 insertions(+), 71 deletions(-)
drivers/block/rnbd/rnbd-clt.c +2 -2
@@ -433,7 +433,7 @@ static void msg_conf(void *priv, int errno)schedule_work (&iu->work); } -static int send_usr_msg(struct rtrs_clt *rtrs, int dir, +static int send_usr_msg(struct rtrs_clt_sess *rtrs, int dir, struct rnbd_iu *iu, struct kvec *vec, size_t len, struct scatterlist *sg, unsigned int sg_len, void (*conf)(struct work_struct *work),
@@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,struct request *rq, struct rnbd_iu *iu) { - struct rtrs_clt *rtrs = dev->sess->rtrs; + struct rtrs_clt_sess *rtrs = dev->sess->rtrs;struct rtrs_permit *permit = iu->permit;struct rnbd_msg_io msg;struct rtrs_clt_req_ops req_ops;
drivers/block/rnbd/rnbd-clt.h +1 -1
@@ -75,7 +75,7 @@ struct rnbd_cpu_qlist {struct rnbd_clt_session {struct list_head list; -struct rtrs_clt *rtrs; +struct rtrs_clt_sess *rtrs;wait_queue_head_t rtrs_waitq;bool rtrs_ready;struct rnbd_cpu_qlist __percpu
drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c +13 -11
@@ -50,7 +50,8 @@ static ssize_t max_reconnect_attempts_show(struct device *dev,struct device_attribute *attr, char *page) { - struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev); + struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess, + dev);return sysfs_emit (page,"%d\n" ,rtrs_clt_get_max_reconnect_attempts (clt));
@@ -63,7 +64,8 @@ static ssize_t max_reconnect_attempts_store(struct device *dev, {int value;int ret; - struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev); + struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess, + dev); ret =kstrtoint (buf,10 , &value);if (ret) {
@@ -90,9 +92,9 @@ static ssize_t mpath_policy_show(struct device *dev,struct device_attribute *attr, char *page) { - struct rtrs_clt *clt; + struct rtrs_clt_sess *clt; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev);switch (clt->mp_policy) {case MP_POLICY_RR :
@@ -114,12 +116,12 @@ static ssize_t mpath_policy_store(struct device *dev, const char *buf, size_t count) { -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;int value;int ret;size_t len =0 ; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev); ret =kstrtoint (buf,10 , &value); if (!ret && (value == MP_POLICY_RR ||
@@ -169,12 +171,12 @@ static ssize_t add_path_store(struct device *dev, .src = &srcaddr, .dst = &dstaddr }; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;const char *nl;size_t len;int err; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev); nl =strchr (buf,'\n' );if (nl)
@@ -425,7 +427,7 @@ static const struct attribute_group rtrs_clt_path_attr_group = {int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path) { -struct rtrs_clt *clt = clt_path->clt; +struct rtrs_clt_sess *clt = clt_path->clt;char str[NAME_MAX ];int err;struct rtrs_addr path = {
@@ -497,12 +499,12 @@ static const struct attribute_group rtrs_clt_attr_group = { .attrs = rtrs_clt_attrs, }; -int rtrs_clt_create_sysfs_root_files (struct rtrs_clt *clt) +int rtrs_clt_create_sysfs_root_files (struct rtrs_clt_sess *clt) {return sysfs_create_group (&clt->dev.kobj, &rtrs_clt_attr_group); } -void rtrs_clt_destroy_sysfs_root (struct rtrs_clt *clt) +void rtrs_clt_destroy_sysfs_root (struct rtrs_clt_sess *clt) {sysfs_remove_group (&clt->dev.kobj, &rtrs_clt_attr_group);
drivers/infiniband/ulp/rtrs/rtrs-clt.c +40 -38
290 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +10 -9
@@ -126,7 +126,7 @@ struct rtrs_rbuf {struct rtrs_clt_path {struct rtrs_path s; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;wait_queue_head_t state_wq;enum rtrs_clt_state state;atomic_t connected_cnt;
@@ -153,7 +153,7 @@ struct rtrs_clt_path { *mp_skip_entry; }; -struct rtrs_clt { +struct rtrs_clt_sess {struct list_head paths_list;/* rcu protected list */ size_t paths_num;struct rtrs_clt_path
@@ -191,25 +191,26 @@ static inline struct rtrs_clt_path *to_clt_path(struct rtrs_path *s) return container_of(s, struct rtrs_clt_path, s); } -static inline int permit_size (struct rtrs_clt *clt) +static inline int permit_size (struct rtrs_clt_sess *clt) {return sizeof (struct rtrs_permit ) + clt->pdu_sz; } -static inline struct rtrs_permit *get_permit (struct rtrs_clt *clt,int idx) +static inline struct rtrs_permit *get_permit (struct rtrs_clt_sess *clt, +int idx) {return (struct rtrs_permit *)(clt->permits +permit_size (clt) * idx); }int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_path *path);void rtrs_clt_close_conns (struct rtrs_clt_path *clt_path,bool wait); -int rtrs_clt_create_path_from_sysfs (struct rtrs_clt *clt, +int rtrs_clt_create_path_from_sysfs (struct rtrs_clt_sess *clt,struct rtrs_addr *addr);int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_path *path,const struct attribute *sysfs_self); -void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt *clt,int value); -int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt *clt); +void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt_sess *clt,int value); +int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt_sess *clt);void free_path (struct rtrs_clt_path *clt_path);/* rtrs-clt-stats.c */
@@ -239,8 +240,8 @@ ssize_t rtrs_clt_reset_all_help(struct rtrs_clt_stats *stats,/* rtrs-clt-sysfs.c */ -int rtrs_clt_create_sysfs_root_files (struct rtrs_clt *clt); -void rtrs_clt_destroy_sysfs_root (struct rtrs_clt *clt); +int rtrs_clt_create_sysfs_root_files (struct rtrs_clt_sess *clt); +void rtrs_clt_destroy_sysfs_root (struct rtrs_clt_sess *clt);int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path); void rtrs_clt_destroy_path_files(struct rtrs_clt_path *clt_path,
drivers/infiniband/ulp/rtrs/rtrs.h +11 -10
@@ -13,7 +13,7 @@#include <linux/scatterlist.h> struct rtrs_permit ; -struct rtrs_clt ; +struct rtrs_clt_sess ;struct rtrs_srv_ctx ;struct rtrs_srv_sess ;struct rtrs_srv_op ;
@@ -52,14 +52,14 @@ struct rtrs_clt_ops {void (*link_ev)(void *priv,enum rtrs_clt_link_ev ev); }; -struct rtrs_clt *rtrs_clt_open (struct rtrs_clt_ops *ops, +struct rtrs_clt_sess *rtrs_clt_open (struct rtrs_clt_ops *ops,const char *pathname,const struct rtrs_addr *paths,size_t path_cnt,u16 port,size_t pdu_sz,u8 reconnect_delay_sec,s16 max_reconnect_attempts,u32 nr_poll_queues); -void rtrs_clt_close (struct rtrs_clt *clt_path); +void rtrs_clt_close (struct rtrs_clt_sess *clt);enum wait_type {RTRS_PERMIT_NOWAIT =0 ,
@@ -77,11 +77,12 @@ enum rtrs_clt_con_type { RTRS_IO_CON }; -struct rtrs_permit *rtrs_clt_get_permit (struct rtrs_clt *sess, -enum rtrs_clt_con_type con_type, -enum wait_type wait); +struct rtrs_permit *rtrs_clt_get_permit (struct rtrs_clt_sess *sess, +enum rtrs_clt_con_type con_type, +enum wait_type wait); -void rtrs_clt_put_permit (struct rtrs_clt *sess,struct rtrs_permit *permit); +void rtrs_clt_put_permit (struct rtrs_clt_sess *sess, +struct rtrs_permit *permit);/** * rtrs_clt_req_ops - it holds the request confirmation callback
@@ -98,10 +99,10 @@ struct rtrs_clt_req_ops { };int rtrs_clt_request (int dir,struct rtrs_clt_req_ops *ops, -struct rtrs_clt *sess,struct rtrs_permit *permit, +struct rtrs_clt_sess *sess,struct rtrs_permit *permit,const struct kvec *vec,size_t nr,size_t len,struct scatterlist *sg,unsigned int sg_cnt); -int rtrs_clt_rdma_cq_direct (struct rtrs_clt *clt,unsigned int index); +int rtrs_clt_rdma_cq_direct (struct rtrs_clt_sess *clt,unsigned int index);/** * rtrs_attrs - RTRS session attributes
@@ -112,7 +113,7 @@ struct rtrs_attrs {u32 max_segments; }; -int rtrs_clt_query (struct rtrs_clt *sess,struct rtrs_attrs *attr); +int rtrs_clt_query (struct rtrs_clt_sess *sess,struct rtrs_attrs *attr);/* * Here goes RTRS server API
Signature · 1 line
2.25.1
Quoted 20 lines · Jack Wang
Hi Jason, hi Leon,
This patchset from Vaishali, renames a few internal structures to make the code easier to understand.
rtrs_sessis in fact a path. rtrs_clt/_srv is in fact a session. This is a mess and makes it difficult to get into the code.The patchset is based on rdma/for-next:
c8f476da84ad("Merge branch 'mlx5-next' ofgit://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")v3: rename a few more variables in log/comments. (Thanks Guoqing) more detailed changelog in patch 2/3/5
v2: merge first 3 patches to one to be bisectable. (Thanks Guoqing)
https://lore.kernel.org/linux-rdma/[email protected]/T/#tv1: https://lore.kernel.org/linux-rdma/[email protected]/T/#md5be427877cbfcb1741cccea4d081df09ae18561
Quoted 8 lines
Thanks!
Vaishali Thakkar (5):
RDMA/rtrs: Renamertrs_sesstortrs_pathRDMA/rtrs-srv: Renamertrs_srv_sesstortrs_srv_pathRDMA/rtrs-clt: Renamertrs_clt_sesstortrs_clt_pathRDMA/rtrs-srv: Renamertrs_srvtortrs_srv_sessRDMA/rtrs-clt: Renamertrs_clttortrs_clt_sess
Applied to for-next, thanks
Jason