rdma/cm: export cma_get_service_id

Allow the rdma_ucm to query the IB service ID formed or
allocated by the rdma_cm by exporting the cma_get_service_id
functionality.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index f7ed942f91b71c87288f35afe03f64bff7be5d70..4666e5bf54d467d75592b5a78b2290656f7a85ed 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1264,13 +1264,14 @@ out:
        return ret;
 }
 
-static __be64 cma_get_service_id(enum rdma_port_space ps, struct sockaddr *addr)
+__be64 rdma_get_service_id(struct rdma_cm_id *id, struct sockaddr *addr)
 {
        if (addr->sa_family == AF_IB)
                return ((struct sockaddr_ib *) addr)->sib_sid;
 
-       return cpu_to_be64(((u64)ps << 16) + be16_to_cpu(cma_port(addr)));
+       return cpu_to_be64(((u64)id->ps << 16) + be16_to_cpu(cma_port(addr)));
 }
+EXPORT_SYMBOL(rdma_get_service_id);
 
 static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
                                 struct ib_cm_compare_data *compare)
@@ -1486,7 +1487,7 @@ static int cma_ib_listen(struct rdma_id_private *id_priv)
                return PTR_ERR(id_priv->cm_id.ib);
 
        addr = (struct sockaddr *) &id_priv->id.route.addr.src_addr;
-       svc_id = cma_get_service_id(id_priv->id.ps, addr);
+       svc_id = rdma_get_service_id(&id_priv->id, addr);
        if (cma_any_addr(addr))
                ret = ib_cm_listen(id_priv->cm_id.ib, svc_id, 0, NULL);
        else {
@@ -1668,8 +1669,8 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,
        path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(&addr->dev_addr));
        path_rec.numb_path = 1;
        path_rec.reversible = 1;
-       path_rec.service_id = cma_get_service_id(id_priv->id.ps,
-                                                (struct sockaddr *) &addr->dst_addr);
+       path_rec.service_id = rdma_get_service_id(&id_priv->id,
+                                                 (struct sockaddr *) &addr->dst_addr);
 
        comp_mask = IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |
                    IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |
@@ -2514,8 +2515,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
        }
 
        req.path = route->path_rec;
-       req.service_id = cma_get_service_id(id_priv->id.ps,
-                                           (struct sockaddr *) &route->addr.dst_addr);
+       req.service_id = rdma_get_service_id(&id_priv->id,
+                                            (struct sockaddr *) &route->addr.dst_addr);
        req.timeout_ms = 1 << (CMA_CM_RESPONSE_TIMEOUT - 8);
        req.max_cm_retries = CMA_MAX_CM_RETRIES;
 
@@ -2565,8 +2566,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.service_id = cma_get_service_id(id_priv->id.ps,
-                                           (struct sockaddr *) &route->addr.dst_addr);
+       req.service_id = rdma_get_service_id(&id_priv->id,
+                                            (struct sockaddr *) &route->addr.dst_addr);
        req.qp_num = id_priv->qp_num;
        req.qp_type = IB_QPT_RC;
        req.starting_psn = id_priv->seq_num;

diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index ce9c933b4a4af1d66fe2cef2b4c783a99d664ffd..968a880bdadcac5357fa3041f30d5401f2a530a9 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -339,4 +339,11 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr);
  */
 void rdma_set_service_type(struct rdma_cm_id *id, int tos);
 
+/**
+ * rdma_get_service_id - Return the IB service ID for a specified address.
+ * @id: Communication identifier associated with the address.
+ * @addr: Address for the service ID.
+ */
+__be64 rdma_get_service_id(struct rdma_cm_id *id, struct sockaddr *addr);
+
 #endif /* RDMA_CM_H */