xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dave Jiang
2017-02-22 15:40:03 -08:00
committed by Linus Torvalds
parent 27a7ffaccd
commit d8a849e1bc
8 changed files with 39 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/dax/dax.c
View File

@@ -473,10 +473,9 @@ static int dax_dev_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
} }
static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,
struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, struct vm_area_struct *vma, struct vm_fault *vmf)
unsigned int flags)
{ {
unsigned long pmd_addr = addr & PMD_MASK; unsigned long pmd_addr = vmf->address & PMD_MASK;
struct device *dev = &dax_dev->dev; struct device *dev = &dax_dev->dev;
struct dax_region *dax_region; struct dax_region *dax_region;
phys_addr_t phys; phys_addr_t phys;
@@ -508,23 +507,22 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,
pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);
return vmf_insert_pfn_pmd(vma, addr, pmd, pfn, return vmf_insert_pfn_pmd(vma, vmf->address, vmf->pmd, pfn,
flags & FAULT_FLAG_WRITE); vmf->flags & FAULT_FLAG_WRITE);
} }
static int dax_dev_pmd_fault(struct vm_area_struct *vma, unsigned long addr, static int dax_dev_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
pmd_t *pmd, unsigned int flags)
{ {
int rc; int rc;
struct file *filp = vma->vm_file; struct file *filp = vma->vm_file;
struct dax_dev *dax_dev = filp->private_data; struct dax_dev *dax_dev = filp->private_data;
dev_dbg(&dax_dev->dev, "%s: %s: %s (%#lx - %#lx)\n", __func__, dev_dbg(&dax_dev->dev, "%s: %s: %s (%#lx - %#lx)\n", __func__,
current->comm, (flags & FAULT_FLAG_WRITE) current->comm, (vmf->flags & FAULT_FLAG_WRITE)
? "write" : "read", vma->vm_start, vma->vm_end); ? "write" : "read", vma->vm_start, vma->vm_end);
rcu_read_lock(); rcu_read_lock();
rc = __dax_dev_pmd_fault(dax_dev, vma, addr, pmd, flags); rc = __dax_dev_pmd_fault(dax_dev, vma, vmf);
rcu_read_unlock(); rcu_read_unlock();
return rc; return rc;

28
fs/dax.c
View File

@@ -1340,18 +1340,17 @@ fallback:
return VM_FAULT_FALLBACK; return VM_FAULT_FALLBACK;
} }
int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
pmd_t *pmd, unsigned int flags, struct iomap_ops *ops) struct iomap_ops *ops)
{ {
struct address_space *mapping = vma->vm_file->f_mapping; struct address_space *mapping = vma->vm_file->f_mapping;
unsigned long pmd_addr = address & PMD_MASK; unsigned long pmd_addr = vmf->address & PMD_MASK;
bool write = flags & FAULT_FLAG_WRITE; bool write = vmf->flags & FAULT_FLAG_WRITE;
unsigned int iomap_flags = (write ? IOMAP_WRITE : 0) | IOMAP_FAULT; unsigned int iomap_flags = (write ? IOMAP_WRITE : 0) | IOMAP_FAULT;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
int result = VM_FAULT_FALLBACK; int result = VM_FAULT_FALLBACK;
struct iomap iomap = { 0 }; struct iomap iomap = { 0 };
pgoff_t max_pgoff, pgoff; pgoff_t max_pgoff, pgoff;
struct vm_fault vmf;
void *entry; void *entry;
loff_t pos; loff_t pos;
int error; int error;
@@ -1364,7 +1363,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
pgoff = linear_page_index(vma, pmd_addr); pgoff = linear_page_index(vma, pmd_addr);
max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT; max_pgoff = (i_size_read(inode) - 1) >> PAGE_SHIFT;
trace_dax_pmd_fault(inode, vma, address, flags, pgoff, max_pgoff, 0); trace_dax_pmd_fault(inode, vma, vmf, max_pgoff, 0);
/* Fall back to PTEs if we're going to COW */ /* Fall back to PTEs if we're going to COW */
if (write && !(vma->vm_flags & VM_SHARED)) if (write && !(vma->vm_flags & VM_SHARED))
@@ -1408,21 +1407,17 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
if (IS_ERR(entry)) if (IS_ERR(entry))
goto finish_iomap; goto finish_iomap;
vmf.pgoff = pgoff;
vmf.flags = flags;
vmf.gfp_mask = mapping_gfp_mask(mapping) | __GFP_IO;
switch (iomap.type) { switch (iomap.type) {
case IOMAP_MAPPED: case IOMAP_MAPPED:
result = dax_pmd_insert_mapping(vma, pmd, &vmf, address, result = dax_pmd_insert_mapping(vma, vmf->pmd, vmf,
&iomap, pos, write, &entry); vmf->address, &iomap, pos, write, &entry);
break; break;
case IOMAP_UNWRITTEN: case IOMAP_UNWRITTEN:
case IOMAP_HOLE: case IOMAP_HOLE:
if (WARN_ON_ONCE(write)) if (WARN_ON_ONCE(write))
goto unlock_entry; goto unlock_entry;
result = dax_pmd_load_hole(vma, pmd, &vmf, address, &iomap, result = dax_pmd_load_hole(vma, vmf->pmd, vmf, vmf->address,
&entry); &iomap, &entry);
break; break;
default: default:
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
@@ -1448,12 +1443,11 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
} }
fallback: fallback:
if (result == VM_FAULT_FALLBACK) { if (result == VM_FAULT_FALLBACK) {
split_huge_pmd(vma, pmd, address); split_huge_pmd(vma, vmf->pmd, vmf->address);
count_vm_event(THP_FAULT_FALLBACK); count_vm_event(THP_FAULT_FALLBACK);
} }
out: out:
trace_dax_pmd_fault_done(inode, vma, address, flags, pgoff, max_pgoff, trace_dax_pmd_fault_done(inode, vma, vmf, max_pgoff, result);
result);
return result; return result;
} }
EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault); EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault);

9
fs/ext4/file.c
View File

@@ -273,21 +273,20 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return result; return result;
} }
static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr, static int
pmd_t *pmd, unsigned int flags) ext4_dax_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
int result; int result;
struct inode *inode = file_inode(vma->vm_file); struct inode *inode = file_inode(vma->vm_file);
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
bool write = flags & FAULT_FLAG_WRITE; bool write = vmf->flags & FAULT_FLAG_WRITE;
if (write) { if (write) {
sb_start_pagefault(sb); sb_start_pagefault(sb);
file_update_time(vma->vm_file); file_update_time(vma->vm_file);
} }
down_read(&EXT4_I(inode)->i_mmap_sem); down_read(&EXT4_I(inode)->i_mmap_sem);
result = dax_iomap_pmd_fault(vma, addr, pmd, flags, result = dax_iomap_pmd_fault(vma, vmf, &ext4_iomap_ops);
&ext4_iomap_ops);
up_read(&EXT4_I(inode)->i_mmap_sem); up_read(&EXT4_I(inode)->i_mmap_sem);
if (write) if (write)
sb_end_pagefault(sb); sb_end_pagefault(sb);

10
fs/xfs/xfs_file.c
View File

@@ -1432,9 +1432,7 @@ xfs_filemap_fault(
STATIC int STATIC int
xfs_filemap_pmd_fault( xfs_filemap_pmd_fault(
struct vm_area_struct *vma, struct vm_area_struct *vma,
unsigned long addr, struct vm_fault *vmf)
pmd_t *pmd,
unsigned int flags)
{ {
struct inode *inode = file_inode(vma->vm_file); struct inode *inode = file_inode(vma->vm_file);
struct xfs_inode *ip = XFS_I(inode); struct xfs_inode *ip = XFS_I(inode);
@@ -1445,16 +1443,16 @@ xfs_filemap_pmd_fault(
trace_xfs_filemap_pmd_fault(ip); trace_xfs_filemap_pmd_fault(ip);
if (flags & FAULT_FLAG_WRITE) { if (vmf->flags & FAULT_FLAG_WRITE) {
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
file_update_time(vma->vm_file); file_update_time(vma->vm_file);
} }
xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
ret = dax_iomap_pmd_fault(vma, addr, pmd, flags, &xfs_iomap_ops); ret = dax_iomap_pmd_fault(vma, vmf, &xfs_iomap_ops);
xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
if (flags & FAULT_FLAG_WRITE) if (vmf->flags & FAULT_FLAG_WRITE)
sb_end_pagefault(inode->i_sb); sb_end_pagefault(inode->i_sb);
return ret; return ret;

7
include/linux/dax.h
View File

@@ -71,16 +71,15 @@ static inline unsigned int dax_radix_order(void *entry)
return PMD_SHIFT - PAGE_SHIFT; return PMD_SHIFT - PAGE_SHIFT;
return 0; return 0;
} }
int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, int dax_iomap_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
pmd_t *pmd, unsigned int flags, struct iomap_ops *ops); struct iomap_ops *ops);
#else #else
static inline unsigned int dax_radix_order(void *entry) static inline unsigned int dax_radix_order(void *entry)
{ {
return 0; return 0;
} }
static inline int dax_iomap_pmd_fault(struct vm_area_struct *vma, static inline int dax_iomap_pmd_fault(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmd, unsigned int flags, struct vm_fault *vmf, struct iomap_ops *ops)
struct iomap_ops *ops)
{ {
return VM_FAULT_FALLBACK; return VM_FAULT_FALLBACK;
} }

3
include/linux/mm.h
View File

@@ -351,8 +351,7 @@ struct vm_operations_struct {
void (*close)(struct vm_area_struct * area); void (*close)(struct vm_area_struct * area);
int (*mremap)(struct vm_area_struct * area); int (*mremap)(struct vm_area_struct * area);
int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf); int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
int (*pmd_fault)(struct vm_area_struct *, unsigned long address, int (*pmd_fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
pmd_t *, unsigned int flags);
void (*map_pages)(struct vm_fault *vmf, void (*map_pages)(struct vm_fault *vmf,
pgoff_t start_pgoff, pgoff_t end_pgoff); pgoff_t start_pgoff, pgoff_t end_pgoff);

15
include/trace/events/fs_dax.h
View File

@@ -8,9 +8,8 @@
DECLARE_EVENT_CLASS(dax_pmd_fault_class, DECLARE_EVENT_CLASS(dax_pmd_fault_class,
TP_PROTO(struct inode *inode, struct vm_area_struct *vma, TP_PROTO(struct inode *inode, struct vm_area_struct *vma,
unsigned long address, unsigned int flags, pgoff_t pgoff, struct vm_fault *vmf, pgoff_t max_pgoff, int result),
pgoff_t max_pgoff, int result), TP_ARGS(inode, vma, vmf, max_pgoff, result),
TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned long, ino) __field(unsigned long, ino)
__field(unsigned long, vm_start) __field(unsigned long, vm_start)
@@ -29,9 +28,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class,
__entry->vm_start = vma->vm_start; __entry->vm_start = vma->vm_start;
__entry->vm_end = vma->vm_end; __entry->vm_end = vma->vm_end;
__entry->vm_flags = vma->vm_flags; __entry->vm_flags = vma->vm_flags;
__entry->address = address; __entry->address = vmf->address;
__entry->flags = flags; __entry->flags = vmf->flags;
__entry->pgoff = pgoff; __entry->pgoff = vmf->pgoff;
__entry->max_pgoff = max_pgoff; __entry->max_pgoff = max_pgoff;
__entry->result = result; __entry->result = result;
), ),
@@ -54,9 +53,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class,
#define DEFINE_PMD_FAULT_EVENT(name) \ #define DEFINE_PMD_FAULT_EVENT(name) \
DEFINE_EVENT(dax_pmd_fault_class, name, \ DEFINE_EVENT(dax_pmd_fault_class, name, \
TP_PROTO(struct inode *inode, struct vm_area_struct *vma, \ TP_PROTO(struct inode *inode, struct vm_area_struct *vma, \
unsigned long address, unsigned int flags, pgoff_t pgoff, \ struct vm_fault *vmf, \
pgoff_t max_pgoff, int result), \ pgoff_t max_pgoff, int result), \
TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result)) TP_ARGS(inode, vma, vmf, max_pgoff, result))
DEFINE_PMD_FAULT_EVENT(dax_pmd_fault); DEFINE_PMD_FAULT_EVENT(dax_pmd_fault);
DEFINE_PMD_FAULT_EVENT(dax_pmd_fault_done); DEFINE_PMD_FAULT_EVENT(dax_pmd_fault_done);

6
mm/memory.c
View File

@@ -3475,8 +3475,7 @@ static int create_huge_pmd(struct vm_fault *vmf)
if (vma_is_anonymous(vma)) if (vma_is_anonymous(vma))
return do_huge_pmd_anonymous_page(vmf); return do_huge_pmd_anonymous_page(vmf);
if (vma->vm_ops->pmd_fault) if (vma->vm_ops->pmd_fault)
return vma->vm_ops->pmd_fault(vma, vmf->address, vmf->pmd, return vma->vm_ops->pmd_fault(vma, vmf);
vmf->flags);
return VM_FAULT_FALLBACK; return VM_FAULT_FALLBACK;
} }
@@ -3485,8 +3484,7 @@ static int wp_huge_pmd(struct vm_fault *vmf, pmd_t orig_pmd)
if (vma_is_anonymous(vmf->vma)) if (vma_is_anonymous(vmf->vma))
return do_huge_pmd_wp_page(vmf, orig_pmd); return do_huge_pmd_wp_page(vmf, orig_pmd);
if (vmf->vma->vm_ops->pmd_fault) if (vmf->vma->vm_ops->pmd_fault)
return vmf->vma->vm_ops->pmd_fault(vmf->vma, vmf->address, return vmf->vma->vm_ops->pmd_fault(vmf->vma, vmf);
vmf->pmd, vmf->flags);
/* COW handled on pte level: split pmd */ /* COW handled on pte level: split pmd */
VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma); VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma);