Commit 3902846a authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/pagemap Fix error paths in drm_pagemap_migrate_to_devmem 



Avoid unlocking and putting device pages unless they were successfully
locked, and do not calculate migrated_pages on error paths.

Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Fixes: 75af93b3 ("drm/pagemap, drm/xe: Support destination migration over interconnect")
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarFrancois Dugast <francois.dugast@intel.com>
Link: https://patch.msgid.link/20260107182716.2236607-2-matthew.brost@intel.com
parent cc54eabd

drivers/gpu/drm/drm_pagemap.c

+5 −3
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, 


	err = ops->populate_devmem_pfn(devmem_allocation, npages, migrate.dst);

	if (err)

		goto err_finalize;

		goto err_aborted_migration;



	own_pages = 0;
@@ -621,9 +621,11 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, 
		err = drm_pagemap_migrate_range(devmem_allocation, migrate.src, migrate.dst,

						pages, pagemap_addr, &last, &cur,

						mdetails);

		if (err)

		if (err) {

			npages = i + 1;

			goto err_finalize;

		}

	}

	cur.start = npages;

	cur.ops = NULL; /* Force migration */

	err = drm_pagemap_migrate_range(devmem_allocation, migrate.src, migrate.dst,
@@ -646,7 +648,7 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, 
err_aborted_migration:

	migrate_vma_pages(&migrate);



	for (i = 0; i < npages;) {

	for (i = 0; !err && i < npages;) {

		struct page *page = migrate_pfn_to_page(migrate.src[i]);

		unsigned long nr_pages = page ? NR_PAGES(folio_order(page_folio(page))) : 1;