drm: Convert object_name_idr to XArray

It's not possible to replace object_name_lock as it protects more
code than should be reasonably be run under a spinlock, so the xa_lock
is nested under the object_name_lock.

Signed-off-by: Matthew Wilcox <willy@infradead.org>

diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index eab0f2687cd6ea31c757eacb2ee4cf88974ee636..002d082c46f694a0860186e1d5d7c24a97293ae7 100644 (file)
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -109,27 +109,20 @@ static int drm_clients_info(struct seq_file *m, void *data)
        return 0;
 }
 
-static int drm_gem_one_name_info(int id, void *ptr, void *data)
-{
-       struct drm_gem_object *obj = ptr;
-       struct seq_file *m = data;
-
-       seq_printf(m, "%6d %8zd %7d %8d\n",
-                  obj->name, obj->size,
-                  obj->handle_count,
-                  kref_read(&obj->refcount));
-       return 0;
-}
-
 static int drm_gem_name_info(struct seq_file *m, void *data)
 {
        struct drm_info_node *node = (struct drm_info_node *) m->private;
        struct drm_device *dev = node->minor->dev;
+       struct drm_gem_object *obj;
+       unsigned long index;
 
        seq_printf(m, "  name     size handles refcount\n");
 
        mutex_lock(&dev->object_name_lock);
-       idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, m);
+       xa_for_each(&dev->object_names, index, obj) {
+               seq_printf(m, "%6d %8zd %7d %8d\n", obj->name, obj->size,
+                               obj->handle_count, kref_read(&obj->refcount));
+       }
        mutex_unlock(&dev->object_name_lock);
 
        return 0;

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index a8c4468f03d9166bd257f2bde65cbfbc7fe05ee5..f2d75bca2ddacbead7afc57a5ca6daf667d55745 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -86,7 +86,7 @@ drm_gem_init(struct drm_device *dev)
        struct drm_vma_offset_manager *vma_offset_manager;
 
        mutex_init(&dev->object_name_lock);
-       idr_init_base(&dev->object_name_idr, 1);
+       xa_init_flags(&dev->object_names, XA_FLAGS_ALLOC1);
 
        vma_offset_manager = kzalloc(sizeof(*vma_offset_manager), GFP_KERNEL);
        if (!vma_offset_manager) {
@@ -197,7 +197,7 @@ static void drm_gem_object_handle_free(struct drm_gem_object *obj)
 
        /* Remove any name for this object */
        if (obj->name) {
-               idr_remove(&dev->object_name_idr, obj->name);
+               xa_erase(&dev->object_names, obj->name);
                obj->name = 0;
        }
 }
@@ -846,11 +846,10 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
        }
 
        if (!obj->name) {
-               ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_KERNEL);
+               ret = xa_alloc(&dev->object_names, &obj->name, obj,
+                               xa_limit_32b, GFP_KERNEL);
                if (ret < 0)
                        goto err;
-
-               obj->name = ret;
        }
 
        args->name = (uint64_t) obj->name;
@@ -886,7 +885,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
                return -EOPNOTSUPP;
 
        mutex_lock(&dev->object_name_lock);
-       obj = idr_find(&dev->object_name_idr, (int) args->name);
+       obj = xa_load(&dev->object_names, (int) args->name);
        if (obj) {
                drm_gem_object_get(obj);
        } else {

diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index 1acfc3bbd3fb2e29c3fe3f2139076b09152708ff..d3c3d087d238d392b453e9d65c480315db554019 100644 (file)
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -281,8 +281,8 @@ struct drm_device {
        /** @object_name_lock: GEM information */
        struct mutex object_name_lock;
 
-       /** @object_name_idr: GEM information */
-       struct idr object_name_idr;
+       /** @object_names: GEM information */
+       struct xarray object_names;
 
        /** @vma_offset_manager: GEM information */
        struct drm_vma_offset_manager *vma_offset_manager;