dax: Change return type to vm_fault_t
Subsystems (4)
PATCH v4 1/1 dax: Change return type to vm_fault_t
Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type.
Commit 1c8f422059ae ("mm: change return type to vm_fault_t")
Previously vm_insert_mixed() returns err which driver mapped into VM_FAULT_* type. The new function vmf_insert_mixed() will replace this inefficiency by returning VM_FAULT_* type.
---
v2: Modified the change log
v3: Updated the change log and
added Ross in review list
v4: Addressed David's comment.
Changes in huge_memory.c put
together in a single patch that
it is bisectable in furture
drivers/dax/device.c | 26 +++++++++++--------------- include/linux/huge_mm.h | 5 +++-- mm/huge_memory.c | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-)
drivers/dax/device.c +11 -15
@@ -243,11 +243,11 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff,return -1 ; } -static int __dev_dax_pte_fault (struct dev_dax *dev_dax,struct vm_fault *vmf) +static vm_fault_t __dev_dax_pte_fault (struct dev_dax *dev_dax, +struct vm_fault *vmf) {struct device *dev = &dev_dax->dev;struct dax_region *dax_region; -int rc =VM_FAULT_SIGBUS ;phys_addr_t phys;pfn_t pfn;unsigned int fault_size =PAGE_SIZE ;
@@ -274,17 +274,11 @@ static int __dev_dax_pte_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) pfn =phys_to_pfn_t (phys, dax_region->pfn_flags); - rc =vm_insert_mixed (vmf->vma, vmf->address, pfn); - -if (rc == -ENOMEM ) -return VM_FAULT_OOM ; -if (rc <0 && rc != -EBUSY ) -return VM_FAULT_SIGBUS ; - -return VM_FAULT_NOPAGE ; +return vmf_insert_mixed (vmf->vma, vmf->address, pfn); } -static int __dev_dax_pmd_fault (struct dev_dax *dev_dax,struct vm_fault *vmf) +static vm_fault_t __dev_dax_pmd_fault (struct dev_dax *dev_dax, +struct vm_fault *vmf) {unsigned long pmd_addr = vmf->address &PMD_MASK ;struct device *dev = &dev_dax->dev;
@@ -335,7 +329,8 @@ static int __dev_dax_pmd_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) }#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD -static int __dev_dax_pud_fault (struct dev_dax *dev_dax,struct vm_fault *vmf) +static vm_fault_t __dev_dax_pud_fault (struct dev_dax *dev_dax, +struct vm_fault *vmf) {unsigned long pud_addr = vmf->address &PUD_MASK ;struct device *dev = &dev_dax->dev;
@@ -386,13 +381,14 @@ static int __dev_dax_pud_fault(struct dev_dax *dev_dax, struct vm_fault *vmf) vmf->flags & FAULT_FLAG_WRITE); }#else -static int __dev_dax_pud_fault (struct dev_dax *dev_dax,struct vm_fault *vmf) +static vm_fault_t __dev_dax_pud_fault (struct dev_dax *dev_dax, +struct vm_fault *vmf) {return VM_FAULT_FALLBACK ; }#endif /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */ -static int dev_dax_huge_fault (struct vm_fault *vmf, +static vm_fault_t dev_dax_huge_fault (struct vm_fault *vmf,enum page_entry_size pe_size) {int rc, id;
@@ -423,7 +419,7 @@ static int dev_dax_huge_fault(struct vm_fault *vmf,return rc; } -static int dev_dax_fault (struct vm_fault *vmf) +static vm_fault_t dev_dax_fault (struct vm_fault *vmf) {return dev_dax_huge_fault (vmf,PE_SIZE_PTE ); }
include/linux/huge_mm.h +3 -2
@@ -3,6 +3,7 @@#define _LINUX_HUGE_MM_H#include <linux/sched/coredump.h> +#include <linux/mm_types.h> #include <linux/fs.h> /* only for vma_is_dax() */
@@ -46,9 +47,9 @@ extern bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,extern int change_huge_pmd (struct vm_area_struct *vma,pmd_t *pmd,unsigned long addr,pgprot_t newprot,int prot_numa); -int vmf_insert_pfn_pmd (struct vm_area_struct *vma,unsigned long addr, +vm_fault_t vmf_insert_pfn_pmd (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmd,pfn_t pfn,bool write); -int vmf_insert_pfn_pud (struct vm_area_struct *vma,unsigned long addr, +vm_fault_t vmf_insert_pfn_pud (struct vm_area_struct *vma,unsigned long addr,pud_t *pud,pfn_t pfn,bool write);enum transparent_hugepage_flag {TRANSPARENT_HUGEPAGE_FLAG ,
mm/huge_memory.c +2 -2
@@ -755,7 +755,7 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,spin_unlock (ptl); } -int vmf_insert_pfn_pmd (struct vm_area_struct *vma,unsigned long addr, +vm_fault_t vmf_insert_pfn_pmd (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmd,pfn_t pfn,bool write) {pgprot_t pgprot = vma->vm_page_prot;
@@ -815,7 +815,7 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr,spin_unlock (ptl); } -int vmf_insert_pfn_pud (struct vm_area_struct *vma,unsigned long addr, +vm_fault_t vmf_insert_pfn_pud (struct vm_area_struct *vma,unsigned long addr,pud_t *pud,pfn_t pfn,bool write) {pgprot_t pgprot = vma->vm_page_prot;
Signature · 6 lines
1.9.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 18 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_mixed()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_mixed()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>Reviewed-by Ross Zwisler <[email protected]>---
v2: Modified the change log
Quoted 7 lines
v3: Updated the change log and
added Ross in review listv4: Addressed David's comment.
Changes inhuge_memory.cput
together in a single patch that
it is bisectable in furture
Thanks, I'll carry this in the nvdimm tree since it collides with some work-in progress development.
Quoted 22 lines · Dan Williams
Quoted 21 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_mixed()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_mixed()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>Reviewed-by Ross Zwisler <[email protected]>---
v2: Modified the change logv3: Updated the change log and
added Ross in review list
Quoted 7 lines
Quoted 4 lines
v4: Addressed David's comment.
Changes inhuge_memory.cput
together in a single patch that
it is bisectable in furtureThanks, I'll carry this in the nvdimm tree since it collides with some work-in progress development.
Thanks Dan :)