IB/cma: Refactor RDMA IP CM private-data parsing code

When receiving a connection request, rdma_cm needs to associate the request
with a network device, in order to disambiguate requests. To do this, it
needs to know the request's destination IP. For this the module needs to
allow getting this information from the private data in the request packet,
instead of relying on the information already being in the listening RDMA
CM ID.

When creating a new incoming connection ID, the code in
cma_save_ip{4,6}_info can no longer rely on the listener's private data to
find the port number, so it reads it from the requested service ID.

Signed-off-by: Guy Shapiro <guysh@mellanox.com>
Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Yotam Kenneth <yotamke@mellanox.com>
Signed-off-by: Shachar Raindel <raindel@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 9664131c4eeb6c1126e0488dac0dcc56760fa8ad..249944c2c537edec8bcb332e20f83e5324439cb1 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -870,107 +870,138 @@ static inline int cma_any_port(struct sockaddr *addr)
        return !cma_port(addr);
 }
 
-static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
+static void cma_save_ib_info(struct sockaddr *src_addr,
+                            struct sockaddr *dst_addr,
+                            struct rdma_cm_id *listen_id,
                             struct ib_sa_path_rec *path)
 {
        struct sockaddr_ib *listen_ib, *ib;
 
        listen_ib = (struct sockaddr_ib *) &listen_id->route.addr.src_addr;
-       ib = (struct sockaddr_ib *) &id->route.addr.src_addr;
-       ib->sib_family = listen_ib->sib_family;
-       if (path) {
-               ib->sib_pkey = path->pkey;
-               ib->sib_flowinfo = path->flow_label;
-               memcpy(&ib->sib_addr, &path->sgid, 16);
-       } else {
-               ib->sib_pkey = listen_ib->sib_pkey;
-               ib->sib_flowinfo = listen_ib->sib_flowinfo;
-               ib->sib_addr = listen_ib->sib_addr;
-       }
-       ib->sib_sid = listen_ib->sib_sid;
-       ib->sib_sid_mask = cpu_to_be64(0xffffffffffffffffULL);
-       ib->sib_scope_id = listen_ib->sib_scope_id;
-
-       if (path) {
-               ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;
-               ib->sib_family = listen_ib->sib_family;
-               ib->sib_pkey = path->pkey;
-               ib->sib_flowinfo = path->flow_label;
-               memcpy(&ib->sib_addr, &path->dgid, 16);
+       if (src_addr) {
+               ib = (struct sockaddr_ib *)src_addr;
+               ib->sib_family = AF_IB;
+               if (path) {
+                       ib->sib_pkey = path->pkey;
+                       ib->sib_flowinfo = path->flow_label;
+                       memcpy(&ib->sib_addr, &path->sgid, 16);
+                       ib->sib_sid = path->service_id;
+                       ib->sib_scope_id = 0;
+               } else {
+                       ib->sib_pkey = listen_ib->sib_pkey;
+                       ib->sib_flowinfo = listen_ib->sib_flowinfo;
+                       ib->sib_addr = listen_ib->sib_addr;
+                       ib->sib_sid = listen_ib->sib_sid;
+                       ib->sib_scope_id = listen_ib->sib_scope_id;
+               }
+               ib->sib_sid_mask = cpu_to_be64(0xffffffffffffffffULL);
+       }
+       if (dst_addr) {
+               ib = (struct sockaddr_ib *)dst_addr;
+               ib->sib_family = AF_IB;
+               if (path) {
+                       ib->sib_pkey = path->pkey;
+                       ib->sib_flowinfo = path->flow_label;
+                       memcpy(&ib->sib_addr, &path->dgid, 16);
+               }
        }
 }
 
-static __be16 ss_get_port(const struct sockaddr_storage *ss)
-{
-       if (ss->ss_family == AF_INET)
-               return ((struct sockaddr_in *)ss)->sin_port;
-       else if (ss->ss_family == AF_INET6)
-               return ((struct sockaddr_in6 *)ss)->sin6_port;
-       BUG();
-}
-
-static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
-                             struct cma_hdr *hdr)
+static void cma_save_ip4_info(struct sockaddr *src_addr,
+                             struct sockaddr *dst_addr,
+                             struct cma_hdr *hdr,
+                             __be16 local_port)
 {
        struct sockaddr_in *ip4;
 
-       ip4 = (struct sockaddr_in *) &id->route.addr.src_addr;
-       ip4->sin_family = AF_INET;
-       ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr;
-       ip4->sin_port = ss_get_port(&listen_id->route.addr.src_addr);
+       if (src_addr) {
+               ip4 = (struct sockaddr_in *)src_addr;
+               ip4->sin_family = AF_INET;
+               ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr;
+               ip4->sin_port = local_port;
+       }
 
-       ip4 = (struct sockaddr_in *) &id->route.addr.dst_addr;
-       ip4->sin_family = AF_INET;
-       ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr;
-       ip4->sin_port = hdr->port;
+       if (dst_addr) {
+               ip4 = (struct sockaddr_in *)dst_addr;
+               ip4->sin_family = AF_INET;
+               ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr;
+               ip4->sin_port = hdr->port;
+       }
 }
 
-static void cma_save_ip6_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
-                             struct cma_hdr *hdr)
+static void cma_save_ip6_info(struct sockaddr *src_addr,
+                             struct sockaddr *dst_addr,
+                             struct cma_hdr *hdr,
+                             __be16 local_port)
 {
        struct sockaddr_in6 *ip6;
 
-       ip6 = (struct sockaddr_in6 *) &id->route.addr.src_addr;
-       ip6->sin6_family = AF_INET6;
-       ip6->sin6_addr = hdr->dst_addr.ip6;
-       ip6->sin6_port = ss_get_port(&listen_id->route.addr.src_addr);
+       if (src_addr) {
+               ip6 = (struct sockaddr_in6 *)src_addr;
+               ip6->sin6_family = AF_INET6;
+               ip6->sin6_addr = hdr->dst_addr.ip6;
+               ip6->sin6_port = local_port;
+       }
 
-       ip6 = (struct sockaddr_in6 *) &id->route.addr.dst_addr;
-       ip6->sin6_family = AF_INET6;
-       ip6->sin6_addr = hdr->src_addr.ip6;
-       ip6->sin6_port = hdr->port;
+       if (dst_addr) {
+               ip6 = (struct sockaddr_in6 *)dst_addr;
+               ip6->sin6_family = AF_INET6;
+               ip6->sin6_addr = hdr->src_addr.ip6;
+               ip6->sin6_port = hdr->port;
+       }
 }
 
-static int cma_save_net_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
-                            struct ib_cm_event *ib_event)
+static u16 cma_port_from_service_id(__be64 service_id)
 {
-       struct cma_hdr *hdr;
+       return (u16)be64_to_cpu(service_id);
+}
 
-       if (listen_id->route.addr.src_addr.ss_family == AF_IB) {
-               if (ib_event->event == IB_CM_REQ_RECEIVED)
-                       cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);
-               else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED)
-                       cma_save_ib_info(id, listen_id, NULL);
-               return 0;
-       }
+static int cma_save_ip_info(struct sockaddr *src_addr,
+                           struct sockaddr *dst_addr,
+                           struct ib_cm_event *ib_event,
+                           __be64 service_id)
+{
+       struct cma_hdr *hdr;
+       __be16 port;
 
        hdr = ib_event->private_data;
        if (hdr->cma_version != CMA_VERSION)
                return -EINVAL;
 
+       port = htons(cma_port_from_service_id(service_id));
+
        switch (cma_get_ip_ver(hdr)) {
        case 4:
-               cma_save_ip4_info(id, listen_id, hdr);
+               cma_save_ip4_info(src_addr, dst_addr, hdr, port);
                break;
        case 6:
-               cma_save_ip6_info(id, listen_id, hdr);
+               cma_save_ip6_info(src_addr, dst_addr, hdr, port);
                break;
        default:
                return -EINVAL;
        }
+
        return 0;
 }
 
+static int cma_save_net_info(struct sockaddr *src_addr,
+                            struct sockaddr *dst_addr,
+                            struct rdma_cm_id *listen_id,
+                            struct ib_cm_event *ib_event,
+                            sa_family_t sa_family, __be64 service_id)
+{
+       if (sa_family == AF_IB) {
+               if (ib_event->event == IB_CM_REQ_RECEIVED)
+                       cma_save_ib_info(src_addr, dst_addr, listen_id,
+                                        ib_event->param.req_rcvd.primary_path);
+               else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED)
+                       cma_save_ib_info(src_addr, dst_addr, listen_id, NULL);
+               return 0;
+       }
+
+       return cma_save_ip_info(src_addr, dst_addr, ib_event, service_id);
+}
+
 static inline int cma_user_data_offset(struct rdma_id_private *id_priv)
 {
        return cma_family(id_priv) == AF_IB ? 0 : sizeof(struct cma_hdr);
@@ -1221,6 +1252,9 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
        struct rdma_id_private *id_priv;
        struct rdma_cm_id *id;
        struct rdma_route *rt;
+       const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family;
+       const __be64 service_id =
+                     ib_event->param.req_rcvd.primary_path->service_id;
        int ret;
 
        id = rdma_create_id(listen_id->event_handler, listen_id->context,
@@ -1229,7 +1263,9 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
                return NULL;
 
        id_priv = container_of(id, struct rdma_id_private, id);
-       if (cma_save_net_info(id, listen_id, ib_event))
+       if (cma_save_net_info((struct sockaddr *)&id->route.addr.src_addr,
+                             (struct sockaddr *)&id->route.addr.dst_addr,
+                             listen_id, ib_event, ss_family, service_id))
                goto err;
 
        rt = &id->route;
@@ -1267,6 +1303,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
 {
        struct rdma_id_private *id_priv;
        struct rdma_cm_id *id;
+       const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family;
        int ret;
 
        id = rdma_create_id(listen_id->event_handler, listen_id->context,
@@ -1275,7 +1312,10 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
                return NULL;
 
        id_priv = container_of(id, struct rdma_id_private, id);
-       if (cma_save_net_info(id, listen_id, ib_event))
+       if (cma_save_net_info((struct sockaddr *)&id->route.addr.src_addr,
+                             (struct sockaddr *)&id->route.addr.dst_addr,
+                             listen_id, ib_event, ss_family,
+                             ib_event->param.sidr_req_rcvd.service_id))
                goto err;
 
        if (!cma_any_addr((struct sockaddr *) &id->route.addr.src_addr)) {