Skip to content

Refactor VM bind code

Matthew Brost intel-xe 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest30 patches 38 repliesIn review
  2. v322 patches 1 replySuperseded
  3. v227 patches 12 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v126 patches3 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/30drm/xe: Lock all gpuva ops during VM bind IOCTLdrivers/gpu/drm/xe/xe_vm.c+101 -414 replies
2/30drm/xe: Add ops_execute function which returns a fencedrivers/gpu/drm/xe/xe_vm.c+111 -1003 replies
3/30drm/xe: Move migrate to prefetch to op_lock functiondrivers/gpu/drm/xe/xe_vm.c+13 -153 replies
4/30drm/xe: Add struct xe_vma_ops abstractiondrivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm_types.h+28 -161 reply
5/30drm/xe: Update xe_vm_rebind to use dummy VMA operationsdrivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm_types.h+132 -1042 replies
6/30drm/xe: Simplify VM bind IOCTL error handling and cleanupdrivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm_types.h+9 -562 replies
7/30drm/xe: Update pagefaults to use dummy VMA operationsdrivers/gpu/drm/xe/xe_gt_pagefault.c drivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm.h +1 more+47 -190 replies
8/30drm/xe: s/xe_tile_migrate_engine/xe_tile_migrate_exec_queuedrivers/gpu/drm/xe/xe_gt_pagefault.c drivers/gpu/drm/xe/xe_migrate.c drivers/gpu/drm/xe/xe_migrate.h+7 -61 reply
9/30drm/xe: Add some members to xe_vma_opsdrivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm_types.h+18 -32 replies
10/30drm/xe: Add vm_bind_ioctl_ops_install_fences helperdrivers/gpu/drm/xe/xe_vm.c+23 -323 replies
11/30drm/xe: Move setting last fence to vm_bind_ioctl_ops_install_fencesdrivers/gpu/drm/xe/xe_vm.c+2 -72 replies
12/30drm/xe: Move ufence check to op_lockdrivers/gpu/drm/xe/xe_vm.c+23 -102 replies
13/30drm/xe: Move ufence add to vm_bind_ioctl_ops_install_fencesdrivers/gpu/drm/xe/xe_sync.c drivers/gpu/drm/xe/xe_sync.h drivers/gpu/drm/xe/xe_vm.c+53 -73 replies
14/30drm/xe: Add xe_gt_tlb_invalidation_range and convert PT layer to use thisdrivers/gpu/drm/xe/xe_gt_tlb_invalidation.c drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h drivers/gpu/drm/xe/xe_pt.c+65 -222 replies
15/30drm/xe: Add xe_vm_pgtable_update_op to xe_vma_opsdrivers/gpu/drm/xe/xe_pt_types.h drivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm_types.h+81 -53 replies
16/30drm/xe: Use ordered WQ for TLB invalidation fencesdrivers/gpu/drm/xe/xe_pt.c+1 -12 replies
17/30drm/xe: Delete PT update selftestdrivers/gpu/drm/xe/tests/xe_migrate.c+0 -861 reply
18/30drm/xe: Convert multiple bind ops into single jobdrivers/gpu/drm/xe/xe_bo_types.h drivers/gpu/drm/xe/xe_exec.c drivers/gpu/drm/xe/xe_gt_pagefault.c +8 more+969 -10202 replies
19/30drm/xe: Remove old functions defs in xe_pt.hdrivers/gpu/drm/xe/xe_pt.h+0 -90 replies
20/30drm/xe: Update PT layer with better error handlingdrivers/gpu/drm/xe/xe_pt.c drivers/gpu/drm/xe/xe_pt_types.h+165 -480 replies
21/30drm/xe: Update xe_vm_rebind to return intdrivers/gpu/drm/xe/xe_exec.c drivers/gpu/drm/xe/xe_vm.c drivers/gpu/drm/xe/xe_vm.h+10 -170 replies
22/30drm/xe: Move vma rebinding to the drm_exec locking loopdrivers/gpu/drm/xe/xe_exec.c drivers/gpu/drm/xe/xe_vm.c+11 -130 replies
23/30drm/xe: Update VM trace eventsdrivers/gpu/drm/xe/xe_trace.h drivers/gpu/drm/xe/xe_vm.c+45 -70 replies
24/30drm/xe: Update clear / populate argumentsdrivers/gpu/drm/xe/xe_migrate.c drivers/gpu/drm/xe/xe_migrate.h drivers/gpu/drm/xe/xe_pt.c+15 -180 replies
25/30drm/xe: Add __xe_migrate_update_pgtables_cpu helperdrivers/gpu/drm/xe/xe_migrate.c+31 -230 replies
26/30drm/xe: CPU binds for jobsdrivers/gpu/drm/xe/xe_bo.c drivers/gpu/drm/xe/xe_bo.h drivers/gpu/drm/xe/xe_bo_types.h +14 more+254 -2720 replies
27/30drm/xe: Don't use migrate exec queue for page fault bindsdrivers/gpu/drm/xe/xe_gt_pagefault.c drivers/gpu/drm/xe/xe_migrate.c drivers/gpu/drm/xe/xe_migrate.h+23 -20 replies
28/30drm/xe: Add VM bind IOCTL error injectiondrivers/gpu/drm/xe/xe_device_types.h drivers/gpu/drm/xe/xe_pt.c drivers/gpu/drm/xe/xe_vm.c +1 more+58 -00 replies
29/30drm/xe/guc: Assert time'd out jobs are not from a VM exec queuedrivers/gpu/drm/xe/xe_guc_submit.c+3 -40 replies
30/30drm/xe: Add PT exec queuesdrivers/gpu/drm/xe/Makefile drivers/gpu/drm/xe/xe_exec.c drivers/gpu/drm/xe/xe_exec_queue.c +9 more+288 -2090 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 00/30] Refactor VM bind code

Broken into roughly 5 parts:
Part 1: Prep patches, patches 1-14
Part 2: 1 jobs per VM bind IOCTL and error handling, patches 15-23 Part 3: CPU binds, patches 24-27
Part 4: Error injection for testing, patch 28
Part 5: PT exec queues 29-30

For reviewing, let's focus on part 1 for now and see if patches from that part can start to get merged.

Tested with [1] and new error handling appears to be working. Also tested with existing tests at every patch in the series and should be working at every patch in the series.

Latest version includes some of Thomas's patches too [2].

Matt

[1] https://patchwork.freedesktop.org/series/129606/
[2] https://patchwork.freedesktop.org/series/130871/

Matthew Brost (28):
drm/xe: Lock all gpuva ops during VM bind IOCTL
drm/xe: Add ops_execute function which returns a fence drm/xe: Move migrate to prefetch to op_lock function drm/xe: Add struct xe_vma_ops abstraction
drm/xe: Update xe_vm_rebind to use dummy VMA operations drm/xe: Simplify VM bind IOCTL error handling and cleanup drm/xe: Update pagefaults to use dummy VMA operations drm/xe: s/xe_tile_migrate_engine/xe_tile_migrate_exec_queue drm/xe: Add some members to xe_vma_ops
drm/xe: Add vm_bind_ioctl_ops_install_fences helper drm/xe: Move setting last fence to vm_bind_ioctl_ops_install_fences drm/xe: Move ufence check to op_lock
drm/xe: Move ufence add to vm_bind_ioctl_ops_install_fences drm/xe: Add xe_gt_tlb_invalidation_range and convert PT layer to use
this
drm/xe: Add xe_vm_pgtable_update_op to xe_vma_ops
drm/xe: Use ordered WQ for TLB invalidation fences drm/xe: Delete PT update selftest
drm/xe: Convert multiple bind ops into single job
drm/xe: Remove old functions defs in xe_pt.h
drm/xe: Update PT layer with better error handling drm/xe: Update VM trace events
drm/xe: Update clear / populate arguments
drm/xe: Add __xe_migrate_update_pgtables_cpu helper drm/xe: CPU binds for jobs
drm/xe: Don't use migrate exec queue for page fault binds drm/xe: Add VM bind IOCTL error injection
drm/xe/guc: Assert time'd out jobs are not from a VM exec queue drm/xe: Add PT exec queues

Thomas Hellström (2):
drm/xe: Update xe_vm_rebind to return int drm/xe: Move vma rebinding to the drm_exec locking loop

 drivers/gpu/drm/xe/Makefile                 |    1 +
 drivers/gpu/drm/xe/tests/xe_migrate.c       |   86 --
 drivers/gpu/drm/xe/xe_bo.c                  |    7 +-
 drivers/gpu/drm/xe/xe_bo.h                  |    4 +-
 drivers/gpu/drm/xe/xe_device.c              |   35 +
 drivers/gpu/drm/xe/xe_device.h              |    2 +
 drivers/gpu/drm/xe/xe_device_types.h        |   16 +
 drivers/gpu/drm/xe/xe_exec.c                |   41 +-
 drivers/gpu/drm/xe/xe_exec_queue.c          |  120 +-
 drivers/gpu/drm/xe/xe_exec_queue_types.h    |   20 +-
 drivers/gpu/drm/xe/xe_gt_pagefault.c        |   10 +-
 drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c |   59 +-
 drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h |    3 +
 drivers/gpu/drm/xe/xe_guc_submit.c          |   22 +-
 drivers/gpu/drm/xe/xe_migrate.c             |  385 ++----
 drivers/gpu/drm/xe/xe_migrate.h             |   46 +-
 drivers/gpu/drm/xe/xe_pt.c                  | 1236 ++++++++++++-------
 drivers/gpu/drm/xe/xe_pt.h                  |   15 +-
 drivers/gpu/drm/xe/xe_pt_exec_queue.c       |  180 +++
 drivers/gpu/drm/xe/xe_pt_exec_queue.h       |   14 +
 drivers/gpu/drm/xe/xe_pt_types.h            |   53 +
 drivers/gpu/drm/xe/xe_sched_job.c           |   68 +-
 drivers/gpu/drm/xe/xe_sched_job_types.h     |   31 +-
 drivers/gpu/drm/xe/xe_sync.c                |   15 +
 drivers/gpu/drm/xe/xe_sync.h                |    1 +
 drivers/gpu/drm/xe/xe_trace.h               |   21 +-
 drivers/gpu/drm/xe/xe_vm.c                  | 1124 ++++++++---------
 drivers/gpu/drm/xe/xe_vm.h                  |    9 +-
 drivers/gpu/drm/xe/xe_vm_types.h            |  198 +--
 29 files changed, 2118 insertions(+), 1704 deletions(-)
 create mode 100644 drivers/gpu/drm/xe/xe_pt_exec_queue.c
 create mode 100644 drivers/gpu/drm/xe/xe_pt_exec_queue.h
Signature · 1 line
2.34.1