drm/amdgpu: Improve error handling for HMM
Subsystems (2)
PATCH 1/1 drm/amdgpu: Improve error handling for HMM
Use unsigned long for number of pages.
Check that pfns are valid after hmm_vma_fault. If they are not, return an error instead of continuing with invalid page pointers and PTEs.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +18 -4
@@ -734,10 +734,11 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)struct mm_struct *mm = gtt->usertask->mm;unsigned long start = gtt->userptr;unsigned long end = start + ttm->num_pages *PAGE_SIZE ; -struct hmm_range *ranges;struct vm_area_struct *vma =NULL , *vmas[MAX_NR_VMAS ]; +struct hmm_range *ranges; +unsigned long nr_pages, i;uint64_t *pfns, f; -int r =0 , i, nr_pages; +int r =0 ;if (!mm)/* Happens during process shutdown */ return -ESRCH ;
@@ -813,8 +814,14 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)up_read (&mm->mmap_sem); -for (i =0 ; i < ttm->num_pages; i++) +for (i =0 ; i < ttm->num_pages; i++) { pages[i] =hmm_pfn_to_page (&ranges[0 ], pfns[i]); +if (!pages[i]) { +pr_err ("Page fault failed for pfn[%lu] = 0x%llx\n" , + i, pfns[i]); + goto out_invalid_pfn; + } + } gtt->ranges = ranges;return 0 ;
@@ -827,6 +834,13 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)up_read (&mm->mmap_sem);return r; + +out_invalid_pfn: +for (i =0 ; i < gtt->nr_ranges; i++) +hmm_vma_range_done (&ranges[i]); +kvfree (pfns); +kvfree (ranges); +return -ENOMEM ; }/**
@@ -871,7 +885,7 @@ bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm)*/ void amdgpu_ttm_tt_set_user_pages (struct ttm_tt *ttm,struct page **pages) { -unsigned i; +unsigned long i;for (i =0 ; i < ttm->num_pages; ++i) ttm->pages[i] = pages ? pages[i] :NULL ;
Signature · 6 lines
2.17.1 _______________________________________________ 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): 20190507215202.14616-1-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Yang, Philip
Reviewed-by Philip YangQuoted 7 lines · Felix
Use unsigned long for number of pages.
Check that pfns are valid after
hmm_vma_fault. If they are not, return an error instead of continuing with invalid page pointers and PTEs.Signed-off-by Felix Kuehling <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +17
-3@@ -734,10 +734,11 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)struct mm_struct *mm = gtt->usertask->mm;unsigned long start = gtt->userptr;unsigned long end = start + ttm->num_pages *PAGE_SIZE ; -struct hmm_range *ranges;struct vm_area_struct *vma =NULL , *vmas[MAX_NR_VMAS ]; +struct hmm_range *ranges; +unsigned long nr_pages, i;uint64_t *pfns, f; -int r =0 , i, nr_pages; +int r =0 ;if (!mm)/* Happens during process shutdown */ return -ESRCH ;@@ -813,8 +814,14 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)up_read (&mm->mmap_sem); -for (i =0 ; i < ttm->num_pages; i++) +for (i =0 ; i < ttm->num_pages; i++) { pages[i] =hmm_pfn_to_page (&ranges[0 ], pfns[i]); +if (!pages[i]) { +pr_err ("Page fault failed for pfn[%lu] = 0x%llx\n" , + i, pfns[i]); + goto out_invalid_pfn; + } + } gtt->ranges = ranges;return 0 ;@@ -827,6 +834,13 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)up_read (&mm->mmap_sem);return r; + +out_invalid_pfn: +for (i =0 ; i < gtt->nr_ranges; i++) +hmm_vma_range_done (&ranges[i]); +kvfree (pfns); +kvfree (ranges); +return -ENOMEM ; }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm) · line 891
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -871,7 +885,7 @@ bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm)*/ void amdgpu_ttm_tt_set_user_pages (struct ttm_tt *ttm,struct page **pages) { -unsigned i; +unsigned long i;for (i =0 ; i < ttm->num_pages; ++i) ttm->pages[i] = pages ? pages[i] :NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx