drm/msm: sparse / "VM_BIND" support
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest40 patches 14 repliesIn review
- v4 posting 3/340 patches 24 repliesSuperseded
- v4 posting 2/311 of 40 patches 20 repliesSuperseded
Earlier versions · 4
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v4 posting 1/3 | 22 of 33 patches | 4 replies | Superseded | |
| v3 | 33 patches | 5 replies | Superseded | |
| v2 | 34 patches | 10 replies | Superseded | |
| v1 RFC | 24 patches | 0 replies | Superseded |
Changes in v5 from the cover letter
- Improved drm/sched enqueue_credit comments, and better define the return from drm_sched_entity_push_job()
- Improve DRM_GPUVM_VA_WEAK_REF comments, and additional WARN_ON()s to make it clear that some of the gpuvm functionality is not available in this mode.
- Link to v4: https://lore.kernel.org/all/[email protected]/
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/40 | drm/gpuvm: Don't require obj lock in destructor pathdrivers/ | +5 | 5 replies | |
| 2/40 | drm/gpuvm: Allow VAs to hold soft reference to BOsdrivers/ include/ | +49 | 3 replies | |
| 3/40 | drm/gem: Add ww_acquire_ctx support to drm_gem_lru_scan()drivers/ drivers/ include/ | +30 | 0 replies | |
| 4/40 | drm/sched: Add enqueue credit limitdrivers/ drivers/ include/ | +43 | 0 replies | |
| 5/40 | iommu/io-pgtable-arm: Add quirk to quiet WARN_ON()drivers/ include/ | +22 | 0 replies | |
| 6/40 | drm/msm: Rename msm_file_private -> msm_contextdrivers/ drivers/ drivers/ +6 more | +49 | 0 replies | |
| 7/40 | drm/msm: Improve msm_context commentsdrivers/ | +29 | 0 replies | |
| 8/40 | drm/msm: Rename msm_gem_address_space -> msm_gem_vmdrivers/ drivers/ drivers/ +38 more | +349 | 0 replies | |
| 9/40 | drm/msm: Remove vram carveout supportdrivers/ drivers/ drivers/ +11 more | +19 | 0 replies | |
| 10/40 | drm/msm: Collapse vma allocation and initializationdrivers/ drivers/ drivers/ | +20 | 0 replies | |
| 11/40 | drm/msm: Collapse vma close and deletedrivers/ drivers/ | +5 | 0 replies | |
| 12/40 | drm/msm: Don't close VMAs on purgedrivers/ | +1 | 0 replies | |
| 13/40 | drm/msm: drm_gpuvm conversiondrivers/ drivers/ drivers/ +9 more | +271 | 0 replies | |
| 14/40 | drm/msm: Convert vm lockingdrivers/ drivers/ drivers/ +2 more | +150 | 0 replies | |
| 15/40 | drm/msm: Use drm_gpuvm types moredrivers/ drivers/ drivers/ +24 more | +190 | 0 replies | |
| 16/40 | drm/msm: Split out helper to get iommu prot flagsdrivers/ drivers/ | +11 | 0 replies | |
| 17/40 | drm/msm: Add mmu support for non-zero offsetdrivers/ drivers/ drivers/ +3 more | +36 | 0 replies | |
| 18/40 | drm/msm: Add PRR supportdrivers/ drivers/ include/ | +73 | 0 replies | |
| 19/40 | drm/msm: Rename msm_gem_vma_purge() -> _unmap()drivers/ drivers/ drivers/ | +4 | 0 replies | |
| 20/40 | drm/msm: Drop queued submits on lastclose()drivers/ drivers/ drivers/ | +15 | 0 replies | |
| 21/40 | drm/msm: Lazily create context VMdrivers/ drivers/ drivers/ +2 more | +43 | 0 replies | |
| 22/40 | drm/msm: Add opt-in for VM_BINDdrivers/ drivers/ drivers/ +4 more | +99 | 0 replies | |
| 23/40 | drm/msm: Mark VM as unusable on GPU hangsdrivers/ drivers/ drivers/ | +34 | 0 replies | |
| 24/40 | drm/msm: Add _NO_SHARE flagdrivers/ drivers/ drivers/ +1 more | +53 | 0 replies | |
| 25/40 | drm/msm: Crashdump prep for sparse mappingsdrivers/ | +10 | 0 replies | |
| 26/40 | drm/msm: rd dumping prep for sparse mappingsdrivers/ drivers/ | +17 | 0 replies | |
| 27/40 | drm/msm: Crashdec support for sparsedrivers/ | +72 | 0 replies | |
| 28/40 | drm/msm: rd dumping support for sparsedrivers/ | +33 | 0 replies | |
| 29/40 | drm/msm: Extract out syncobj helpersdrivers/ drivers/ drivers/ +2 more | +235 | 0 replies | |
| 30/40 | drm/msm: Use DMA_RESV_USAGE_BOOKKEEP/KERNELdrivers/ drivers/ | +4 | 0 replies | |
| 31/40 | drm/msm: Add VM_BIND submitqueuedrivers/ drivers/ drivers/ +3 more | +197 | 0 replies | |
| 32/40 | drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ONdrivers/ drivers/ drivers/ | +20 | 0 replies | |
| 33/40 | drm/msm: Support pgtable preallocationdrivers/ drivers/ drivers/ | +225 | 0 replies | |
| 34/40 | drm/msm: Split out map/unmap opsdrivers/ | +56 | 0 replies | |
| 35/40 | drm/msm: Add VM_BIND ioctldrivers/ drivers/ drivers/ +4 more | +1185 | 0 replies | |
| 36/40 | drm/msm: Add VM logging for VM_BIND updatesdrivers/ drivers/ drivers/ +2 more | +202 | 0 replies | |
| 37/40 | drm/msm: Add VMA unmap reasondrivers/ drivers/ drivers/ | +23 | 0 replies | |
| 38/40 | drm/msm: Add mmu prealloc tracepointdrivers/ drivers/ | +18 | 0 replies | |
| 39/40 | drm/msm: use trylock for debugfsdrivers/ drivers/ | +8 | 0 replies | |
| 40/40 | drm/msm: Bump UAPI versiondrivers/ | +2 | 0 replies |
Reviews trailers per patch
4 of 40 patches have a Reviewed-by or Acked-by.
| Patch | Robin Murphy | Dmitry Baryshkov |
|---|---|---|
| 1/40 | ||
| 2/40 | ||
| 3/40 | ||
| 4/40 | ||
| 5/40 | A-b | |
| 6/40 | R-b | |
| 7/40 | R-b | |
| 8/40 | R-b | |
| 9/40 | ||
| 10/40 | ||
| 11/40 | ||
| 12/40 | ||
| 13/40 | ||
| 14/40 | ||
| 15/40 | ||
| 16/40 | ||
| 17/40 | ||
| 18/40 | ||
| 19/40 | ||
| 20/40 | ||
| 21/40 | ||
| 22/40 | ||
| 23/40 | ||
| 24/40 | ||
| 25/40 | ||
| 26/40 | ||
| 27/40 | ||
| 28/40 | ||
| 29/40 | ||
| 30/40 | ||
| 31/40 | ||
| 32/40 | ||
| 33/40 | ||
| 34/40 | ||
| 35/40 | ||
| 36/40 | ||
| 37/40 | ||
| 38/40 | ||
| 39/40 | ||
| 40/40 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v5 00/40] drm/msm: sparse / "VM_BIND" support
From: Rob Clark <[email protected]>
Conversion to DRM GPU VA Manager[1], and adding support for Vulkan Sparse Memory[2] in the form of:
1. A new VM_BIND submitqueue type for executing VM MSM_SUBMIT_BO_OP_MAP/ MAP_NULL/UNMAP commands
2. A new VM_BIND ioctl to allow submitting batches of one or more MAP/MAP_NULL/UNMAP commands to a VM_BIND submitqueue
I did not implement support for synchronous VM_BIND commands. Since userspace could just immediately wait for the SUBMIT to complete, I don't think we need this extra complexity in the kernel. Synchronous/immediate VM_BIND operations could be implemented with a 2nd VM_BIND submitqueue.
The corresponding mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32533
Changes in v5:
- Improved drm/sched enqueue_credit comments, and better define the return from drm_sched_entity_push_job()
- Improve DRM_GPUVM_VA_WEAK_REF comments, and additional WARN_ON()s to make it clear that some of the gpuvm functionality is not available in this mode.
- Link to v4: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Various locking/etc fixes
- Optimize the pgtable preallocation. If userspace sorts the VM_BIND ops then the kernel detects ops that fall into the same 2MB last level PTD to avoid duplicate page preallocation.
- Add way to throttle pushing jobs to the scheduler, to cap the amount of potentially temporary prealloc'd pgtable pages.
- Add vm_log to devcoredump for debugging. If the vm_log_shift module param is set, keep a log of the last 1<<vm_log_shift VM updates for easier debugging of faults/crashes.
- Link to v3: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Switched to seperate VM_BIND ioctl. This makes the UABI a bit cleaner, but OTOH the userspace code was cleaner when the end result of either type of VkQueue lead to the same ioctl. So I'm a bit on the fence.
- Switched to doing the gpuvm bookkeeping synchronously, and only deferring the pgtable updates. This avoids needing to hold any resv locks in the fence signaling path, resolving the last shrinker related lockdep complaints. OTOH it means userspace can trigger invalid pgtable updates with multiple VM_BIND queues. In this case, we ensure that unmaps happen completely (to prevent userspace from using this to access free'd pages), mark the context as unusable, and move on with life.
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Dropped Bibek Kumar Patro's arm-smmu patches[3], which have since been
merged.
- Pre-allocate all the things, and drop HACK patch which disabled shrinker.
This includes ensuring that vm_bo objects are allocated up front, pre-
allocating VMA objects, and pre-allocating pages used for pgtable updates.
The latter utilizes io_pgtable_cfg callbacks for pgtable alloc/free, that
were initially added for panthor.
- Add back support for BO dumping for devcoredump.
- Link to v1 (RFC): https://lore.kernel.org/dri-devel/[email protected]/T/#t
[1] https://www.kernel.org/doc/html/next/gpu/drm-mm.html#drm-gpuvm
[2] https://docs.vulkan.org/spec/latest/chapters/sparsemem.html
[3] https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=909700
Rob Clark (40):
drm/gpuvm: Don't require obj lock in destructor path drm/gpuvm: Allow VAs to hold soft reference to BOs drm/gem: Add ww_acquire_ctx support to drm_gem_lru_scan() drm/sched: Add enqueue credit limit iommu/io-pgtable-arm: Add quirk to quiet WARN_ON() drm/msm: Rename msm_file_private -> msm_context drm/msm: Improve msm_context comments
drm/msm: Rename msm_gem_address_space -> msm_gem_vm drm/msm: Remove vram carveout support
drm/msm: Collapse vma allocation and initialization drm/msm: Collapse vma close and delete
drm/msm: Don't close VMAs on purge
drm/msm: drm_gpuvm conversion
drm/msm: Convert vm locking
drm/msm: Use drm_gpuvm types more
drm/msm: Split out helper to get iommu prot flags drm/msm: Add mmu support for non-zero offset drm/msm: Add PRR support
drm/msm: Rename msm_gem_vma_purge() -> _unmap() drm/msm: Drop queued submits on lastclose() drm/msm: Lazily create context VM
drm/msm: Add opt-in for VM_BIND
drm/msm: Mark VM as unusable on GPU hangs drm/msm: Add _NO_SHARE flag
drm/msm: Crashdump prep for sparse mappings drm/msm: rd dumping prep for sparse mappings drm/msm: Crashdec support for sparse
drm/msm: rd dumping support for sparse
drm/msm: Extract out syncobj helpers
drm/msm: Use DMA_RESV_USAGE_BOOKKEEP/KERNEL drm/msm: Add VM_BIND submitqueue
drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ON drm/msm: Support pgtable preallocation
drm/msm: Split out map/unmap ops
drm/msm: Add VM_BIND ioctl
drm/msm: Add VM logging for VM_BIND updates drm/msm: Add VMA unmap reason
drm/msm: Add mmu prealloc tracepoint
drm/msm: use trylock for debugfs
drm/msm: Bump UAPI version
drivers/gpu/drm/drm_gem.c | 14 +- drivers/gpu/drm/drm_gpuvm.c | 38 +- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 25 +- drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 17 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 17 +- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 22 +- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 32 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 49 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 - drivers/gpu/drm/msm/adreno/adreno_gpu.c | 99 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 23 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 +- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 14 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 28 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 12 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 19 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 12 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +- drivers/gpu/drm/msm/msm_drv.c | 184 +-- drivers/gpu/drm/msm/msm_drv.h | 35 +- drivers/gpu/drm/msm/msm_fb.c | 18 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 494 +++--- drivers/gpu/drm/msm/msm_gem.h | 247 ++- drivers/gpu/drm/msm/msm_gem_prime.c | 15 + drivers/gpu/drm/msm/msm_gem_shrinker.c | 104 +- drivers/gpu/drm/msm/msm_gem_submit.c | 295 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 1471 ++++++++++++++++- drivers/gpu/drm/msm/msm_gpu.c | 211 ++- drivers/gpu/drm/msm/msm_gpu.h | 144 +- drivers/gpu/drm/msm/msm_gpu_trace.h | 14 + drivers/gpu/drm/msm/msm_iommu.c | 302 +++- drivers/gpu/drm/msm/msm_kms.c | 18 +- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_mmu.h | 38 +- drivers/gpu/drm/msm/msm_rd.c | 62 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 10 +- drivers/gpu/drm/msm/msm_submitqueue.c | 96 +- drivers/gpu/drm/msm/msm_syncobj.c | 172 ++ drivers/gpu/drm/msm/msm_syncobj.h | 37 + drivers/gpu/drm/scheduler/sched_entity.c | 19 +- drivers/gpu/drm/scheduler/sched_main.c | 3 + drivers/iommu/io-pgtable-arm.c | 27 +- include/drm/drm_gem.h | 10 +- include/drm/drm_gpuvm.h | 19 +- include/drm/gpu_scheduler.h | 24 +- include/linux/io-pgtable.h | 8 + include/uapi/drm/msm_drm.h | 149 +- 63 files changed, 3526 insertions(+), 1250 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_syncobj.c create mode 100644 drivers/gpu/drm/msm/msm_syncobj.h
Signature · 1 line
2.49.0