From patchwork Wed Sep 28 15:10:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Barak X-Patchwork-Id: 9354075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3ECE660757 for ; Wed, 28 Sep 2016 15:11:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C62C2870A for ; Wed, 28 Sep 2016 15:11:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2131E296A3; Wed, 28 Sep 2016 15:11:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39DE8296A4 for ; Wed, 28 Sep 2016 15:11:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932745AbcI1PLV (ORCPT ); Wed, 28 Sep 2016 11:11:21 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:37302 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932486AbcI1PLS (ORCPT ); Wed, 28 Sep 2016 11:11:18 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from matanb@mellanox.com) with ESMTPS (AES256-SHA encrypted); 28 Sep 2016 18:11:12 +0300 Received: from dev-r-vrt-064.mtr.labs.mlnx (dev-r-vrt-064.mtr.labs.mlnx [10.212.64.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id u8SFBC9f001722; Wed, 28 Sep 2016 18:11:12 +0300 From: Matan Barak To: linux-rdma@vger.kernel.org Cc: Doug Ledford , Jason Gunthorpe , Sean Hefty , Liran Liss , Haggai Eran , Matan Barak , Majd Dibbiny , Christoph Lameter , Leon Romanovsky Subject: [RFC ABI V4 3/7] RDMA/core: Add support for custom types Date: Wed, 28 Sep 2016 18:10:13 +0300 Message-Id: <1475075417-30189-4-git-send-email-matanb@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475075417-30189-1-git-send-email-matanb@mellanox.com> References: <1475075417-30189-1-git-send-email-matanb@mellanox.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new ioctl infrastructure supports driver specific objects. Each such object type has a free function, allocation size and an order of destruction. This information is embedded in the same table describing the various action allowed on the object, similarly to object oriented programming. When a ucontext is created, a new list is created in this ib_ucontext. This list contains all objects created under this ib_ucontext. When a ib_ucontext is destroyed, we traverse this list several time destroying the various objects by the order mentioned in the object type description. If few object types have the same destruction order, they are destroyed in an order opposite to their creation order. Adding an object is done in two parts. First, an object is allocated and added to IDR/fd table. Then, the command's handlers (in downstream patches) could work on this object and fill in its required details. After a successful command, ib_uverbs_uobject_enable is called and this user objects becomes ucontext visible. Removing an uboject is done by calling ib_uverbs_uobject_remove. We should make sure IDR (per-device) and list (per-ucontext) could be accessed concurrently without corrupting them. Signed-off-by: Matan Barak Signed-off-by: Haggai Eran Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/Makefile | 3 +- drivers/infiniband/core/device.c | 1 + drivers/infiniband/core/rdma_core.c | 489 ++++++++++++++++++++++++++++++++++ drivers/infiniband/core/rdma_core.h | 75 ++++++ drivers/infiniband/core/uverbs.h | 1 + drivers/infiniband/core/uverbs_main.c | 2 +- include/rdma/ib_verbs.h | 28 +- include/rdma/uverbs_ioctl.h | 195 ++++++++++++++ 8 files changed, 789 insertions(+), 5 deletions(-) create mode 100644 drivers/infiniband/core/rdma_core.c create mode 100644 drivers/infiniband/core/rdma_core.h create mode 100644 include/rdma/uverbs_ioctl.h diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile index edaae9f..1819623 100644 --- a/drivers/infiniband/core/Makefile +++ b/drivers/infiniband/core/Makefile @@ -28,4 +28,5 @@ ib_umad-y := user_mad.o ib_ucm-y := ucm.o -ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o +ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ + rdma_core.o diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index b0135c2..5f09c40 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -243,6 +243,7 @@ struct ib_device *ib_alloc_device(size_t size) spin_lock_init(&device->client_data_lock); INIT_LIST_HEAD(&device->client_data_list); INIT_LIST_HEAD(&device->port_list); + INIT_LIST_HEAD(&device->type_list); return device; } diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c new file mode 100644 index 0000000..337abc2 --- /dev/null +++ b/drivers/infiniband/core/rdma_core.c @@ -0,0 +1,489 @@ +/* + * Copyright (c) 2016, Mellanox Technologies inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include +#include "uverbs.h" +#include "rdma_core.h" +#include + +const struct uverbs_type *uverbs_get_type(const struct ib_device *ibdev, + uint16_t type) +{ + const struct uverbs_types_group *groups = ibdev->types_group; + const struct uverbs_types *types; + int ret = groups->dist(&type, groups->priv); + + if (ret >= groups->num_groups) + return NULL; + + types = groups->type_groups[ret]; + + if (type >= types->num_types) + return NULL; + + return types->types[type]; +} + +static int uverbs_lock_object(struct ib_uobject *uobj, + enum uverbs_idr_access access) +{ + if (access == UVERBS_IDR_ACCESS_READ) + return down_read_trylock(&uobj->usecnt) == 1 ? 0 : -EBUSY; + + /* lock is either WRITE or DESTROY - should be exclusive */ + return down_write_trylock(&uobj->usecnt) == 1 ? 0 : -EBUSY; +} + +static struct ib_uobject *get_uobj(int id, struct ib_ucontext *context) +{ + struct ib_uobject *uobj; + + rcu_read_lock(); + uobj = idr_find(&context->device->idr, id); + if (uobj && uobj->live) { + if (uobj->context != context) + uobj = NULL; + } + rcu_read_unlock(); + + return uobj; +} + +struct ib_ucontext_lock { + struct kref ref; + /* locking the uobjects_list */ + struct mutex lock; +}; + +static void init_uobjects_list_lock(struct ib_ucontext_lock *lock) +{ + mutex_init(&lock->lock); + kref_init(&lock->ref); +} + +static void release_uobjects_list_lock(struct kref *ref) +{ + struct ib_ucontext_lock *lock = container_of(ref, + struct ib_ucontext_lock, + ref); + + kfree(lock); +} + +static void init_uobj(struct ib_uobject *uobj, u64 user_handle, + struct ib_ucontext *context) +{ + init_rwsem(&uobj->usecnt); + uobj->user_handle = user_handle; + uobj->context = context; + uobj->live = 0; +} + +static int add_uobj(struct ib_uobject *uobj) +{ + int ret; + + idr_preload(GFP_KERNEL); + spin_lock(&uobj->context->device->idr_lock); + + ret = idr_alloc(&uobj->context->device->idr, uobj, 0, 0, GFP_NOWAIT); + if (ret >= 0) + uobj->id = ret; + + spin_unlock(&uobj->context->device->idr_lock); + idr_preload_end(); + + return ret < 0 ? ret : 0; +} + +static void remove_uobj(struct ib_uobject *uobj) +{ + spin_lock(&uobj->context->device->idr_lock); + idr_remove(&uobj->context->device->idr, uobj->id); + spin_unlock(&uobj->context->device->idr_lock); +} + +static void put_uobj(struct ib_uobject *uobj) +{ + kfree_rcu(uobj, rcu); +} + +static struct ib_uobject *get_uobject_from_context(struct ib_ucontext *ucontext, + const struct uverbs_type_alloc_action *type, + u32 idr, + enum uverbs_idr_access access) +{ + struct ib_uobject *uobj; + int ret; + + rcu_read_lock(); + uobj = get_uobj(idr, ucontext); + if (!uobj) + goto free; + + if (uobj->type != type) { + uobj = NULL; + goto free; + } + + ret = uverbs_lock_object(uobj, access); + if (ret) + uobj = ERR_PTR(ret); +free: + rcu_read_unlock(); + return uobj; + + return NULL; +} + +static int ib_uverbs_uobject_add(struct ib_uobject *uobject, + const struct uverbs_type_alloc_action *uobject_type) +{ + uobject->type = uobject_type; + return add_uobj(uobject); +} + +struct ib_uobject *uverbs_get_type_from_idr(const struct uverbs_type_alloc_action *type, + struct ib_ucontext *ucontext, + enum uverbs_idr_access access, + uint32_t idr) +{ + struct ib_uobject *uobj; + int ret; + + if (access == UVERBS_IDR_ACCESS_NEW) { + uobj = kmalloc(type->obj_size, GFP_KERNEL); + if (!uobj) + return ERR_PTR(-ENOMEM); + + init_uobj(uobj, 0, ucontext); + + /* lock idr */ + ret = ib_uverbs_uobject_add(uobj, type); + if (ret) { + kfree(uobj); + return ERR_PTR(ret); + } + + } else { + uobj = get_uobject_from_context(ucontext, type, idr, + access); + + if (!uobj) + return ERR_PTR(-ENOENT); + } + + return uobj; +} + +struct ib_uobject *uverbs_get_type_from_fd(const struct uverbs_type_alloc_action *type, + struct ib_ucontext *ucontext, + enum uverbs_idr_access access, + int fd) +{ + if (access == UVERBS_IDR_ACCESS_NEW) { + int _fd; + struct ib_uobject *uobj = NULL; + struct file *filp; + + _fd = get_unused_fd_flags(O_CLOEXEC); + if (_fd < 0 || WARN_ON(type->obj_size < sizeof(struct ib_uobject))) + return ERR_PTR(_fd); + + uobj = kmalloc(type->obj_size, GFP_KERNEL); + init_uobj(uobj, 0, ucontext); + + if (!uobj) + return ERR_PTR(-ENOMEM); + + filp = anon_inode_getfile(type->fd.name, type->fd.fops, + uobj + 1, type->fd.flags); + if (IS_ERR(filp)) { + put_unused_fd(_fd); + kfree(uobj); + return (void *)filp; + } + + uobj->type = type; + uobj->id = _fd; + uobj->object = filp; + + return uobj; + } else if (access == UVERBS_IDR_ACCESS_READ) { + struct file *f = fget(fd); + struct ib_uobject *uobject; + + if (!f) + return ERR_PTR(-EBADF); + + uobject = f->private_data - sizeof(struct ib_uobject); + if (f->f_op != type->fd.fops || + !uobject->live) { + fput(f); + return ERR_PTR(-EBADF); + } + + /* + * No need to protect it with a ref count, as fget increases + * f_count. + */ + return uobject; + } else { + return ERR_PTR(-EOPNOTSUPP); + } +} + +static void ib_uverbs_uobject_enable(struct ib_uobject *uobject) +{ + mutex_lock(&uobject->context->uobjects_lock->lock); + list_add(&uobject->list, &uobject->context->uobjects); + mutex_unlock(&uobject->context->uobjects_lock->lock); + uobject->live = 1; +} + +static void ib_uverbs_uobject_remove(struct ib_uobject *uobject, bool lock) +{ + /* + * Calling remove requires exclusive access, so it's not possible + * another thread will use our object. + */ + uobject->live = 0; + uobject->type->free_fn(uobject->type, uobject); + if (lock) + mutex_lock(&uobject->context->uobjects_lock->lock); + list_del(&uobject->list); + if (lock) + mutex_unlock(&uobject->context->uobjects_lock->lock); + remove_uobj(uobject); + put_uobj(uobject); +} + +static void uverbs_unlock_idr(struct ib_uobject *uobj, + enum uverbs_idr_access access, + bool success) +{ + switch (access) { + case UVERBS_IDR_ACCESS_READ: + up_read(&uobj->usecnt); + break; + case UVERBS_IDR_ACCESS_NEW: + if (success) { + ib_uverbs_uobject_enable(uobj); + } else { + remove_uobj(uobj); + put_uobj(uobj); + } + break; + case UVERBS_IDR_ACCESS_WRITE: + up_write(&uobj->usecnt); + break; + case UVERBS_IDR_ACCESS_DESTROY: + if (success) + ib_uverbs_uobject_remove(uobj, true); + else + up_write(&uobj->usecnt); + break; + } +} + +static void uverbs_unlock_fd(struct ib_uobject *uobj, + enum uverbs_idr_access access, + bool success) +{ + struct file *filp = uobj->object; + + if (access == UVERBS_IDR_ACCESS_NEW) { + if (success) { + kref_get(&uobj->context->ufile->ref); + uobj->uobjects_lock = uobj->context->uobjects_lock; + kref_get(&uobj->uobjects_lock->ref); + ib_uverbs_uobject_enable(uobj); + fd_install(uobj->id, uobj->object); + } else { + fput(uobj->object); + put_unused_fd(uobj->id); + kfree(uobj); + } + } else { + fput(filp); + } +} + +void uverbs_unlock_object(struct ib_uobject *uobj, + enum uverbs_idr_access access, + bool success) +{ + if (uobj->type->type == UVERBS_ATTR_TYPE_IDR) + uverbs_unlock_idr(uobj, access, success); + else if (uobj->type->type == UVERBS_ATTR_TYPE_FD) + uverbs_unlock_fd(uobj, access, success); + else + WARN_ON(true); +} + +static void ib_uverbs_remove_fd(struct ib_uobject *uobject) +{ + /* + * user should release the uobject in the release + * callback. + */ + if (uobject->live) { + uobject->live = 0; + list_del(&uobject->list); + uobject->type->free_fn(uobject->type, uobject); + kref_put(&uobject->context->ufile->ref, ib_uverbs_release_file); + uobject->context = NULL; + } +} + +void ib_uverbs_close_fd(struct file *f) +{ + struct ib_uobject *uobject = f->private_data - sizeof(struct ib_uobject); + + mutex_lock(&uobject->uobjects_lock->lock); + if (uobject->live) { + uobject->live = 0; + list_del(&uobject->list); + kref_put(&uobject->context->ufile->ref, ib_uverbs_release_file); + uobject->context = NULL; + } + mutex_unlock(&uobject->uobjects_lock->lock); + kref_put(&uobject->uobjects_lock->ref, release_uobjects_list_lock); +} + +void ib_uverbs_cleanup_fd(void *private_data) +{ + struct ib_uboject *uobject = private_data - sizeof(struct ib_uobject); + + kfree(uobject); +} + +void uverbs_unlock_objects(struct uverbs_attr_array *attr_array, + size_t num, + const struct uverbs_action_spec *spec, + bool success) +{ + unsigned int i; + + for (i = 0; i < num; i++) { + struct uverbs_attr_array *attr_spec_array = &attr_array[i]; + const struct uverbs_attr_group_spec *group_spec = + spec->attr_groups[i]; + unsigned int j; + + for (j = 0; j < attr_spec_array->num_attrs; j++) { + struct uverbs_attr *attr = &attr_spec_array->attrs[j]; + struct uverbs_attr_spec *spec = &group_spec->attrs[j]; + + if (!attr->valid) + continue; + + if (spec->type == UVERBS_ATTR_TYPE_IDR || + spec->type == UVERBS_ATTR_TYPE_FD) + /* + * refcounts should be handled at the object + * level and not at the uobject level. + */ + uverbs_unlock_object(attr->obj_attr.uobject, + spec->obj.access, success); + } + } +} + +static unsigned int get_type_orders(const struct uverbs_types_group *types_group) +{ + unsigned int i; + unsigned int max = 0; + + for (i = 0; i < types_group->num_groups; i++) { + unsigned int j; + const struct uverbs_types *types = types_group->type_groups[i]; + + for (j = 0; j < types->num_types; j++) { + if (!types->types[j] || !types->types[j]->alloc) + continue; + if (types->types[j]->alloc->order > max) + max = types->types[j]->alloc->order; + } + } + + return max; +} + +void ib_uverbs_uobject_type_cleanup_ucontext(struct ib_ucontext *ucontext, + const struct uverbs_types_group *types_group) +{ + unsigned int num_orders = get_type_orders(types_group); + unsigned int i; + + for (i = 0; i <= num_orders; i++) { + struct ib_uobject *obj, *next_obj; + + /* + * No need to take lock here, as cleanup should be called + * after all commands finished executing. Newly executed + * commands should fail. + */ + mutex_lock(&ucontext->uobjects_lock->lock); + list_for_each_entry_safe(obj, next_obj, &ucontext->uobjects, + list) + if (obj->type->order == i) { + if (obj->type->type == UVERBS_ATTR_TYPE_IDR) + ib_uverbs_uobject_remove(obj, false); + else + ib_uverbs_remove_fd(obj); + } + mutex_unlock(&ucontext->uobjects_lock->lock); + } + kref_put(&ucontext->uobjects_lock->ref, release_uobjects_list_lock); +} + +int ib_uverbs_uobject_type_initialize_ucontext(struct ib_ucontext *ucontext) +{ + ucontext->uobjects_lock = kmalloc(sizeof(*ucontext->uobjects_lock), + GFP_KERNEL); + if (!ucontext->uobjects_lock) + return -ENOMEM; + + init_uobjects_list_lock(ucontext->uobjects_lock); + INIT_LIST_HEAD(&ucontext->uobjects); + + return 0; +} + +void ib_uverbs_uobject_type_release_ucontext(struct ib_ucontext *ucontext) +{ + kfree(ucontext->uobjects_lock); +} + diff --git a/drivers/infiniband/core/rdma_core.h b/drivers/infiniband/core/rdma_core.h new file mode 100644 index 0000000..8990115 --- /dev/null +++ b/drivers/infiniband/core/rdma_core.h @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2005 Topspin Communications. All rights reserved. + * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved. + * Copyright (c) 2005-2016 Mellanox Technologies. All rights reserved. + * Copyright (c) 2005 Voltaire, Inc. All rights reserved. + * Copyright (c) 2005 PathScale, Inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef UOBJECT_H +#define UOBJECT_H + +#include +#include +#include +#include + +const struct uverbs_type *uverbs_get_type(const struct ib_device *ibdev, + uint16_t type); +struct ib_uobject *uverbs_get_type_from_idr(const struct uverbs_type_alloc_action *type, + struct ib_ucontext *ucontext, + enum uverbs_idr_access access, + uint32_t idr); +struct ib_uobject *uverbs_get_type_from_fd(const struct uverbs_type_alloc_action *type, + struct ib_ucontext *ucontext, + enum uverbs_idr_access access, + int fd); +void uverbs_unlock_object(struct ib_uobject *uobj, + enum uverbs_idr_access access, + bool success); +void uverbs_unlock_objects(struct uverbs_attr_array *attr_array, + size_t num, + const struct uverbs_action_spec *spec, + bool success); + +void ib_uverbs_uobject_type_cleanup_ucontext(struct ib_ucontext *ucontext, + const struct uverbs_types_group *types_group); +int ib_uverbs_uobject_type_initialize_ucontext(struct ib_ucontext *ucontext); +void ib_uverbs_uobject_type_release_ucontext(struct ib_ucontext *ucontext); +void ib_uverbs_close_fd(struct file *f); +void ib_uverbs_cleanup_fd(void *private_data); + +static inline void *uverbs_fd_to_priv(struct ib_uobject *uobj) +{ + return uobj + 1; +} + +#endif /* UIDR_H */ diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h index 60d7c3d..f6ccd7b 100644 --- a/drivers/infiniband/core/uverbs.h +++ b/drivers/infiniband/core/uverbs.h @@ -175,6 +175,7 @@ void idr_remove_uobj(struct ib_uobject *uobj); struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file, struct ib_device *ib_dev, int is_async); +void ib_uverbs_release_file(struct kref *ref); void ib_uverbs_free_async_event_file(struct ib_uverbs_file *uverbs_file); struct ib_uverbs_event_file *ib_uverbs_lookup_comp_file(int fd); diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 333ed70..b3aa733 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -315,7 +315,7 @@ static void ib_uverbs_comp_dev(struct ib_uverbs_device *dev) complete(&dev->comp); } -static void ib_uverbs_release_file(struct kref *ref) +void ib_uverbs_release_file(struct kref *ref) { struct ib_uverbs_file *file = container_of(ref, struct ib_uverbs_file, ref); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 14bfe3b..77e21b5 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1312,8 +1312,11 @@ struct ib_fmr_attr { struct ib_umem; +struct ib_ucontext_lock; + struct ib_ucontext { struct ib_device *device; + struct ib_uverbs_file *ufile; struct list_head pd_list; struct list_head mr_list; struct list_head mw_list; @@ -1325,6 +1328,10 @@ struct ib_ucontext { struct list_head rule_list; int closing; + /* lock for uobjects list */ + struct ib_ucontext_lock *uobjects_lock; + struct list_head uobjects; + struct pid *tgid; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING struct rb_root umem_tree; @@ -1344,16 +1351,28 @@ struct ib_ucontext { #endif }; +struct uverbs_object_list; + +#define OLD_ABI_COMPAT + struct ib_uobject { u64 user_handle; /* handle given to us by userspace */ struct ib_ucontext *context; /* associated user context */ void *object; /* containing object */ struct list_head list; /* link to context's list */ - int id; /* index into kernel idr */ - struct kref ref; - struct rw_semaphore mutex; /* protects .live */ + int id; /* index into kernel idr/fd */ +#ifdef OLD_ABI_COMPAT + struct kref ref; +#endif + struct rw_semaphore usecnt; /* protects exclusive access */ +#ifdef OLD_ABI_COMPAT + struct rw_semaphore mutex; /* protects .live */ +#endif struct rcu_head rcu; /* kfree_rcu() overhead */ int live; + + const struct uverbs_type_alloc_action *type; + struct ib_ucontext_lock *uobjects_lock; }; struct ib_udata { @@ -1960,6 +1979,9 @@ struct ib_device { * in fast paths. */ int (*get_port_immutable)(struct ib_device *, u8, struct ib_port_immutable *); + struct list_head type_list; + + const struct uverbs_types_group *types_group; }; struct ib_client { diff --git a/include/rdma/uverbs_ioctl.h b/include/rdma/uverbs_ioctl.h new file mode 100644 index 0000000..2f50045 --- /dev/null +++ b/include/rdma/uverbs_ioctl.h @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2016, Mellanox Technologies inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef _UVERBS_IOCTL_ +#define _UVERBS_IOCTL_ + +#include + +struct uverbs_object_type; +struct ib_ucontext; +struct ib_uobject; +struct ib_device; +struct uverbs_uobject_type; + +/* + * ======================================= + * Verbs action specifications + * ======================================= + */ + +enum uverbs_attr_type { + UVERBS_ATTR_TYPE_PTR_IN, + UVERBS_ATTR_TYPE_PTR_OUT, + UVERBS_ATTR_TYPE_IDR, + UVERBS_ATTR_TYPE_FD, +}; + +enum uverbs_idr_access { + UVERBS_IDR_ACCESS_READ, + UVERBS_IDR_ACCESS_WRITE, + UVERBS_IDR_ACCESS_NEW, + UVERBS_IDR_ACCESS_DESTROY +}; + +struct uverbs_attr_spec { + u16 len; + enum uverbs_attr_type type; + struct { + u16 obj_type; + u8 access; + } obj; +}; + +struct uverbs_attr_group_spec { + struct uverbs_attr_spec *attrs; + size_t num_attrs; +}; + +struct uverbs_action_spec { + const struct uverbs_attr_group_spec **attr_groups; + /* if > 0 -> validator, otherwise, error */ + int (*dist)(__u16 *attr_id, void *priv); + void *priv; + size_t num_groups; +}; + +struct uverbs_attr_array; +struct ib_uverbs_file; + +struct uverbs_action { + struct uverbs_action_spec spec; + void *priv; + int (*handler)(struct ib_device *ib_dev, struct ib_uverbs_file *ufile, + struct uverbs_attr_array *ctx, size_t num, void *priv); +}; + +struct uverbs_type_alloc_action; +typedef void (*free_type)(const struct uverbs_type_alloc_action *uobject_type, + struct ib_uobject *uobject); + +struct uverbs_type_alloc_action { + enum uverbs_attr_type type; + int order; + size_t obj_size; + free_type free_fn; + struct { + const struct file_operations *fops; + const char *name; + int flags; + } fd; +}; + +struct uverbs_type_actions_group { + size_t num_actions; + const struct uverbs_action **actions; +}; + +struct uverbs_type { + size_t num_groups; + const struct uverbs_type_actions_group **action_groups; + const struct uverbs_type_alloc_action *alloc; + int (*dist)(__u16 *action_id, void *priv); + void *priv; +}; + +struct uverbs_types { + size_t num_types; + const struct uverbs_type **types; +}; + +struct uverbs_types_group { + const struct uverbs_types **type_groups; + size_t num_groups; + int (*dist)(__u16 *type_id, void *priv); + void *priv; +}; + +/* ================================================= + * Parsing infrastructure + * ================================================= + */ + +struct uverbs_ptr_attr { + void * __user ptr; + __u16 len; +}; + +struct uverbs_fd_attr { + int fd; +}; + +struct uverbs_uobj_attr { + /* idr handle */ + __u32 idr; +}; + +struct uverbs_obj_attr { + /* pointer to the kernel descriptor -> type, access, etc */ + const struct uverbs_attr_spec *val; + struct ib_uverbs_attr __user *uattr; + const struct uverbs_type_alloc_action *type; + struct ib_uobject *uobject; + union { + struct uverbs_fd_attr fd; + struct uverbs_uobj_attr uobj; + }; +}; + +struct uverbs_attr { + bool valid; + union { + struct uverbs_ptr_attr cmd_attr; + struct uverbs_obj_attr obj_attr; + }; +}; + +/* output of one validator */ +struct uverbs_attr_array { + size_t num_attrs; + /* arrays of attrubytes, index is the id i.e SEND_CQ */ + struct uverbs_attr *attrs; +}; + +/* ================================================= + * Types infrastructure + * ================================================= + */ + +int ib_uverbs_uobject_type_add(struct list_head *head, + void (*free)(struct uverbs_uobject_type *type, + struct ib_uobject *uobject, + struct ib_ucontext *ucontext), + uint16_t obj_type); +void ib_uverbs_uobject_types_remove(struct ib_device *ib_dev); + +#endif