parisc/mm/fault.c: Port OOM changes to do_page_fault
PATCH v2 17/19 parisc/mm/fault.c: Port OOM changes to do_page_fault
Commit d065bd810b6deb67d4897a14bfe21f8eb526ba99 (mm: retry page fault when blocking on disk transfer) and commit 37b23e0525d393d48a7d59f870b3bc061a30ccdb (x86,mm: make pagefault killable)
The above commits introduced changes into the x86 pagefault handler for making the page fault handler retryable as well as killable.
These changes reduce the mmap_sem hold time, which is crucial during OOM killer invocation.
--- arch/parisc/mm/fault.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-)
arch/parisc/mm/fault.c +24 -5
@@ -175,10 +175,12 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,struct mm_struct *mm = tsk->mm;unsigned long acc_type;int fault; +unsigned int flags =FAULT_FLAG_ALLOW_RETRY |FAULT_FLAG_KILLABLE ;if (in_atomic () || !mm) goto no_context; +retry:down_read (&mm->mmap_sem); vma =find_vma_prev (mm, address, &prev_vma);if (!vma || address < vma->vm_start)
@@ -201,7 +203,12 @@ good_area:* fault. */ - fault =handle_mm_fault (mm, vma, address, (acc_type &VM_WRITE ) ?FAULT_FLAG_WRITE :0 ); + fault =handle_mm_fault (mm, vma, address, + flags | ((acc_type &VM_WRITE ) ?FAULT_FLAG_WRITE :0 )); + +if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) +return ; +if (unlikely (fault &VM_FAULT_ERROR )) {/* * We hit a shared mapping outside of the file, or some
@@ -214,10 +221,22 @@ good_area: goto bad_area;BUG (); } -if (fault &VM_FAULT_MAJOR ) - current->maj_flt++; -else - current->min_flt++; +if (flags &FAULT_FLAG_ALLOW_RETRY ) { +if (fault &VM_FAULT_MAJOR ) + current->maj_flt++; +else + current->min_flt++; +if (fault &VM_FAULT_RETRY ) { + flags &= ~FAULT_FLAG_ALLOW_RETRY ; + +/* No need to up_read(&mm->mmap_sem) as we would +* have already released it in __lock_page_or_retry +* in mm/filemap.c. +*/ + + goto retry; + } + }up_read (&mm->mmap_sem);return ;
Signature · 1 line
1.7.5.4
Hi,
Did anyone get a chance to review this patch ?
This is v2 of this patch set now.
Hi,
Can you please review this patch ?
Many archs have actually accepted this change so I think maybe this is = okay. :)
Thanks,
Kautuk.
On Sat, Mar 31, 2012 at 5:36 PM, Kautuk Consul <[email protected]=
arch/parisc/mm/fault.c void do_page_fault(struct pt_regs *regs, unsign=
Quoted 22 lines
wrote:
Commitd065bd810b6deb67d4897a14bfe21f8eb526ba99(mm: retry page fault when blocking on disk transfer) and commit37b23e0525d393d48a7d59f870b3bc061a30ccdb(x86,mm: make pagefault killable)The above commits introduced changes into the x86 pagefault handler for making the page fault handler retryable as well as killable.
These changes reduce the
mmap_semhold time, which is crucial during OOM killer invocation.Signed-off-by Kautuk Consul <[email protected]>---
=A0arch/parisc/mm/fault.c | =A0 29 ++++++++++++++++++++++++----- =A01 files changed, 24 insertions(+), 5 deletions(-)arch/parisc/mm/fault.c +0
-0@@ -175,10 +175,12 @@ void do_page_fault(struct pt_regs *regs, unsign=
ed long code,
arch/parisc/mm/fault.c void do_page_fault(struct pt_regs *regs, unsign= · line 178
Quoted 4 lines
arch/parisc/mm/fault.c +1
-0=A0 =A0 =A0 =A0struct mm_struct *mm =3D tsk->mm; =A0 =A0 =A0 =A0unsigned long acc_type; =A0 =A0 =A0 =A0int fault; + =A0 =A0 =A0 unsigned int flags =3D FAULT_FLAG_ALLOW_RETRY | FAULT_F=
LAG_KILLABLE;
Quoted 12 lines
arch/parisc/mm/fault.c +1
-0=A0 =A0 =A0 =A0if (in_atomic () || !mm) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto no_context; +retry: =A0 =A0 =A0 =A0down_read (&mm->mmap_sem); =A0 =A0 =A0 =A0vma =3D find_vma_prev(mm, address, &prev_vma); =A0 =A0 =A0 =A0if (!vma || address < vma->vm_start)@@ -201,7 +203,12 @@ good_area:=A0 =A0 =A0 =A0 * fault.
=A0 =A0 =A0 =A0 */
Quoted 1 line
- =A0 =A0 =A0 fault =3D handle_mm_fault(mm, vma, address, (
acc_type&=
VM_WRITE) ? FAULT_FLAG_WRITE : 0);
Quoted 2 lines
+ =A0 =A0 =A0 fault =3D handle_mm_fault(mm, vma, address,
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 flags | ((acc_type& VM=
_WRITE) ? FAULT_FLAG_WRITE : 0));
Quoted 2 lines
+
+ =A0 =A0 =A0 if ((fault &VM_FAULT_RETRY) && fatal_signal_pending(cu=
rrent))
Quoted 5 lines
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return;
+
=A0 =A0 =A0 =A0if (unlikely(fault & VM_FAULT_ERROR)) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/*
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * We hit a shared mapping outside of =
the file, or some
Quoted 5 lines
arch/parisc/mm/fault.c +0
-1@@ -214,10 +221,22 @@ good_area: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto bad_area; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0BUG(); =A0 =A0 =A0 =A0} - =A0 =A0 =A0 if (fault & VM_FAULT_MAJOR)
arch/parisc/mm/fault.c good_area: · line 230
Quoted 10 lines
arch/parisc/mm/fault.c +7
-3- =A0 =A0 =A0 =A0 =A0 =A0 =A0 current->maj_flt++; - =A0 =A0 =A0 else - =A0 =A0 =A0 =A0 =A0 =A0 =A0 current->min_flt++; + =A0 =A0 =A0 if (flags & FAULT_FLAG_ALLOW_RETRY) { + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (fault & VM_FAULT_MAJOR) + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 current->maj_flt++; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 else + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 current->min_flt++; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (fault & VM_FAULT_RETRY) { + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 flags &=3D ~FAULT_FLAG_=
ALLOW_RETRY;
arch/parisc/mm/fault.c good_area: · line 232
Quoted 2 lines
arch/parisc/mm/fault.c +2
-0+ + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* No need to up_rea=
d(&mm->mmap_sem) as we would
arch/parisc/mm/fault.c good_area: · line 233
Quoted 1 line
arch/parisc/mm/fault.c +1
-0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* have already relea=
sed it in __lock_page_or_retry
Quoted 10 lines
arch/parisc/mm/fault.c +6
-1+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* in mm/filemap.c. +=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/ + + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto retry; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } + =A0 =A0 =A0 } =A0 =A0 =A0 =A0up_read(&mm->mmap_sem); =A0 =A0 =A0 =A0return; --
Quoted 2 lines
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Helge Deller
maintainerHi Kautuk,
sorry for the very late reply!
Anyway, the patch seems OK, and we will include it in the next parisc kernel.
THANKS!!!
Helge
@Dave, James:
- This is the patch "11" in Dave's package...
- Kautuk even sent a testcase: http://marc.info/?l=linux-mm&m=133319623304492&w=2
Quoted 87 lines · Kautuk Consul
Hi,
Can you please review this patch ?
Many archs have actually accepted this change so I think maybe this is okay. :)
Thanks,
Kautuk.Quoted 77 lines · Kautuk Consul
Commit
d065bd810b6deb67d4897a14bfe21f8eb526ba99(mm: retry page fault when blocking on disk transfer) and commit37b23e0525d393d48a7d59f870b3bc061a30ccdb(x86,mm: make pagefault killable)The above commits introduced changes into the x86 pagefault handler for making the page fault handler retryable as well as killable.
These changes reduce the
mmap_semhold time, which is crucial during OOM killer invocation.Signed-off-by Kautuk Consul <[email protected]>--- arch/parisc/mm/fault.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-)arch/parisc/mm/fault.c +24
-6@@ -175,10 +175,12 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,struct mm_struct *mm = tsk->mm;unsigned long acc_type;int fault; +unsigned int flags =FAULT_FLAG_ALLOW_RETRY |FAULT_FLAG_KILLABLE ;if (in_atomic () || !mm) goto no_context; +retry:down_read (&mm->mmap_sem); vma =find_vma_prev (mm, address, &prev_vma);if (!vma || address < vma->vm_start)@@ -201,7 +203,12 @@ good_area:* fault. */ - fault =handle_mm_fault (mm, vma, address, (acc_type &VM_WRITE ) ?FAULT_FLAG_WRITE :0 ); + fault =handle_mm_fault (mm, vma, address, + flags | ((acc_type &VM_WRITE ) ?FAULT_FLAG_WRITE :0 )); + +if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) +return ; +if (unlikely (fault &VM_FAULT_ERROR )) {/* * We hit a shared mapping outside of the file, or some @@ -214,10 +221,22 @@ good_area: goto bad_area;BUG (); } -if (fault &VM_FAULT_MAJOR ) - current->maj_flt++; -else - current->min_flt++; +if (flags &FAULT_FLAG_ALLOW_RETRY ) { +if (fault &VM_FAULT_MAJOR ) + current->maj_flt++; +else + current->min_flt++; +if (fault &VM_FAULT_RETRY ) { + flags &= ~FAULT_FLAG_ALLOW_RETRY ; + +/* No need to up_read(&mm->mmap_sem) as we would +* have already released it in __lock_page_or_retry +* in mm/filemap.c. +*/ + + goto retry; + } + }up_read (&mm->mmap_sem);return ; --1.7.5.4