[PATCH 04/20] mm: Use passed vm_fault structure in __do_fault()

[Jan Kara]

Instead of creating another vm_fault structure, use the one passed to
__do_fault() for passing arguments into fault handler.

Acked-by: Kirill A. Shutemov 
Reviewed-by: Ross Zwisler 
Signed-off-by: Jan Kara 
---
 mm/memory.c | 25 ++---
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 79b321dfdaf2..2d7cdefc0690 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2852,37 +2852,31 @@ static int __do_fault(struct vm_fault *vmf, struct page 
*cow_page,
  struct page **page, void **entry)
 {
struct vm_area_struct *vma = vmf->vma;
-   struct vm_fault vmf2;
int ret;
 
-   vmf2.address = vmf->address;
-   vmf2.pgoff = vmf->pgoff;
-   vmf2.flags = vmf->flags;
-   vmf2.page = NULL;
-   vmf2.gfp_mask = __get_fault_gfp_mask(vma);
-   vmf2.cow_page = cow_page;
+   vmf->cow_page = cow_page;
 
-   ret = vma->vm_ops->fault(vma, );
+   ret = vma->vm_ops->fault(vma, vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
return ret;
if (ret & VM_FAULT_DAX_LOCKED) {
-   *entry = vmf2.entry;
+   *entry = vmf->entry;
return ret;
}
 
-   if (unlikely(PageHWPoison(vmf2.page))) {
+   if (unlikely(PageHWPoison(vmf->page))) {
if (ret & VM_FAULT_LOCKED)
-   unlock_page(vmf2.page);
-   put_page(vmf2.page);
+   unlock_page(vmf->page);
+   put_page(vmf->page);
return VM_FAULT_HWPOISON;
}
 
if (unlikely(!(ret & VM_FAULT_LOCKED)))
-   lock_page(vmf2.page);
+   lock_page(vmf->page);
else
-   VM_BUG_ON_PAGE(!PageLocked(vmf2.page), vmf2.page);
+   VM_BUG_ON_PAGE(!PageLocked(vmf->page), vmf->page);
 
-   *page = vmf2.page;
+   *page = vmf->page;
return ret;
 }
 
@@ -3579,6 +3573,7 @@ static int __handle_mm_fault(struct vm_area_struct *vma, 
unsigned long address,
.address = address & PAGE_MASK,
.flags = flags,
.pgoff = linear_page_index(vma, address),
+   .gfp_mask = __get_fault_gfp_mask(vma),
};
struct mm_struct *mm = vma->vm_mm;
pgd_t *pgd;
-- 
2.6.6

___
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

Re: [PATCH 04/20] mm: Use passed vm_fault structure in __do_fault()

[Ross Zwisler]

On Tue, Sep 27, 2016 at 06:08:08PM +0200, Jan Kara wrote:
> Instead of creating another vm_fault structure, use the one passed to
> __do_fault() for passing arguments into fault handler.
> 
> Signed-off-by: Jan Kara 

Reviewed-by: Ross Zwisler 
___
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

[PATCH 04/20] mm: Use passed vm_fault structure in __do_fault()

[Jan Kara]

Instead of creating another vm_fault structure, use the one passed to
__do_fault() for passing arguments into fault handler.

Signed-off-by: Jan Kara 
---
 mm/memory.c | 26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 4c2ec9a9d8af..b7f1f535e079 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2848,37 +2848,31 @@ static int __do_fault(struct vm_fault *vmf, struct page 
*cow_page,
  struct page **page, void **entry)
 {
struct vm_area_struct *vma = vmf->vma;
-   struct vm_fault vmf2;
int ret;
 
-   vmf2.virtual_address = vmf->address & PAGE_MASK;
-   vmf2.pgoff = vmf->pgoff;
-   vmf2.flags = vmf->flags;
-   vmf2.page = NULL;
-   vmf2.gfp_mask = __get_fault_gfp_mask(vma);
-   vmf2.cow_page = cow_page;
+   vmf->cow_page = cow_page;
 
-   ret = vma->vm_ops->fault(vma, );
+   ret = vma->vm_ops->fault(vma, vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
return ret;
if (ret & VM_FAULT_DAX_LOCKED) {
-   *entry = vmf2.entry;
+   *entry = vmf->entry;
return ret;
}
 
-   if (unlikely(PageHWPoison(vmf2.page))) {
+   if (unlikely(PageHWPoison(vmf->page))) {
if (ret & VM_FAULT_LOCKED)
-   unlock_page(vmf2.page);
-   put_page(vmf2.page);
+   unlock_page(vmf->page);
+   put_page(vmf->page);
return VM_FAULT_HWPOISON;
}
 
if (unlikely(!(ret & VM_FAULT_LOCKED)))
-   lock_page(vmf2.page);
+   lock_page(vmf->page);
else
-   VM_BUG_ON_PAGE(!PageLocked(vmf2.page), vmf2.page);
+   VM_BUG_ON_PAGE(!PageLocked(vmf->page), vmf->page);
 
-   *page = vmf2.page;
+   *page = vmf->page;
return ret;
 }
 
@@ -3573,8 +3567,10 @@ static int __handle_mm_fault(struct vm_area_struct *vma, 
unsigned long address,
struct vm_fault vmf = {
.vma = vma,
.address = address,
+   .virtual_address = address & PAGE_MASK,
.flags = flags,
.pgoff = linear_page_index(vma, address),
+   .gfp_mask = __get_fault_gfp_mask(vma),
};
struct mm_struct *mm = vma->vm_mm;
pgd_t *pgd;
-- 
2.6.6

___
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm