drm/amdgpu: Fix error handling in amdgpu_amdkfd_gpuvm_free_memory_of_gpu
Subsystems (3)
PATCH 1/1 drm/amdgpu: Fix error handling in amdgpu_amdkfd_gpuvm_free_memory_of_gpu
Following error conditions are fixed:
Unpin MMIO and DOORBELL BOs only after map count goes to zero Remove BO from validate list of a KFD process in a safe manner Print a warning message if unreserving GPUVMs encounters an error
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +25 -17
@@ -1013,14 +1013,22 @@ static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem,mutex_unlock (&process_info->lock); } -static void remove_kgd_mem_from_kfd_bo_list (struct kgd_mem *mem, +/** +* remove_kgd_mem_from_validate_list() - Remove BO from process's validate list, +* in an idempotent manner, so that restore worker can't access it anymore +* @mem: BO's membership handle in validate list +* @process_info: KFD process handle to which BO belongs +* +* Return: void +*/ +static void remove_kgd_mem_from_validate_list (struct kgd_mem *mem,struct amdkfd_process_info *process_info) {struct ttm_validate_buffer *bo_list_entry; bo_list_entry = &mem->validate_list;mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); +list_del_init (&bo_list_entry->head);mutex_unlock (&process_info->lock); }
@@ -1796,7 +1804,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( allocate_init_user_pages_failed: err_pin_bo: -remove_kgd_mem_from_kfd_bo_list (*mem, avm->process_info); +remove_kgd_mem_from_validate_list (*mem, avm->process_info);drm_vma_node_revoke (&gobj->vma_node, drm_priv); err_node_allow:/* Don't unreserve system mem limit twice */
@@ -1825,20 +1833,12 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(unsigned long bo_size = mem->bo->tbo.base.size;struct kfd_mem_attachment *entry, *tmp;struct bo_vm_reservation_context ctx; -struct ttm_validate_buffer *bo_list_entry;unsigned int mapped_to_gpu_memory;int ret;bool is_imported = false;mutex_lock (&mem->lock); -/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ -if (mem->alloc_flags & - (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | -KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) { -amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo); - } - mapped_to_gpu_memory = mem->mapped_to_gpu_memory; is_imported = mem->is_imported;mutex_unlock (&mem->lock);
@@ -1853,10 +1853,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }/* Make sure restore workers don't access the BO any more */ - bo_list_entry = &mem->validate_list; -mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); -mutex_unlock (&process_info->lock); +remove_kgd_mem_from_validate_list (mem, process_info);/* No more MMU notifiers */ amdgpu_mn_unregister (mem->bo);
@@ -1878,7 +1875,18 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(list_for_each_entry_safe (entry, tmp, &mem->attachments, list)kfd_mem_detach (entry); +/* Return success even in case of error */ ret =unreserve_bo_and_vms (&ctx, false, false); +if (unlikely (ret)) { +WARN_ONCE (ret,"Error in unreserving BO and associated VMs" ); + ret =0 ; + } + +/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ +if (mem->alloc_flags & + (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | +KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) +amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo);/* Free the sync object */ amdgpu_sync_free (&mem->sync);
@@ -2814,7 +2822,7 @@ int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem bo_reservation_failure:mutex_unlock (&(*mem)->process_info->lock);amdgpu_sync_free (&(*mem)->sync); -remove_kgd_mem_from_kfd_bo_list (*mem, process_info); +remove_kgd_mem_from_validate_list (*mem, process_info);amdgpu_bo_unref (&gws_bo);mutex_destroy (&(*mem)->lock);kfree (*mem);
@@ -2832,7 +2840,7 @@ int amdgpu_amdkfd_remove_gws_from_process(void *info, void *mem)/* Remove BO from process's validate list so restore worker won't touch * it anymore */ -remove_kgd_mem_from_kfd_bo_list (kgd_mem, process_info); +remove_kgd_mem_from_validate_list (kgd_mem, process_info); ret =amdgpu_bo_reserve (gws_bo, false);if (unlikely (ret)) {
Signature · 1 line
2.35.1
Am 2022-06-10 um 00:04 schrieb Ramesh Errabolu:
Quoted 16 lines
Following error conditions are fixed:
Unpin MMIO and DOORBELL BOs only after map count goes to zero Remove BO from validate list of a KFD process in a safe manner Print a warning message if unreserving GPUVMs encounters an errorSigned-off-by Ramesh Errabolu <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-0@@ -1013,14 +1013,22 @@ static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem,mutex_unlock (&process_info->lock);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem, · line 1022
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +7
-1} -static void remove_kgd_mem_from_kfd_bo_list(struct kgd_mem *mem, +/** +* remove_kgd_mem_from_validate_list() - Remove BO from process's validate list, +* in an idempotent manner, so that restore worker can't access it anymore +* @mem: BO's membership handle in validate list +* @process_info: KFD process handle to which BO belongs +* +* Return: void
I don't think you need to state a void return explicitly. [+David], since you were looking into KFD documentation and kernel-doc comments lately, do you have any feedback on the kernel-doc syntax?
Other than that, this patch is
Quoted 92 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +18
-16+*/ +static void remove_kgd_mem_from_validate_list (struct kgd_mem *mem,struct amdkfd_process_info *process_info) {struct ttm_validate_buffer *bo_list_entry; bo_list_entry = &mem->validate_list;mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); +list_del_init (&bo_list_entry->head);mutex_unlock (&process_info->lock); }@@ -1796,7 +1804,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( allocate_init_user_pages_failed: err_pin_bo: -remove_kgd_mem_from_kfd_bo_list (*mem, avm->process_info); +remove_kgd_mem_from_validate_list (*mem, avm->process_info);drm_vma_node_revoke (&gobj->vma_node, drm_priv); err_node_allow:/* Don't unreserve system mem limit twice */ @@ -1825,20 +1833,12 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(unsigned long bo_size = mem->bo->tbo.base.size;struct kfd_mem_attachment *entry, *tmp;struct bo_vm_reservation_context ctx; -struct ttm_validate_buffer *bo_list_entry;unsigned int mapped_to_gpu_memory;int ret;bool is_imported = false;mutex_lock (&mem->lock); -/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ -if (mem->alloc_flags & - (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | -KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) { -amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo); - } - mapped_to_gpu_memory = mem->mapped_to_gpu_memory; is_imported = mem->is_imported;mutex_unlock (&mem->lock);@@ -1853,10 +1853,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }/* Make sure restore workers don't access the BO any more */ - bo_list_entry = &mem->validate_list; -mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); -mutex_unlock (&process_info->lock); +remove_kgd_mem_from_validate_list (mem, process_info);/* No more MMU notifiers */ amdgpu_mn_unregister (mem->bo);@@ -1878,7 +1875,18 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(list_for_each_entry_safe (entry, tmp, &mem->attachments, list)kfd_mem_detach (entry); +/* Return success even in case of error */ ret =unreserve_bo_and_vms (&ctx, false, false); +if (unlikely (ret)) { +WARN_ONCE (ret,"Error in unreserving BO and associated VMs" ); + ret =0 ; + } + +/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ +if (mem->alloc_flags & + (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | +KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) +amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo);/* Free the sync object */ amdgpu_sync_free (&mem->sync);@@ -2814,7 +2822,7 @@ int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem bo_reservation_failure:mutex_unlock (&(*mem)->process_info->lock);amdgpu_sync_free (&(*mem)->sync); -remove_kgd_mem_from_kfd_bo_list (*mem, process_info); +remove_kgd_mem_from_validate_list (*mem, process_info);amdgpu_bo_unref (&gws_bo);mutex_destroy (&(*mem)->lock);kfree (*mem);@@ -2832,7 +2840,7 @@ int amdgpu_amdkfd_remove_gws_from_process(void *info, void *mem)/* Remove BO from process's validate list so restore worker won't touch * it anymore */ -remove_kgd_mem_from_kfd_bo_list (kgd_mem, process_info); +remove_kgd_mem_from_validate_list (kgd_mem, process_info); ret =amdgpu_bo_reserve (gws_bo, false);if (unlikely (ret)) {
[AMD Official Use Only - General]
Quoted 41 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Felix Kuehling
Sent: Friday, June 10, 2022 4:54 PM
To: Errabolu, Ramesh <[email protected]>; amd- [email protected]; Francis, David <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: Fix error handling inamdgpu_amdkfd_gpuvm_free_memory_of_gpuAm 2022-06-10 um 00:04 schrieb Ramesh Errabolu:
Quoted 8 lines
Following error conditions are fixed:
Unpin MMIO and DOORBELL BOs only after map count goes to zero Remove BO from validate list of a KFD process in a safe manner Print a warning message if unreserving GPUVMs encounters an errorSigned-off-by Ramesh Errabolu <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 42 +++++++++++--------
Review
Quoted 3 lines
1 file changed, 25 insertions(+), 17 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.cdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static void add_kgd_mem_to_kfd_bo_list(struct
Quoted 4 lines
index
a1de900ba677..ee48e6591f99100644drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-0@@ -1013,14 +1013,22 @@ static void add_kgd_mem_to_kfd_bo_list(struct
kgd_mem*mem,drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem,
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +2
-1mutex_unlock (&process_info->lock); } -static void remove_kgd_mem_from_kfd_bo_list(struct kgd_mem *mem, +/** +* remove_kgd_mem_from_validate_list() - Remove BO from process's validate list,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem, · line 1022
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +5
-0+* in an idempotent manner, so that restore worker can't access it anymore +* @mem: BO's membership handle in validate list +* @process_info: KFD process handle to which BO belongs +* +* Return: void
Quoted 5 lines
I don't think you need to state a void return explicitly. [+David], since you were looking into KFD documentation and kernel-doc comments lately, do you have any feedback on the kernel-doc syntax?
Other than that, this patch is
Indeed, it's not required for void functions:
"A non-void function should have a Return: section describing the return value(s). Example-sections should contain the string EXAMPLE so that they are marked appropriately in the output format." -https://return42.github.io/linuxdoc/linuxdoc-howto/kernel-doc-syntax.html
Since that's not official kernel-doc documentation, we have:
-https://github.com/torvalds/linux/blob/master/scripts/kernel-doc#L1625
-https://docs.kernel.org/doc-guide/kernel-doc.html just says "return value (if any)". So it's not explicit, but the kernel-doc checker (github link above) explicitly ignores return on void, so we can drop it for clarity. It's not an error, but it's not required (or terribly helpful) so let's drop it.
Kent
Quoted 104 lines
Reviewed-by Felix Kuehling <[email protected]>drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3
-1+*/ +static void remove_kgd_mem_from_validate_list (struct kgd_mem *mem,struct amdkfd_process_info *process_info) {struct ttm_validate_buffer *bo_list_entry; bo_list_entry = &mem->validate_list;mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); +list_del_init (&bo_list_entry->head);mutex_unlock (&process_info->lock); }@@ -1796,7 +1804,7 @@ intamdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-1allocate_init_user_pages_failed: err_pin_bo: -remove_kgd_mem_from_kfd_bo_list (*mem, avm->process_info); +remove_kgd_mem_from_validate_list (*mem, avm->process_info);drm_vma_node_revoke (&gobj->vma_node, drm_priv); err_node_allow:/* Don't unreserve system mem limit twice */ @@ -1825,20 +1833,12 @@ intamdgpu_amdkfd_gpuvm_free_memory_of_gpu(
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int
Quoted 21 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-8unsigned long bo_size = mem->bo->tbo.base.size;struct kfd_mem_attachment *entry, *tmp;struct bo_vm_reservation_context ctx; -struct ttm_validate_buffer *bo_list_entry;unsigned int mapped_to_gpu_memory;int ret;bool is_imported = false;mutex_lock (&mem->lock); -/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ -if (mem->alloc_flags & - (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | -KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) { -amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo); - } - mapped_to_gpu_memory = mem->mapped_to_gpu_memory; is_imported = mem->is_imported;mutex_unlock (&mem->lock);@@ -1853,10 +1853,7 @@ intamdgpu_amdkfd_gpuvm_free_memory_of_gpu(
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-4}/* Make sure restore workers don't access the BO any more */ - bo_list_entry = &mem->validate_list; -mutex_lock (&process_info->lock); -list_del (&bo_list_entry->head); -mutex_unlock (&process_info->lock); +remove_kgd_mem_from_validate_list (mem, process_info);/* No more MMU notifiers */ amdgpu_mn_unregister (mem->bo);@@ -1878,7 +1875,18 @@ intamdgpu_amdkfd_gpuvm_free_memory_of_gpu(
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3
-0list_for_each_entry_safe (entry, tmp, &mem->attachments, list)kfd_mem_detach (entry); +/* Return success even in case of error */ ret =unreserve_bo_and_vms (&ctx, false, false); +if (unlikely (ret)) { + WARN_ONCE(ret, "Error in unreserving BO and associatedVMs");
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int amdgpu_amdkfd_add_gws_to_process(void
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +8
-0+ ret =0 ; + } + +/* Unpin MMIO/DOORBELL BO's that were pinned during allocation */ +if (mem->alloc_flags & + (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | +KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) +amdgpu_amdkfd_gpuvm_unpin_bo (mem->bo);/* Free the sync object */ amdgpu_sync_free (&mem->sync);@@ -2814,7 +2822,7 @@ int amdgpu_amdkfd_add_gws_to_process(void*info, void *gws, struct
kgd_mem**memdrivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-1bo_reservation_failure:mutex_unlock (&(*mem)->process_info->lock);amdgpu_sync_free (&(*mem)->sync); -remove_kgd_mem_from_kfd_bo_list (*mem, process_info); +remove_kgd_mem_from_validate_list (*mem, process_info);amdgpu_bo_unref (&gws_bo);mutex_destroy (&(*mem)->lock);kfree (*mem);@@ -2832,7 +2840,7 @@ int
amdgpu_amdkfd_remove_gws_from_process(void *info, void *mem)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int · line 2840
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-0/* Remove BO from process's validate list so restore worker won't touch
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1
-1* it anymore */ -remove_kgd_mem_from_kfd_bo_list (kgd_mem, process_info); +remove_kgd_mem_from_validate_list (kgd_mem, process_info); ret =amdgpu_bo_reserve (gws_bo, false);if (unlikely (ret)) {