wok-next annotate linux/stuff/aufs3-mmap.patch @ rev 15743

linux: update modules.list
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 02 15:04:05 2014 +0100 (2014-01-02)
parents f4df390821bc
children
rev   line source
pascal@15733 1 aufs3.2 mmap patch
pascal@15733 2
pascal@15733 3 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
pascal@15733 4 index b1822dd..d8518aa 100644
pascal@15733 5 --- a/fs/proc/nommu.c
pascal@15733 6 +++ b/fs/proc/nommu.c
pascal@15733 7 @@ -45,7 +45,9 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
pascal@15733 8 file = region->vm_file;
pascal@15733 9
pascal@15733 10 if (file) {
pascal@15733 11 - struct inode *inode = region->vm_file->f_path.dentry->d_inode;
pascal@15733 12 + struct inode *inode;
pascal@15733 13 + file = vmr_pr_or_file(region);
pascal@15733 14 + inode = file->f_path.dentry->d_inode;
pascal@15733 15 dev = inode->i_sb->s_dev;
pascal@15733 16 ino = inode->i_ino;
pascal@15733 17 }
pascal@15733 18 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
pascal@15733 19 index e418c5a..06bbf80 100644
pascal@15733 20 --- a/fs/proc/task_mmu.c
pascal@15733 21 +++ b/fs/proc/task_mmu.c
pascal@15733 22 @@ -221,7 +221,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
pascal@15733 23 int len;
pascal@15733 24
pascal@15733 25 if (file) {
pascal@15733 26 - struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
pascal@15733 27 + struct inode *inode;
pascal@15733 28 + file = vma_pr_or_file(vma);
pascal@15733 29 + inode = file->f_path.dentry->d_inode;
pascal@15733 30 dev = inode->i_sb->s_dev;
pascal@15733 31 ino = inode->i_ino;
pascal@15733 32 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
pascal@15743 33 @@ -1044,6 +1046,7 @@ static int show_numa_map(struct seq_file *m, void *v)
pascal@15733 34 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
pascal@15733 35
pascal@15733 36 if (file) {
pascal@15733 37 + file = vma_pr_or_file(vma);
pascal@15733 38 seq_printf(m, " file=");
pascal@15733 39 seq_path(m, &file->f_path, "\n\t= ");
pascal@15733 40 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
pascal@15733 41 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
pascal@15733 42 index 980de54..b59aa1e 100644
pascal@15733 43 --- a/fs/proc/task_nommu.c
pascal@15733 44 +++ b/fs/proc/task_nommu.c
pascal@15733 45 @@ -147,7 +147,9 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
pascal@15733 46 file = vma->vm_file;
pascal@15733 47
pascal@15733 48 if (file) {
pascal@15733 49 - struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
pascal@15733 50 + struct inode *inode;
pascal@15733 51 + file = vma_pr_or_file(file);
pascal@15733 52 + inode = file->f_path.dentry->d_inode;
pascal@15733 53 dev = inode->i_sb->s_dev;
pascal@15733 54 ino = inode->i_ino;
pascal@15733 55 pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
pascal@15733 56 diff --git a/include/linux/mm.h b/include/linux/mm.h
pascal@15733 57 index 4baadd1..b1ee63e 100644
pascal@15733 58 --- a/include/linux/mm.h
pascal@15733 59 +++ b/include/linux/mm.h
pascal@15733 60 @@ -17,6 +17,9 @@
pascal@15733 61 #include <linux/pfn.h>
pascal@15733 62 #include <linux/bit_spinlock.h>
pascal@15733 63 #include <linux/shrinker.h>
pascal@15733 64 +#include <linux/dcache.h>
pascal@15733 65 +#include <linux/file.h>
pascal@15733 66 +#include <linux/fs.h>
pascal@15733 67
pascal@15733 68 struct mempolicy;
pascal@15733 69 struct anon_vma;
pascal@15743 70 @@ -984,6 +987,87 @@ static inline int fixup_user_fault(struct task_struct *tsk,
pascal@15733 71 }
pascal@15733 72 #endif
pascal@15733 73
pascal@15733 74 +/*
pascal@15733 75 + * Mainly for aufs which mmap(2) diffrent file and wants to print different path
pascal@15733 76 + * in /proc/PID/maps.
pascal@15733 77 + */
pascal@15733 78 +/* #define AUFS_DEBUG_MMAP */
pascal@15733 79 +static inline void aufs_trace(struct file *f, struct file *pr,
pascal@15733 80 + const char func[], int line, const char func2[])
pascal@15733 81 +{
pascal@15733 82 +#ifdef AUFS_DEBUG_MMAP
pascal@15733 83 + if (pr)
pascal@15733 84 + pr_info("%s:%d: %s, %p\n", func, line, func2,
pascal@15733 85 + f ? (char *)f->f_dentry->d_name.name : "(null)");
pascal@15733 86 +#endif
pascal@15733 87 +}
pascal@15733 88 +
pascal@15733 89 +static inline struct file *vmr_do_pr_or_file(struct vm_region *region,
pascal@15733 90 + const char func[], int line)
pascal@15733 91 +{
pascal@15733 92 + struct file *f = region->vm_file, *pr = region->vm_prfile;
pascal@15733 93 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 94 + return (f && pr) ? pr : f;
pascal@15733 95 +}
pascal@15733 96 +
pascal@15733 97 +static inline void vmr_do_fput(struct vm_region *region,
pascal@15733 98 + const char func[], int line)
pascal@15733 99 +{
pascal@15733 100 + struct file *f = region->vm_file, *pr = region->vm_prfile;
pascal@15733 101 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 102 + fput(f);
pascal@15733 103 + if (f && pr)
pascal@15733 104 + fput(pr);
pascal@15733 105 +}
pascal@15733 106 +
pascal@15733 107 +static inline void vma_do_file_update_time(struct vm_area_struct *vma,
pascal@15733 108 + const char func[], int line)
pascal@15733 109 +{
pascal@15733 110 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
pascal@15733 111 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 112 + file_update_time(f);
pascal@15733 113 + if (f && pr)
pascal@15733 114 + file_update_time(pr);
pascal@15733 115 +}
pascal@15733 116 +
pascal@15733 117 +static inline struct file *vma_do_pr_or_file(struct vm_area_struct *vma,
pascal@15733 118 + const char func[], int line)
pascal@15733 119 +{
pascal@15733 120 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
pascal@15733 121 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 122 + return (f && pr) ? pr : f;
pascal@15733 123 +}
pascal@15733 124 +
pascal@15733 125 +static inline void vma_do_get_file(struct vm_area_struct *vma,
pascal@15733 126 + const char func[], int line)
pascal@15733 127 +{
pascal@15733 128 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
pascal@15733 129 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 130 + get_file(f);
pascal@15733 131 + if (f && pr)
pascal@15733 132 + get_file(pr);
pascal@15733 133 +}
pascal@15733 134 +
pascal@15733 135 +static inline void vma_do_fput(struct vm_area_struct *vma,
pascal@15733 136 + const char func[], int line)
pascal@15733 137 +{
pascal@15733 138 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
pascal@15733 139 + aufs_trace(f, pr, func, line, __func__);
pascal@15733 140 + fput(f);
pascal@15733 141 + if (f && pr)
pascal@15733 142 + fput(pr);
pascal@15733 143 +}
pascal@15733 144 +
pascal@15733 145 +#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \
pascal@15733 146 + __LINE__)
pascal@15733 147 +#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
pascal@15733 148 +#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
pascal@15733 149 + __LINE__)
pascal@15733 150 +#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
pascal@15733 151 + __LINE__)
pascal@15733 152 +#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
pascal@15733 153 +#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
pascal@15733 154 +
pascal@15733 155 extern int make_pages_present(unsigned long addr, unsigned long end);
pascal@15733 156 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
pascal@15733 157 extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
pascal@15733 158 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
pascal@15733 159 index 5b42f1b..a49a07e 100644
pascal@15733 160 --- a/include/linux/mm_types.h
pascal@15733 161 +++ b/include/linux/mm_types.h
pascal@15733 162 @@ -186,6 +186,7 @@ struct vm_region {
pascal@15733 163 unsigned long vm_top; /* region allocated to here */
pascal@15733 164 unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
pascal@15733 165 struct file *vm_file; /* the backing file or NULL */
pascal@15733 166 + struct file *vm_prfile; /* the virtual backing file or NULL */
pascal@15733 167
pascal@15733 168 int vm_usage; /* region usage count (access under nommu_region_sem) */
pascal@15733 169 bool vm_icache_flushed : 1; /* true if the icache has been flushed for
pascal@15733 170 @@ -245,6 +246,7 @@ struct vm_area_struct {
pascal@15733 171 unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
pascal@15733 172 units, *not* PAGE_CACHE_SIZE */
pascal@15733 173 struct file * vm_file; /* File we map to (can be NULL). */
pascal@15733 174 + struct file *vm_prfile; /* shadow of vm_file */
pascal@15733 175 void * vm_private_data; /* was vm_pte (shared mem) */
pascal@15733 176
pascal@15733 177 #ifndef CONFIG_MMU
pascal@15733 178 diff --git a/kernel/fork.c b/kernel/fork.c
pascal@15733 179 index da4a6a1..4a31675 100644
pascal@15733 180 --- a/kernel/fork.c
pascal@15733 181 +++ b/kernel/fork.c
pascal@15743 182 @@ -378,7 +378,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
pascal@15733 183 struct inode *inode = file->f_path.dentry->d_inode;
pascal@15733 184 struct address_space *mapping = file->f_mapping;
pascal@15733 185
pascal@15733 186 - get_file(file);
pascal@15733 187 + vma_get_file(tmp);
pascal@15733 188 if (tmp->vm_flags & VM_DENYWRITE)
pascal@15733 189 atomic_dec(&inode->i_writecount);
pascal@15733 190 mutex_lock(&mapping->i_mmap_mutex);
pascal@15733 191 diff --git a/mm/fremap.c b/mm/fremap.c
pascal@15733 192 index 9ed4fd4..00ee66b 100644
pascal@15733 193 --- a/mm/fremap.c
pascal@15733 194 +++ b/mm/fremap.c
pascal@15733 195 @@ -198,10 +198,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
pascal@15733 196 struct file *file = vma->vm_file;
pascal@15733 197
pascal@15733 198 flags &= MAP_NONBLOCK;
pascal@15733 199 - get_file(file);
pascal@15733 200 + vma_get_file(vma);
pascal@15733 201 addr = mmap_region(file, start, size,
pascal@15733 202 flags, vma->vm_flags, pgoff);
pascal@15733 203 - fput(file);
pascal@15733 204 + vma_fput(vma);
pascal@15733 205 if (IS_ERR_VALUE(addr)) {
pascal@15733 206 err = addr;
pascal@15733 207 } else {
pascal@15733 208 diff --git a/mm/memory.c b/mm/memory.c
pascal@15733 209 index 829d437..6c6f9f1 100644
pascal@15733 210 --- a/mm/memory.c
pascal@15733 211 +++ b/mm/memory.c
pascal@15743 212 @@ -2684,7 +2684,7 @@ reuse:
pascal@15733 213
pascal@15733 214 /* file_update_time outside page_lock */
pascal@15733 215 if (vma->vm_file)
pascal@15733 216 - file_update_time(vma->vm_file);
pascal@15733 217 + vma_file_update_time(vma);
pascal@15733 218
pascal@15733 219 return ret;
pascal@15733 220 }
pascal@15743 221 @@ -3369,7 +3369,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
pascal@15733 222
pascal@15733 223 /* file_update_time outside page_lock */
pascal@15733 224 if (vma->vm_file)
pascal@15733 225 - file_update_time(vma->vm_file);
pascal@15733 226 + vma_file_update_time(vma);
pascal@15733 227 } else {
pascal@15733 228 unlock_page(vmf.page);
pascal@15733 229 if (anon)
pascal@15733 230 diff --git a/mm/mmap.c b/mm/mmap.c
pascal@15733 231 index eae90af..570ac61 100644
pascal@15733 232 --- a/mm/mmap.c
pascal@15733 233 +++ b/mm/mmap.c
pascal@15733 234 @@ -231,7 +231,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
pascal@15733 235 if (vma->vm_ops && vma->vm_ops->close)
pascal@15733 236 vma->vm_ops->close(vma);
pascal@15733 237 if (vma->vm_file) {
pascal@15733 238 - fput(vma->vm_file);
pascal@15733 239 + vma_fput(vma);
pascal@15733 240 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 241 removed_exe_file_vma(vma->vm_mm);
pascal@15733 242 }
pascal@15733 243 @@ -618,7 +618,7 @@ again: remove_next = 1 + (end > next->vm_end);
pascal@15733 244
pascal@15733 245 if (remove_next) {
pascal@15733 246 if (file) {
pascal@15733 247 - fput(file);
pascal@15733 248 + vma_fput(vma);
pascal@15733 249 if (next->vm_flags & VM_EXECUTABLE)
pascal@15733 250 removed_exe_file_vma(mm);
pascal@15733 251 }
pascal@15733 252 @@ -1334,8 +1334,8 @@ out:
pascal@15733 253 unmap_and_free_vma:
pascal@15733 254 if (correct_wcount)
pascal@15733 255 atomic_inc(&inode->i_writecount);
pascal@15733 256 + vma_fput(vma);
pascal@15733 257 vma->vm_file = NULL;
pascal@15733 258 - fput(file);
pascal@15733 259
pascal@15733 260 /* Undo any partial mapping done by a device driver. */
pascal@15733 261 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
pascal@15733 262 @@ -1964,7 +1964,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
pascal@15733 263 goto out_free_mpol;
pascal@15733 264
pascal@15733 265 if (new->vm_file) {
pascal@15733 266 - get_file(new->vm_file);
pascal@15733 267 + vma_get_file(new);
pascal@15733 268 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 269 added_exe_file_vma(mm);
pascal@15733 270 }
pascal@15733 271 @@ -1988,7 +1988,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
pascal@15733 272 if (new->vm_file) {
pascal@15733 273 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 274 removed_exe_file_vma(mm);
pascal@15733 275 - fput(new->vm_file);
pascal@15733 276 + vma_fput(new);
pascal@15733 277 }
pascal@15733 278 unlink_anon_vmas(new);
pascal@15733 279 out_free_mpol:
pascal@15733 280 @@ -2355,7 +2355,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
pascal@15733 281 new_vma->vm_end = addr + len;
pascal@15733 282 new_vma->vm_pgoff = pgoff;
pascal@15733 283 if (new_vma->vm_file) {
pascal@15733 284 - get_file(new_vma->vm_file);
pascal@15733 285 + vma_get_file(new_vma);
pascal@15733 286 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 287 added_exe_file_vma(mm);
pascal@15733 288 }
pascal@15733 289 diff --git a/mm/msync.c b/mm/msync.c
pascal@15733 290 index 632df45..02d770e 100644
pascal@15733 291 --- a/mm/msync.c
pascal@15733 292 +++ b/mm/msync.c
pascal@15733 293 @@ -80,10 +80,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
pascal@15733 294 start = vma->vm_end;
pascal@15733 295 if ((flags & MS_SYNC) && file &&
pascal@15733 296 (vma->vm_flags & VM_SHARED)) {
pascal@15733 297 - get_file(file);
pascal@15733 298 + vma_get_file(vma);
pascal@15733 299 up_read(&mm->mmap_sem);
pascal@15733 300 error = vfs_fsync(file, 0);
pascal@15733 301 - fput(file);
pascal@15733 302 + vma_fput(vma);
pascal@15733 303 if (error || start >= end)
pascal@15733 304 goto out;
pascal@15733 305 down_read(&mm->mmap_sem);
pascal@15733 306 diff --git a/mm/nommu.c b/mm/nommu.c
pascal@15733 307 index b982290..6eb4f31 100644
pascal@15733 308 --- a/mm/nommu.c
pascal@15733 309 +++ b/mm/nommu.c
pascal@15733 310 @@ -632,7 +632,7 @@ static void __put_nommu_region(struct vm_region *region)
pascal@15733 311 up_write(&nommu_region_sem);
pascal@15733 312
pascal@15733 313 if (region->vm_file)
pascal@15733 314 - fput(region->vm_file);
pascal@15733 315 + vmr_fput(region);
pascal@15733 316
pascal@15733 317 /* IO memory and memory shared directly out of the pagecache
pascal@15733 318 * from ramfs/tmpfs mustn't be released here */
pascal@15743 319 @@ -790,7 +790,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
pascal@15733 320 if (vma->vm_ops && vma->vm_ops->close)
pascal@15733 321 vma->vm_ops->close(vma);
pascal@15733 322 if (vma->vm_file) {
pascal@15733 323 - fput(vma->vm_file);
pascal@15733 324 + vma_fput(vma);
pascal@15733 325 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 326 removed_exe_file_vma(mm);
pascal@15733 327 }
pascal@15743 328 @@ -1363,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file,
pascal@15733 329 goto error_just_free;
pascal@15733 330 }
pascal@15733 331 }
pascal@15733 332 - fput(region->vm_file);
pascal@15733 333 + vmr_fput(region);
pascal@15733 334 kmem_cache_free(vm_region_jar, region);
pascal@15733 335 region = pregion;
pascal@15733 336 result = start;
pascal@15743 337 @@ -1439,10 +1439,10 @@ error_just_free:
pascal@15733 338 up_write(&nommu_region_sem);
pascal@15733 339 error:
pascal@15733 340 if (region->vm_file)
pascal@15733 341 - fput(region->vm_file);
pascal@15733 342 + vmr_fput(region);
pascal@15733 343 kmem_cache_free(vm_region_jar, region);
pascal@15733 344 if (vma->vm_file)
pascal@15733 345 - fput(vma->vm_file);
pascal@15733 346 + vma_fput(vma);
pascal@15733 347 if (vma->vm_flags & VM_EXECUTABLE)
pascal@15733 348 removed_exe_file_vma(vma->vm_mm);
pascal@15733 349 kmem_cache_free(vm_area_cachep, vma);