ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mm: introduce vma_set_file function v4"

Browse Source 
The kernel test robot is not happy with that.

This reverts commit 2b5b95b1ff.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394773/
This commit is contained in:
Christian König
2020-11-05 17:05:35 +01:00
parent 00efd65a65
commit e40b0b56ff
10 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dma-buf/dma-buf.c
View File

@@ -1183,7 +1183,8 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
return -EINVAL; return -EINVAL;
/* readjust the vma */ /* readjust the vma */
vma_set_file(vma, dmabuf->file); fput(vma->vm_file);
vma->vm_file = get_file(dmabuf->file);
vma->vm_pgoff = pgoff; vma->vm_pgoff = pgoff;
return dmabuf->ops->mmap(dmabuf, vma); return dmabuf->ops->mmap(dmabuf, vma);

4
drivers/gpu/drm/etnaviv/etnaviv_gem.c
View File

@@ -145,8 +145,10 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
* address_space (so unmap_mapping_range does what we want, * address_space (so unmap_mapping_range does what we want,
* in particular in the case of mmap'd dmabufs) * in particular in the case of mmap'd dmabufs)
*/ */
fput(vma->vm_file);
get_file(etnaviv_obj->base.filp);
vma->vm_pgoff = 0; vma->vm_pgoff = 0;
vma_set_file(vma, etnaviv_obj->base.filp); vma->vm_file = etnaviv_obj->base.filp;
vma->vm_page_prot = vm_page_prot; vma->vm_page_prot = vm_page_prot;
} }

3
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
View File

@@ -114,7 +114,8 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *
if (ret) if (ret)
return ret; return ret;
vma_set_file(vma, obj->base.filp); fput(vma->vm_file);
vma->vm_file = get_file(obj->base.filp);
return 0; return 0;
} }

5
drivers/gpu/drm/i915/gem/i915_gem_mman.c
View File

@@ -893,9 +893,8 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)
* requires avoiding extraneous references to their filp, hence why * requires avoiding extraneous references to their filp, hence why
* we prefer to use an anonymous file for their mmaps. * we prefer to use an anonymous file for their mmaps.
*/ */
vma_set_file(vma, anon); fput(vma->vm_file);
/* Drop the initial creation reference, the vma is now holding one. */ vma->vm_file = anon;
fput(anon);
switch (mmo->mmap_type) { switch (mmo->mmap_type) {
case I915_MMAP_TYPE_WC: case I915_MMAP_TYPE_WC:

4
drivers/gpu/drm/msm/msm_gem.c
View File

@@ -212,8 +212,10 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj,
* address_space (so unmap_mapping_range does what we want, * address_space (so unmap_mapping_range does what we want,
* in particular in the case of mmap'd dmabufs) * in particular in the case of mmap'd dmabufs)
*/ */
fput(vma->vm_file);
get_file(obj->filp);
vma->vm_pgoff = 0; vma->vm_pgoff = 0;
vma_set_file(vma, obj->filp); vma->vm_file = obj->filp;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
} }

3
drivers/gpu/drm/omapdrm/omap_gem.c
View File

@@ -564,8 +564,9 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj,
* address_space (so unmap_mapping_range does what we want, * address_space (so unmap_mapping_range does what we want,
* in particular in the case of mmap'd dmabufs) * in particular in the case of mmap'd dmabufs)
*/ */
fput(vma->vm_file);
vma->vm_pgoff = 0; vma->vm_pgoff = 0;
vma_set_file(vma, obj->filp); vma->vm_file = get_file(obj->filp);
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
} }

3
drivers/gpu/drm/vgem/vgem_drv.c
View File

@@ -397,7 +397,8 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,
if (ret) if (ret)
return ret; return ret;
vma_set_file(vma, obj->filp); fput(vma->vm_file);
vma->vm_file = get_file(obj->filp);
vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));

6
drivers/staging/android/ashmem.c
View File

@@ -450,9 +450,9 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
vma_set_anonymous(vma); vma_set_anonymous(vma);
} }
vma_set_file(vma, asma->file); if (vma->vm_file)
/* XXX: merge this with the get_file() above if possible */ fput(vma->vm_file);
fput(asma->file); vma->vm_file = asma->file;
out: out:
mutex_unlock(&ashmem_mutex); mutex_unlock(&ashmem_mutex);

2
include/linux/mm.h
View File

@@ -2719,8 +2719,6 @@ static inline void vma_set_page_prot(struct vm_area_struct *vma)
} }
#endif #endif
void vma_set_file(struct vm_area_struct *vma, struct file *file);
#ifdef CONFIG_NUMA_BALANCING #ifdef CONFIG_NUMA_BALANCING
unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long change_prot_numa(struct vm_area_struct *vma,
unsigned long start, unsigned long end); unsigned long start, unsigned long end);

12
mm/mmap.c
View File

@@ -136,18 +136,6 @@ void vma_set_page_prot(struct vm_area_struct *vma)
WRITE_ONCE(vma->vm_page_prot, vm_page_prot); WRITE_ONCE(vma->vm_page_prot, vm_page_prot);
} }
/*
* Change backing file, only valid to use during initial VMA setup.
*/
void vma_set_file(struct vm_area_struct *vma, struct file *file)
{
/* Changing an anonymous vma with this is illegal */
get_file(file);
swap(vma->vm_file, file);
fput(file);
}
EXPORT_SYMBOL(vma_set_file);
/* /*
* Requires inode->i_mapping->i_mmap_rwsem * Requires inode->i_mapping->i_mmap_rwsem
*/ */