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

Commit 50a7ca3c authored by Souptick Joarder's avatar Souptick Joarder Committed by Linus Torvalds
Browse files

mm: convert return type of handle_mm_fault() caller 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.

Ref-> commit 1c8f4220 ("mm: change return type to vm_fault_t")

In this patch all the caller of handle_mm_fault() are changed to return
vm_fault_t type.

Link: http://lkml.kernel.org/r/20180617084810.GA6730@jordon-HP-15-Notebook-PC


Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: James Hogan <jhogan@kernel.org>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: David S. Miller <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0882ff91

arch/alpha/mm/fault.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	struct vm_area_struct * vma;

	struct mm_struct *mm = current->mm;

	const struct exception_table_entry *fixup;

	int fault, si_code = SEGV_MAPERR;

	int si_code = SEGV_MAPERR;

	vm_fault_t fault;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	/* As of EV6, a load into $31/$f31 is a prefetch, and never faults

arch/arc/mm/fault.c

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/uaccess.h>

#include <linux/kdebug.h>

#include <linux/perf_event.h>

#include <linux/mm_types.h>

#include <asm/pgalloc.h>

#include <asm/mmu.h>
@@ -66,7 +67,8 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) 
	struct task_struct *tsk = current;

	struct mm_struct *mm = tsk->mm;

	siginfo_t info;

	int fault, ret;

	int ret;

	vm_fault_t fault;

	int write = regs->ecr_cause & ECR_C_PROTV_STORE;  /* ST/EX */

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;

arch/arm/mm/fault.c

+4 −3
Original line number Diff line number Diff line
@@ -224,12 +224,12 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma) 
	return vma->vm_flags & mask ? false : true;

}



static int __kprobes

static vm_fault_t __kprobes

__do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,

		unsigned int flags, struct task_struct *tsk)

{

	struct vm_area_struct *vma;

	int fault;

	vm_fault_t fault;



	vma = find_vma(mm, addr);

	fault = VM_FAULT_BADMAP;
@@ -264,7 +264,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
{

	struct task_struct *tsk;

	struct mm_struct *mm;

	int fault, sig, code;

	int sig, code;

	vm_fault_t fault;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	if (notify_page_fault(regs, fsr))

arch/arm64/mm/fault.c

+3 −3
Original line number Diff line number Diff line
@@ -379,12 +379,12 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re 
#define VM_FAULT_BADMAP		0x010000

#define VM_FAULT_BADACCESS	0x020000



static int __do_page_fault(struct mm_struct *mm, unsigned long addr,

static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr,

			   unsigned int mm_flags, unsigned long vm_flags,

			   struct task_struct *tsk)

{

	struct vm_area_struct *vma;

	int fault;

	vm_fault_t fault;



	vma = find_vma(mm, addr);

	fault = VM_FAULT_BADMAP;
@@ -427,7 +427,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
	struct task_struct *tsk;

	struct mm_struct *mm;

	struct siginfo si;

	int fault, major = 0;

	vm_fault_t fault, major = 0;

	unsigned long vm_flags = VM_READ | VM_WRITE;

	unsigned int mm_flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;

arch/hexagon/mm/vm_fault.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs) 
	struct mm_struct *mm = current->mm;

	int si_signo;

	int si_code = SEGV_MAPERR;

	int fault;

	vm_fault_t fault;

	const struct exception_table_entry *fixup;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;