mm: Add f_ops->populate()
Subsystems (9)
RFC PATCH 1/1 mm: Add f_ops->populate()
Sometimes you might want to use MAP_POPULATE to ask a device driver to initialize the device memory in some specific manner. SGX driver can use this to request more memory by issuing ENCLS[EAUG] x86 opcode for each page in the address range.
Add f_ops->populate() with the same parameters as f_ops->mmap() and make it conditionally called inside call_mmap(). Update call sites accodingly.
Signed-off-by Jarkko Sakkinen <[email protected]>
--- arch/mips/kernel/vdso.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- fs/coda/file.c | 2 +- fs/overlayfs/file.c | 2 +- include/linux/fs.h | 10 ++++++++-- include/linux/mm.h | 2 +- ipc/shm.c | 2 +- mm/mmap.c | 10 +++++----- mm/nommu.c | 4 ++-- 9 files changed, 21 insertions(+), 15 deletions(-)
arch/mips/kernel/vdso.c +1 -1
@@ -102,7 +102,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) base =mmap_region (NULL ,STACK_TOP ,PAGE_SIZE ,VM_READ |VM_EXEC |VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC , -0 ,NULL ); +0 ,NULL , false);if (IS_ERR_VALUE (base)) { ret = base; goto out;
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1 -1
@@ -107,7 +107,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *if (!obj->base.filp)return -ENODEV ; - ret =call_mmap (obj->base.filp, vma); + ret =call_mmap (obj->base.filp, vma, false);if (ret)return ret;
fs/coda/file.c +1 -1
@@ -173,7 +173,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)spin_unlock (&cii->c_lock); vma->vm_file =get_file (host_file); - ret =call_mmap (vma->vm_file, vma); + ret =call_mmap (vma->vm_file, vma, false);if (ret) {/* if call_mmap fails, our caller will put host_file so we
fs/overlayfs/file.c +1 -1
@@ -503,7 +503,7 @@ static int ovl_mmap(struct file *file, struct vm_area_struct *vma)vma_set_file (vma, realfile); old_cred =ovl_override_creds (file_inode (file)->i_sb); - ret =call_mmap (vma->vm_file, vma); + ret =call_mmap (vma->vm_file, vma, false);revert_creds (old_cred);ovl_file_accessed (file);
include/linux/fs.h +8 -2
@@ -1993,6 +1993,7 @@ struct file_operations {long (*unlocked_ioctl) (struct file *,unsigned int ,unsigned long );long (*compat_ioctl) (struct file *,unsigned int ,unsigned long );int (*mmap) (struct file *,struct vm_area_struct *); +int (*populate)(struct file *,struct vm_area_struct *);unsigned long mmap_supported_flags;int (*open) (struct inode *,struct file *);int (*flush) (struct file *,fl_owner_t id);
@@ -2074,9 +2075,14 @@ static inline ssize_t call_write_iter(struct file *file, struct kiocb *kio,return file->f_op->write_iter (kio, iter); } -static inline int call_mmap (struct file *file,struct vm_area_struct *vma) +static inline int call_mmap (struct file *file,struct vm_area_struct *vma,bool do_populate) { -return file->f_op->mmap (file, vma); +int ret = file->f_op->mmap (file, vma); + +if (!ret && do_populate) + ret = file->f_op->populate (file, vma); + +return ret; }extern ssize_t vfs_read (struct file *,char __user *,size_t ,loff_t *);
include/linux/mm.h +1 -1
@@ -2683,7 +2683,7 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned loextern unsigned long mmap_region (struct file *file,unsigned long addr,unsigned long len,vm_flags_t vm_flags,unsigned long pgoff, -struct list_head *uf); +struct list_head *uf,bool do_populate);extern unsigned long do_mmap (struct file *file,unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags,unsigned long pgoff,unsigned long *populate,struct list_head *uf);
ipc/shm.c +1 -1
@@ -587,7 +587,7 @@ static int shm_mmap(struct file *file, struct vm_area_struct *vma)if (ret)return ret; - ret =call_mmap (sfd->file, vma); + ret =call_mmap (sfd->file, vma, do_populate);if (ret) {shm_close (vma);return ret;
mm/mmap.c +5 -5
@@ -1413,6 +1413,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long flags, unsigned long pgoff, unsigned long *populate, struct list_head *uf) { + bool do_populate = (flags & (MAP_POPULATE | MAP_NONBLOCK)) == MAP_POPULATE;struct mm_struct *mm = current->mm;vm_flags_t vm_flags;int pkey =0 ;
@@ -1579,10 +1580,9 @@ unsigned long do_mmap(struct file *file, unsigned long addr, vm_flags |=VM_NORESERVE ; } - addr =mmap_region (file, addr, len, vm_flags, pgoff, uf); + addr =mmap_region (file, addr, len, vm_flags, pgoff, uf, do_populate);if (!IS_ERR_VALUE (addr) && - ((vm_flags &VM_LOCKED ) || - (flags & (MAP_POPULATE |MAP_NONBLOCK )) ==MAP_POPULATE )) + ((vm_flags &VM_LOCKED ) || do_populate)) *populate = len;return addr; }
@@ -1721,7 +1721,7 @@ static inline int accountable_mapping(struct file *file, vm_flags_t vm_flags)unsigned long mmap_region (struct file *file,unsigned long addr,unsigned long len,vm_flags_t vm_flags,unsigned long pgoff, -struct list_head *uf) +struct list_head *uf,bool do_populate) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma, *prev, *merge;
@@ -1790,7 +1790,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } vma->vm_file =get_file (file); - error =call_mmap (file, vma); + error =call_mmap (file, vma, do_populate);if (error) goto unmap_and_free_vma;
mm/nommu.c +2 -2
@@ -941,7 +941,7 @@ static int do_mmap_shared_file(struct vm_area_struct *vma) {int ret; - ret =call_mmap (vma->vm_file, vma); + ret =call_mmap (vma->vm_file, vma, false);if (ret ==0 ) { vma->vm_region->vm_top = vma->vm_region->vm_end;return 0 ;
@@ -972,7 +972,7 @@ static int do_mmap_private(struct vm_area_struct *vma,* - VM_MAYSHARE will be set if it may attempt to share */ if (capabilities &NOMMU_MAP_DIRECT ) { - ret =call_mmap (vma->vm_file, vma); + ret =call_mmap (vma->vm_file, vma, false);if (ret ==0 ) {/* shouldn't return success if we're not sharing */ BUG_ON (!(vma->vm_flags &VM_MAYSHARE ));
Signature · 1 line
2.35.1