Skip to content
Permalink
Browse files

merge: aufs-mmap

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information...
RobertCNelson committed Aug 4, 2019
1 parent df636ea commit 9374020068cbe445d119b36701f52142f6533a32
Showing with 157 additions and 21 deletions.
  1. +1 −1 fs/proc/base.c
  2. +4 −1 fs/proc/nommu.c
  3. +5 −2 fs/proc/task_mmu.c
  4. +4 −1 fs/proc/task_nommu.c
  5. +22 −0 include/linux/mm.h
  6. +2 −0 include/linux/mm_types.h
  7. +1 −1 kernel/fork.c
  8. +1 −1 mm/Makefile
  9. +1 −1 mm/filemap.c
  10. +25 −8 mm/mmap.c
  11. +5 −5 mm/nommu.c
  12. +86 −0 mm/prfile.c
@@ -2031,7 +2031,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
*path = vma->vm_file->f_path;
*path = vma_pr_or_file(vma)->f_path;
path_get(path);
rc = 0;
}
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
file = region->vm_file;

if (file) {
struct inode *inode = file_inode(region->vm_file);
struct inode *inode;

file = vmr_pr_or_file(region);
inode = file_inode(file);
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
}
@@ -310,7 +310,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
const char *name = NULL;

if (file) {
struct inode *inode = file_inode(vma->vm_file);
struct inode *inode;

file = vma_pr_or_file(vma);
inode = file_inode(file);
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1757,7 +1760,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
struct file *file = vma->vm_file;
struct file *file = vma_pr_or_file(vma);
struct mm_struct *mm = vma->vm_mm;
struct mm_walk walk = {
.hugetlb_entry = gather_hugetlb_stats,
@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
file = vma->vm_file;

if (file) {
struct inode *inode = file_inode(vma->vm_file);
struct inode *inode;

file = vma_pr_or_file(vma);
inode = file_inode(file);
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
@@ -1350,6 +1350,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
}
#endif

extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
int);
extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
extern void vma_do_fput(struct vm_area_struct *, const char[], int);

#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
__LINE__)
#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
__LINE__)
#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)

#ifndef CONFIG_MMU
extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int);
extern void vmr_do_fput(struct vm_region *, const char[], int);

#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \
__LINE__)
#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
#endif /* !CONFIG_MMU */

extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len,
unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
@@ -253,6 +253,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
struct file *vm_prfile; /* the virtual backing file or NULL */

int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -327,6 +328,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
struct file *vm_prfile; /* shadow of vm_file */
void * vm_private_data; /* was vm_pte (shared mem) */

atomic_long_t swap_readahead_info;
@@ -675,7 +675,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;

get_file(file);
vma_get_file(tmp);
if (tmp->vm_flags & VM_DENYWRITE)
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \
mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o swap_slots.o \
interval_tree.o list_lru.o workingset.o \
debug.o $(mmu-y)
prfile.o debug.o $(mmu-y)

obj-y += init-mm.o

@@ -2589,7 +2589,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
int ret = VM_FAULT_LOCKED;

sb_start_pagefault(inode->i_sb);
file_update_time(vmf->vma->vm_file);
vma_file_update_time(vmf->vma);
lock_page(page);
if (page->mapping != inode->i_mapping) {
unlock_page(page);
@@ -171,7 +171,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
fput(vma->vm_file);
vma_fput(vma);
mpol_put(vma_policy(vma));
kmem_cache_free(vm_area_cachep, vma);
return next;
@@ -896,7 +896,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
fput(file);
vma_fput(vma);
}
if (next->anon_vma)
anon_vma_merge(vma, next);
@@ -1778,8 +1778,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;

unmap_and_free_vma:
vma_fput(vma);
vma->vm_file = NULL;
fput(file);

/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2602,7 +2602,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;

if (new->vm_file)
get_file(new->vm_file);
vma_get_file(new);

if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -2621,7 +2621,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
fput(new->vm_file);
vma_fput(new);
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
@@ -2783,7 +2783,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
struct file *file;
struct file *file, *prfile;

pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
current->comm, current->pid);
@@ -2858,10 +2858,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}

file = get_file(vma->vm_file);
vma_get_file(vma);
file = vma->vm_file;
prfile = vma->vm_prfile;
ret = do_mmap_pgoff(vma->vm_file, start, size,
prot, flags, pgoff, &populate, NULL);
if (!IS_ERR_VALUE(ret) && file && prfile) {
struct vm_area_struct *new_vma;

new_vma = find_vma(mm, ret);
if (!new_vma->vm_prfile)
new_vma->vm_prfile = prfile;
if (new_vma != vma)
get_file(prfile);
}
/*
* two fput()s instead of vma_fput(vma),
* coz vma may not be available anymore.
*/
fput(file);
if (prfile)
fput(prfile);
out:
up_write(&mm->mmap_sem);
if (populate)
@@ -3172,7 +3189,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
get_file(new_vma->vm_file);
vma_get_file(new_vma);
if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);

if (region->vm_file)
fput(region->vm_file);
vmr_fput(region);

/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
fput(vma->vm_file);
vma_fput(vma);
put_nommu_region(vma->vm_region);
kmem_cache_free(vm_area_cachep, vma);
}
@@ -1321,7 +1321,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
fput(region->vm_file);
vmr_fput(region);
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
@@ -1396,10 +1396,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
fput(region->vm_file);
vmr_fput(region);
kmem_cache_free(vm_region_jar, region);
if (vma->vm_file)
fput(vma->vm_file);
vma_fput(vma);
kmem_cache_free(vm_area_cachep, vma);
return ret;

@@ -0,0 +1,86 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Mainly for aufs which mmap(2) different file and wants to print different
* path in /proc/PID/maps.
* Call these functions via macros defined in linux/mm.h.
*
* See Documentation/filesystems/aufs/design/06mmap.txt
*
* Copyright (c) 2014-2019 Junjro R. Okajima
* Copyright (c) 2014 Ian Campbell
*/

#include <linux/mm.h>
#include <linux/file.h>
#include <linux/fs.h>

/* #define PRFILE_TRACE */
static inline void prfile_trace(struct file *f, struct file *pr,
const char func[], int line, const char func2[])
{
#ifdef PRFILE_TRACE
if (pr)
pr_info("%s:%d: %s, %pD2\n", func, line, func2, f);
#endif
}

void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
int line)
{
struct file *f = vma->vm_file, *pr = vma->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
file_update_time(f);
if (f && pr)
file_update_time(pr);
}

struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[],
int line)
{
struct file *f = vma->vm_file, *pr = vma->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
return (f && pr) ? pr : f;
}

void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line)
{
struct file *f = vma->vm_file, *pr = vma->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
get_file(f);
if (f && pr)
get_file(pr);
}

void vma_do_fput(struct vm_area_struct *vma, const char func[], int line)
{
struct file *f = vma->vm_file, *pr = vma->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
fput(f);
if (f && pr)
fput(pr);
}

#ifndef CONFIG_MMU
struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
int line)
{
struct file *f = region->vm_file, *pr = region->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
return (f && pr) ? pr : f;
}

void vmr_do_fput(struct vm_region *region, const char func[], int line)
{
struct file *f = region->vm_file, *pr = region->vm_prfile;

prfile_trace(f, pr, func, line, __func__);
fput(f);
if (f && pr)
fput(pr);
}
#endif /* !CONFIG_MMU */

0 comments on commit 9374020

Please sign in to comment.
You can’t perform that action at this time.