[v2] include: mm: Adding new inline function vmf_error

Commit Message

Souptick Joarder May 10, 2018, 5:48 p.m. UTC

Many places in drivers/ file systems, error was handled
in a common way like below -
ret = (ret == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;
This new inline function vmf_error() will replace this
and return vm_fault_t type err.

A lot of drivers and filesystems currently have a rather
complex mapping of errno-to-VM_FAULT code. We have been
able to eliminate a lot of it by just returning VM_FAULT
codes directly from functions which are called exclusively
from the fault handling path.

Some functions can be called both from the fault handler
and other context which are expecting an errno, so they
have to continue to return an errno. Some users still need
to choose different behaviour for different errnos, but
vmf_error() captures the essential error translation
that's common to all users, and those that need to handle
additional errors can handle them first.

Signed-off-by: Souptick Joarder <[e-mail]>
Reviewed-by: Matthew Wilcox <[e-mail]>
---
v2: Addressed Andrew's comment. Updated the change log.
    Modified vmf_error() to less verbose

 include/linux/mm.h | 7 +++++++
 1 file changed, 7 insertions(+)

Patch

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a4d8853..6ef5d94 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2453,6 +2453,13 @@  static inline vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma,
 	return VM_FAULT_NOPAGE;
 }
 
+static inline vm_fault_t vmf_error(int err)
+{
+	if (err == -ENOMEM)
+		return VM_FAULT_OOM;
+	return VM_FAULT_SIGBUS;
+}
+
 struct page *follow_page_mask(struct vm_area_struct *vma,
 			      unsigned long address, unsigned int foll_flags,
 			      unsigned int *page_mask);