Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: add lockdep assert to drm_is_current_master_locked

In drm_is_current_master_locked, accessing drm_file.master should be
protected by either drm_file.master_lookup_lock or
drm_device.master_mutex. This was previously awkward to assert with
lockdep.

Following patch ("locking/lockdep: Provide lockdep_assert{,_once}()
helpers"), this assertion is now convenient. So we add in the
assertion and explain this lock design in the kerneldoc.

Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
Acked-by: Boqun Feng <boqun.feng@gmail.com>
Acked-by: Waiman Long <longman@redhat.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210802105957.77692-3-desmondcheongzx@gmail.com

authored by

Desmond Cheong Zhi Xi and committed by
Daniel Vetter
649839d7 d19c8137

+7 -3
+3 -3
drivers/gpu/drm/drm_auth.c
··· 63 63 64 64 static bool drm_is_current_master_locked(struct drm_file *fpriv) 65 65 { 66 - /* Either drm_device.master_mutex or drm_file.master_lookup_lock 67 - * should be held here. 68 - */ 66 + lockdep_assert_once(lockdep_is_held(&fpriv->master_lookup_lock) || 67 + lockdep_is_held(&fpriv->minor->dev->master_mutex)); 68 + 69 69 return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; 70 70 } 71 71
+4
include/drm/drm_file.h
··· 233 233 * this only matches &drm_device.master if the master is the currently 234 234 * active one. 235 235 * 236 + * To update @master, both &drm_device.master_mutex and 237 + * @master_lookup_lock need to be held, therefore holding either of 238 + * them is safe and enough for the read side. 239 + * 236 240 * When dereferencing this pointer, either hold struct 237 241 * &drm_device.master_mutex for the duration of the pointer's use, or 238 242 * use drm_file_get_master() if struct &drm_device.master_mutex is not