diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1811-drm-amdgpu-move-taking-mmap_sem-into-get_user_pages-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1811-drm-amdgpu-move-taking-mmap_sem-into-get_user_pages-.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1811-drm-amdgpu-move-taking-mmap_sem-into-get_user_pages-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1811-drm-amdgpu-move-taking-mmap_sem-into-get_user_pages-.patch new file mode 100644 index 00000000..62a7e36a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1811-drm-amdgpu-move-taking-mmap_sem-into-get_user_pages-.patch @@ -0,0 +1,108 @@ +From 7e708905c88b8fcf6c6298a02a0cc81109307c87 Mon Sep 17 00:00:00 2001 +From: Christian Koenig <christian.koenig@amd.com> +Date: Sun, 3 Sep 2017 15:22:06 +0200 +Subject: [PATCH 1811/4131] drm/amdgpu: move taking mmap_sem into + get_user_pages v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This didn't helped as intended, just simplify the code. + +v2: unlock mmap_sem in the error path as well + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c + +Change-Id: If977df72680ad91fb2a14666199de7c8d9e25ff7 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 --------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +++++++- + 2 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 178339c..1ecc133 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -521,7 +521,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + struct amdgpu_fpriv *fpriv = p->filp->driver_priv; + struct amdgpu_bo_list_entry *e; + struct list_head duplicates; +- bool need_mmap_lock = false; + unsigned i, tries = 10; + int r; + +@@ -529,8 +528,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + + p->bo_list = amdgpu_bo_list_get(fpriv, cs->in.bo_list_handle); + if (p->bo_list) { +- need_mmap_lock = p->bo_list->first_userptr != +- p->bo_list->num_entries; + amdgpu_bo_list_get_list(p->bo_list, &p->validated); + if (p->bo_list->first_userptr != p->bo_list->num_entries) + p->mn = amdgpu_mn_get(p->adev, AMDGPU_MN_TYPE_GFX); +@@ -542,9 +539,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + if (p->uf_entry.robj && !p->uf_entry.robj->parent) + list_add(&p->uf_entry.tv.head, &p->validated); + +- if (need_mmap_lock) +- down_read(¤t->mm->mmap_sem); +- + while (1) { + struct list_head need_pages; + unsigned i; +@@ -712,9 +706,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + + error_free_pages: + +- if (need_mmap_lock) +- up_read(¤t->mm->mmap_sem); +- + if (p->bo_list) { + for (i = p->bo_list->first_userptr; + i < p->bo_list->num_entries; ++i) { +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 0ef0472..8727194 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -689,6 +689,8 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + if (!(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY)) + flags |= FOLL_WRITE; + ++ down_read(¤t->mm->mmap_sem); ++ + if (gtt->userflags & AMDGPU_GEM_USERPTR_ANONONLY) { + /* check that we only use anonymous memory + to prevent problems with writeback */ +@@ -696,8 +698,10 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + struct vm_area_struct *vma; + + vma = find_vma(mm, gtt->userptr); +- if (!vma || vma->vm_file || vma->vm_end < end) ++ if (!vma || vma->vm_file || vma->vm_end < end) { ++ up_read(¤t->mm->mmap_sem); + return -EPERM; ++ } + } + + do { +@@ -724,10 +728,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + + } while (pinned < ttm->num_pages); + ++ up_read(¤t->mm->mmap_sem); + return 0; + + release_pages: + release_pages(pages, pinned, 0); ++ up_read(¤t->mm->mmap_sem); + return r; + } + +-- +2.7.4 + |