[Nouveau] [PATCH drm-misc-next v9 04/12] drm/nouveau: make use of drm_gpuvm_range_valid()

[Danilo Krummrich]

Use drm_gpuvm_range_valid() in order to validate userspace requests.

Reviewed-by: Dave Airlie <airl...@redhat.com>
Signed-off-by: Danilo Krummrich <d...@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_uvmm.c | 17 +----------------
 drivers/gpu/drm/nouveau/nouveau_uvmm.h |  3 ---
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c 
b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
index aaf5d28bd587..641a911528db 100644
--- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
@@ -929,25 +929,13 @@ nouveau_uvmm_sm_unmap_cleanup(struct nouveau_uvmm *uvmm,
 static int
 nouveau_uvmm_validate_range(struct nouveau_uvmm *uvmm, u64 addr, u64 range)
 {
-       u64 end = addr + range;
-       u64 kernel_managed_end = uvmm->kernel_managed_addr +
-                                uvmm->kernel_managed_size;
-
        if (addr & ~PAGE_MASK)
                return -EINVAL;
 
        if (range & ~PAGE_MASK)
                return -EINVAL;
 
-       if (end <= addr)
-               return -EINVAL;
-
-       if (addr < NOUVEAU_VA_SPACE_START ||
-           end > NOUVEAU_VA_SPACE_END)
-               return -EINVAL;
-
-       if (addr < kernel_managed_end &&
-           end > uvmm->kernel_managed_addr)
+       if (!drm_gpuvm_range_valid(&uvmm->base, addr, range))
                return -EINVAL;
 
        return 0;
@@ -1834,9 +1822,6 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct 
nouveau_cli *cli,
                goto out_unlock;
        }
 
-       uvmm->kernel_managed_addr = kernel_managed_addr;
-       uvmm->kernel_managed_size = kernel_managed_size;
-
        drm_gpuvm_init(&uvmm->base, cli->name, drm,
                       NOUVEAU_VA_SPACE_START,
                       NOUVEAU_VA_SPACE_END,
diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.h 
b/drivers/gpu/drm/nouveau/nouveau_uvmm.h
index a308c59760a5..06a0c36de392 100644
--- a/drivers/gpu/drm/nouveau/nouveau_uvmm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.h
@@ -14,9 +14,6 @@ struct nouveau_uvmm {
        struct mutex mutex;
        struct dma_resv resv;
 
-       u64 kernel_managed_addr;
-       u64 kernel_managed_size;
-
        bool disabled;
 };
 
-- 
2.41.0