Skip to content

drm+msm: Shrinker and LRU rework

Rob Clark dri-devel linux-arm-msm lkml 4 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest15 patches 0 repliesNew
  2. v315 patches 10 repliesSuperseded
  3. v213 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v115 patches0 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15drm/msm: Reorder lock vs submit allocdrivers/gpu/drm/msm/msm_gem_submit.c+10 -140 replies
2/15drm/msm: Small submit cleanupdrivers/gpu/drm/msm/msm_gem_submit.c+9 -110 replies
3/15drm/msm: Split out idr_lockdrivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_gem_submit.c drivers/gpu/drm/msm/msm_gpu.h +1 more+14 -50 replies
4/15drm/msm/gem: Check for active in shrinker pathdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_shrinker.c+17 -00 replies
5/15drm/msm/gem: Rename update_inactivedrivers/gpu/drm/msm/msm_gem.c+13 -120 replies
6/15drm/msm/gem: Rename to pin/unpin_pagesdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_prime.c+17 -90 replies
7/15drm/msm/gem: Consolidate pin/unpin pathsdrivers/gpu/drm/msm/msm_gem.c+5 -80 replies
8/15drm/msm/gem: Remove active refcntdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c+8 -730 replies
9/15drm/gem: Add LRU/shrinker helperdrivers/gpu/drm/drm_gem.c include/drm/drm_gem.h+225 -00 replies
10/15drm/msm/gem: Convert to using drm_gem_lrudrivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_drv.h drivers/gpu/drm/msm/msm_gem.c +4 more+104 -2570 replies
11/15drm/msm/gem: Unpin buffers earlierdrivers/gpu/drm/msm/msm_gem_submit.c+2 -60 replies
12/15drm/msm/gem: Consolidate shrinker tracedrivers/gpu/drm/msm/msm_gem_shrinker.c drivers/gpu/drm/msm/msm_gpu_trace.h+20 -310 replies
13/15drm/msm/gem: Evict active GEM objects when necessarydrivers/gpu/drm/msm/msm_gem_shrinker.c drivers/gpu/drm/msm/msm_gpu_trace.h+68 -180 replies
14/15drm/msm/gem: Add msm_gem_assert_locked()drivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h+25 -190 replies
15/15drm/msm/gem: Convert to lockdep assertdrivers/gpu/drm/msm/msm_gem.h+6 -90 replies

Reviews trailers per patch

1 of 15 patches has a Reviewed-by or Acked-by.

PatchDmitry Osipenko
1/15
2/15
3/15
4/15
5/15
6/15
7/15
8/15
9/15R-b
10/15
11/15
12/15
13/15
14/15
15/15

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/15] drm+msm: Shrinker and LRU rework

From: Rob Clark <[email protected]>

Unchanged other than small update in 09/15

original description below:

This is mostly motivated by getting drm/msm to pass an i-g-t shrinker test that I've been working on. In particular the test creates and cycles between more GEM buffers than what will fit in RAM to force eviction and re-pin. (There are sub-tests that cover this case both single threaded and with many child processes in parallel.)

Getting this test to pass necessitated a few improvements:

1. Re-ordering submit path to get rid of __GFP_NORETRY (in the common case, doing this for syncobjs is still TODO)
2. Decoupling locks needed in the retire path from locks that could be held while hitting reclaim in the submit path
3. If necessary, allow stalling on active BOs for reclaim.

The latter point is because we pin objects in the synchronous part of the submit path (before queuing on the drm gpu-scheduler), which means in the parallel variant of the i-g-t test, we need to be able to block in the reclaim path until some queued work has completed/retired.

In the process of re-working how drm/msm tracks buffer state in it's various LRU lists, I refactored out a drm_gem_lru helper which, in theory, should be usable by other drivers and drm shmem helpers for implementing LRU tracking and shrinker.

v2: rebase + small fix in 13/13
v3: use lockdep_assert_held in GEM LRU helper, and add a couple patches
at the end to convert MSM from WARN_ON(!is_locked()) to lockdep asserts
v4: keep drm_gem_move_tail_locked() static until there is a user

Rob Clark (15):
drm/msm: Reorder lock vs submit alloc drm/msm: Small submit cleanup
drm/msm: Split out idr_lock
drm/msm/gem: Check for active in shrinker path drm/msm/gem: Rename update_inactive drm/msm/gem: Rename to pin/unpin_pages drm/msm/gem: Consolidate pin/unpin paths drm/msm/gem: Remove active refcnt
drm/gem: Add LRU/shrinker helper drm/msm/gem: Convert to using drm_gem_lru drm/msm/gem: Unpin buffers earlier drm/msm/gem: Consolidate shrinker trace drm/msm/gem: Evict active GEM objects when necessary drm/msm/gem: Add msm_gem_assert_locked() drm/msm/gem: Convert to lockdep assert

 drivers/gpu/drm/drm_gem.c              | 170 +++++++++++++++++++++++
 drivers/gpu/drm/msm/msm_drv.c          |  18 ++-
 drivers/gpu/drm/msm/msm_drv.h          |  70 +++++++---
 drivers/gpu/drm/msm/msm_gem.c          | 179 +++++++++----------------
 drivers/gpu/drm/msm/msm_gem.h          | 123 ++---------------
 drivers/gpu/drm/msm/msm_gem_prime.c    |   4 +-
 drivers/gpu/drm/msm/msm_gem_shrinker.c | 164 +++++++++++-----------
 drivers/gpu/drm/msm/msm_gem_submit.c   |  78 ++++-------
 drivers/gpu/drm/msm/msm_gpu.c          |   3 -
 drivers/gpu/drm/msm/msm_gpu.h          |  10 +-
 drivers/gpu/drm/msm/msm_gpu_trace.h    |  36 +++--
 drivers/gpu/drm/msm/msm_submitqueue.c  |   1 +
 include/drm/drm_gem.h                  |  55 ++++++++
 13 files changed, 491 insertions(+), 420 deletions(-)
Signature · 1 line
2.36.1