github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

IB/cm: Use sgid_attr from the AV

Browse Source 
Prior patches now ensure that the AV has a sgid_attr, if one would have
been required.  Instead of querying for one, take it directly from the AH.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
This commit is contained in:
Parav Pandit 2018-06-19 10:59:20 +03:00 committed by Jason Gunthorpe
parent 398391071f
commit a8872d53e9
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/infiniband/core/cm.c
View File

@ -1941,9 +1941,8 @@ static int cm_req_handler(struct cm_work *work)
struct ib_cm_id *cm_id; struct ib_cm_id *cm_id;
struct cm_id_private *cm_id_priv, *listen_cm_id_priv; struct cm_id_private *cm_id_priv, *listen_cm_id_priv;
struct cm_req_msg *req_msg; struct cm_req_msg *req_msg;
union ib_gid gid;
struct ib_gid_attr gid_attr;
const struct ib_global_route *grh; const struct ib_global_route *grh;
const struct ib_gid_attr *gid_attr;
int ret; int ret;
req_msg = (struct cm_req_msg *)work->mad_recv_wc->recv_buf.mad; req_msg = (struct cm_req_msg *)work->mad_recv_wc->recv_buf.mad;
@ -1988,20 +1987,13 @@ static int cm_req_handler(struct cm_work *work)
if (cm_req_has_alt_path(req_msg)) if (cm_req_has_alt_path(req_msg))
memset(&work->path[1], 0, sizeof(work->path[1])); memset(&work->path[1], 0, sizeof(work->path[1]));
grh = rdma_ah_read_grh(&cm_id_priv->av.ah_attr); grh = rdma_ah_read_grh(&cm_id_priv->av.ah_attr);
ret = ib_get_cached_gid(work->port->cm_dev->ib_device, gid_attr = grh->sgid_attr;
work->port->port_num,
grh->sgid_index,
&gid, &gid_attr);
if (ret) {
ib_send_cm_rej(cm_id, IB_CM_REJ_UNSUPPORTED, NULL, 0, NULL, 0);
goto rejected;
}
if (gid_attr.ndev) { if (gid_attr && gid_attr->ndev) {
work->path[0].rec_type = work->path[0].rec_type =
sa_conv_gid_to_pathrec_type(gid_attr.gid_type); sa_conv_gid_to_pathrec_type(gid_attr->gid_type);
dev_put(gid_attr.ndev);
} else { } else {
/* If no GID attribute or ndev is null, it is not RoCE. */
cm_path_set_rec_type(work->port->cm_dev->ib_device, cm_path_set_rec_type(work->port->cm_dev->ib_device,
work->port->port_num, work->port->port_num,
&work->path[0], &work->path[0],
@ -2015,7 +2007,7 @@ static int cm_req_handler(struct cm_work *work)
sa_path_set_dmac(&work->path[0], sa_path_set_dmac(&work->path[0],
cm_id_priv->av.ah_attr.roce.dmac); cm_id_priv->av.ah_attr.roce.dmac);
work->path[0].hop_limit = grh->hop_limit; work->path[0].hop_limit = grh->hop_limit;
ret = cm_init_av_by_path(&work->path[0], &gid_attr, &cm_id_priv->av, ret = cm_init_av_by_path(&work->path[0], gid_attr, &cm_id_priv->av,
cm_id_priv); cm_id_priv);
if (ret) { if (ret) {
int err; int err;