IB/cm: Include HCA ACK delay in local ACK timeout

[linux-2.6] / drivers / infiniband / core / ucm.c

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 0136aee0faa743a5055e88f24df14cced2c29724..424983f5b1ee249f5685907d6f695c03c20d4c4a 100644 (file)
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -64,7 +64,7 @@ struct ib_ucm_device {
 };
 
 struct ib_ucm_file {
-       struct semaphore mutex;
+       struct mutex file_mutex;
        struct file *filp;
        struct ib_ucm_device *device;
 
@@ -153,7 +153,7 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)
 {
        struct ib_ucm_event *uevent;
 
-       down(&ctx->file->mutex);
+       mutex_lock(&ctx->file->file_mutex);
        list_del(&ctx->file_list);
        while (!list_empty(&ctx->events)) {
 
@@ -161,14 +161,16 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)
                                    struct ib_ucm_event, ctx_list);
                list_del(&uevent->file_list);
                list_del(&uevent->ctx_list);
+               mutex_unlock(&ctx->file->file_mutex);
 
                /* clear incoming connections. */
                if (ib_ucm_new_cm_id(uevent->resp.event))
                        ib_destroy_cm_id(uevent->cm_id);
 
                kfree(uevent);
+               mutex_lock(&ctx->file->file_mutex);
        }
-       up(&ctx->file->mutex);
+       mutex_unlock(&ctx->file->file_mutex);
 }
 
 static struct ib_ucm_context *ib_ucm_ctx_alloc(struct ib_ucm_file *file)
@@ -309,9 +311,9 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,
                info          = evt->param.apr_rcvd.apr_info;
                break;
        case IB_CM_SIDR_REQ_RECEIVED:
-               uvt->resp.u.sidr_req_resp.pkey = 
+               uvt->resp.u.sidr_req_resp.pkey =
                                        evt->param.sidr_req_rcvd.pkey;
-               uvt->resp.u.sidr_req_resp.port = 
+               uvt->resp.u.sidr_req_resp.port =
                                        evt->param.sidr_req_rcvd.port;
                uvt->data_len = IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE;
                break;
@@ -328,20 +330,18 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,
        }
 
        if (uvt->data_len) {
-               uvt->data = kmalloc(uvt->data_len, GFP_KERNEL);
+               uvt->data = kmemdup(evt->private_data, uvt->data_len, GFP_KERNEL);
                if (!uvt->data)
                        goto err1;
 
-               memcpy(uvt->data, evt->private_data, uvt->data_len);
                uvt->resp.present |= IB_UCM_PRES_DATA;
        }
 
        if (uvt->info_len) {
-               uvt->info = kmalloc(uvt->info_len, GFP_KERNEL);
+               uvt->info = kmemdup(info, uvt->info_len, GFP_KERNEL);
                if (!uvt->info)
                        goto err2;
 
-               memcpy(uvt->info, info, uvt->info_len);
                uvt->resp.present |= IB_UCM_PRES_INFO;
        }
        return 0;
@@ -375,11 +375,11 @@ static int ib_ucm_event_handler(struct ib_cm_id *cm_id,
        if (result)
                goto err2;
 
-       down(&ctx->file->mutex);
+       mutex_lock(&ctx->file->file_mutex);
        list_add_tail(&uevent->file_list, &ctx->file->events);
        list_add_tail(&uevent->ctx_list, &ctx->events);
        wake_up_interruptible(&ctx->file->poll_wait);
-       up(&ctx->file->mutex);
+       mutex_unlock(&ctx->file->file_mutex);
        return 0;
 
 err2:
@@ -405,31 +405,20 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,
        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
                return -EFAULT;
 
-       down(&file->mutex);
+       mutex_lock(&file->file_mutex);
        while (list_empty(&file->events)) {
+               mutex_unlock(&file->file_mutex);
 
-               if (file->filp->f_flags & O_NONBLOCK) {
-                       result = -EAGAIN;
-                       break;
-               }
-
-               if (signal_pending(current)) {
-                       result = -ERESTARTSYS;
-                       break;
-               }
+               if (file->filp->f_flags & O_NONBLOCK)
+                       return -EAGAIN;
 
-               prepare_to_wait(&file->poll_wait, &wait, TASK_INTERRUPTIBLE);
+               if (wait_event_interruptible(file->poll_wait,
+                                            !list_empty(&file->events)))
+                       return -ERESTARTSYS;
 
-               up(&file->mutex);
-               schedule();
-               down(&file->mutex);
-
-               finish_wait(&file->poll_wait, &wait);
+               mutex_lock(&file->file_mutex);
        }
 
-       if (result)
-               goto done;
-
        uevent = list_entry(file->events.next, struct ib_ucm_event, file_list);
 
        if (ib_ucm_new_cm_id(uevent->resp.event)) {
@@ -482,7 +471,7 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,
        kfree(uevent->info);
        kfree(uevent);
 done:
-       up(&file->mutex);
+       mutex_unlock(&file->file_mutex);
        return result;
 }
 
@@ -501,9 +490,9 @@ static ssize_t ib_ucm_create_id(struct ib_ucm_file *file,
        if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
                return -EFAULT;
 
-       down(&file->mutex);
+       mutex_lock(&file->file_mutex);
        ctx = ib_ucm_ctx_alloc(file);
-       up(&file->mutex);
+       mutex_unlock(&file->file_mutex);
        if (!ctx)
                return -ENOMEM;
 
@@ -685,11 +674,11 @@ out:
        return result;
 }
 
-static ssize_t ib_ucm_establish(struct ib_ucm_file *file,
-                               const char __user *inbuf,
-                               int in_len, int out_len)
+static ssize_t ib_ucm_notify(struct ib_ucm_file *file,
+                            const char __user *inbuf,
+                            int in_len, int out_len)
 {
-       struct ib_ucm_establish cmd;
+       struct ib_ucm_notify cmd;
        struct ib_ucm_context *ctx;
        int result;
 
@@ -700,7 +689,7 @@ static ssize_t ib_ucm_establish(struct ib_ucm_file *file,
        if (IS_ERR(ctx))
                return PTR_ERR(ctx);
 
-       result = ib_cm_establish(ctx->cm_id);
+       result = ib_cm_notify(ctx->cm_id, (enum ib_event_type) cmd.event);
        ib_ucm_ctx_put(ctx);
        return result;
 }
@@ -834,7 +823,6 @@ static ssize_t ib_ucm_send_rep(struct ib_ucm_file *file,
        param.private_data_len    = cmd.len;
        param.responder_resources = cmd.responder_resources;
        param.initiator_depth     = cmd.initiator_depth;
-       param.target_ack_delay    = cmd.target_ack_delay;
        param.failover_accepted   = cmd.failover_accepted;
        param.flow_control        = cmd.flow_control;
        param.rnr_retry_count     = cmd.rnr_retry_count;
@@ -1044,7 +1032,6 @@ static ssize_t ib_ucm_send_sidr_req(struct ib_ucm_file *file,
        param.service_id       = cmd.sid;
        param.timeout_ms       = cmd.timeout;
        param.max_cm_retries   = cmd.max_cm_retries;
-       param.pkey             = cmd.pkey;
 
        ctx = ib_ucm_ctx_get(file, cmd.id);
        if (!IS_ERR(ctx)) {
@@ -1108,7 +1095,7 @@ static ssize_t (*ucm_cmd_table[])(struct ib_ucm_file *file,
        [IB_USER_CM_CMD_DESTROY_ID]    = ib_ucm_destroy_id,
        [IB_USER_CM_CMD_ATTR_ID]       = ib_ucm_attr_id,
        [IB_USER_CM_CMD_LISTEN]        = ib_ucm_listen,
-       [IB_USER_CM_CMD_ESTABLISH]     = ib_ucm_establish,
+       [IB_USER_CM_CMD_NOTIFY]        = ib_ucm_notify,
        [IB_USER_CM_CMD_SEND_REQ]      = ib_ucm_send_req,
        [IB_USER_CM_CMD_SEND_REP]      = ib_ucm_send_rep,
        [IB_USER_CM_CMD_SEND_RTU]      = ib_ucm_send_rtu,
@@ -1177,7 +1164,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)
        INIT_LIST_HEAD(&file->ctxs);
        init_waitqueue_head(&file->poll_wait);
 
-       init_MUTEX(&file->mutex);
+       mutex_init(&file->file_mutex);
 
        filp->private_data = file;
        file->filp = filp;
@@ -1191,11 +1178,11 @@ static int ib_ucm_close(struct inode *inode, struct file *filp)
        struct ib_ucm_file *file = filp->private_data;
        struct ib_ucm_context *ctx;
 
-       down(&file->mutex);
+       mutex_lock(&file->file_mutex);
        while (!list_empty(&file->ctxs)) {
                ctx = list_entry(file->ctxs.next,
                                 struct ib_ucm_context, file_list);
-               up(&file->mutex);
+               mutex_unlock(&file->file_mutex);
 
                mutex_lock(&ctx_id_mutex);
                idr_remove(&ctx_id_table, ctx->id);
@@ -1205,9 +1192,9 @@ static int ib_ucm_close(struct inode *inode, struct file *filp)
                ib_ucm_cleanup_events(ctx);
                kfree(ctx);
 
-               down(&file->mutex);
+               mutex_lock(&file->file_mutex);
        }
-       up(&file->mutex);
+       mutex_unlock(&file->file_mutex);
        kfree(file);
        return 0;
 }
@@ -1222,7 +1209,7 @@ static void ib_ucm_release_class_dev(struct class_device *class_dev)
        kfree(dev);
 }
 
-static struct file_operations ucm_fops = {
+static const struct file_operations ucm_fops = {
        .owner   = THIS_MODULE,
        .open    = ib_ucm_open,
        .release = ib_ucm_close,
@@ -1238,7 +1225,7 @@ static struct class ucm_class = {
 static ssize_t show_ibdev(struct class_device *class_dev, char *buf)
 {
        struct ib_ucm_device *dev;
-       
+
        dev = container_of(class_dev, struct ib_ucm_device, class_dev);
        return sprintf(buf, "%s\n", dev->ib_dev->name);
 }
@@ -1248,7 +1235,8 @@ static void ib_ucm_add_one(struct ib_device *device)
 {
        struct ib_ucm_device *ucm_dev;
 
-       if (!device->alloc_ucontext)
+       if (!device->alloc_ucontext ||
+           rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
                return;
 
        ucm_dev = kzalloc(sizeof *ucm_dev, GFP_KERNEL);