wok-undigest annotate linux/stuff/aufs3-mmap.patch @ rev 1089

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