mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
IB/core: Extend ib_uverbs_create_cq
ib_uverbs_ex_create_cq follows the extension verbs mechanism. New features (for example, CQ creation flags field which is added in a downstream patch) could used via user-space libraries without breaking the ABI. Signed-off-by: Matan Barak <matanb@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
b9926b92a4
commit
565197dd8f
4 changed files with 154 additions and 35 deletions
|
@ -259,5 +259,6 @@ IB_UVERBS_DECLARE_CMD(close_xrcd);
|
||||||
IB_UVERBS_DECLARE_EX_CMD(create_flow);
|
IB_UVERBS_DECLARE_EX_CMD(create_flow);
|
||||||
IB_UVERBS_DECLARE_EX_CMD(destroy_flow);
|
IB_UVERBS_DECLARE_EX_CMD(destroy_flow);
|
||||||
IB_UVERBS_DECLARE_EX_CMD(query_device);
|
IB_UVERBS_DECLARE_EX_CMD(query_device);
|
||||||
|
IB_UVERBS_DECLARE_EX_CMD(create_cq);
|
||||||
|
|
||||||
#endif /* UVERBS_H */
|
#endif /* UVERBS_H */
|
||||||
|
|
|
@ -1330,41 +1330,37 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,
|
||||||
return in_len;
|
return in_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
|
||||||
const char __user *buf, int in_len,
|
struct ib_udata *ucore,
|
||||||
int out_len)
|
struct ib_udata *uhw,
|
||||||
|
struct ib_uverbs_ex_create_cq *cmd,
|
||||||
|
size_t cmd_sz,
|
||||||
|
int (*cb)(struct ib_uverbs_file *file,
|
||||||
|
struct ib_ucq_object *obj,
|
||||||
|
struct ib_uverbs_ex_create_cq_resp *resp,
|
||||||
|
struct ib_udata *udata,
|
||||||
|
void *context),
|
||||||
|
void *context)
|
||||||
{
|
{
|
||||||
struct ib_uverbs_create_cq cmd;
|
|
||||||
struct ib_uverbs_create_cq_resp resp;
|
|
||||||
struct ib_udata udata;
|
|
||||||
struct ib_ucq_object *obj;
|
struct ib_ucq_object *obj;
|
||||||
struct ib_uverbs_event_file *ev_file = NULL;
|
struct ib_uverbs_event_file *ev_file = NULL;
|
||||||
struct ib_cq *cq;
|
struct ib_cq *cq;
|
||||||
int ret;
|
int ret;
|
||||||
|
struct ib_uverbs_ex_create_cq_resp resp;
|
||||||
struct ib_cq_init_attr attr = {};
|
struct ib_cq_init_attr attr = {};
|
||||||
|
|
||||||
if (out_len < sizeof resp)
|
if (cmd->comp_vector >= file->device->num_comp_vectors)
|
||||||
return -ENOSPC;
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
if (copy_from_user(&cmd, buf, sizeof cmd))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
INIT_UDATA(&udata, buf + sizeof cmd,
|
|
||||||
(unsigned long) cmd.response + sizeof resp,
|
|
||||||
in_len - sizeof cmd, out_len - sizeof resp);
|
|
||||||
|
|
||||||
if (cmd.comp_vector >= file->device->num_comp_vectors)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
obj = kmalloc(sizeof *obj, GFP_KERNEL);
|
obj = kmalloc(sizeof *obj, GFP_KERNEL);
|
||||||
if (!obj)
|
if (!obj)
|
||||||
return -ENOMEM;
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
init_uobj(&obj->uobject, cmd.user_handle, file->ucontext, &cq_lock_class);
|
init_uobj(&obj->uobject, cmd->user_handle, file->ucontext, &cq_lock_class);
|
||||||
down_write(&obj->uobject.mutex);
|
down_write(&obj->uobject.mutex);
|
||||||
|
|
||||||
if (cmd.comp_channel >= 0) {
|
if (cmd->comp_channel >= 0) {
|
||||||
ev_file = ib_uverbs_lookup_comp_file(cmd.comp_channel);
|
ev_file = ib_uverbs_lookup_comp_file(cmd->comp_channel);
|
||||||
if (!ev_file) {
|
if (!ev_file) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -1377,10 +1373,14 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
||||||
INIT_LIST_HEAD(&obj->comp_list);
|
INIT_LIST_HEAD(&obj->comp_list);
|
||||||
INIT_LIST_HEAD(&obj->async_list);
|
INIT_LIST_HEAD(&obj->async_list);
|
||||||
|
|
||||||
attr.cqe = cmd.cqe;
|
attr.cqe = cmd->cqe;
|
||||||
attr.comp_vector = cmd.comp_vector;
|
attr.comp_vector = cmd->comp_vector;
|
||||||
|
|
||||||
|
if (cmd_sz > offsetof(typeof(*cmd), flags) + sizeof(cmd->flags))
|
||||||
|
attr.flags = cmd->flags;
|
||||||
|
|
||||||
cq = file->device->ib_dev->create_cq(file->device->ib_dev, &attr,
|
cq = file->device->ib_dev->create_cq(file->device->ib_dev, &attr,
|
||||||
file->ucontext, &udata);
|
file->ucontext, uhw);
|
||||||
if (IS_ERR(cq)) {
|
if (IS_ERR(cq)) {
|
||||||
ret = PTR_ERR(cq);
|
ret = PTR_ERR(cq);
|
||||||
goto err_file;
|
goto err_file;
|
||||||
|
@ -1399,14 +1399,15 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
||||||
goto err_free;
|
goto err_free;
|
||||||
|
|
||||||
memset(&resp, 0, sizeof resp);
|
memset(&resp, 0, sizeof resp);
|
||||||
resp.cq_handle = obj->uobject.id;
|
resp.base.cq_handle = obj->uobject.id;
|
||||||
resp.cqe = cq->cqe;
|
resp.base.cqe = cq->cqe;
|
||||||
|
|
||||||
if (copy_to_user((void __user *) (unsigned long) cmd.response,
|
resp.response_length = offsetof(typeof(resp), response_length) +
|
||||||
&resp, sizeof resp)) {
|
sizeof(resp.response_length);
|
||||||
ret = -EFAULT;
|
|
||||||
goto err_copy;
|
ret = cb(file, obj, &resp, ucore, context);
|
||||||
}
|
if (ret)
|
||||||
|
goto err_cb;
|
||||||
|
|
||||||
mutex_lock(&file->mutex);
|
mutex_lock(&file->mutex);
|
||||||
list_add_tail(&obj->uobject.list, &file->ucontext->cq_list);
|
list_add_tail(&obj->uobject.list, &file->ucontext->cq_list);
|
||||||
|
@ -1416,9 +1417,9 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
||||||
|
|
||||||
up_write(&obj->uobject.mutex);
|
up_write(&obj->uobject.mutex);
|
||||||
|
|
||||||
return in_len;
|
return obj;
|
||||||
|
|
||||||
err_copy:
|
err_cb:
|
||||||
idr_remove_uobj(&ib_uverbs_cq_idr, &obj->uobject);
|
idr_remove_uobj(&ib_uverbs_cq_idr, &obj->uobject);
|
||||||
|
|
||||||
err_free:
|
err_free:
|
||||||
|
@ -1430,7 +1431,106 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
||||||
|
|
||||||
err:
|
err:
|
||||||
put_uobj_write(&obj->uobject);
|
put_uobj_write(&obj->uobject);
|
||||||
return ret;
|
|
||||||
|
return ERR_PTR(ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ib_uverbs_create_cq_cb(struct ib_uverbs_file *file,
|
||||||
|
struct ib_ucq_object *obj,
|
||||||
|
struct ib_uverbs_ex_create_cq_resp *resp,
|
||||||
|
struct ib_udata *ucore, void *context)
|
||||||
|
{
|
||||||
|
if (ib_copy_to_udata(ucore, &resp->base, sizeof(resp->base)))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
|
||||||
|
const char __user *buf, int in_len,
|
||||||
|
int out_len)
|
||||||
|
{
|
||||||
|
struct ib_uverbs_create_cq cmd;
|
||||||
|
struct ib_uverbs_ex_create_cq cmd_ex;
|
||||||
|
struct ib_uverbs_create_cq_resp resp;
|
||||||
|
struct ib_udata ucore;
|
||||||
|
struct ib_udata uhw;
|
||||||
|
struct ib_ucq_object *obj;
|
||||||
|
|
||||||
|
if (out_len < sizeof(resp))
|
||||||
|
return -ENOSPC;
|
||||||
|
|
||||||
|
if (copy_from_user(&cmd, buf, sizeof(cmd)))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
|
INIT_UDATA(&ucore, buf, cmd.response, sizeof(cmd), sizeof(resp));
|
||||||
|
|
||||||
|
INIT_UDATA(&uhw, buf + sizeof(cmd),
|
||||||
|
(unsigned long)cmd.response + sizeof(resp),
|
||||||
|
in_len - sizeof(cmd), out_len - sizeof(resp));
|
||||||
|
|
||||||
|
memset(&cmd_ex, 0, sizeof(cmd_ex));
|
||||||
|
cmd_ex.user_handle = cmd.user_handle;
|
||||||
|
cmd_ex.cqe = cmd.cqe;
|
||||||
|
cmd_ex.comp_vector = cmd.comp_vector;
|
||||||
|
cmd_ex.comp_channel = cmd.comp_channel;
|
||||||
|
|
||||||
|
obj = create_cq(file, &ucore, &uhw, &cmd_ex,
|
||||||
|
offsetof(typeof(cmd_ex), comp_channel) +
|
||||||
|
sizeof(cmd.comp_channel), ib_uverbs_create_cq_cb,
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
if (IS_ERR(obj))
|
||||||
|
return PTR_ERR(obj);
|
||||||
|
|
||||||
|
return in_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ib_uverbs_ex_create_cq_cb(struct ib_uverbs_file *file,
|
||||||
|
struct ib_ucq_object *obj,
|
||||||
|
struct ib_uverbs_ex_create_cq_resp *resp,
|
||||||
|
struct ib_udata *ucore, void *context)
|
||||||
|
{
|
||||||
|
if (ib_copy_to_udata(ucore, resp, resp->response_length))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ib_uverbs_ex_create_cq(struct ib_uverbs_file *file,
|
||||||
|
struct ib_udata *ucore,
|
||||||
|
struct ib_udata *uhw)
|
||||||
|
{
|
||||||
|
struct ib_uverbs_ex_create_cq_resp resp;
|
||||||
|
struct ib_uverbs_ex_create_cq cmd;
|
||||||
|
struct ib_ucq_object *obj;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
if (ucore->inlen < sizeof(cmd))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
err = ib_copy_from_udata(&cmd, ucore, sizeof(cmd));
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
if (cmd.comp_mask)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (cmd.reserved)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (ucore->outlen < (offsetof(typeof(resp), response_length) +
|
||||||
|
sizeof(resp.response_length)))
|
||||||
|
return -ENOSPC;
|
||||||
|
|
||||||
|
obj = create_cq(file, ucore, uhw, &cmd,
|
||||||
|
min(ucore->inlen, sizeof(cmd)),
|
||||||
|
ib_uverbs_ex_create_cq_cb, NULL);
|
||||||
|
|
||||||
|
if (IS_ERR(obj))
|
||||||
|
return PTR_ERR(obj);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,
|
ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,
|
||||||
|
|
|
@ -124,6 +124,7 @@ static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file,
|
||||||
[IB_USER_VERBS_EX_CMD_CREATE_FLOW] = ib_uverbs_ex_create_flow,
|
[IB_USER_VERBS_EX_CMD_CREATE_FLOW] = ib_uverbs_ex_create_flow,
|
||||||
[IB_USER_VERBS_EX_CMD_DESTROY_FLOW] = ib_uverbs_ex_destroy_flow,
|
[IB_USER_VERBS_EX_CMD_DESTROY_FLOW] = ib_uverbs_ex_destroy_flow,
|
||||||
[IB_USER_VERBS_EX_CMD_QUERY_DEVICE] = ib_uverbs_ex_query_device,
|
[IB_USER_VERBS_EX_CMD_QUERY_DEVICE] = ib_uverbs_ex_query_device,
|
||||||
|
[IB_USER_VERBS_EX_CMD_CREATE_CQ] = ib_uverbs_ex_create_cq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void ib_uverbs_add_one(struct ib_device *device);
|
static void ib_uverbs_add_one(struct ib_device *device);
|
||||||
|
|
|
@ -91,6 +91,7 @@ enum {
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
|
IB_USER_VERBS_EX_CMD_QUERY_DEVICE = IB_USER_VERBS_CMD_QUERY_DEVICE,
|
||||||
|
IB_USER_VERBS_EX_CMD_CREATE_CQ = IB_USER_VERBS_CMD_CREATE_CQ,
|
||||||
IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
|
IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
|
||||||
IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
|
IB_USER_VERBS_EX_CMD_DESTROY_FLOW,
|
||||||
};
|
};
|
||||||
|
@ -353,11 +354,27 @@ struct ib_uverbs_create_cq {
|
||||||
__u64 driver_data[0];
|
__u64 driver_data[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ib_uverbs_ex_create_cq {
|
||||||
|
__u64 user_handle;
|
||||||
|
__u32 cqe;
|
||||||
|
__u32 comp_vector;
|
||||||
|
__s32 comp_channel;
|
||||||
|
__u32 comp_mask;
|
||||||
|
__u32 flags;
|
||||||
|
__u32 reserved;
|
||||||
|
};
|
||||||
|
|
||||||
struct ib_uverbs_create_cq_resp {
|
struct ib_uverbs_create_cq_resp {
|
||||||
__u32 cq_handle;
|
__u32 cq_handle;
|
||||||
__u32 cqe;
|
__u32 cqe;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ib_uverbs_ex_create_cq_resp {
|
||||||
|
struct ib_uverbs_create_cq_resp base;
|
||||||
|
__u32 comp_mask;
|
||||||
|
__u32 response_length;
|
||||||
|
};
|
||||||
|
|
||||||
struct ib_uverbs_resize_cq {
|
struct ib_uverbs_resize_cq {
|
||||||
__u64 response;
|
__u64 response;
|
||||||
__u32 cq_handle;
|
__u32 cq_handle;
|
||||||
|
|
Loading…
Reference in a new issue