]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
nouveau/svm: Fix to migrate all requested pages
authorAlistair Popple <apopple@nvidia.com>
Wed, 20 Jul 2022 06:27:45 +0000 (16:27 +1000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 16 Sep 2022 08:53:39 +0000 (10:53 +0200)
commite4cb4a4d5079a2205347b4a4327ba4d01c17be19
tree28988076ad6907390a1eaa574d04aa80ec37aac2
parentaf567eb3e4aa7b95c2de37c842edf9c89c74483f
nouveau/svm: Fix to migrate all requested pages

BugLink: https://bugs.launchpad.net/bugs/1989218
commit 66cee9097e2b74ff3c8cc040ce5717c521a0c3fa upstream.

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: Alistair Popple <apopple@nvidia.com>
Fixes: e3d8b0890469 ("drm/nouveau/svm: map pages after migration")
Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220720062745.960701-1-apopple@nvidia.com
Cc: <stable@vger.kernel.org> # v5.8+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/gpu/drm/nouveau/nouveau_dmem.c