drm/amdgpu: Set pasid for compute vm
Subsystems (3)
PATCH 1/2 drm/amdgpu: Set pasid for compute vm
To make a amdgpu vm to a compute vm, the old pasid will be freed and replaced with a pasid managed by kfd. Kfd can't reuse original pasid allocated by amdgpu because kfd uses different pasid policy with amdgpu. For example, all graphic devices share one same pasid in a process.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 33 +++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +-- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 ++-- 6 files changed, 41 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -1
@@ -156,11 +156,12 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);/* GPUVM API */ int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,void **vm, -void **process_info, +void **process_info,unsigned int pasid,struct dma_fence **ef);int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd,struct file *filp,void **vm,void **process_info, +unsigned int pasid,struct dma_fence **ef);void amdgpu_amdkfd_gpuvm_destroy_cb (struct amdgpu_device *adev,struct amdgpu_vm *vm);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -3
@@ -1004,7 +1004,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, }int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,void **vm, -void **process_info, +void **process_info,unsigned int pasid,struct dma_fence **ef) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,return -ENOMEM ;/* Initialize AMDGPU part of the VM */ - ret =amdgpu_vm_init (adev, new_vm,AMDGPU_VM_CONTEXT_COMPUTE ,0 ); + ret =amdgpu_vm_init (adev, new_vm,AMDGPU_VM_CONTEXT_COMPUTE , pasid);if (ret) {pr_err ("Failed init vm ret %d\n" , ret); goto amdgpu_vm_init_fail;
@@ -1041,6 +1041,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd,struct file *filp,void **vm,void **process_info, +unsigned int pasid,struct dma_fence **ef) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
@@ -1054,7 +1055,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,return -EINVAL ;/* Convert VM into a compute VM */ - ret =amdgpu_vm_make_compute (adev, avm); + ret =amdgpu_vm_make_compute (adev, avm, pasid);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +29 -4
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,* Returns: * 0 for success, -errno for errors. */ -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm) +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid) {bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r;
@@ -2702,7 +2702,20 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)/* Sanity checks */ if (!RB_EMPTY_ROOT (&vm->va.rb_root) || vm->root.entries) { r = -EINVAL ; - goto error; + goto unreserve_bo; + } + +if (pasid) { +unsigned long flags; + +spin_lock_irqsave (&adev->vm_manager.pasid_lock, flags); + r =idr_alloc (&adev->vm_manager.pasid_idr, vm, pasid, pasid +1 , +GFP_ATOMIC ); +spin_unlock_irqrestore (&adev->vm_manager.pasid_lock, flags); + +if (r == -ENOSPC ) + goto unreserve_bo; + r =0 ; }/* Check if PD needs to be reinitialized and do it before
@@ -2713,7 +2726,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm) adev->vm_manager.root_level, pte_support_ats);if (r) - goto error; + goto free_idr; }/* Update VM state */
@@ -2732,10 +2745,22 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)idr_remove (&adev->vm_manager.pasid_idr, vm->pasid);spin_unlock_irqrestore (&adev->vm_manager.pasid_lock, flags); +/* Free the original amdgpu allocated pasid +* Will be replaced with kfd allocated pasid +*/ +amdgpu_pasid_free (vm->pasid); vm->pasid =0 ; } -error: +if (pasid) + vm->pasid = pasid; + + goto unreserve_bo; + +free_idr: +if (pasid) +idr_remove (&adev->vm_manager.pasid_idr, pasid); +unreserve_bo:amdgpu_bo_unreserve (vm->root.base.bo);return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -1
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev);void amdgpu_vm_manager_fini (struct amdgpu_device *adev);int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm,int vm_context,unsigned int pasid); -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm); +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid);void amdgpu_vm_fini (struct amdgpu_device *adev,struct amdgpu_vm *vm);bool amdgpu_vm_pasid_fault_credit (struct amdgpu_device *adev,unsigned int pasid);
drivers/gpu/drm/amd/amdkfd/kfd_process.c +2 -2
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,if (drm_file) ret = dev->kfd2kgd->acquire_process_vm ( dev->kgd, drm_file, - &pdd->vm, &p->kgd_process_info, &p->ef); + &pdd->vm, &p->kgd_process_info, p->pasid, &p->ef);else ret = dev->kfd2kgd->create_process_vm ( - dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef); + dev->kgd, &pdd->vm, &p->kgd_process_info, p->pasid, &p->ef);if (ret) {pr_err ("Failed to create process VM object\n" );return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +3 -2
@@ -347,9 +347,10 @@ struct kfd2kgd_calls {uint64_t (*get_vram_usage)(struct kgd_dev *kgd);int (*create_process_vm)(struct kgd_dev *kgd,void **vm, -void **process_info,struct dma_fence **ef); +void **process_info,unsigned int pasid,struct dma_fence **ef);int (*acquire_process_vm)(struct kgd_dev *kgd,struct file *filp, -void **vm,void **process_info,struct dma_fence **ef); +void **vm,void **process_info,unsigned int pasid, +struct dma_fence **ef);void (*destroy_process_vm)(struct kgd_dev *kgd,void *vm);uint32_t (*get_process_page_dir)(void *vm); void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1535397903-9874-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdkfd: Release an acquired process vm
For compute vm acquired from amdgpu, vm.pasid is managed by kfd. Decouple pasid from such vm on process destroy to avoid duplicate pasid release.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 ++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + 7 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -166,6 +166,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,void amdgpu_amdkfd_gpuvm_destroy_cb (struct amdgpu_device *adev,struct amdgpu_vm *vm);void amdgpu_amdkfd_gpuvm_destroy_process_vm (struct kgd_dev *kgd,void *vm); +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm);uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm); int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( struct kgd_dev *kgd, uint64_t va, uint64_t size,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1 -0
@@ -204,6 +204,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1 -0
@@ -164,6 +164,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1 -0
@@ -201,6 +201,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +18 -0
@@ -1118,6 +1118,24 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)kfree (vm); } +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm) +{ +struct amdgpu_vm *avm = (struct amdgpu_vm *)vm; + +if (WARN_ON (!vm)) +return ; + +pr_debug ("Releasing process vm %p\n" , vm); + +/* The original pasid of amdgpu vm has already been +* released during making a amdgpu vm to a compute vm +* The current pasid is managed by kfd and will be +* released on kfd process destroy. Set amdgpu pasid +* to 0 to avoid duplicate release. +*/ + avm->pasid =0 ; +} +uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm) {struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
drivers/gpu/drm/amd/amdkfd/kfd_process.c +3 -1
@@ -320,8 +320,10 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)pr_debug ("Releasing pdd (topology id %d) for process (pasid %d)\n" , pdd->dev->id, p->pasid); -if (pdd->drm_file) +if (pdd->drm_file) { + pdd->dev->kfd2kgd->release_process_vm (pdd->vm);fput (pdd->drm_file); + }else if (pdd->vm) pdd->dev->kfd2kgd->destroy_process_vm ( pdd->dev->kgd, pdd->vm);
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 -0
@@ -352,6 +352,7 @@ struct kfd2kgd_calls { void **vm, void **process_info, unsigned int pasid, struct dma_fence **ef);void (*destroy_process_vm)(struct kgd_dev *kgd,void *vm); +void (*release_process_vm)(void *vm);uint32_t (*get_process_page_dir)(void *vm);void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,uint32_t vmid,uint32_t page_table_base);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1535397903-9874-2-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 2/2] drm/amdkfd: Release an acquired process vm
Quoted 77 lines · Oak Zeng
For compute vm acquired from amdgpu, vm.pasid is managed by kfd. Decouple pasid from such vm on process destroy to avoid duplicate pasid release.
Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 ++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + 7 files changed, 26 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1
-0@@ -166,6 +166,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,void amdgpu_amdkfd_gpuvm_destroy_cb (struct amdgpu_device *adev,struct amdgpu_vm *vm);void amdgpu_amdkfd_gpuvm_destroy_process_vm (struct kgd_dev *kgd,void *vm); +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm);uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm); int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( struct kgd_dev *kgd, uint64_t va, uint64_t size,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1
-0@@ -204,6 +204,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1
-0@@ -164,6 +164,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1
-0@@ -201,6 +201,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +6
-0@@ -1118,6 +1118,24 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)kfree (vm); } +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm) +{ +struct amdgpu_vm *avm = (struct amdgpu_vm *)vm; + +if (WARN_ON (!vm)) +return ;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm) · line 1136
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +10
-0+ +pr_debug ("Releasing process vm %p\n" , vm); + +/* The original pasid of amdgpu vm has already been +* released during making a amdgpu vm to a compute vm +* The current pasid is managed by kfd and will be +* released on kfd process destroy. Set amdgpu pasid +* to 0 to avoid duplicate release. +*/ + avm->pasid =0 ;
Don't you also need to call idr_remove(&adev->vm_manager.pasid_idr, avm->pasid) here? After setting avm->pasid to 0, amdgpu_vm_fini won't take care of this any more.
Regards,
Felix
Quoted 26 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2
-0+} +uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm) {struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;drivers/gpu/drm/amd/amdkfd/kfd_process.c +3
-1@@ -320,8 +320,10 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)pr_debug ("Releasing pdd (topology id %d) for process (pasid %d)\n" , pdd->dev->id, p->pasid); -if (pdd->drm_file) +if (pdd->drm_file) { + pdd->dev->kfd2kgd->release_process_vm (pdd->vm);fput (pdd->drm_file); + }else if (pdd->vm) pdd->dev->kfd2kgd->destroy_process_vm ( pdd->dev->kgd, pdd->vm);drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0
-0
drivers/gpu/drm/amd/include/kgd_kfd_interface.h struct kfd2kgd_calls { · line 358
Quoted 7 lines
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1
-0@@ -352,6 +352,7 @@ struct kfd2kgd_calls { void **vm, void **process_info, unsigned int pasid, struct dma_fence **ef);void (*destroy_process_vm)(struct kgd_dev *kgd,void *vm); +void (*release_process_vm)(void *vm);uint32_t (*get_process_page_dir)(void *vm);void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,uint32_t vmid,uint32_t page_table_base);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 57e4251e-01d4-084d-8edf-79b1674555ef-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 2/2] drm/amdkfd: Release an acquired process vm
Thank you Felix. That is a great point. I will update patch.
Thanks,
Oak
-----Original Message-----
From: Kuehling, Felix
Sent: Monday, August 27, 2018 4:05 PM
To: Oak Zeng <[email protected]>; [email protected]
Cc: Zeng, Oak <[email protected]>
Subject: Re: [PATCH 2/2] drm/amdkfd: Release an acquired process vm
Quoted 82 lines · Oak Zeng
For compute vm acquired from amdgpu, vm.pasid is managed by kfd. Decouple pasid from such vm on process destroy to avoid duplicate pasid release.
Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 ++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + 7 files changed, 26 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1
-0@@ -166,6 +166,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd, void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,struct amdgpu_vm *vm);void amdgpu_amdkfd_gpuvm_destroy_process_vm (struct kgd_dev *kgd,void *vm); +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm);uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm);int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
structkgd_dev*kgd,uint64_tva,uint64_tsize, diff --gita/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
index ea79908..03a83d3 100644drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1
-0@@ -204,6 +204,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1
-0@@ -164,6 +164,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1
-0@@ -201,6 +201,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm, .acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm, .destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm, + .release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm, .get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir, .set_vm_context_page_table_base = set_vm_context_page_table_base, .alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +5
-0@@ -1118,6 +1118,24 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)kfree (vm); } +void amdgpu_amdkfd_gpuvm_release_process_vm (void *vm) { +struct amdgpu_vm *avm = (struct amdgpu_vm *)vm; + +if (WARN_ON (!vm)) +return ;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm) · line 1135
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +10
-0+ +pr_debug ("Releasing process vm %p\n" , vm); + +/* The original pasid of amdgpu vm has already been +* released during making a amdgpu vm to a compute vm +* The current pasid is managed by kfd and will be +* released on kfd process destroy. Set amdgpu pasid +* to 0 to avoid duplicate release. +*/ + avm->pasid =0 ;
Don't you also need to call idr_remove(&adev->vm_manager.pasid_idr, avm->pasid) here? After setting avm->pasid to 0, amdgpu_vm_fini won't take care of this any more.
Regards,
Felix
Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2
-0+} +uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir (void *vm) { struct amdgpu_vm *avm = (struct amdgpu_vm *)vm; diff --git
a/drivers/gpu/drm/amd/amdkfd/kfd_process.cb/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 571edd8..a716422 100644drivers/gpu/drm/amd/amdkfd/kfd_process.c +3
-1@@ -320,8 +320,10 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)pr_debug ("Releasing pdd (topology id %d) for process (pasid %d)\n" , pdd->dev->id, p->pasid); -if (pdd->drm_file) +if (pdd->drm_file) { + pdd->dev->kfd2kgd->release_process_vm (pdd->vm);fput (pdd->drm_file); + }else if (pdd->vm) pdd->dev->kfd2kgd->destroy_process_vm ( pdd->dev->kgd, pdd->vm);drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0
-0
drivers/gpu/drm/amd/include/kgd_kfd_interface.h struct kfd2kgd_calls { · line 358
Quoted 7 lines
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1
-0@@ -352,6 +352,7 @@ struct kfd2kgd_calls { void **vm, void **process_info, unsigned int pasid, struct dma_fence **ef);void (*destroy_process_vm)(struct kgd_dev *kgd,void *vm); +void (*release_process_vm)(void *vm);uint32_t (*get_process_page_dir)(void *vm);void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,uint32_t vmid,uint32_t page_table_base);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 20 lines · Oak Zeng
To make a amdgpu vm to a compute vm, the old pasid will be freed and replaced with a pasid managed by kfd. Kfd can't reuse original pasid allocated by amdgpu because kfd uses different pasid policy with amdgpu. For example, all graphic devices share one same pasid in a process.
Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 33 +++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +-- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 ++-- 6 files changed, 41 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd); · line 159
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1
-1@@ -156,11 +156,12 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);/* GPUVM API */ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm, - void **process_info, + void **process_info, unsigned int pasid,
The pasid is still in between a bunch of output parameters. Please move it between kgd and vm.
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd); · line 164
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1
-0struct dma_fence **ef); int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd, struct file *filp, void **vm, void **process_info, + unsigned int pasid,
Move pasid between filp and vm.
Thanks,
Felix
Quoted 147 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0
-0struct dma_fence **ef);void amdgpu_amdkfd_gpuvm_destroy_cb (struct amdgpu_device *adev,struct amdgpu_vm *vm);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4
-3@@ -1004,7 +1004,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, }int amdgpu_amdkfd_gpuvm_create_process_vm (struct kgd_dev *kgd,void **vm, -void **process_info, +void **process_info,unsigned int pasid,struct dma_fence **ef) {struct amdgpu_device *adev =get_amdgpu_device (kgd);@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,return -ENOMEM ;/* Initialize AMDGPU part of the VM */ - ret =amdgpu_vm_init (adev, new_vm,AMDGPU_VM_CONTEXT_COMPUTE ,0 ); + ret =amdgpu_vm_init (adev, new_vm,AMDGPU_VM_CONTEXT_COMPUTE , pasid);if (ret) {pr_err ("Failed init vm ret %d\n" , ret); goto amdgpu_vm_init_fail;@@ -1041,6 +1041,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,int amdgpu_amdkfd_gpuvm_acquire_process_vm (struct kgd_dev *kgd,struct file *filp,void **vm,void **process_info, +unsigned int pasid,struct dma_fence **ef) {struct amdgpu_device *adev =get_amdgpu_device (kgd);@@ -1054,7 +1055,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,return -EINVAL ;/* Convert VM into a compute VM */ - ret =amdgpu_vm_make_compute (adev, avm); + ret =amdgpu_vm_make_compute (adev, avm, pasid);if (ret)return ret;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +29
-4@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,* Returns: * 0 for success, -errno for errors. */ -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm) +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid) {bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r;@@ -2702,7 +2702,20 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)/* Sanity checks */ if (!RB_EMPTY_ROOT (&vm->va.rb_root) || vm->root.entries) { r = -EINVAL ; - goto error; + goto unreserve_bo; + } + +if (pasid) { +unsigned long flags; + +spin_lock_irqsave (&adev->vm_manager.pasid_lock, flags); + r =idr_alloc (&adev->vm_manager.pasid_idr, vm, pasid, pasid +1 , +GFP_ATOMIC ); +spin_unlock_irqrestore (&adev->vm_manager.pasid_lock, flags); + +if (r == -ENOSPC ) + goto unreserve_bo; + r =0 ; }/* Check if PD needs to be reinitialized and do it before @@ -2713,7 +2726,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm) adev->vm_manager.root_level, pte_support_ats);if (r) - goto error; + goto free_idr; }/* Update VM state */ @@ -2732,10 +2745,22 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)idr_remove (&adev->vm_manager.pasid_idr, vm->pasid);spin_unlock_irqrestore (&adev->vm_manager.pasid_lock, flags); +/* Free the original amdgpu allocated pasid +* Will be replaced with kfd allocated pasid +*/ +amdgpu_pasid_free (vm->pasid); vm->pasid =0 ; } -error: +if (pasid) + vm->pasid = pasid; + + goto unreserve_bo; + +free_idr: +if (pasid) +idr_remove (&adev->vm_manager.pasid_idr, pasid); +unreserve_bo:amdgpu_bo_unreserve (vm->root.base.bo);return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-1@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev);void amdgpu_vm_manager_fini (struct amdgpu_device *adev);int amdgpu_vm_init (struct amdgpu_device *adev,struct amdgpu_vm *vm,int vm_context,unsigned int pasid); -int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm); +int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid);void amdgpu_vm_fini (struct amdgpu_device *adev,struct amdgpu_vm *vm);bool amdgpu_vm_pasid_fault_credit (struct amdgpu_device *adev,unsigned int pasid);drivers/gpu/drm/amd/amdkfd/kfd_process.c +2
-2@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,if (drm_file) ret = dev->kfd2kgd->acquire_process_vm ( dev->kgd, drm_file, - &pdd->vm, &p->kgd_process_info, &p->ef); + &pdd->vm, &p->kgd_process_info, p->pasid, &p->ef);else ret = dev->kfd2kgd->create_process_vm ( - dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef); + dev->kgd, &pdd->vm, &p->kgd_process_info, p->pasid, &p->ef);if (ret) {pr_err ("Failed to create process VM object\n" );return ret;drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0
-0@@ -347,9 +347,10 @@ struct kfd2kgd_calls {uint64_t (*get_vram_usage)(struct kgd_dev *kgd);
drivers/gpu/drm/amd/include/kgd_kfd_interface.h struct kfd2kgd_calls { · line 356
Quoted 10 lines
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +3
-2int (*create_process_vm)(struct kgd_dev *kgd,void **vm, -void **process_info,struct dma_fence **ef); +void **process_info,unsigned int pasid,struct dma_fence **ef);int (*acquire_process_vm)(struct kgd_dev *kgd,struct file *filp, -void **vm,void **process_info,struct dma_fence **ef); +void **vm,void **process_info,unsigned int pasid, +struct dma_fence **ef);void (*destroy_process_vm)(struct kgd_dev *kgd,void *vm);uint32_t (*get_process_page_dir)(void *vm); void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx