Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 393a86af authored by Kautuk Consul's avatar Kautuk Consul Committed by Richard Kuo
Browse files

hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault 



Commit d065bd81
(mm: retry page fault when blocking on disk transfer) and
commit 37b23e05
(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.

Port these changes to hexagon.

Signed-off-by: default avatarKautuk Consul <consul.kautuk@gmail.com>
Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
parent 222c547e

arch/hexagon/mm/vm_fault.c

+17 −5
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs) 
	int si_code = SEGV_MAPERR;

	int fault;

	const struct exception_table_entry *fixup;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |

				 (cause > 0 ? FAULT_FLAG_WRITE : 0);



	/*

	 * If we're in an interrupt or have no user context,
@@ -63,6 +65,7 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs) 


	local_irq_enable();



retry:

	down_read(&mm->mmap_sem);

	vma = find_vma(mm, address);

	if (!vma)
@@ -96,14 +99,23 @@ good_area: 
		break;

	}



	fault = handle_mm_fault(mm, vma, address, (cause > 0));

	fault = handle_mm_fault(mm, vma, address, flags);



	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))

		return;



	/* The most common case -- we are done. */

	if (likely(!(fault & VM_FAULT_ERROR))) {

		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;

				goto retry;

			}

		}



		up_read(&mm->mmap_sem);

		return;