Skip to content

Commit

Permalink
RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path
Browse files Browse the repository at this point in the history 
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.

Link: https://lore.kernel.org/r/20220105180708.7774-3-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>
  • Loading branch information
Vaishali Thakkar authored and Jason Gunthorpe committed Jan 7, 2022
1 parent d937279 commit ae4c816
Show file tree
Hide file tree
Showing 6 changed files with 392 additions and 381 deletions.
12 changes: 6 additions & 6 deletions drivers/block/rnbd/rnbd-srv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/ulp/rtrs/rtrs-pri.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};

Expand Down
119 changes: 60 additions & 59 deletions drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

static void rtrs_srv_release(struct kobject *kobj)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;

sess = container_of(kobj, struct rtrs_srv_sess, kobj);
kfree(sess);
srv_path = container_of(kobj, struct rtrs_srv_path, kobj);
kfree(srv_path);
}

static struct kobj_type ktype = {
Expand All @@ -36,24 +36,25 @@ static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj,
struct kobj_attribute *attr,
const char *buf, size_t count)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;
struct rtrs_path *s;
char str[MAXHOSTNAMELEN];

sess = container_of(kobj, struct rtrs_srv_sess, kobj);
s = &sess->s;
srv_path = container_of(kobj, struct rtrs_srv_path, kobj);
s = &srv_path->s;
if (!sysfs_streq(buf, "1")) {
rtrs_err(s, "%s: invalid value: '%s'\n",
attr->attr.name, buf);
return -EINVAL;
}

sockaddr_to_str((struct sockaddr *)&sess->s.dst_addr, str, sizeof(str));
sockaddr_to_str((struct sockaddr *)&srv_path->s.dst_addr, str,
sizeof(str));

rtrs_info(s, "disconnect for path %s requested\n", str);
/* first remove sysfs itself to avoid deadlock */
sysfs_remove_file_self(&sess->kobj, &attr->attr);
close_sess(sess);
sysfs_remove_file_self(&srv_path->kobj, &attr->attr);
close_path(srv_path);

return count;
}
Expand All @@ -66,11 +67,11 @@ static ssize_t rtrs_srv_hca_port_show(struct kobject *kobj,
struct kobj_attribute *attr,
char *page)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;
struct rtrs_con *usr_con;

sess = container_of(kobj, typeof(*sess), kobj);
usr_con = sess->s.con[0];
srv_path = container_of(kobj, typeof(*srv_path), kobj);
usr_con = srv_path->s.con[0];

return sysfs_emit(page, "%u\n", usr_con->cm_id->port_num);
}
Expand All @@ -82,11 +83,11 @@ static ssize_t rtrs_srv_hca_name_show(struct kobject *kobj,
struct kobj_attribute *attr,
char *page)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;

sess = container_of(kobj, struct rtrs_srv_sess, kobj);
srv_path = container_of(kobj, struct rtrs_srv_path, kobj);

return sysfs_emit(page, "%s\n", sess->s.dev->ib_dev->name);
return sysfs_emit(page, "%s\n", srv_path->s.dev->ib_dev->name);
}

static struct kobj_attribute rtrs_srv_hca_name_attr =
Expand All @@ -96,11 +97,11 @@ static ssize_t rtrs_srv_src_addr_show(struct kobject *kobj,
struct kobj_attribute *attr,
char *page)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;
int cnt;

sess = container_of(kobj, struct rtrs_srv_sess, kobj);
cnt = sockaddr_to_str((struct sockaddr *)&sess->s.dst_addr,
srv_path = container_of(kobj, struct rtrs_srv_path, kobj);
cnt = sockaddr_to_str((struct sockaddr *)&srv_path->s.dst_addr,
page, PAGE_SIZE);
return cnt + sysfs_emit_at(page, cnt, "\n");
}
Expand All @@ -112,11 +113,11 @@ static ssize_t rtrs_srv_dst_addr_show(struct kobject *kobj,
struct kobj_attribute *attr,
char *page)
{
struct rtrs_srv_sess *sess;
struct rtrs_srv_path *srv_path;
int len;

sess = container_of(kobj, struct rtrs_srv_sess, kobj);
len = sockaddr_to_str((struct sockaddr *)&sess->s.src_addr, page,
srv_path = container_of(kobj, struct rtrs_srv_path, kobj);
len = sockaddr_to_str((struct sockaddr *)&srv_path->s.src_addr, page,
PAGE_SIZE);
len += sysfs_emit_at(page, len, "\n");
return len;
Expand All @@ -125,7 +126,7 @@ static ssize_t rtrs_srv_dst_addr_show(struct kobject *kobj,
static struct kobj_attribute rtrs_srv_dst_addr_attr =
__ATTR(dst_addr, 0444, rtrs_srv_dst_addr_show, NULL);

static struct attribute *rtrs_srv_sess_attrs[] = {
static struct attribute *rtrs_srv_path_attrs[] = {
&rtrs_srv_hca_name_attr.attr,
&rtrs_srv_hca_port_attr.attr,
&rtrs_srv_src_addr_attr.attr,
Expand All @@ -134,8 +135,8 @@ static struct attribute *rtrs_srv_sess_attrs[] = {
NULL,
};

static const struct attribute_group rtrs_srv_sess_attr_group = {
.attrs = rtrs_srv_sess_attrs,
static const struct attribute_group rtrs_srv_path_attr_group = {
.attrs = rtrs_srv_path_attrs,
};

STAT_ATTR(struct rtrs_srv_stats, rdma,
Expand All @@ -151,9 +152,9 @@ static const struct attribute_group rtrs_srv_stats_attr_group = {
.attrs = rtrs_srv_stats_attrs,
};

static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_path *srv_path)
{
struct rtrs_srv *srv = sess->srv;
struct rtrs_srv *srv = srv_path->srv;
int err = 0;

mutex_lock(&srv->paths_mutex);
Expand All @@ -164,7 +165,7 @@ static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
goto unlock;
}
srv->dev.class = rtrs_dev_class;
err = dev_set_name(&srv->dev, "%s", sess->s.sessname);
err = dev_set_name(&srv->dev, "%s", srv_path->s.sessname);
if (err)
goto unlock;

Expand Down Expand Up @@ -196,9 +197,9 @@ static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
}

static void
rtrs_srv_destroy_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
rtrs_srv_destroy_once_sysfs_root_folders(struct rtrs_srv_path *srv_path)
{
struct rtrs_srv *srv = sess->srv;
struct rtrs_srv *srv = srv_path->srv;

mutex_lock(&srv->paths_mutex);
if (!--srv->dev_ref) {
Expand All @@ -213,7 +214,7 @@ rtrs_srv_destroy_once_sysfs_root_folders(struct rtrs_srv_sess *sess)
}
}

static void rtrs_srv_sess_stats_release(struct kobject *kobj)
static void rtrs_srv_path_stats_release(struct kobject *kobj)
{
struct rtrs_srv_stats *stats;

Expand All @@ -224,22 +225,22 @@ static void rtrs_srv_sess_stats_release(struct kobject *kobj)

static struct kobj_type ktype_stats = {
.sysfs_ops = &kobj_sysfs_ops,
.release = rtrs_srv_sess_stats_release,
.release = rtrs_srv_path_stats_release,
};

static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)
static int rtrs_srv_create_stats_files(struct rtrs_srv_path *srv_path)
{
int err;
struct rtrs_path *s = &sess->s;
struct rtrs_path *s = &srv_path->s;

err = kobject_init_and_add(&sess->stats->kobj_stats, &ktype_stats,
&sess->kobj, "stats");
err = kobject_init_and_add(&srv_path->stats->kobj_stats, &ktype_stats,
&srv_path->kobj, "stats");
if (err) {
rtrs_err(s, "kobject_init_and_add(): %d\n", err);
kobject_put(&sess->stats->kobj_stats);
kobject_put(&srv_path->stats->kobj_stats);
return err;
}
err = sysfs_create_group(&sess->stats->kobj_stats,
err = sysfs_create_group(&srv_path->stats->kobj_stats,
&rtrs_srv_stats_attr_group);
if (err) {
rtrs_err(s, "sysfs_create_group(): %d\n", err);
Expand All @@ -249,64 +250,64 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)
return 0;

err:
kobject_del(&sess->stats->kobj_stats);
kobject_put(&sess->stats->kobj_stats);
kobject_del(&srv_path->stats->kobj_stats);
kobject_put(&srv_path->stats->kobj_stats);

return err;
}

int rtrs_srv_create_sess_files(struct rtrs_srv_sess *sess)
int rtrs_srv_create_path_files(struct rtrs_srv_path *srv_path)
{
struct rtrs_srv *srv = sess->srv;
struct rtrs_path *s = &sess->s;
struct rtrs_srv *srv = srv_path->srv;
struct rtrs_path *s = &srv_path->s;
char str[NAME_MAX];
int err;
struct rtrs_addr path = {
.src = &sess->s.dst_addr,
.dst = &sess->s.src_addr,
.src = &srv_path->s.dst_addr,
.dst = &srv_path->s.src_addr,
};

rtrs_addr_to_str(&path, str, sizeof(str));
err = rtrs_srv_create_once_sysfs_root_folders(sess);
err = rtrs_srv_create_once_sysfs_root_folders(srv_path);
if (err)
return err;

err = kobject_init_and_add(&sess->kobj, &ktype, srv->kobj_paths,
err = kobject_init_and_add(&srv_path->kobj, &ktype, srv->kobj_paths,
"%s", str);
if (err) {
rtrs_err(s, "kobject_init_and_add(): %d\n", err);
goto destroy_root;
}
err = sysfs_create_group(&sess->kobj, &rtrs_srv_sess_attr_group);
err = sysfs_create_group(&srv_path->kobj, &rtrs_srv_path_attr_group);
if (err) {
rtrs_err(s, "sysfs_create_group(): %d\n", err);
goto put_kobj;
}
err = rtrs_srv_create_stats_files(sess);
err = rtrs_srv_create_stats_files(srv_path);
if (err)
goto remove_group;

return 0;

remove_group:
sysfs_remove_group(&sess->kobj, &rtrs_srv_sess_attr_group);
sysfs_remove_group(&srv_path->kobj, &rtrs_srv_path_attr_group);
put_kobj:
kobject_del(&sess->kobj);
kobject_del(&srv_path->kobj);
destroy_root:
kobject_put(&sess->kobj);
rtrs_srv_destroy_once_sysfs_root_folders(sess);
kobject_put(&srv_path->kobj);
rtrs_srv_destroy_once_sysfs_root_folders(srv_path);

return err;
}

void rtrs_srv_destroy_sess_files(struct rtrs_srv_sess *sess)
void rtrs_srv_destroy_path_files(struct rtrs_srv_path *srv_path)
{
if (sess->kobj.state_in_sysfs) {
kobject_del(&sess->stats->kobj_stats);
kobject_put(&sess->stats->kobj_stats);
sysfs_remove_group(&sess->kobj, &rtrs_srv_sess_attr_group);
kobject_put(&sess->kobj);
if (srv_path->kobj.state_in_sysfs) {
kobject_del(&srv_path->stats->kobj_stats);
kobject_put(&srv_path->stats->kobj_stats);
sysfs_remove_group(&srv_path->kobj, &rtrs_srv_path_attr_group);
kobject_put(&srv_path->kobj);

rtrs_srv_destroy_once_sysfs_root_folders(sess);
rtrs_srv_destroy_once_sysfs_root_folders(srv_path);
}
}
Loading

0 comments on commit ae4c816

Please sign in to comment.