drm/amdkfd: evict svm bo worker handle error
Subsystems (3)
PATCH 1/1 drm/amdkfd: evict svm bo worker handle error
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets prange->svm_bo to NULL and warn svm_bo ref count != 1 only if migrating vram to ram successfully.
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 27 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 ++++++++++-------- 2 files changed, 33 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +22 -5
@@ -638,6 +638,22 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,return r; } +/** +* svm_migrate_vma_to_ram - migrate range inside one vma from device to system +* +* @adev: amdgpu device to migrate from +* @prange: svm range structure +* @vma: vm_area_struct that range [start, end] belongs to +* @start: range start virtual address in pages +* @end: range end virtual address in pages +* +* Context: Process context, caller hold mmap read lock, svms lock, prange lock +* +* Return: +* 0 - success with all pages migrated +* negative values - indicate error +* positive values - partial migration, number of pages not migrated +*/ static long svm_migrate_vma_to_ram (struct amdgpu_device *adev,struct svm_range *prange,struct vm_area_struct *vma,uint64_t start,uint64_t end)
@@ -709,8 +725,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd =svm_range_get_pdd_by_adev (prange, adev);if (pdd)WRITE_ONCE (pdd->page_out, pdd->page_out + cpages); - -return upages; }return r ? r : upages; }
@@ -759,13 +773,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)unsigned long next; vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start) +if (!vma || addr < vma->vm_start) { +pr_debug ("failed to find vma for prange %p\n" , prange); + r = -EFAULT ;break ; + } next =min (vma->vm_end, end); r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next);if (r <0 ) { -pr_debug ("failed %ld to migrate\n" , r); +pr_debug ("failed %ld to migrate prange %p\n" , r, prange);break ; }else { upages += r;
@@ -773,7 +790,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } -if (!upages) { +if (r >=0 && !upages) {svm_range_vram_node_free (prange); prange->actual_loc =0 ; }
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +11 -9
@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)struct svm_range_bo *svm_bo;struct kfd_process *p;struct mm_struct *mm; +int r =0 ; svm_bo = container_of(work, struct svm_range_bo, eviction_work);if (!svm_bo_ref_unless_zero (svm_bo))
@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_lock (mm);spin_lock (&svm_bo->list_lock); -while (!list_empty (&svm_bo->range_list)) { +while (!list_empty (&svm_bo->range_list) && !r) {struct svm_range *prange =list_first_entry (&svm_bo->range_list, struct svm_range, svm_bo_list);
@@ -3184,15 +3185,15 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mutex_lock (&prange->migrate_mutex);do { -svm_migrate_vram_to_ram (prange, + r =svm_migrate_vram_to_ram (prange, svm_bo->eviction_fence->mm); - }while (prange->actual_loc && --retries); -WARN (prange->actual_loc,"Migration failed during eviction" ); - -mutex_lock (&prange->lock); - prange->svm_bo =NULL ; -mutex_unlock (&prange->lock); + }while (!r && prange->actual_loc && --retries); +if (!prange->actual_loc) { +mutex_lock (&prange->lock); + prange->svm_bo =NULL ; +mutex_unlock (&prange->lock); + }mutex_unlock (&prange->migrate_mutex);spin_lock (&svm_bo->list_lock);
@@ -3201,10 +3202,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_unlock (mm);dma_fence_signal (&svm_bo->eviction_fence->base); +/* This is the last reference to svm_bo, after svm_range_vram_node_free * has been called in svm_migrate_vram_to_ram */ -WARN_ONCE (kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" ); +WARN_ONCE (!r &&kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" );svm_range_bo_unref (svm_bo); }
Signature · 1 line
2.35.1
Felix Kuehling
maintainerAm 2022-03-14 um 10:50 schrieb Philip Yang:
Quoted 100 lines
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets
prange->svm_boto NULL and warnsvm_boref count != 1 only if migrating vram to ram successfully.Signed-off-by Philip Yang <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 27 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 ++++++++++-------- 2 files changed, 33 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +22
-5@@ -638,6 +638,22 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,return r; } +/** +* svm_migrate_vma_to_ram - migrate range inside one vma from device to system +* +* @adev: amdgpu device to migrate from +* @prange: svm range structure +* @vma: vm_area_struct that range [start, end] belongs to +* @start: range start virtual address in pages +* @end: range end virtual address in pages +* +* Context: Process context, caller hold mmap read lock, svms lock, prange lock +* +* Return: +* 0 - success with all pages migrated +* negative values - indicate error +* positive values - partial migration, number of pages not migrated +*/ static long svm_migrate_vma_to_ram (struct amdgpu_device *adev,struct svm_range *prange,struct vm_area_struct *vma,uint64_t start,uint64_t end)@@ -709,8 +725,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd =svm_range_get_pdd_by_adev (prange, adev);if (pdd)WRITE_ONCE (pdd->page_out, pdd->page_out + cpages); - -return upages; }return r ? r : upages; }@@ -759,13 +773,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)unsigned long next; vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start) +if (!vma || addr < vma->vm_start) { +pr_debug ("failed to find vma for prange %p\n" , prange); + r = -EFAULT ;break ; + } next =min (vma->vm_end, end); r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next);if (r <0 ) { -pr_debug ("failed %ld to migrate\n" , r); +pr_debug ("failed %ld to migrate prange %p\n" , r, prange);break ; }else { upages += r;@@ -773,7 +790,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } -if (!upages) { +if (r >=0 && !upages) {svm_range_vram_node_free (prange); prange->actual_loc =0 ; }drivers/gpu/drm/amd/amdkfd/kfd_svm.c +2
-1@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)struct svm_range_bo *svm_bo;struct kfd_process *p;struct mm_struct *mm; +int r =0 ; svm_bo = container_of(work, struct svm_range_bo, eviction_work);if (!svm_bo_ref_unless_zero (svm_bo))@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_lock (mm);spin_lock (&svm_bo->list_lock); -while (!list_empty (&svm_bo->range_list)) { +while (!list_empty (&svm_bo->range_list) && !r) {struct svm_range *prange =list_first_entry (&svm_bo->range_list, struct svm_range, svm_bo_list);@@ -3184,15 +3185,15 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mutex_lock (&prange->migrate_mutex); do {
drivers/gpu/drm/amd/amdkfd/kfd_svm.c static void svm_range_evict_svm_bo_worker(struct work_struct *work) · line 3190
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +2
-7-svm_migrate_vram_to_ram (prange, + r =svm_migrate_vram_to_ram (prange, svm_bo->eviction_fence->mm); - }while (prange->actual_loc && --retries); -WARN (prange->actual_loc,"Migration failed during eviction" ); - -mutex_lock (&prange->lock); - prange->svm_bo =NULL ; -mutex_unlock (&prange->lock); + }while (!r && prange->actual_loc && --retries);
I think it would still be good to have a WARN here for other cases than process termination. Is there a way to distinguish the process termination case from the error code? Maybe we could even avoid the retry in this case.
Other than that, this patch is a good improvement on the error handling.
Regards,
Felix
Quoted 22 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +7
-1+if (!prange->actual_loc) { +mutex_lock (&prange->lock); + prange->svm_bo =NULL ; +mutex_unlock (&prange->lock); + }mutex_unlock (&prange->migrate_mutex);spin_lock (&svm_bo->list_lock);@@ -3201,10 +3202,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_unlock (mm);dma_fence_signal (&svm_bo->eviction_fence->base); +/* This is the last reference to svm_bo, after svm_range_vram_node_free * has been called in svm_migrate_vram_to_ram */ -WARN_ONCE (kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" ); +WARN_ONCE (!r &&kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" );svm_range_bo_unref (svm_bo); }
On 2022-03-14 3:58 p.m., Felix Kuehling wrote:
Am 2022-03-14 um 10:50 schrieb Philip Yang:
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets prange->svm_bo to NULL and warn svm_bo ref count != 1 only if migrating vram to ram successfully.
---
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 27 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 ++++++++++--------
2 files changed, 33 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +0 -0
@@ -638,6 +638,22 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,
return r;
}
+/**
+ * svm_migrate_vma_to_ram - migrate range inside one vma from device to system
+ *
+ * @adev: amdgpu device to migrate from
+ * @prange: svm range structure
+ * @vma: vm_area_struct that range [start, end] belongs to
+ * @start: range start virtual address in pages
+ * @end: range end virtual address in pages
+ *
+ * Context: Process context, caller hold mmap read lock, svms lock, prange lock
+ *
+ * Return:
+ * 0 - success with all pages migrated
+ * negative values - indicate error
+ * positive values - partial migration, number of pages not migrated
+ */
static long
svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, struct vm_area_struct *vma, uint64_t start, uint64_t end)
@@ -709,8 +725,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd = svm_range_get_pdd_by_adev(prange, adev);
if (pdd)
WRITE_ONCE(pdd->page_out, pdd->page_out + cpages);
-
- return upages;
}
return r ? r : upages;
}
@@ -759,13 +773,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) unsigned long next;
vma = find_vma(mm, addr);
- if (!vma || addr < vma->vm_start)
+ if (!vma || addr < vma->vm_start) {+ pr_debug("failed to find vma for prange %p\n", prange);
+ r = -EFAULT;
break;
+ }
next = min(vma->vm_end, end);
r = svm_migrate_vma_to_ram(adev, prange, vma, addr, next);
if (r < 0) {
- pr_debug("failed %ld to migrate\n", r);
+ pr_debug("failed %ld to migrate prange %p\n", r, prange);
break;
} else {
upages += r;
@@ -773,7 +790,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next;
}
- if (!upages) {
+ if (r >= 0 && !upages) {
svm_range_vram_node_free(prange);
prange->actual_loc = 0;
}
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +0 -0
@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)
struct svm_range_bo *svm_bo;
struct kfd_process *p;
struct mm_struct *mm;
+ int r = 0;
svm_bo = container_of(work, struct svm_range_bo, eviction_work);
if (!svm_bo_ref_unless_zero(svm_bo))
@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_lock(mm);
spin_lock(&svm_bo->list_lock);
- while (!list_empty(&svm_bo->range_list)) {
+ while (!list_empty(&svm_bo->range_list) && !r) {
struct svm_range *prange =
list_first_entry(&svm_bo->range_list,
struct svm_range, svm_bo_list);
@@ -3184,15 +3185,15 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mutex_lock(&prange->migrate_mutex);
do {
- svm_migrate_vram_to_ram(prange,
+ r = svm_migrate_vram_to_ram(prange, svm_bo->eviction_fence->mm);
- } while (prange->actual_loc && --retries);
- WARN(prange->actual_loc, "Migration failed during eviction");
-
- mutex_lock(&prange->lock);
- prange->svm_bo = NULL;
- mutex_unlock(&prange->lock);
+ } while (!r && prange->actual_loc && --retries);
I think it would still be good to have a WARN here for other cases than process termination. Is there a way to distinguish the process termination case from the error code? Maybe we could even avoid the retry in this case.
It was bug that prange->actual_loc set to 0 even if vma not found, that's why this WARN never trigger. With this fix, the WARN is kind of duplicate with below WARN_ONCE. Change this to pr_info_once to help debug, as below WARN_ONCE is real critical issue to notify TTM to alloc VRAM from BO while svm_bo ref count is not 1. retry is avoided if r return error code.
Regards,
Philip
Other than that, this patch is a good improvement on the error handling.
Regards,
Felix
+ if (!prange->actual_loc) {
+ mutex_lock(&prange->lock);
+ prange->svm_bo = NULL;
+ mutex_unlock(&prange->lock);
+ }
mutex_unlock(&prange->migrate_mutex); spin_lock(&svm_bo->list_lock);
@@ -3201,10 +3202,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_unlock(mm);
dma_fence_signal(&svm_bo->eviction_fence->base);
+
/* This is the last reference to svm_bo, after svm_range_vram_node_free
* has been called in svm_migrate_vram_to_ram
*/
- WARN_ONCE(kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); + WARN_ONCE(!r && kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); svm_range_bo_unref(svm_bo);
}
Felix Kuehling
maintainerAm 2022-03-15 um 10:44 schrieb philip yang:
Quoted 120 lines · Felix Kuehling
Quoted 108 lines
Am 2022-03-14 um 10:50 schrieb Philip Yang:
Quoted 107 lines
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets
prange->svm_boto NULL and warnsvm_boref count != 1 only if migrating vram to ram successfully.Signed-off-by Philip Yang <[email protected]>---
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c| 27
+++++++++++++++++++-----
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 ++++++++++--------2 files changed, 33 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +0
-0@@ -638,6 +638,22 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange, return r; }+/**
+ *svm_migrate_vma_to_ram- migrate range inside one vma from device to system
+ *
+ * @adev: amdgpu device to migrate from
+ * @prange: svm range structure
+ * @vma:vm_area_structthat range [start, end] belongs to
+ * @start: range start virtual address in pages
+ * @end: range end virtual address in pages
+ *
+ * Context: Process context, caller hold mmap read lock, svms lock, prange lock
+ *
+ * Return:
+ * 0 - success with all pages migrated
+ * negative values - indicate error
+ * positive values - partial migration, number of pages not migrated
+ */
static long
svm_migrate_vma_to_ram(structamdgpu_device*adev, structsvm_range*prange, structvm_area_struct*vma,uint64_tstart,uint64_tend)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +0
-2@@ -709,8 +725,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd = svm_range_get_pdd_by_adev(prange, adev); if (pdd) WRITE_ONCE(pdd->page_out, pdd->page_out + cpages); - - return upages; } return r ? r : upages;}
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +6
-2@@ -759,13 +773,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) unsigned long next; vma = find_vma(mm, addr); - if (!vma || addr < vma->vm_start) + if (!vma || addr < vma->vm_start) { + pr_debug("failed to find vma for prange %p\n", prange); + r = -EFAULT; break; + } next = min(vma->vm_end, end); r = svm_migrate_vma_to_ram(adev, prange, vma, addr, next); if (r < 0) { - pr_debug("failed %ld to migrate\n", r); + pr_debug("failed %ld to migrate prange %p\n", r, prange); break; } else { upages += r;@@ -773,7 +790,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } - if (!upages) { + if (r >= 0 && !upages) { svm_range_vram_node_free(prange); prange->actual_loc = 0;}
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +2
-1@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) struct svm_range_bo *svm_bo; struct kfd_process *p; struct mm_struct *mm; + int r = 0; svm_bo = container_of(work, struct svm_range_bo, eviction_work); if (!svm_bo_ref_unless_zero(svm_bo))@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_lock(mm); spin_lock(&svm_bo->list_lock); - while (!list_empty(&svm_bo->range_list)) { + while (!list_empty(&svm_bo->range_list) && !r) {struct
svm_range*prange =list_first_entry(&svm_bo->range_list, struct svm_range, svm_bo_list);drivers/gpu/drm/amd/amdkfd/kfd_svm.c +1
-2@@ -3184,15 +3185,15 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mutex_lock(&prange->migrate_mutex); do { - svm_migrate_vram_to_ram(prange, + r = svm_migrate_vram_to_ram(prange, svm_bo->eviction_fence->mm); - } while (prange->actual_loc && --retries);Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c static void · line 3190
Quoted 6 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +1
-5- WARN(prange->actual_loc, "Migration failed during eviction"); - - mutex_lock(&prange->lock); - prange->svm_bo = NULL; - mutex_unlock(&prange->lock); + } while (!r && prange->actual_loc && --retries);I think it would still be good to have a WARN here for other cases than process termination. Is there a way to distinguish the process termination case from the error code? Maybe we could even avoid the retry in this case.
Quoted 2 lines
It was bug that
prange->actual_locset to 0 even if vma not found, that's why this WARN never trigger. With this fix, the WARN is kind of duplicate with belowWARN_ONCE. Change this topr_info_onceto help debug, as belowWARN_ONCEis real critical issue to notify TTM to alloc VRAM from BO whilesvm_boref count is not 1.
OK, makes sense.
Quoted 2 lines
retry is avoided if r return error code.
Right, I didn't read it carefully. I think my concern is, that the WARN_ONCE is only printed, if the migration failure occurs with r==0. If it fails for any other reason, we no longer warn about it. This is kind of intentional, because you don't want to print the warning in the process termination case, where the error is expected. I'm just a little worried that there may be other error conditions that can cause a migration failure with r!=0, where we're now failing silently.
Regards,
Felix
Quoted 31 lines
Regards,
Philip
Quoted 27 lines
Other than that, this patch is a good improvement on the error handling.
Regards,
FelixQuoted 21 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +6
-1+ if (!prange->actual_loc) { + mutex_lock(&prange->lock); + prange->svm_bo = NULL; + mutex_unlock(&prange->lock); + } mutex_unlock(&prange->migrate_mutex); spin_lock(&svm_bo->list_lock);@@ -3201,10 +3202,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_unlock(mm);dma_fence_signal (&svm_bo->eviction_fence->base); + /* This is the last reference to svm_bo, after svm_range_vram_node_free* has been called in svm_migrate_vram_to_ram */ - WARN_ONCE(kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); + WARN_ONCE(!r && kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); svm_range_bo_unref(svm_bo);}
Felix Kuehling
maintainerAm 2022-03-14 um 10:50 schrieb Philip Yang:
Quoted 19 lines
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets
prange->svm_boto NULL and warnsvm_boref count != 1 only if migrating vram to ram successfully.Signed-off-by Philip Yang <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 27 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 20 ++++++++++-------- 2 files changed, 33 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +0
-0@@ -638,6 +638,22 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,return r; }
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange, · line 650
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +10
-0+/** +* svm_migrate_vma_to_ram - migrate range inside one vma from device to system +* +* @adev: amdgpu device to migrate from +* @prange: svm range structure +* @vma: vm_area_struct that range [start, end] belongs to +* @start: range start virtual address in pages +* @end: range end virtual address in pages +* +* Context: Process context, caller hold mmap read lock, svms lock, prange lock
I believe this is not quite correct. In svm_range_evict_svm_bo_worker we're not holding the smvs->lock.
Regards,
Felix
Quoted 103 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +12
-5+* +* Return: +* 0 - success with all pages migrated +* negative values - indicate error +* positive values - partial migration, number of pages not migrated +*/ static long svm_migrate_vma_to_ram (struct amdgpu_device *adev,struct svm_range *prange,struct vm_area_struct *vma,uint64_t start,uint64_t end)@@ -709,8 +725,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd =svm_range_get_pdd_by_adev (prange, adev);if (pdd)WRITE_ONCE (pdd->page_out, pdd->page_out + cpages); - -return upages; }return r ? r : upages; }@@ -759,13 +773,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)unsigned long next; vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start) +if (!vma || addr < vma->vm_start) { +pr_debug ("failed to find vma for prange %p\n" , prange); + r = -EFAULT ;break ; + } next =min (vma->vm_end, end); r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next);if (r <0 ) { -pr_debug ("failed %ld to migrate\n" , r); +pr_debug ("failed %ld to migrate prange %p\n" , r, prange);break ; }else { upages += r;@@ -773,7 +790,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } -if (!upages) { +if (r >=0 && !upages) {svm_range_vram_node_free (prange); prange->actual_loc =0 ; }drivers/gpu/drm/amd/amdkfd/kfd_svm.c +11
-9@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)struct svm_range_bo *svm_bo;struct kfd_process *p;struct mm_struct *mm; +int r =0 ; svm_bo = container_of(work, struct svm_range_bo, eviction_work);if (!svm_bo_ref_unless_zero (svm_bo))@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_lock (mm);spin_lock (&svm_bo->list_lock); -while (!list_empty (&svm_bo->range_list)) { +while (!list_empty (&svm_bo->range_list) && !r) {struct svm_range *prange =list_first_entry (&svm_bo->range_list, struct svm_range, svm_bo_list);@@ -3184,15 +3185,15 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mutex_lock (&prange->migrate_mutex);do { -svm_migrate_vram_to_ram (prange, + r =svm_migrate_vram_to_ram (prange, svm_bo->eviction_fence->mm); - }while (prange->actual_loc && --retries); -WARN (prange->actual_loc,"Migration failed during eviction" ); - -mutex_lock (&prange->lock); - prange->svm_bo =NULL ; -mutex_unlock (&prange->lock); + }while (!r && prange->actual_loc && --retries); +if (!prange->actual_loc) { +mutex_lock (&prange->lock); + prange->svm_bo =NULL ; +mutex_unlock (&prange->lock); + }mutex_unlock (&prange->migrate_mutex);spin_lock (&svm_bo->list_lock);@@ -3201,10 +3202,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_unlock (mm);dma_fence_signal (&svm_bo->eviction_fence->base); +/* This is the last reference to svm_bo, after svm_range_vram_node_free * has been called in svm_migrate_vram_to_ram */ -WARN_ONCE (kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" ); +WARN_ONCE (!r &&kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" );svm_range_bo_unref (svm_bo); }
PATCH v2 1/1 drm/amdkfd: evict svm bo worker handle error
In reply to Philip YangMigrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets prange->svm_bo to NULL and warn svm_bo ref count != 1 only if migrating vram to ram successfully. Signed-off-by: Philip Yang <[email protected]> --- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 28 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 +++++++++++------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index 7f689094be5a..7187417273f9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -638,6 +638,23 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange, return r; } +/** + * svm_migrate_vma_to_ram - migrate range inside one vma from device to system + * + * @adev: amdgpu device to migrate from + * @prange: svm range structure + * @vma: vm_area_struct that range [start, end] belongs to + * @start: range start virtual address in pages + * @end: range end virtual address in pages + * + * Context: Process context, caller hold mmap read lock, svms lock except calling + * from svm_range_evict_svm_bo_worker, prange->migrate_mutex + * + * Return: + * 0 - success with all pages migrated + * negative values - indicate error + * positive values - partial migration, number of pages not migrated + */ static long svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, struct vm_area_struct *vma, uint64_t start, uint64_t end) @@ -709,8 +726,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd = svm_range_get_pdd_by_adev(prange, adev); if (pdd) WRITE_ONCE(pdd->page_out, pdd->page_out + cpages); - - return upages; } return r ? r : upages; } @@ -759,13 +774,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) unsigned long next; vma = find_vma(mm, addr); - if (!vma || addr < vma->vm_start) + if (!vma || addr < vma->vm_start) { + pr_debug("failed to find vma for prange %p\n", prange); + r = -EFAULT; break; + } next = min(vma->vm_end, end); r = svm_migrate_vma_to_ram(adev, prange, vma, addr, next); if (r < 0) { - pr_debug("failed %ld to migrate\n", r); + pr_debug("failed %ld to migrate prange %p\n", r, prange); break; } else { upages += r; @@ -773,7 +791,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } - if (!upages) { + if (r >= 0 && !upages) { svm_range_vram_node_free(prange); prange->actual_loc = 0; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index 509d915cbe69..3b8856b4cece 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) struct svm_range_bo *svm_bo; struct kfd_process *p; struct mm_struct *mm; + int r = 0; svm_bo = container_of(work, struct svm_range_bo, eviction_work); if (!svm_bo_ref_unless_zero(svm_bo)) @@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_lock(mm); spin_lock(&svm_bo->list_lock); - while (!list_empty(&svm_bo->range_list)) { + while (!list_empty(&svm_bo->range_list) && !r) { struct svm_range *prange = list_first_entry(&svm_bo->range_list, struct svm_range, svm_bo_list); @@ -3184,15 +3185,18 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mutex_lock(&prange->migrate_mutex); do { - svm_migrate_vram_to_ram(prange, + r = svm_migrate_vram_to_ram(prange, svm_bo->eviction_fence->mm); - } while (prange->actual_loc && --retries); - WARN(prange->actual_loc, "Migration failed during eviction"); + } while (!r && prange->actual_loc && --retries); - mutex_lock(&prange->lock); - prange->svm_bo = NULL; - mutex_unlock(&prange->lock); + if (!r && prange->actual_loc) + pr_info_once("Migration failed during eviction"); + if (!prange->actual_loc) { + mutex_lock(&prange->lock); + prange->svm_bo = NULL; + mutex_unlock(&prange->lock); + } mutex_unlock(&prange->migrate_mutex); spin_lock(&svm_bo->list_lock); @@ -3201,10 +3205,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work) mmap_read_unlock(mm); dma_fence_signal(&svm_bo->eviction_fence->base); + /* This is the last reference to svm_bo, after svm_range_vram_node_free * has been called in svm_migrate_vram_to_ram */ - WARN_ONCE(kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); + WARN_ONCE(!r && kref_read(&svm_bo->kref) != 1, "This was not the last reference\n"); svm_range_bo_unref(svm_bo); } -- 2.35.1
Am 2022-03-15 um 11:05 schrieb philip yang:
Quoted 20 lines
Migrate vram to ram may fail to find the vma if process is exiting and vma is removed, evict svm bo worker sets
prange->svm_boto NULL and warnsvm_boref count != 1 only if migrating vram to ram successfully.Signed-off-by Philip Yang<[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 28 +++++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 +++++++++++------- 2 files changed, 36 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1
-0@@ -638,6 +638,23 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,return r; } +/**
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange, · line 651
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +10
-0+* svm_migrate_vma_to_ram - migrate range inside one vma from device to system +* +* @adev: amdgpu device to migrate from +* @prange: svm range structure +* @vma: vm_area_struct that range [start, end] belongs to +* @start: range start virtual address in pages +* @end: range end virtual address in pages +* +* Context: Process context, caller hold mmap read lock, svms lock except calling +* from svm_range_evict_svm_bo_worker, prange->migrate_mutex
This doesn't make a lot of sense to me. This function either requires that svms->lock is held, or it doesn't. If svm_range_evict_svm_bo_worker functions without holding that lock, it means this function doesn't depend on it. I'd just remove the "svms lock ..." from the comment. Also remove it from the comment above svm_migrate_vram_to_ram for consistency.
With that fixed, the patch is
Quoted 106 lines
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +12
-5+* +* Return: +* 0 - success with all pages migrated +* negative values - indicate error +* positive values - partial migration, number of pages not migrated +*/ static long svm_migrate_vma_to_ram (struct amdgpu_device *adev,struct svm_range *prange,struct vm_area_struct *vma,uint64_t start,uint64_t end)@@ -709,8 +726,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, pdd =svm_range_get_pdd_by_adev (prange, adev);if (pdd)WRITE_ONCE (pdd->page_out, pdd->page_out + cpages); - -return upages; }return r ? r : upages; }@@ -759,13 +774,16 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)unsigned long next; vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start) +if (!vma || addr < vma->vm_start) { +pr_debug ("failed to find vma for prange %p\n" , prange); + r = -EFAULT ;break ; + } next =min (vma->vm_end, end); r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next);if (r <0 ) { -pr_debug ("failed %ld to migrate\n" , r); +pr_debug ("failed %ld to migrate prange %p\n" , r, prange);break ; }else { upages += r;@@ -773,7 +791,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm) addr = next; } -if (!upages) { +if (r >=0 && !upages) {svm_range_vram_node_free (prange); prange->actual_loc =0 ; }drivers/gpu/drm/amd/amdkfd/kfd_svm.c +13
-9@@ -3155,6 +3155,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)struct svm_range_bo *svm_bo;struct kfd_process *p;struct mm_struct *mm; +int r =0 ; svm_bo = container_of(work, struct svm_range_bo, eviction_work);if (!svm_bo_ref_unless_zero (svm_bo))@@ -3170,7 +3171,7 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_lock (mm);spin_lock (&svm_bo->list_lock); -while (!list_empty (&svm_bo->range_list)) { +while (!list_empty (&svm_bo->range_list) && !r) {struct svm_range *prange =list_first_entry (&svm_bo->range_list, struct svm_range, svm_bo_list);@@ -3184,15 +3185,18 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mutex_lock (&prange->migrate_mutex);do { -svm_migrate_vram_to_ram (prange, + r =svm_migrate_vram_to_ram (prange, svm_bo->eviction_fence->mm); - }while (prange->actual_loc && --retries); -WARN (prange->actual_loc,"Migration failed during eviction" ); + }while (!r && prange->actual_loc && --retries); -mutex_lock (&prange->lock); - prange->svm_bo =NULL ; -mutex_unlock (&prange->lock); +if (!r && prange->actual_loc) +pr_info_once ("Migration failed during eviction" ); +if (!prange->actual_loc) { +mutex_lock (&prange->lock); + prange->svm_bo =NULL ; +mutex_unlock (&prange->lock); + }mutex_unlock (&prange->migrate_mutex);spin_lock (&svm_bo->list_lock);@@ -3201,10 +3205,11 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mmap_read_unlock (mm);dma_fence_signal (&svm_bo->eviction_fence->base); +/* This is the last reference to svm_bo, after svm_range_vram_node_free * has been called in svm_migrate_vram_to_ram */ -WARN_ONCE (kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" ); +WARN_ONCE (!r &&kref_read (&svm_bo->kref) !=1 ,"This was not the last reference\n" );svm_range_bo_unref (svm_bo); } -- 2.35.1