• Chris Wilson's avatar
    drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES · 226e5ae9
    Chris Wilson authored
    If CONFIG_DEBUG_MUTEXES is set, the mutex->owner field is only cleared
    if the mutex debugging is enabled which introduces a race in our
    mutex_is_locked_by() - i.e. we may inspect the old owner value before it
    is acquired by the new task.
    
    This is the root cause of this error:
    
     diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
     index 5cf6731..3ef3736 100644
     --- a/kernel/locking/mutex-debug.c
     +++ b/kernel/locking/mutex-debug.c
     @@ -80,13 +80,13 @@ void debug_mutex_unlock(struct mutex *lock)
     			DEBUG_LOCKS_WARN_ON(lock->owner != current);
    
     		DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
     -		mutex_clear_owner(lock);
     	}
    
     	/*
     	 * __mutex_slowpath_needs_to_unlock() is explicitly 0 for debug
     	 * mutexes so that we can do it here after we've verified state.
     	 */
     +	mutex_clear_owner(lock);
     	atomic_set(&lock->count, 1);
      }
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87955Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
    Cc: stable@vger.kernel.org
    Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
    226e5ae9
i915_gem.c 136 KB