History

mm, dax: make pmd_fault() and friends be the same as fault()

Instead of passing in multiple parameters in the pmd_fault() handler, a vmf can be passed in just like a fault() handler. This will simplify code and remove the need for the actual pmd fault handlers to allocate a vmf. Related functions are also modified to do the same. [dave.jiang@intel.com: fix issue with xfs_tests stall when DAX option is off] Link: http://lkml.kernel.org/r/148469861071.195597.3619476895250028518.stgit@djiang5-desk3.ch.intel.com Link: http://lkml.kernel.org/r/1484085142-2297-7-git-send-email-ross.zwisler@linux.intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Dave Chinner <david@fromorbit.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Dave Jiang committed 9 years ago

Commit d8a849e1 parent 27a7ffa8 files · +39 −55Browse files

Unified · Split

8 files
  1. drivers/dax/dax.c +7 −9
  2. fs/dax.c +11 −17
  3. fs/ext4/file.c +4 −5
  4. fs/xfs/xfs_file.c +4 −6
  5. include/linux/dax.h +3 −4
  6. include/linux/mm.h +1 −2
  7. include/trace/events/fs_dax.h +7 −8
  8. mm/memory.c +2 −4
drivers/dax/dax.c+7−9
@@ -473,10 +473,9 @@ static int dax_dev_fault(struct vm_area_struct *vma, struct vm_fault *vmf) · 472 unmodified lines
473473 }
474474
475475 static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,
476− struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd,
477− unsigned int flags)
476+ struct vm_area_struct *vma, struct vm_fault *vmf)
478477 {
479− unsigned long pmd_addr = addr & PMD_MASK;
478+ unsigned long pmd_addr = vmf->address & PMD_MASK;
480479 struct device *dev = &dax_dev->dev;
481480 struct dax_region *dax_region;
482481 phys_addr_t phys;
@@ -508,23 +507,22 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, · 25 unmodified lines
508507
509508 pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);
510509
511− return vmf_insert_pfn_pmd(vma, addr, pmd, pfn,
512− flags & FAULT_FLAG_WRITE);
510+ return vmf_insert_pfn_pmd(vma, vmf->address, vmf->pmd, pfn,
511+ vmf->flags & FAULT_FLAG_WRITE);
513512 }
514513
515−static int dax_dev_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
516− pmd_t *pmd, unsigned int flags)
514+static int dax_dev_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
517515 {
518516 int rc;
519517 struct file *filp = vma->vm_file;
520518 struct dax_dev *dax_dev = filp->private_data;
521519
522520 dev_dbg(&dax_dev->dev, "%s: %s: %s (%#lx - %#lx)\n", __func__,
523− current->comm, (flags & FAULT_FLAG_WRITE)
521+ current->comm, (vmf->flags & FAULT_FLAG_WRITE)
524522 ? "write" : "read", vma->vm_start, vma->vm_end);
525523
526524 rcu_read_lock();
527− rc = __dax_dev_pmd_fault(dax_dev, vma, addr, pmd, flags);
525+ rc = __dax_dev_pmd_fault(dax_dev, vma, vmf);
528526 rcu_read_unlock();
529527
530528 return rc;
fs/dax.c+11−17
@@ -1340,18 +1340,17 @@ fallback: · 1339 unmodified lines
13401340 return VM_FAULT_FALLBACK;
13411341 }
13421342
1343−int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
1344− pmd_t *pmd, unsigned int flags, struct iomap_ops *ops)
1343+int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
1344+ struct iomap_ops *ops)
13451345 {
13461346 struct address_space *mapping = vma->vm_file->f_mapping;
1347− unsigned long pmd_addr = address & PMD_MASK;
1348− bool write = flags & FAULT_FLAG_WRITE;
1347+ unsigned long pmd_addr = vmf->address & PMD_MASK;
1348+ bool write = vmf->flags & FAULT_FLAG_WRITE;
13491349 unsigned int iomap_flags = (write ? IOMAP_WRITE : 0) | IOMAP_FAULT;
13501350 struct inode *inode = mapping->host;
13511351 int result = VM_FAULT_FALLBACK;
13521352 struct iomap iomap = { 0 };
13531353 pgoff_t max_pgoff, pgoff;
1354− struct vm_fault vmf;
13551354 void *entry;
13561355 loff_t pos;
13571356 int error;
@@ -1364,7 +1363,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, · 6 unmodified lines
13641363 pgoff = linear_page_index(vma, pmd_addr);
13651364 max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
13661365
1367− trace_dax_pmd_fault(inode, vma, address, flags, pgoff, max_pgoff, 0);
1366+ trace_dax_pmd_fault(inode, vma, vmf, max_pgoff, 0);
13681367
13691368 /* Fall back to PTEs if we're going to COW */
13701369 if (write && !(vma->vm_flags & VM_SHARED))
@@ -1408,21 +1407,17 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, · 37 unmodified lines
14081407 if (IS_ERR(entry))
14091408 goto finish_iomap;
14101409
1411− vmf.pgoff = pgoff;
1412− vmf.flags = flags;
1413− vmf.gfp_mask = mapping_gfp_mask(mapping) | __GFP_IO;
1414−
14151410 switch (iomap.type) {
14161411 case IOMAP_MAPPED:
1417− result = dax_pmd_insert_mapping(vma, pmd, &vmf, address,
1418− &iomap, pos, write, &entry);
1412+ result = dax_pmd_insert_mapping(vma, vmf->pmd, vmf,
1413+ vmf->address, &iomap, pos, write, &entry);
14191414 break;
14201415 case IOMAP_UNWRITTEN:
14211416 case IOMAP_HOLE:
14221417 if (WARN_ON_ONCE(write))
14231418 goto unlock_entry;
1424− result = dax_pmd_load_hole(vma, pmd, &vmf, address, &iomap,
1425− &entry);
1419+ result = dax_pmd_load_hole(vma, vmf->pmd, vmf, vmf->address,
1420+ &iomap, &entry);
14261421 break;
14271422 default:
14281423 WARN_ON_ONCE(1);
@@ -1448,12 +1443,11 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, · 19 unmodified lines
14481443 }
14491444 fallback:
14501445 if (result == VM_FAULT_FALLBACK) {
1451− split_huge_pmd(vma, pmd, address);
1446+ split_huge_pmd(vma, vmf->pmd, vmf->address);
14521447 count_vm_event(THP_FAULT_FALLBACK);
14531448 }
14541449 out:
1455− trace_dax_pmd_fault_done(inode, vma, address, flags, pgoff, max_pgoff,
1456− result);
1450+ trace_dax_pmd_fault_done(inode, vma, vmf, max_pgoff, result);
14571451 return result;
14581452 }
14591453 EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault);
fs/ext4/file.c+4−5
@@ -273,21 +273,20 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) · 272 unmodified lines
273273 return result;
274274 }
275275
276−static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
277− pmd_t *pmd, unsigned int flags)
276+static int
277+ext4_dax_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
278278 {
279279 int result;
280280 struct inode *inode = file_inode(vma->vm_file);
281281 struct super_block *sb = inode->i_sb;
282− bool write = flags & FAULT_FLAG_WRITE;
282+ bool write = vmf->flags & FAULT_FLAG_WRITE;
283283
284284 if (write) {
285285 sb_start_pagefault(sb);
286286 file_update_time(vma->vm_file);
287287 }
288288 down_read(&EXT4_I(inode)->i_mmap_sem);
289− result = dax_iomap_pmd_fault(vma, addr, pmd, flags,
290− &ext4_iomap_ops);
289+ result = dax_iomap_pmd_fault(vma, vmf, &ext4_iomap_ops);
291290 up_read(&EXT4_I(inode)->i_mmap_sem);
292291 if (write)
293292 sb_end_pagefault(sb);
fs/xfs/xfs_file.c+4−6
@@ -1432,9 +1432,7 @@ xfs_filemap_fault( · 1431 unmodified lines
14321432 STATIC int
14331433 xfs_filemap_pmd_fault(
14341434 struct vm_area_struct *vma,
1435− unsigned long addr,
1436− pmd_t *pmd,
1437− unsigned int flags)
1435+ struct vm_fault *vmf)
14381436 {
14391437 struct inode *inode = file_inode(vma->vm_file);
14401438 struct xfs_inode *ip = XFS_I(inode);
@@ -1445,16 +1443,16 @@ xfs_filemap_pmd_fault( · 4 unmodified lines
14451443
14461444 trace_xfs_filemap_pmd_fault(ip);
14471445
1448− if (flags & FAULT_FLAG_WRITE) {
1446+ if (vmf->flags & FAULT_FLAG_WRITE) {
14491447 sb_start_pagefault(inode->i_sb);
14501448 file_update_time(vma->vm_file);
14511449 }
14521450
14531451 xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
1454− ret = dax_iomap_pmd_fault(vma, addr, pmd, flags, &xfs_iomap_ops);
1452+ ret = dax_iomap_pmd_fault(vma, vmf, &xfs_iomap_ops);
14551453 xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
14561454
1457− if (flags & FAULT_FLAG_WRITE)
1455+ if (vmf->flags & FAULT_FLAG_WRITE)
14581456 sb_end_pagefault(inode->i_sb);
14591457
14601458 return ret;
include/linux/dax.h+3−4
@@ -71,16 +71,15 @@ static inline unsigned int dax_radix_order(void *entry) · 70 unmodified lines
7171 return PMD_SHIFT - PAGE_SHIFT;
7272 return 0;
7373 }
74−int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
75− pmd_t *pmd, unsigned int flags, struct iomap_ops *ops);
74+int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
75+ struct iomap_ops *ops);
7676 #else
7777 static inline unsigned int dax_radix_order(void *entry)
7878 {
7979 return 0;
8080 }
8181 static inline int dax_iomap_pmd_fault(struct vm_area_struct *vma,
82− unsigned long address, pmd_t *pmd, unsigned int flags,
83− struct iomap_ops *ops)
82+ struct vm_fault *vmf, struct iomap_ops *ops)
8483 {
8584 return VM_FAULT_FALLBACK;
8685 }
include/linux/mm.h+1−2
@@ -351,8 +351,7 @@ struct vm_operations_struct { · 350 unmodified lines
351351 void (*close)(struct vm_area_struct * area);
352352 int (*mremap)(struct vm_area_struct * area);
353353 int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
354− int (*pmd_fault)(struct vm_area_struct *, unsigned long address,
355− pmd_t *, unsigned int flags);
354+ int (*pmd_fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
356355 void (*map_pages)(struct vm_fault *vmf,
357356 pgoff_t start_pgoff, pgoff_t end_pgoff);
358357
include/trace/events/fs_dax.h+7−8
@@ -8,9 +8,8 @@ · 7 unmodified lines
88
99 DECLARE_EVENT_CLASS(dax_pmd_fault_class,
1010 TP_PROTO(struct inode *inode, struct vm_area_struct *vma,
11− unsigned long address, unsigned int flags, pgoff_t pgoff,
12− pgoff_t max_pgoff, int result),
13− TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result),
11+ struct vm_fault *vmf, pgoff_t max_pgoff, int result),
12+ TP_ARGS(inode, vma, vmf, max_pgoff, result),
1413 TP_STRUCT__entry(
1514 __field(unsigned long, ino)
1615 __field(unsigned long, vm_start)
@@ -29,9 +28,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, · 12 unmodified lines
2928 __entry->vm_start = vma->vm_start;
3029 __entry->vm_end = vma->vm_end;
3130 __entry->vm_flags = vma->vm_flags;
32− __entry->address = address;
33− __entry->flags = flags;
34− __entry->pgoff = pgoff;
31+ __entry->address = vmf->address;
32+ __entry->flags = vmf->flags;
33+ __entry->pgoff = vmf->pgoff;
3534 __entry->max_pgoff = max_pgoff;
3635 __entry->result = result;
3736 ),
@@ -54,9 +53,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, · 16 unmodified lines
5453 #define DEFINE_PMD_FAULT_EVENT(name) \
5554 DEFINE_EVENT(dax_pmd_fault_class, name, \
5655 TP_PROTO(struct inode *inode, struct vm_area_struct *vma, \
57− unsigned long address, unsigned int flags, pgoff_t pgoff, \
56+ struct vm_fault *vmf, \
5857 pgoff_t max_pgoff, int result), \
59− TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result))
58+ TP_ARGS(inode, vma, vmf, max_pgoff, result))
6059
6160 DEFINE_PMD_FAULT_EVENT(dax_pmd_fault);
6261 DEFINE_PMD_FAULT_EVENT(dax_pmd_fault_done);
mm/memory.c+2−4
@@ -3475,8 +3475,7 @@ static int create_huge_pmd(struct vm_fault *vmf) · 3474 unmodified lines
34753475 if (vma_is_anonymous(vma))
34763476 return do_huge_pmd_anonymous_page(vmf);
34773477 if (vma->vm_ops->pmd_fault)
3478− return vma->vm_ops->pmd_fault(vma, vmf->address, vmf->pmd,
3479− vmf->flags);
3478+ return vma->vm_ops->pmd_fault(vma, vmf);
34803479 return VM_FAULT_FALLBACK;
34813480 }
34823481
@@ -3485,8 +3484,7 @@ static int wp_huge_pmd(struct vm_fault *vmf, pmd_t orig_pmd) · 2 unmodified lines
34853484 if (vma_is_anonymous(vmf->vma))
34863485 return do_huge_pmd_wp_page(vmf, orig_pmd);
34873486 if (vmf->vma->vm_ops->pmd_fault)
3488− return vmf->vma->vm_ops->pmd_fault(vmf->vma, vmf->address,
3489− vmf->pmd, vmf->flags);
3487+ return vmf->vma->vm_ops->pmd_fault(vmf->vma, vmf);
34903488
34913489 /* COW handled on pte level: split pmd */
34923490 VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma);