librdmacm: add support for AF_IB multicast addresses

Allow the user to specify AF_IB addresses when joining
multicast groups.  AF_IB addresses contain MGIDs directly.

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

diff --git a/include/rdma/rdma_cma_abi.h b/include/rdma/rdma_cma_abi.h
index 1e3cb57300d6185a0d00c4a5795b743eacd81700..fc965449c379e5aa1f03c2f91694d624c569aac0 100644 (file)
--- a/include/rdma/rdma_cma_abi.h
+++ b/include/rdma/rdma_cma_abi.h
@@ -68,7 +68,8 @@ enum {
        UCMA_CMD_MIGRATE_ID,
        UCMA_CMD_QUERY,
        UCMA_CMD_BIND,
-       UCMA_CMD_RESOLVE_ADDR
+       UCMA_CMD_RESOLVE_ADDR,
+       UCMA_CMD_JOIN_MCAST
 };
 
 struct ucma_abi_cmd_hdr {
@@ -243,6 +244,15 @@ struct ucma_abi_join_ip_mcast {
        __u32 id;
 };
 
+struct ucma_abi_join_mcast {
+       __u64 response;         /* rdma_ucma_create_id_resp */
+       __u64 uid;
+       __u32 id;
+       __u16 addr_size;
+       __u16 reserved;
+       struct sockaddr_storage addr;
+};
+
 struct ucma_abi_get_event {
        __u64 response;
 };

diff --git a/src/cma.c b/src/cma.c
index d2205d4bc015d49bc07d2ecfa977438dfe316748..8b6585e89f1d2bf6967e3cfc01bdd252f941e6fe 100644 (file)
--- a/src/cma.c
+++ b/src/cma.c
@@ -1244,21 +1244,16 @@ int rdma_disconnect(struct rdma_cm_id *id)
        return 0;
 }
 
-int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
-                       void *context)
+static int rdma_join_multicast2(struct rdma_cm_id *id, struct sockaddr *addr,
+                               socklen_t addrlen, void *context)
 {
-       struct ucma_abi_join_ip_mcast *cmd;
        struct ucma_abi_create_id_resp *resp;
        struct cma_id_private *id_priv;
        struct cma_multicast *mc, **pos;
        void *msg;
-       int ret, size, addrlen;
+       int ret, size;
        
        id_priv = container_of(id, struct cma_id_private, id);
-       addrlen = ucma_addrlen(addr);
-       if (!addrlen)
-               return ERR(EINVAL);
-
        mc = malloc(sizeof *mc);
        if (!mc)
                return ERR(ENOMEM);
@@ -1277,10 +1272,23 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
        id_priv->mc_list = mc;
        pthread_mutex_unlock(&id_priv->mut);
 
-       CMA_CREATE_MSG_CMD_RESP(msg, cmd, resp, UCMA_CMD_JOIN_IP_MCAST, size);
-       cmd->id = id_priv->handle;
-       memcpy(&cmd->addr, addr, addrlen);
-       cmd->uid = (uintptr_t) mc;
+       if (af_ib_support) {
+               struct ucma_abi_join_mcast *cmd;
+
+               CMA_CREATE_MSG_CMD_RESP(msg, cmd, resp, UCMA_CMD_JOIN_MCAST, size);
+               cmd->id = id_priv->handle;
+               memcpy(&cmd->addr, addr, addrlen);
+               cmd->addr_size = addrlen;
+               cmd->uid = (uintptr_t) mc;
+               cmd->reserved = 0;
+       } else {
+               struct ucma_abi_join_ip_mcast *cmd;
+
+               CMA_CREATE_MSG_CMD_RESP(msg, cmd, resp, UCMA_CMD_JOIN_IP_MCAST, size);
+               cmd->id = id_priv->handle;
+               memcpy(&cmd->addr, addr, addrlen);
+               cmd->uid = (uintptr_t) mc;
+       }
 
        ret = write(id->channel->fd, msg, size);
        if (ret != size) {
@@ -1303,6 +1311,18 @@ err1:
        return ret;
 }
 
+int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
+                       void *context)
+{
+       int addrlen;
+       
+       addrlen = ucma_addrlen(addr);
+       if (!addrlen)
+               return ERR(EINVAL);
+
+       return rdma_join_multicast2(id, addr, addrlen, context);
+}
+
 int rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
 {
        struct ucma_abi_destroy_id *cmd;