Skip to contentSkip to conversation

drm/amdkfd: Correct partial migration virtual addr

PATCH In review Philip Yang 2 participants 2 messages Jan 15, 2024 – Jan 16, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdkfd: Correct partial migration virtual addr

Partial migration to system memory should use migrate.addr, not prange->start as virtual address to allocate system memory page.

Fixes 18eb61bd5a6a ("drm/amdkfd: Use partial migrations/mapping for GPU/CPU page faults in SVM"
---
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -1
index f856901055d3..bdc01ca9609a 100644
@@ -574,7 +574,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,
 	pr_debug("svms 0x%p [0x%lx 0x%lx]\n", prange->svms, prange->start,
 		 prange->last);
 
-	addr = prange->start << PAGE_SHIFT;
+	addr = migrate->start;
 
 	src = (uint64_t *)(scratch + npages);
 	dst = scratch;
Signature · 1 line
2.35.1
#1 lore raw

This patch is:

Reviewed-by Xiaogang Chen <[email protected]>

Quoted 22 lines · Philip Yang

Partial migration to system memory should use migrate.addr, not prange->start as virtual address to allocate system memory page.

Fixes 18eb61bd5a6a ("drm/amdkfd: Use partial migrations/mapping for GPU/CPU page faults in SVM"
---
  drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -1
index f856901055d3..bdc01ca9609a 100644
@@ -574,7 +574,7 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,
  	pr_debug("svms 0x%p [0x%lx 0x%lx]\n", prange->svms, prange->start,
  		 prange->last);
 
-	addr = prange->start << PAGE_SHIFT;
+	addr = migrate->start;
 
  	src = (uint64_t *)(scratch + npages);
  	dst = scratch;