Commit a414fe3a authored by Rob Clark's avatar Rob Clark

drm/msm/gem: Drop obj lock in msm_gem_free_object()

The only reason we grabbed the lock was to satisfy a bunch of places
that WARN_ON() if called without the lock held.  But this angers lockdep
which doesn't realize no one else can be holding the lock by the time we
end up destroying the object (and sees what would otherwise be a locking
inversion between reservation_ww_class_mutex and fs_reclaim).

Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/14Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/489364/
Link: https://lore.kernel.org/r/20220613205032.2652374-1-robdclark@gmail.com
parent ff46c2c4
...@@ -1020,8 +1020,6 @@ static void msm_gem_free_object(struct drm_gem_object *obj) ...@@ -1020,8 +1020,6 @@ static void msm_gem_free_object(struct drm_gem_object *obj)
list_del(&msm_obj->mm_list); list_del(&msm_obj->mm_list);
mutex_unlock(&priv->mm_lock); mutex_unlock(&priv->mm_lock);
msm_gem_lock(obj);
/* object should not be on active list: */ /* object should not be on active list: */
GEM_WARN_ON(is_active(msm_obj)); GEM_WARN_ON(is_active(msm_obj));
...@@ -1037,17 +1035,11 @@ static void msm_gem_free_object(struct drm_gem_object *obj) ...@@ -1037,17 +1035,11 @@ static void msm_gem_free_object(struct drm_gem_object *obj)
put_iova_vmas(obj); put_iova_vmas(obj);
/* dma_buf_detach() grabs resv lock, so we need to unlock
* prior to drm_prime_gem_destroy
*/
msm_gem_unlock(obj);
drm_prime_gem_destroy(obj, msm_obj->sgt); drm_prime_gem_destroy(obj, msm_obj->sgt);
} else { } else {
msm_gem_vunmap(obj); msm_gem_vunmap(obj);
put_pages(obj); put_pages(obj);
put_iova_vmas(obj); put_iova_vmas(obj);
msm_gem_unlock(obj);
} }
drm_gem_object_release(obj); drm_gem_object_release(obj);
......
...@@ -229,7 +229,19 @@ msm_gem_unlock(struct drm_gem_object *obj) ...@@ -229,7 +229,19 @@ msm_gem_unlock(struct drm_gem_object *obj)
static inline bool static inline bool
msm_gem_is_locked(struct drm_gem_object *obj) msm_gem_is_locked(struct drm_gem_object *obj)
{ {
return dma_resv_is_locked(obj->resv); /*
* Destroying the object is a special case.. msm_gem_free_object()
* calls many things that WARN_ON if the obj lock is not held. But
* acquiring the obj lock in msm_gem_free_object() can cause a
* locking order inversion between reservation_ww_class_mutex and
* fs_reclaim.
*
* This deadlock is not actually possible, because no one should
* be already holding the lock when msm_gem_free_object() is called.
* Unfortunately lockdep is not aware of this detail. So when the
* refcount drops to zero, we pretend it is already locked.
*/
return dma_resv_is_locked(obj->resv) || (kref_read(&obj->refcount) == 0);
} }
static inline bool is_active(struct msm_gem_object *msm_obj) static inline bool is_active(struct msm_gem_object *msm_obj)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment