rdma/ucm: Allow user space to bind to AF_IB

Support user space binding to addresses using AF_IB.  Since
sockaddr_ib is larger than sockaddr_in6, we need to define
a larger structure when binding using AF_IB.  This time we
use sockaddr_storage to cover future cases.

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

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index af8bbe4aa98a9c6629f6c912afc6b39132c4eef4..ceb800be6d7bf9d195ad46ba7cce06f5ff4ad788 100644 (file)
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -555,6 +555,30 @@ static ssize_t ucma_bind_ip(struct ucma_file *file, const char __user *inbuf,
        return ret;
 }
 
+static ssize_t ucma_bind(struct ucma_file *file, const char __user *inbuf,
+                        int in_len, int out_len)
+{
+       struct rdma_ucm_bind cmd;
+       struct sockaddr *addr;
+       struct ucma_context *ctx;
+       int ret;
+
+       if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
+               return -EFAULT;
+
+       addr = (struct sockaddr *) &cmd.addr;
+       if (cmd.reserved || !cmd.addr_size || (cmd.addr_size != rdma_addr_size(addr)))
+               return -EINVAL;
+
+       ctx = ucma_get_ctx(file, cmd.id);
+       if (IS_ERR(ctx))
+               return PTR_ERR(ctx);
+
+       ret = rdma_bind_addr(ctx->cm_id, addr);
+       ucma_put_ctx(ctx);
+       return ret;
+}
+
 static ssize_t ucma_resolve_ip(struct ucma_file *file,
                               const char __user *inbuf,
                               int in_len, int out_len)
@@ -1417,7 +1441,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
        [RDMA_USER_CM_CMD_JOIN_IP_MCAST] = ucma_join_ip_multicast,
        [RDMA_USER_CM_CMD_LEAVE_MCAST]   = ucma_leave_multicast,
        [RDMA_USER_CM_CMD_MIGRATE_ID]    = ucma_migrate_id,
-       [RDMA_USER_CM_CMD_QUERY]         = ucma_query
+       [RDMA_USER_CM_CMD_QUERY]         = ucma_query,
+       [RDMA_USER_CM_CMD_BIND]          = ucma_bind
 };
 
 static ssize_t ucma_write(struct file *filp, const char __user *buf,

diff --git a/include/rdma/rdma_user_cm.h b/include/rdma/rdma_user_cm.h
index bfb2ca7fdca5354199728040118d653940172c1c..cae3e278d70d588ad3fe2f18e2666c994cd13ceb 100644 (file)
--- a/include/rdma/rdma_user_cm.h
+++ b/include/rdma/rdma_user_cm.h
@@ -62,7 +62,8 @@ enum {
        RDMA_USER_CM_CMD_JOIN_IP_MCAST,
        RDMA_USER_CM_CMD_LEAVE_MCAST,
        RDMA_USER_CM_CMD_MIGRATE_ID,
-       RDMA_USER_CM_CMD_QUERY
+       RDMA_USER_CM_CMD_QUERY,
+       RDMA_USER_CM_CMD_BIND
 };
 
 /*
@@ -102,6 +103,13 @@ struct rdma_ucm_bind_ip {
        __u32 id;
 };
 
+struct rdma_ucm_bind {
+       __u32 id;
+       __u16 addr_size;
+       __u16 reserved;
+       struct sockaddr_storage addr;
+};
+
 struct rdma_ucm_resolve_ip {
        struct sockaddr_in6 src_addr;
        struct sockaddr_in6 dst_addr;