drm/vmwgfx: Refactor ttm reference object hashtable to use linux/hashtable.

This is part of an effort to move from the vmwgfx_open_hash hashtable to
linux/hashtable implementation.
Refactor the ref_hash hashtable, used for fast lookup of reference objects
associated with a ttm file.
This also exposed a problem related to inconsistently using 32-bit and
64-bit keys with this hashtable. The hash function used changes depending
on the size of the type, and results are not consistent across numbers,
for example, hash_32(329) = 329, but hash_long(329) = 328. This would
cause the lookup to fail for objects already in the hashtable, since keys
of different sizes were being passed during adding and lookup. This was
not an issue before because vmwgfx_open_hash always used hash_long.
Fix this by always using 64-bit keys for this hashtable, which means that
hash_long is always used.

Signed-off-by: Maaz Mombasawala <mombasawalam@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
Signed-off-by: Zack Rusin <zackr@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221022040236.616490-11-zack@kde.org

diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c
index 9546b121bc2215ece34492a03f790818d96bc3ee..c07b81fbc4950101911f4495950612158569d484 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/ttm_object.c
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.c
@@ -52,9 +52,12 @@
 #include <linux/slab.h>
 #include <linux/atomic.h>
 #include <linux/module.h>
+#include <linux/hashtable.h>
 
 MODULE_IMPORT_NS(DMA_BUF);
 
+#define VMW_TTM_OBJECT_REF_HT_ORDER 10
+
 /**
  * struct ttm_object_file
  *
@@ -75,7 +78,7 @@ struct ttm_object_file {
        struct ttm_object_device *tdev;
        spinlock_t lock;
        struct list_head ref_list;
-       struct vmwgfx_open_hash ref_hash;
+       DECLARE_HASHTABLE(ref_hash, VMW_TTM_OBJECT_REF_HT_ORDER);
        struct kref refcount;
 };
 
@@ -136,6 +139,36 @@ ttm_object_file_ref(struct ttm_object_file *tfile)
        return tfile;
 }
 
+static int ttm_tfile_find_ref_rcu(struct ttm_object_file *tfile,
+                                 uint64_t key,
+                                 struct vmwgfx_hash_item **p_hash)
+{
+       struct vmwgfx_hash_item *hash;
+
+       hash_for_each_possible_rcu(tfile->ref_hash, hash, head, key) {
+               if (hash->key == key) {
+                       *p_hash = hash;
+                       return 0;
+               }
+       }
+       return -EINVAL;
+}
+
+static int ttm_tfile_find_ref(struct ttm_object_file *tfile,
+                             uint64_t key,
+                             struct vmwgfx_hash_item **p_hash)
+{
+       struct vmwgfx_hash_item *hash;
+
+       hash_for_each_possible(tfile->ref_hash, hash, head, key) {
+               if (hash->key == key) {
+                       *p_hash = hash;
+                       return 0;
+               }
+       }
+       return -EINVAL;
+}
+
 static void ttm_object_file_destroy(struct kref *kref)
 {
        struct ttm_object_file *tfile =
@@ -238,14 +271,13 @@ void ttm_base_object_unref(struct ttm_base_object **p_base)
  * Return: A pointer to the object if successful or NULL otherwise.
  */
 struct ttm_base_object *
-ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint32_t key)
+ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint64_t key)
 {
        struct vmwgfx_hash_item *hash;
-       struct vmwgfx_open_hash *ht = &tfile->ref_hash;
        int ret;
 
        rcu_read_lock();
-       ret = vmwgfx_ht_find_item_rcu(ht, key, &hash);
+       ret = ttm_tfile_find_ref_rcu(tfile, key, &hash);
        if (ret) {
                rcu_read_unlock();
                return NULL;
@@ -257,15 +289,14 @@ ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint32_t key)
 EXPORT_SYMBOL(ttm_base_object_noref_lookup);
 
 struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file *tfile,
-                                              uint32_t key)
+                                              uint64_t key)
 {
        struct ttm_base_object *base = NULL;
        struct vmwgfx_hash_item *hash;
-       struct vmwgfx_open_hash *ht = &tfile->ref_hash;
        int ret;
 
        rcu_read_lock();
-       ret = vmwgfx_ht_find_item_rcu(ht, key, &hash);
+       ret = ttm_tfile_find_ref_rcu(tfile, key, &hash);
 
        if (likely(ret == 0)) {
                base = drm_hash_entry(hash, struct ttm_ref_object, hash)->obj;
@@ -278,7 +309,7 @@ struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file *tfile,
 }
 
 struct ttm_base_object *
-ttm_base_object_lookup_for_ref(struct ttm_object_device *tdev, uint32_t key)
+ttm_base_object_lookup_for_ref(struct ttm_object_device *tdev, uint64_t key)
 {
        struct ttm_base_object *base;
 
@@ -297,7 +328,6 @@ int ttm_ref_object_add(struct ttm_object_file *tfile,
                       bool *existed,
                       bool require_existed)
 {
-       struct vmwgfx_open_hash *ht = &tfile->ref_hash;
        struct ttm_ref_object *ref;
        struct vmwgfx_hash_item *hash;
        int ret = -EINVAL;
@@ -310,7 +340,7 @@ int ttm_ref_object_add(struct ttm_object_file *tfile,
 
        while (ret == -EINVAL) {
                rcu_read_lock();
-               ret = vmwgfx_ht_find_item_rcu(ht, base->handle, &hash);
+               ret = ttm_tfile_find_ref_rcu(tfile, base->handle, &hash);
 
                if (ret == 0) {
                        ref = drm_hash_entry(hash, struct ttm_ref_object, hash);
@@ -335,21 +365,14 @@ int ttm_ref_object_add(struct ttm_object_file *tfile,
                kref_init(&ref->kref);
 
                spin_lock(&tfile->lock);
-               ret = vmwgfx_ht_insert_item_rcu(ht, &ref->hash);
-
-               if (likely(ret == 0)) {
-                       list_add_tail(&ref->head, &tfile->ref_list);
-                       kref_get(&base->refcount);
-                       spin_unlock(&tfile->lock);
-                       if (existed != NULL)
-                               *existed = false;
-                       break;
-               }
+               hash_add_rcu(tfile->ref_hash, &ref->hash.head, ref->hash.key);
+               ret = 0;
 
+               list_add_tail(&ref->head, &tfile->ref_list);
+               kref_get(&base->refcount);
                spin_unlock(&tfile->lock);
-               BUG_ON(ret != -EINVAL);
-
-               kfree(ref);
+               if (existed != NULL)
+                       *existed = false;
        }
 
        return ret;
@@ -361,10 +384,8 @@ ttm_ref_object_release(struct kref *kref)
        struct ttm_ref_object *ref =
            container_of(kref, struct ttm_ref_object, kref);
        struct ttm_object_file *tfile = ref->tfile;
-       struct vmwgfx_open_hash *ht;
 
-       ht = &tfile->ref_hash;
-       (void)vmwgfx_ht_remove_item_rcu(ht, &ref->hash);
+       hash_del_rcu(&ref->hash.head);
        list_del(&ref->head);
        spin_unlock(&tfile->lock);
 
@@ -376,13 +397,12 @@ ttm_ref_object_release(struct kref *kref)
 int ttm_ref_object_base_unref(struct ttm_object_file *tfile,
                              unsigned long key)
 {
-       struct vmwgfx_open_hash *ht = &tfile->ref_hash;
        struct ttm_ref_object *ref;
        struct vmwgfx_hash_item *hash;
        int ret;
 
        spin_lock(&tfile->lock);
-       ret = vmwgfx_ht_find_item(ht, key, &hash);
+       ret = ttm_tfile_find_ref(tfile, key, &hash);
        if (unlikely(ret != 0)) {
                spin_unlock(&tfile->lock);
                return -EINVAL;
@@ -414,16 +434,13 @@ void ttm_object_file_release(struct ttm_object_file **p_tfile)
        }
 
        spin_unlock(&tfile->lock);
-       vmwgfx_ht_remove(&tfile->ref_hash);
 
        ttm_object_file_unref(&tfile);
 }
 
-struct ttm_object_file *ttm_object_file_init(struct ttm_object_device *tdev,
-                                            unsigned int hash_order)
+struct ttm_object_file *ttm_object_file_init(struct ttm_object_device *tdev)
 {
        struct ttm_object_file *tfile = kmalloc(sizeof(*tfile), GFP_KERNEL);
-       int ret;
 
        if (unlikely(tfile == NULL))
                return NULL;
@@ -433,17 +450,9 @@ struct ttm_object_file *ttm_object_file_init(struct ttm_object_device *tdev,
        kref_init(&tfile->refcount);
        INIT_LIST_HEAD(&tfile->ref_list);
 
-       ret = vmwgfx_ht_create(&tfile->ref_hash, hash_order);
-       if (ret)
-               goto out_err;
+       hash_init(tfile->ref_hash);
 
        return tfile;
-out_err:
-       vmwgfx_ht_remove(&tfile->ref_hash);
-
-       kfree(tfile);
-
-       return NULL;
 }
 
 struct ttm_object_device *

diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.h b/drivers/gpu/drm/vmwgfx/ttm_object.h
index 6870f951b677cb4338eb479b3ad3bf05144f99f6..67f30d589e271270ef6791b0a1c7423b11c21a73 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/ttm_object.h
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.h
@@ -104,7 +104,7 @@ struct ttm_base_object {
        struct ttm_object_file *tfile;
        struct kref refcount;
        void (*refcount_release) (struct ttm_base_object **base);
-       u32 handle;
+       u64 handle;
        enum ttm_object_type object_type;
        u32 shareable;
 };
@@ -164,7 +164,7 @@ extern int ttm_base_object_init(struct ttm_object_file *tfile,
  */
 
 extern struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file
-                                                     *tfile, uint32_t key);
+                                                     *tfile, uint64_t key);
 
 /**
  * ttm_base_object_lookup_for_ref
@@ -178,7 +178,7 @@ extern struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file
  */
 
 extern struct ttm_base_object *
-ttm_base_object_lookup_for_ref(struct ttm_object_device *tdev, uint32_t key);
+ttm_base_object_lookup_for_ref(struct ttm_object_device *tdev, uint64_t key);
 
 /**
  * ttm_base_object_unref
@@ -237,14 +237,12 @@ extern int ttm_ref_object_base_unref(struct ttm_object_file *tfile,
  * ttm_object_file_init - initialize a struct ttm_object file
  *
  * @tdev: A struct ttm_object device this file is initialized on.
- * @hash_order: Order of the hash table used to hold the reference objects.
  *
  * This is typically called by the file_ops::open function.
  */
 
 extern struct ttm_object_file *ttm_object_file_init(struct ttm_object_device
-                                                   *tdev,
-                                                   unsigned int hash_order);
+                                                   *tdev);
 
 /**
  * ttm_object_file_release - release data held by a ttm_object_file
@@ -312,7 +310,7 @@ extern int ttm_prime_handle_to_fd(struct ttm_object_file *tfile,
        kfree_rcu(__obj, __prime.base.rhead)
 
 struct ttm_base_object *
-ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint32_t key);
+ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint64_t key);
 
 /**
  * ttm_base_object_noref_release - release a base object pointer looked up

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 8d77e79bd9045e1b6de8e944239769a5d0adbfa0..b909a3ce9af3ca92621e7d3d9994ac24ac7cb717 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1242,7 +1242,7 @@ static int vmw_driver_open(struct drm_device *dev, struct drm_file *file_priv)
        if (unlikely(!vmw_fp))
                return ret;
 
-       vmw_fp->tfile = ttm_object_file_init(dev_priv->tdev, 10);
+       vmw_fp->tfile = ttm_object_file_init(dev_priv->tdev);
        if (unlikely(vmw_fp->tfile == NULL))
                goto out_no_tfile;