IB/cm: Pass the sgid_attr through various events

Make the sgid_attr available along with path information to the event
consumer, this allows the consumer to keep using the same GID table entry
as the event is related to.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

3 files changed, 10 insertions, 2 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index fe1171226c13..00c90d4f27bb 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3671,7 +3671,8 @@ error:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
 }
 EXPORT_SYMBOL(ib_send_cm_sidr_rep);
 
-static void cm_format_sidr_rep_event(struct cm_work *work)
+static void cm_format_sidr_rep_event(struct cm_work *work,
+                                     const struct cm_id_private *cm_id_priv)
 {
         struct cm_sidr_rep_msg *sidr_rep_msg;
         struct ib_cm_sidr_rep_event_param *param;
@@ -3684,6 +3685,7 @@ static void cm_format_sidr_rep_event(struct cm_work *work)
         param->qpn = be32_to_cpu(cm_sidr_rep_get_qpn(sidr_rep_msg));
         param->info = &sidr_rep_msg->info;
         param->info_len = sidr_rep_msg->info_length;
+        param->sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
         work->cm_event.private_data = &sidr_rep_msg->private_data;
 }
 
@@ -3707,7 +3709,7 @@ static int cm_sidr_rep_handler(struct cm_work *work)
         ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
         spin_unlock_irq(&cm_id_priv->lock);
 
-        cm_format_sidr_rep_event(work);
+        cm_format_sidr_rep_event(work, cm_id_priv);
         cm_process_work(cm_id_priv, work);
         return 0;
 out:
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index de7d2501a740..f0eeb43b388f 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -3581,6 +3581,7 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
         id_priv->cm_id.ib = id;
 
         req.path = id_priv->id.route.path_rec;
+        req.sgid_attr = id_priv->id.route.addr.dev_addr.sgid_attr;
         req.service_id = rdma_get_service_id(&id_priv->id, cma_dst_addr(id_priv));
         req.timeout_ms = 1 << (CMA_CM_RESPONSE_TIMEOUT - 8);
         req.max_cm_retries = CMA_MAX_CM_RETRIES;
@@ -3642,6 +3643,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
         if (route->num_paths == 2)
                 req.alternate_path = &route->path_rec[1];
 
+        req.ppath_sgid_attr = id_priv->id.route.addr.dev_addr.sgid_attr;
+        /* Alternate path SGID attribute currently unsupported */
         req.service_id = rdma_get_service_id(&id_priv->id, cma_dst_addr(id_priv));
         req.qp_num = id_priv->qp_num;
         req.qp_type = id_priv->id.qp_type;
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 7979cb04f529..c98d603c0b63 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -246,6 +246,7 @@ struct ib_cm_sidr_rep_event_param {
         u32                     qkey;
         u32                     qpn;
         void                    *info;
+        const struct ib_gid_attr *sgid_attr;
         u8                      info_len;
 };
 
@@ -365,6 +366,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
 struct ib_cm_req_param {
         struct sa_path_rec      *primary_path;
         struct sa_path_rec      *alternate_path;
+        const struct ib_gid_attr *ppath_sgid_attr;
         __be64                  service_id;
         u32                     qp_num;
         enum ib_qp_type         qp_type;
@@ -566,6 +568,7 @@ int ib_send_cm_apr(struct ib_cm_id *cm_id,
 
 struct ib_cm_sidr_req_param {
         struct sa_path_rec      *path;
+        const struct ib_gid_attr *sgid_attr;
         __be64                  service_id;
         int                     timeout_ms;
         const void              *private_data;