Skip to content

Commit

Permalink
[IB/ucm]: Clean up userspace CM
Browse files Browse the repository at this point in the history 
Only print debug messages when debug_level is set.
Eliminate NULL checks prior to calling kfree.

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Libor Michalek <libor@topspin.com>
  • Loading branch information
Hal Rosenstock authored and Roland Dreier committed Jul 28, 2005
1 parent 2868bd2 commit 79d8190
Showing 1 changed file with 41 additions and 47 deletions.
88 changes: 41 additions & 47 deletions drivers/infiniband/core/ucm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,26 @@ MODULE_AUTHOR("Libor Michalek");
MODULE_DESCRIPTION("InfiniBand userspace Connection Manager access");
MODULE_LICENSE("Dual BSD/GPL");

static int ucm_debug_level;

module_param_named(debug_level, ucm_debug_level, int, 0644);
MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");

enum {
IB_UCM_MAJOR = 231,
IB_UCM_MINOR = 255
};

#define IB_UCM_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_MINOR)

#define PFX "UCM: "

#define ucm_dbg(format, arg...) \
do { \
if (ucm_debug_level > 0) \
printk(KERN_DEBUG PFX format, ## arg); \
} while (0)

static struct semaphore ctx_id_mutex;
static struct idr ctx_id_table;
static int ctx_id_rover = 0;
Expand Down Expand Up @@ -107,7 +120,7 @@ static void ib_ucm_ctx_put(struct ib_ucm_context *ctx)

up(&ctx->file->mutex);

printk(KERN_ERR "UCM: Destroyed CM ID <%d>\n", ctx->id);
ucm_dbg("Destroyed CM ID <%d>\n", ctx->id);

ib_destroy_cm_id(ctx->cm_id);
kfree(ctx);
Expand Down Expand Up @@ -145,7 +158,7 @@ static struct ib_ucm_context *ib_ucm_ctx_alloc(struct ib_ucm_file *file)
if (result)
goto error;

printk(KERN_ERR "UCM: Allocated CM ID <%d>\n", ctx->id);
ucm_dbg("Allocated CM ID <%d>\n", ctx->id);

return ctx;
error:
Expand Down Expand Up @@ -378,10 +391,8 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,

return 0;
error:
if (uvt->info)
kfree(uvt->info);
if (uvt->data)
kfree(uvt->data);
kfree(uvt->info);
kfree(uvt->data);
return result;
}

Expand All @@ -407,8 +418,7 @@ static int ib_ucm_event_handler(struct ib_cm_id *cm_id,
break;
}

printk(KERN_ERR "UCM: Event. CM ID <%d> event <%d>\n",
id, event->event);
ucm_dbg("Event. CM ID <%d> event <%d>\n", id, event->event);

ctx = ib_ucm_ctx_get(id);
if (!ctx)
Expand Down Expand Up @@ -551,10 +561,8 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,
list_del(&uevent->file_list);
list_del(&uevent->ctx_list);

if (uevent->data)
kfree(uevent->data);
if (uevent->info)
kfree(uevent->info);
kfree(uevent->data);
kfree(uevent->info);
kfree(uevent);
done:
up(&file->mutex);
Expand Down Expand Up @@ -846,12 +854,9 @@ static ssize_t ib_ucm_send_req(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (param.private_data)
kfree(param.private_data);
if (param.primary_path)
kfree(param.primary_path);
if (param.alternate_path)
kfree(param.alternate_path);
kfree(param.private_data);
kfree(param.primary_path);
kfree(param.alternate_path);

return result;
}
Expand Down Expand Up @@ -900,8 +905,7 @@ static ssize_t ib_ucm_send_rep(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (param.private_data)
kfree(param.private_data);
kfree(param.private_data);

return result;
}
Expand Down Expand Up @@ -939,8 +943,7 @@ static ssize_t ib_ucm_send_private_data(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (private_data)
kfree(private_data);
kfree(private_data);

return result;
}
Expand Down Expand Up @@ -1009,10 +1012,8 @@ static ssize_t ib_ucm_send_info(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (data)
kfree(data);
if (info)
kfree(info);
kfree(data);
kfree(info);

return result;
}
Expand Down Expand Up @@ -1063,8 +1064,7 @@ static ssize_t ib_ucm_send_mra(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (data)
kfree(data);
kfree(data);

return result;
}
Expand Down Expand Up @@ -1105,10 +1105,8 @@ static ssize_t ib_ucm_send_lap(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (data)
kfree(data);
if (path)
kfree(path);
kfree(data);
kfree(path);

return result;
}
Expand Down Expand Up @@ -1157,10 +1155,8 @@ static ssize_t ib_ucm_send_sidr_req(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (param.private_data)
kfree(param.private_data);
if (param.path)
kfree(param.path);
kfree(param.private_data);
kfree(param.path);

return result;
}
Expand Down Expand Up @@ -1209,10 +1205,8 @@ static ssize_t ib_ucm_send_sidr_rep(struct ib_ucm_file *file,
up(&ctx->file->mutex);
ib_ucm_ctx_put(ctx); /* func reference */
done:
if (param.private_data)
kfree(param.private_data);
if (param.info)
kfree(param.info);
kfree(param.private_data);
kfree(param.info);

return result;
}
Expand Down Expand Up @@ -1252,8 +1246,8 @@ static ssize_t ib_ucm_write(struct file *filp, const char __user *buf,
if (copy_from_user(&hdr, buf, sizeof(hdr)))
return -EFAULT;

printk(KERN_ERR "UCM: Write. cmd <%d> in <%d> out <%d> len <%Zu>\n",
hdr.cmd, hdr.in, hdr.out, len);
ucm_dbg("Write. cmd <%d> in <%d> out <%d> len <%Zu>\n",
hdr.cmd, hdr.in, hdr.out, len);

if (hdr.cmd < 0 || hdr.cmd >= ARRAY_SIZE(ucm_cmd_table))
return -EINVAL;
Expand Down Expand Up @@ -1300,7 +1294,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)
filp->private_data = file;
file->filp = filp;

printk(KERN_ERR "UCM: Created struct\n");
ucm_dbg("Created struct\n");

return 0;
}
Expand All @@ -1326,7 +1320,7 @@ static int ib_ucm_close(struct inode *inode, struct file *filp)

kfree(file);

printk(KERN_ERR "UCM: Deleted struct\n");
ucm_dbg("Deleted struct\n");
return 0;
}

Expand All @@ -1348,22 +1342,22 @@ static int __init ib_ucm_init(void)

result = register_chrdev_region(IB_UCM_DEV, 1, "infiniband_cm");
if (result) {
printk(KERN_ERR "UCM: Error <%d> registering dev\n", result);
ucm_dbg("Error <%d> registering dev\n", result);
goto err_chr;
}

cdev_init(&ib_ucm_cdev, &ib_ucm_fops);

result = cdev_add(&ib_ucm_cdev, IB_UCM_DEV, 1);
if (result) {
printk(KERN_ERR "UCM: Error <%d> adding cdev\n", result);
ucm_dbg("Error <%d> adding cdev\n", result);
goto err_cdev;
}

ib_ucm_class = class_create(THIS_MODULE, "infiniband_cm");
if (IS_ERR(ib_ucm_class)) {
result = PTR_ERR(ib_ucm_class);
printk(KERN_ERR "UCM: Error <%d> creating class\n", result);
ucm_dbg("Error <%d> creating class\n", result);
goto err_class;
}

Expand Down

0 comments on commit 79d8190

Please sign in to comment.