Skip to content

drm/msm: de-struct_mutex-ification

Rob Clark dri-devel linux-arm-msm linux-media lkml oe-kbuild-all 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest23 patches 6 repliesIn review
  2. v323 patches 4 repliesSuperseded
  3. v10 of 14 patches 0 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23drm/msm: Fix a couple incorrect usages of get_vaddr_active()drivers/gpu/drm/msm/adreno/a5xx_gpu.c drivers/gpu/drm/msm/adreno/a6xx_gpu.c+2 -20 replies
2/23drm/msm/gem: Add obj->lock wrappersdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h+74 -530 replies
3/23drm/msm/gem: Rename internal get_iova_locked helperdrivers/gpu/drm/msm/msm_gem.c+3 -30 replies
4/23drm/msm/gem: Move prototypes to msm_gem.hdrivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c drivers/gpu/drm/msm/dsi/dsi_host.c +3 more+60 -540 replies
5/23drm/msm/gem: Add some _locked() helpersdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h+75 -200 replies
6/23drm/msm/gem: Move locking in shrinker pathdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_shrinker.c+35 -450 replies
7/23drm/msm/submit: Move copy_from_user ahead of locking bosdrivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c+82 -480 replies
8/23drm/msm: Do rpm get sooner in the submit pathdrivers/gpu/drm/msm/msm_gem_submit.c+13 -20 replies
9/23drm/msm/gem: Switch over to obj->resv for lockingdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c +2 more+29 -280 replies
10/23drm/msm: Use correct drm_gem_object_put() in fail casedrivers/gpu/drm/msm/msm_gem.c+5 -10 replies
11/23drm/msm: Drop chatty tracedrivers/gpu/drm/msm/msm_gpu.c+0 -10 replies
12/23drm/msm: Move update_fences()drivers/gpu/drm/msm/msm_gpu.c+14 -140 replies
13/23drm/msm: Add priv->mm_lock to protect active/inactive listsdrivers/gpu/drm/msm/msm_debugfs.c drivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_drv.h +3 more+58 -140 replies
14/23drm/msm: Document and rename preempt_lockdrivers/gpu/drm/msm/adreno/a5xx_gpu.c drivers/gpu/drm/msm/adreno/a5xx_preempt.c drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 more+17 -120 replies
15/23drm/msm: Protect ring->submits with it's own lockdrivers/gpu/drm/msm/msm_gem_submit.c drivers/gpu/drm/msm/msm_gpu.c drivers/gpu/drm/msm/msm_ringbuffer.c +1 more+39 -70 replies
16/23drm/msm: Refcount submitsdrivers/gpu/drm/msm/msm_drv.h drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c +1 more+34 -120 replies
17/23drm/msm: Remove obj->gpudrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gpu.c+0 -80 replies
18/23drm/msm: Drop struct_mutex from the retire pathdrivers/gpu/drm/msm/msm_gpu.c+1 -70 replies
19/23drm/msm: Drop struct_mutex in free_object() pathdrivers/gpu/drm/msm/msm_gem.c+0 -80 replies
20/23drm/msm: Remove msm_gem_free_workdrivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_drv.h drivers/gpu/drm/msm/msm_gem.c +1 more+0 -360 replies
21/23drm/msm: Drop struct_mutex in madvise pathdrivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h+3 -140 replies
22/23drm/msm: Drop struct_mutex in shrinker pathdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem_shrinker.c+0 -550 replies
23/23drm/msm: Don't implicit-sync if only a single ringdrivers/gpu/drm/msm/msm_gem_submit.c+4 -36 replies

Reviews trailers per patch

All 23 patches have a Reviewed-by or Acked-by.

PatchKristian H. KristensenJordan Crouse
1/23R-b
2/23R-b
3/23R-b
4/23R-b
5/23R-b
6/23R-b
7/23R-b
8/23R-b
9/23R-b
10/23R-b
11/23R-b R-b
12/23R-b R-b
13/23R-b R-b
14/23R-b R-b
15/23R-b R-b
16/23R-b R-b
17/23R-b
18/23R-b R-b
19/23R-b
20/23R-b
21/23R-b
22/23R-b
23/23R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/23] drm/msm: de-struct_mutex-ification

From: Rob Clark <[email protected]>

This doesn't remove *all* the struct_mutex, but it covers the worst of it, ie. shrinker/madvise/free/retire. The submit path still uses struct_mutex, but it still needs *something* serialize a portion of the submit path, and lock_stat mostly just shows the lock contention there being with other submits. And there are a few other bits of struct_mutex usage in less critical paths (debugfs, etc). But this seems like a reasonable step in the right direction.

v2: teach lockdep about shrinker locking patters (danvet) and

    convert to obj->resv locking (danvet)
v3: fix get_vaddr locking for legacy userspace (relocs), devcoredump,
    and rd/hangrd
v4: couple minor review comments (krh), fix deadlock with imported
    dma-buf's (ie. from v4l2, etc)

Rob Clark (23):
drm/msm: Fix a couple incorrect usages of get_vaddr_active() drm/msm/gem: Add obj->lock wrappers
drm/msm/gem: Rename internal get_iova_locked helper drm/msm/gem: Move prototypes to msm_gem.h drm/msm/gem: Add some _locked() helpers drm/msm/gem: Move locking in shrinker path drm/msm/submit: Move copy_from_user ahead of locking bos drm/msm: Do rpm get sooner in the submit path drm/msm/gem: Switch over to obj->resv for locking drm/msm: Use correct drm_gem_object_put() in fail case drm/msm: Drop chatty trace
drm/msm: Move update_fences()
drm/msm: Add priv->mm_lock to protect active/inactive lists drm/msm: Document and rename preempt_lock
drm/msm: Protect ring->submits with it's own lock drm/msm: Refcount submits
drm/msm: Remove obj->gpu
drm/msm: Drop struct_mutex from the retire path drm/msm: Drop struct_mutex in free_object() path drm/msm: Remove msm_gem_free_work
drm/msm: Drop struct_mutex in madvise path drm/msm: Drop struct_mutex in shrinker path drm/msm: Don't implicit-sync if only a single ring

 drivers/gpu/drm/msm/adreno/a5xx_gpu.c     |   6 +-
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c |  12 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c     |   6 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c |   1 +
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c |   1 +
 drivers/gpu/drm/msm/dsi/dsi_host.c        |   1 +
 drivers/gpu/drm/msm/msm_debugfs.c         |   7 +
 drivers/gpu/drm/msm/msm_drv.c             |  21 +-
 drivers/gpu/drm/msm/msm_drv.h             |  73 +-----
 drivers/gpu/drm/msm/msm_fbdev.c           |   1 +
 drivers/gpu/drm/msm/msm_gem.c             | 271 +++++++++++-----------
 drivers/gpu/drm/msm/msm_gem.h             | 133 +++++++++--
 drivers/gpu/drm/msm/msm_gem_shrinker.c    |  81 ++-----
 drivers/gpu/drm/msm/msm_gem_submit.c      | 164 ++++++++-----
 drivers/gpu/drm/msm/msm_gpu.c             | 110 +++++----
 drivers/gpu/drm/msm/msm_gpu.h             |   5 +-
 drivers/gpu/drm/msm/msm_rd.c              |   2 +-
 drivers/gpu/drm/msm/msm_ringbuffer.c      |   3 +-
 drivers/gpu/drm/msm/msm_ringbuffer.h      |  13 +-
 19 files changed, 506 insertions(+), 405 deletions(-)
Signature · 1 line
2.26.2