Commit 66cee909 authored by Alistair Popple's avatar Alistair Popple Committed by Lyude Paul
Browse files

nouveau/svm: Fix to migrate all requested pages 



Users may request that pages from an OpenCL SVM allocation be migrated
to the GPU with clEnqueueSVMMigrateMem(). In Nouveau this will call into
nouveau_dmem_migrate_vma() to do the migration. If the total range to be
migrated exceeds SG_MAX_SINGLE_ALLOC the pages will be migrated in
chunks of size SG_MAX_SINGLE_ALLOC. However a typo in updating the
starting address means that only the first chunk will get migrated.

Fix the calculation so that the entire range will get migrated if
possible.

Signed-off-by: default avatarAlistair Popple <apopple@nvidia.com>
Fixes: e3d8b089 ("drm/nouveau/svm: map pages after migration")
Reviewed-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220720062745.960701-1-apopple@nvidia.com
Cc: <stable@vger.kernel.org> # v5.8+
parent 0c09bc33

drivers/gpu/drm/nouveau/nouveau_dmem.c

+5 −1
Original line number Diff line number Diff line
@@ -680,7 +680,11 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, 
		goto out_free_dma;



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

		args.end = start + (max << PAGE_SHIFT);

		if (args.start + (max << PAGE_SHIFT) > end)

			args.end = end;

		else

			args.end = args.start + (max << PAGE_SHIFT);



		ret = migrate_vma_setup(&args);

		if (ret)

			goto out_free_pfns;