Commit b5f022fe authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

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 earlier.

v3:
Uses MIGRATE_PFN_MIGRATE to identify whether page could be migrated.

v4:
Correct the error part.

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarPhilip <Yang&lt;Philip.Yang@amd.com>
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 19b7f7c7

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+14 −8
Original line number Diff line number Diff line
@@ -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,14 +296,16 @@ 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;



		if (migrate->src[i] & MIGRATE_PFN_MIGRATE) {

			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]);



			mpages++;

		}

		spage = migrate_pfn_to_page(migrate->src[i]);

		if (spage && !is_zone_device_page(spage)) {

			src[i] = dma_map_page(dev, spage, 0, PAGE_SIZE,
@@ -353,9 +356,12 @@ svm_migrate_copy_to_vram(struct kfd_node *node, struct svm_range *prange, 
out_free_vram_pages:

	if (r) {

		pr_debug("failed %d to copy memory to vram\n", r);

		while (i--) {

		for (i = 0; i < npages && mpages; i++) {

			if (!dst[i])

				continue;

			svm_migrate_put_vram_page(adev, dst[i]);

			migrate->dst[i] = 0;

			mpages--;

		}

	}