Skip to content

Commit

Permalink
IB/srp: Introduce two new srp_target_port member variables
Browse files Browse the repository at this point in the history 
Introduce the srp_target_port member variables 'sgid' and 'pkey'.
Change the type of 'orig_dgid' from __be16[8] into union ib_gid.
This patch does not change any functionality but makes the
"Separate target and channel variables" patch easier to verify.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Bart Van Assche authored and Christoph Hellwig committed Nov 12, 2014
1 parent 34aa654 commit 747fe00
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 17 deletions.
39 changes: 23 additions & 16 deletions drivers/infiniband/ulp/srp/ib_srp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static int srp_init_qp(struct srp_target_port *target,

ret = ib_find_pkey(target->srp_host->srp_dev->dev,
target->srp_host->port,
be16_to_cpu(target->path.pkey),
be16_to_cpu(target->pkey),
&attr->pkey_index);
if (ret)
goto out;
Expand Down Expand Up @@ -295,6 +295,10 @@ static int srp_new_cm_id(struct srp_target_port *target)
if (target->cm_id)
ib_destroy_cm_id(target->cm_id);
target->cm_id = new_cm_id;
target->path.sgid = target->sgid;
target->path.dgid = target->orig_dgid;
target->path.pkey = target->pkey;
target->path.service_id = target->service_id;

return 0;
}
Expand Down Expand Up @@ -689,7 +693,7 @@ static int srp_send_req(struct srp_target_port *target)
*/
if (target->io_class == SRP_REV10_IB_IO_CLASS) {
memcpy(req->priv.initiator_port_id,
&target->path.sgid.global.interface_id, 8);
&target->sgid.global.interface_id, 8);
memcpy(req->priv.initiator_port_id + 8,
&target->initiator_ext, 8);
memcpy(req->priv.target_port_id, &target->ioc_guid, 8);
Expand All @@ -698,7 +702,7 @@ static int srp_send_req(struct srp_target_port *target)
memcpy(req->priv.initiator_port_id,
&target->initiator_ext, 8);
memcpy(req->priv.initiator_port_id + 8,
&target->path.sgid.global.interface_id, 8);
&target->sgid.global.interface_id, 8);
memcpy(req->priv.target_port_id, &target->id_ext, 8);
memcpy(req->priv.target_port_id + 8, &target->ioc_guid, 8);
}
Expand Down Expand Up @@ -2175,8 +2179,8 @@ static void srp_cm_rej_handler(struct ib_cm_id *cm_id,
else
shost_printk(KERN_WARNING, shost, PFX
"SRP LOGIN from %pI6 to %pI6 REJECTED, reason 0x%08x\n",
target->path.sgid.raw,
target->orig_dgid, reason);
target->sgid.raw,
target->orig_dgid.raw, reason);
} else
shost_printk(KERN_WARNING, shost,
" REJ reason: IB_CM_REJ_CONSUMER_DEFINED,"
Expand Down Expand Up @@ -2442,15 +2446,15 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr,
{
struct srp_target_port *target = host_to_target(class_to_shost(dev));

return sprintf(buf, "0x%04x\n", be16_to_cpu(target->path.pkey));
return sprintf(buf, "0x%04x\n", be16_to_cpu(target->pkey));
}

static ssize_t show_sgid(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct srp_target_port *target = host_to_target(class_to_shost(dev));

return sprintf(buf, "%pI6\n", target->path.sgid.raw);
return sprintf(buf, "%pI6\n", target->sgid.raw);
}

static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
Expand All @@ -2466,7 +2470,7 @@ static ssize_t show_orig_dgid(struct device *dev,
{
struct srp_target_port *target = host_to_target(class_to_shost(dev));

return sprintf(buf, "%pI6\n", target->orig_dgid);
return sprintf(buf, "%pI6\n", target->orig_dgid.raw);
}

static ssize_t show_req_lim(struct device *dev,
Expand Down Expand Up @@ -2804,19 +2808,23 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
}

for (i = 0; i < 16; ++i) {
strlcpy(dgid, p + i * 2, 3);
target->path.dgid.raw[i] = simple_strtoul(dgid, NULL, 16);
strlcpy(dgid, p + i * 2, sizeof(dgid));
if (sscanf(dgid, "%hhx",
&target->orig_dgid.raw[i]) < 1) {
ret = -EINVAL;
kfree(p);
goto out;
}
}
kfree(p);
memcpy(target->orig_dgid, target->path.dgid.raw, 16);
break;

case SRP_OPT_PKEY:
if (match_hex(args, &token)) {
pr_warn("bad P_Key parameter '%s'\n", p);
goto out;
}
target->path.pkey = cpu_to_be16(token);
target->pkey = cpu_to_be16(token);
break;

case SRP_OPT_SERVICE_ID:
Expand All @@ -2826,7 +2834,6 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
goto out;
}
target->service_id = cpu_to_be64(simple_strtoull(p, NULL, 16));
target->path.service_id = target->service_id;
kfree(p);
break;

Expand Down Expand Up @@ -3036,7 +3043,7 @@ static ssize_t srp_create_target(struct device *dev,
if (ret)
goto err_free_mem;

ret = ib_query_gid(ibdev, host->port, 0, &target->path.sgid);
ret = ib_query_gid(ibdev, host->port, 0, &target->sgid);
if (ret)
goto err_free_mem;

Expand Down Expand Up @@ -3064,9 +3071,9 @@ static ssize_t srp_create_target(struct device *dev,
"new target: id_ext %016llx ioc_guid %016llx pkey %04x service_id %016llx sgid %pI6 dgid %pI6\n",
be64_to_cpu(target->id_ext),
be64_to_cpu(target->ioc_guid),
be16_to_cpu(target->path.pkey),
be16_to_cpu(target->pkey),
be64_to_cpu(target->service_id),
target->path.sgid.raw, target->orig_dgid);
target->sgid.raw, target->orig_dgid.raw);
}

ret = count;
Expand Down
4 changes: 3 additions & 1 deletion drivers/infiniband/ulp/srp/ib_srp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ struct srp_target_port {
* command processing. Try to keep them packed into cachelines.
*/

union ib_gid sgid;
__be64 id_ext;
__be64 ioc_guid;
__be64 service_id;
Expand All @@ -173,8 +174,9 @@ struct srp_target_port {
int comp_vector;
int tl_retry_count;

union ib_gid orig_dgid;
__be16 pkey;
struct ib_sa_path_rec path;
__be16 orig_dgid[8];
struct ib_sa_query *path_query;
int path_query_id;

Expand Down

0 comments on commit 747fe00

Please sign in to comment.