drm/amdkfd: Fix partial migrate issue
Subsystems (3)
PATCH v2 1/1 drm/amdkfd: Fix partial migrate issue
For partial migrate from ram to vram, the migrate->cpages is not equal to migrate->npages, should use migrate->npages to check all needed migrate pages which could be copied or not.
And only need to set those pages could be migrated to migrate->dst[i], or the migrate_vma_pages will migrate the wrong pages based on the migrate->dst[i].
v2:
Add mpages to break the loop eariler.
Signed-off-by Emily Deng <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +7 -5
@@ -278,10 +278,11 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange, struct migrate_vma *migrate, struct dma_fence **mfence, dma_addr_t *scratch, uint64_t ttm_res_offset) { - uint64_t npages = migrate->cpages; + uint64_t npages = migrate->npages;struct amdgpu_device *adev = node->adev;struct device *dev = adev->dev;struct amdgpu_res_cursor cursor; +uint64_t mpages =0 ;dma_addr_t *src;uint64_t *dst;uint64_t i, j;
@@ -295,13 +296,10 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange,amdgpu_res_first (prange->ttm_res, ttm_res_offset, npages <<PAGE_SHIFT , &cursor); -for (i = j =0 ; i < npages; i++) { +for (i = j =0 ; i < npages && mpages < migrate->cpages; i++) {struct page *spage; dst[i] = cursor.start + (j <<PAGE_SHIFT ); - migrate->dst[i] =svm_migrate_addr_to_pfn (adev, dst[i]); -svm_migrate_get_vram_page (prange, migrate->dst[i]); - migrate->dst[i] =migrate_pfn (migrate->dst[i]); spage =migrate_pfn_to_page (migrate->src[i]);if (spage && !is_zone_device_page (spage)) {
@@ -345,6 +343,10 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange, }else { j++; } + migrate->dst[i] =svm_migrate_addr_to_pfn (adev, dst[i]); +svm_migrate_get_vram_page (prange, migrate->dst[i]); + migrate->dst[i] =migrate_pfn (migrate->dst[i]); + mpages++; } r = svm_migrate_copy_memory_gart(adev, src + i - j, dst + i - j, j,
Signature · 1 line
2.34.1