| Message ID | 20240521071639.77614-1-thomas.hellstrom@linux.intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | TTM shrinker helpers and xe buffer object shrinker | expand |
Hi, all On Tue, 2024-05-21 at 09:16 +0200, Thomas Hellström wrote: > This series implements TTM shrinker / eviction helpers and an xe bo > shrinker. It builds on two previous series, *and obsoletes these*. > First > > https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg484425.html > > Second the previous TTM shrinker series > > https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/ > > Where the comment about layering > https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/#ma918844aa8a6efe8768fdcda0c6590d5c93850c9 > > now addressed, and this version also implements shmem objects for > backup > rather than direct swap-cache insertions, which was used in the > previuos > series. It turns out that with per-page backup / shrinking, shmem > objects > appears to work just as well as direct swap-cache insertions with the > added benefit that was introduced in the previous TTM shrinker series > to > avoid running out of swap entries isn't really needed. > > Patch 1-4 implements restartable LRU list iteration. > > Patch 5 implements a LRU walker + resv locking helper > > Patch 6 moves TTM swapping over to the walker. > > Patch 7 moves TTM eviction over to the walker. > > Patch 8 could in theory be skipped but introduces a possibility to > easily > add or test multiple backup backends, like the direct swap-cache > insertion or even files into fast dedicated nvme storage for for > example. > > Patch 9 introduces helpers in the ttm_pool code for page-by-page > shrinking > and recovery. It avoids having to temporarily allocate a huge amount > of > memory to be able to shrink a buffer object. It also introduces the > possibility to immediately write-back pages if needed, since that > tends > to be a bit delayed when left to kswapd. > > Patch 10 Adds a simple error injection to the above code to help > increase > test coverage. > > Patch 11 Implements an xe bo shrinker and a common helper in TTM for > shrinking. > > Patch 12-21 are really a separate POC series, for introducing > drm_exec locking > in TTM. The patch touches both drm_exec and dma-buf and is for now > marked as > an RFC: > > Patch 12 Introduces dma_resv_trylock_ctx. > > Patches 13-14 deal with introducing drm_exec_trylock. > > Patch 15 adds a snapshot capability to drm_exec. > > Patch 16 adds an evict mode locking capability to drm_exec > > Patch 17 converts the LRU + locking walker to drm_exec. > > Patch 18 converts TTM vm to use drm_exec. > > Patch 19 converts the xe fault handler to drm_exec. > > Patch 20 converts bo initialization locking to drm_exec > > Patch 21 introduces drm_exec locking around some of the > bo validation callsites in drm_exec. > > v2: > - Squash obsolete revision history in the patch commit messages. > - Fix a couple of review comments by Christian > - Don't store the mem_type in the TTM managers but in the > resource cursor. > - Rename introduced TTM *back_up* function names to *backup* > - Add ttm pool recovery fault injection. > - Shrinker xe kunit test > - Various bugfixes > > v3: > - Address some review comments from Matthew Brost and Christian > König. > - Use the restartable LRU walk for TTM swapping and eviction. > - Provide a POC drm_exec locking implementation for exhaustive > eviction. (Christian König). > > Cc: Somalapuram Amaranath <Amaranath.Somalapuram@amd.com> > Cc: Christian König <christian.koenig@amd.com> > Cc: Matthew Brost <matthew.brost@intel.com> > Cc: <dri-devel@lists.freedesktop.org> Now with a POC available how the drm_exec locking could be done in TTM (the RFC part) I think the best approach is to get patch 1-11 reviewed and pushed, and we could then settle on a solution for the drm_exec part as a follow-up. Undoubtedly there are a couple of things that need discussion there, in particular the resv_set, the snapshot and the trylock memory allocation. /Thomas
This series implements TTM shrinker / eviction helpers and an xe bo shrinker. It builds on two previous series, *and obsoletes these*. First https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg484425.html Second the previous TTM shrinker series https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/ Where the comment about layering https://lore.kernel.org/linux-mm/b7491378-defd-4f1c-31e2-29e4c77e2d67@amd.com/T/#ma918844aa8a6efe8768fdcda0c6590d5c93850c9 now addressed, and this version also implements shmem objects for backup rather than direct swap-cache insertions, which was used in the previuos series. It turns out that with per-page backup / shrinking, shmem objects appears to work just as well as direct swap-cache insertions with the added benefit that was introduced in the previous TTM shrinker series to avoid running out of swap entries isn't really needed. Patch 1-4 implements restartable LRU list iteration. Patch 5 implements a LRU walker + resv locking helper Patch 6 moves TTM swapping over to the walker. Patch 7 moves TTM eviction over to the walker. Patch 8 could in theory be skipped but introduces a possibility to easily add or test multiple backup backends, like the direct swap-cache insertion or even files into fast dedicated nvme storage for for example. Patch 9 introduces helpers in the ttm_pool code for page-by-page shrinking and recovery. It avoids having to temporarily allocate a huge amount of memory to be able to shrink a buffer object. It also introduces the possibility to immediately write-back pages if needed, since that tends to be a bit delayed when left to kswapd. Patch 10 Adds a simple error injection to the above code to help increase test coverage. Patch 11 Implements an xe bo shrinker and a common helper in TTM for shrinking. Patch 12-21 are really a separate POC series, for introducing drm_exec locking in TTM. The patch touches both drm_exec and dma-buf and is for now marked as an RFC: Patch 12 Introduces dma_resv_trylock_ctx. Patches 13-14 deal with introducing drm_exec_trylock. Patch 15 adds a snapshot capability to drm_exec. Patch 16 adds an evict mode locking capability to drm_exec Patch 17 converts the LRU + locking walker to drm_exec. Patch 18 converts TTM vm to use drm_exec. Patch 19 converts the xe fault handler to drm_exec. Patch 20 converts bo initialization locking to drm_exec Patch 21 introduces drm_exec locking around some of the bo validation callsites in drm_exec. v2: - Squash obsolete revision history in the patch commit messages. - Fix a couple of review comments by Christian - Don't store the mem_type in the TTM managers but in the resource cursor. - Rename introduced TTM *back_up* function names to *backup* - Add ttm pool recovery fault injection. - Shrinker xe kunit test - Various bugfixes v3: - Address some review comments from Matthew Brost and Christian König. - Use the restartable LRU walk for TTM swapping and eviction. - Provide a POC drm_exec locking implementation for exhaustive eviction. (Christian König). Cc: Somalapuram Amaranath <Amaranath.Somalapuram@amd.com> Cc: Christian König <christian.koenig@amd.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: <dri-devel@lists.freedesktop.org> Thomas Hellström (21): drm/ttm: Allow TTM LRU list nodes of different types drm/ttm: Slightly clean up LRU list iteration drm/ttm: Use LRU hitches drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves drm/ttm: Provide a generic LRU walker helper drm/ttm: Use the LRU walker helper for swapping drm/ttm: Use the LRU walker for eviction drm/ttm: Add a virtual base class for graphics memory backup drm/ttm/pool: Provide a helper to shrink pages drm/ttm: Use fault-injection to test error paths drm/ttm, drm/xe: Add a shrinker for xe bos dma-buf/dma-resv: Introduce dma_resv_trylock_ctx() drm/exec: Rework contended locking drm/exec: Introduce a drm_exec_trylock_obj() function drm/exec: Add a snapshot capability drm/exec: Introduce an evict mode drm/ttm: Support drm_exec locking for eviction and swapping drm/ttm: Convert ttm vm to using drm_exec drm/xe: Use drm_exec for fault locking drm/ttm: Use drm_exec_trylock for bo initialization drm/xe: Initial support for drm exec locking during validate drivers/gpu/drm/Kconfig | 10 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- drivers/gpu/drm/drm_exec.c | 209 ++++++- drivers/gpu/drm/drm_gpuvm.c | 8 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 4 +- drivers/gpu/drm/imagination/pvr_job.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/tests/drm_exec_test.c | 12 +- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_backup_shmem.c | 137 +++++ drivers/gpu/drm/ttm/ttm_bo.c | 516 +++++++++--------- drivers/gpu/drm/ttm/ttm_bo_util.c | 241 ++++++++ drivers/gpu/drm/ttm/ttm_bo_vm.c | 101 ++-- drivers/gpu/drm/ttm/ttm_device.c | 29 +- drivers/gpu/drm/ttm/ttm_pool.c | 412 +++++++++++++- drivers/gpu/drm/ttm/ttm_resource.c | 264 +++++++-- drivers/gpu/drm/ttm/ttm_tt.c | 37 ++ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 6 +- drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/display/xe_fb_pin.c | 2 +- drivers/gpu/drm/xe/tests/xe_bo.c | 124 ++++- drivers/gpu/drm/xe/tests/xe_bo_test.c | 1 + drivers/gpu/drm/xe/tests/xe_bo_test.h | 1 + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 4 +- drivers/gpu/drm/xe/tests/xe_migrate.c | 2 +- drivers/gpu/drm/xe/xe_bo.c | 173 ++++-- drivers/gpu/drm/xe/xe_bo.h | 8 +- drivers/gpu/drm/xe/xe_device.c | 8 + drivers/gpu/drm/xe/xe_device_types.h | 2 + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- drivers/gpu/drm/xe/xe_ggtt.c | 2 +- drivers/gpu/drm/xe/xe_gt_pagefault.c | 6 +- drivers/gpu/drm/xe/xe_shrinker.c | 224 ++++++++ drivers/gpu/drm/xe/xe_shrinker.h | 18 + drivers/gpu/drm/xe/xe_vm.c | 18 +- include/drm/drm_exec.h | 62 ++- include/drm/ttm/ttm_backup.h | 136 +++++ include/drm/ttm/ttm_bo.h | 59 +- include/drm/ttm/ttm_pool.h | 5 + include/drm/ttm/ttm_resource.h | 99 +++- include/drm/ttm/ttm_tt.h | 20 + include/linux/dma-resv.h | 23 +- 53 files changed, 2535 insertions(+), 531 deletions(-) create mode 100644 drivers/gpu/drm/ttm/ttm_backup_shmem.c create mode 100644 drivers/gpu/drm/xe/xe_shrinker.c create mode 100644 drivers/gpu/drm/xe/xe_shrinker.h create mode 100644 include/drm/ttm/ttm_backup.h