drm/amdgpu: have bos for PDs/PTS cpu accessible when kfd uses cpu to update vm
Subsystems (2)
PATCH 1/1 drm/amdgpu: have bos for PDs/PTS cpu accessible when kfd uses cpu to update vm
From: Xiaogang Chen <[email protected]>
When kfd uses cpu to update vm iterates all current PDs/PTs bos, adds AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED flag and kmap them to kernel virtual address space before kfd updates the vm that was created by gfx.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 28 +++++++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -7
@@ -2278,17 +2278,14 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)if (r) goto unreserve_bo; + r =amdgpu_vm_pt_cpu_access_root (adev, vm); +if (r) + goto unreserve_bo; + vm->update_funcs = &amdgpu_vm_cpu_funcs; }else { vm->update_funcs = &amdgpu_vm_sdma_funcs; } -/* -* Make sure root PD gets mapped. As vm_update_mode could be changed -* when turning a GFX VM into a compute VM. -*/ - r = vm->update_funcs->map_table (to_amdgpu_bo_vm (vm->root.bo)); -if (r) - goto unreserve_bo;dma_fence_put (vm->last_update); vm->last_update =dma_fence_get_stub ();
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -0
@@ -491,6 +491,8 @@ void amdgpu_vm_pt_free_work(struct work_struct *work);void amdgpu_debugfs_vm_bo_info (struct amdgpu_vm *vm,struct seq_file *m);#endif +int amdgpu_vm_pt_cpu_access_root (struct amdgpu_device *adev,struct amdgpu_vm *vm); +/** * amdgpu_vm_tlb_seq - return tlb flush sequence number * @vm: the amdgpu_vm structure to query
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +28 -0
@@ -1044,3 +1044,31 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params,return 0 ; } + +/** +* amdgpu_vm_pt_cpu_access_root - have bo of root PD cpu accessible +* @adev: amdgpu device structure +* @vm: amdgpu vm structure +* +* make root page directory and everything below it cpu accessible. +*/ +int amdgpu_vm_pt_cpu_access_root (struct amdgpu_device *adev,struct amdgpu_vm *vm) +{ +struct amdgpu_vm_pt_cursor cursor; +struct amdgpu_vm_bo_base *entry; +int r; +struct amdgpu_bo_vm *bo; + +for_each_amdgpu_vm_pt_dfs_safe (adev, vm,NULL , cursor, entry) { + +if (entry->bo) { + bo =to_amdgpu_bo_vm (entry->bo); + entry->bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; + r = amdgpu_vm_cpu_funcs.map_table (bo); +if (r) +return r; + } + } + +return 0 ; +}
Signature · 1 line
2.25.1
Christian König
maintainerAm 29.06.23 um 18:09 schrieb Xiaogang.Chen:
Quoted 18 lines
From: Xiaogang Chen <[email protected]>
When kfd uses cpu to update vm iterates all current PDs/PTs bos, adds
AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIREDflag and kmap them to kernel virtual address space before kfd updates the vm that was created by gfx.Signed-off-by Xiaogang Chen <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 ++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 28 +++++++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm) · line 2284
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4
-0@@ -2278,17 +2278,14 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)if (r) goto unreserve_bo; + r =amdgpu_vm_pt_cpu_access_root (adev, vm); +if (r) + goto unreserve_bo; +
Please call that after setting vm->update_funcs.
Quoted 34 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-7vm->update_funcs = &amdgpu_vm_cpu_funcs; }else { vm->update_funcs = &amdgpu_vm_sdma_funcs; } -/* -* Make sure root PD gets mapped. As vm_update_mode could be changed -* when turning a GFX VM into a compute VM. -*/ - r = vm->update_funcs->map_table (to_amdgpu_bo_vm (vm->root.bo)); -if (r) - goto unreserve_bo;dma_fence_put (vm->last_update); vm->last_update =dma_fence_get_stub ();drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2
-0@@ -491,6 +491,8 @@ void amdgpu_vm_pt_free_work(struct work_struct *work);void amdgpu_debugfs_vm_bo_info (struct amdgpu_vm *vm,struct seq_file *m);#endif +int amdgpu_vm_pt_cpu_access_root (struct amdgpu_device *adev,struct amdgpu_vm *vm); +/** * amdgpu_vm_tlb_seq - return tlb flush sequence number * @vm: the amdgpu_vm structure to query drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +0
-0@@ -1044,3 +1044,31 @@ int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params,return 0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params, · line 1055
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +9
-0} + +/** +* amdgpu_vm_pt_cpu_access_root - have bo of root PD cpu accessible +* @adev: amdgpu device structure +* @vm: amdgpu vm structure +* +* make root page directory and everything below it cpu accessible. +*/ +int amdgpu_vm_pt_cpu_access_root (struct amdgpu_device *adev,struct amdgpu_vm *vm)
Rename that to amdgpu_vm_pt_map_tables.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params, · line 1060
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +5
-0+{ +struct amdgpu_vm_pt_cursor cursor; +struct amdgpu_vm_bo_base *entry; +int r; +struct amdgpu_bo_vm *bo;
Please use reverse xmas tree for declarations and declare variables local to the block they are used in if possible.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params, · line 1066
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +6
-0+ +for_each_amdgpu_vm_pt_dfs_safe (adev, vm,NULL , cursor, entry) { + +if (entry->bo) { + bo =to_amdgpu_bo_vm (entry->bo); + entry->bo->flags |=AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ;
Probably best to move this into amdgpu_vm_cpu_map_table(). This should allow us to remove setting the flag while creating page tables as well.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c int amdgpu_vm_ptes_update(struct amdgpu_vm_update_params *params, · line 1067
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +1
-0+ r = amdgpu_vm_cpu_funcs.map_table (bo);
Please use vm->update_funcs->map_table here.
Apart from those minor cleanups the patch looks good from the technical side.
Regards,
Christian.
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +7
-0+if (r) +return r; + } + } + +return 0 ; +}