Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b92103b559c77abc5f8b7bec269230a219c880b7

Authored by Ralph Campbell
Committed by Ben Skeggs
1 parent e18c6e8b6f

drm/nouveau/svm: fix vma range check for migration 

find_vma_intersection(mm, start, end) only guarantees that end is greater
than or equal to vma->vm_start but doesn't guarantee that start is
greater than or equal to vma->vm_start. The calculation for the
intersecting range in nouveau_svmm_bind() isn't accounting for this and
can call migrate_vma_setup() with a starting address less than
vma->vm_start. This results in migrate_vma_setup() returning -EINVAL for
the range instead of nouveau skipping that part of the range and migrating
the rest.

Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

Showing 1 changed file with 1 additions and 0 deletions Side-by-side Diff

drivers/gpu/drm/nouveau/nouveau_svm.c
Diff comments   View file @ b92103b
... ... @@ -179,6 +179,7 @@
179 179 if (!vma)
180 180 break;
181 181  
  182 + addr = max(addr, vma->vm_start);
182 183 next = min(vma->vm_end, end);
183 184 /* This is a best effort so we ignore errors */
184 185 nouveau_dmem_migrate_vma(cli->drm, vma, addr, next);