init_user_pages() registers every userptr writable (flags = 0), ignoring
the KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE flag that get_pte_flags() already
honors when mapping the BO.

Pass AMDGPU_GEM_USERPTR_READONLY for a read-only allocation, so the
userptr registration matches the permission already enforced in the page
table.

Signed-off-by: Junhua Shen <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 1b79c9f182b1..04f221192768 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1082,7 +1082,9 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t 
user_addr,
 
        mutex_lock(&process_info->lock);
 
-       ret = amdgpu_ttm_tt_set_userptr(&bo->tbo, user_addr, 0);
+       ret = amdgpu_ttm_tt_set_userptr(&bo->tbo, user_addr,
+                                       (mem->alloc_flags & 
KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE) ?
+                                       0 : AMDGPU_GEM_USERPTR_READONLY);
        if (ret) {
                pr_err("%s: Failed to set userptr: %d\n", __func__, ret);
                goto out;
-- 
2.53.0

Reply via email to