Commit 0911d004 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers

Some ->page_mkwrite handlers may return VM_FAULT_RETRY as its return
code (GFS2 or Lustre can definitely do this).  However VM_FAULT_RETRY
from ->page_mkwrite is completely unhandled by the mm code and results
in locking and writeably mapping the page which definitely is not what
the caller wanted.

Fix Lustre and block_page_mkwrite_ret() used by other filesystems
(notably GFS2) to return VM_FAULT_NOPAGE instead which results in
bailing out from the fault code, the CPU then retries the access, and we
fault again effectively doing what the handler wanted.

Link: http://lkml.kernel.org/r/20170203150729.15863-1-jack@suse.czSigned-off-by: default avatarJan Kara <jack@suse.cz>
Reported-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ed5bd7dc
...@@ -390,15 +390,13 @@ static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ...@@ -390,15 +390,13 @@ static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
result = VM_FAULT_LOCKED; result = VM_FAULT_LOCKED;
break; break;
case -ENODATA: case -ENODATA:
case -EAGAIN:
case -EFAULT: case -EFAULT:
result = VM_FAULT_NOPAGE; result = VM_FAULT_NOPAGE;
break; break;
case -ENOMEM: case -ENOMEM:
result = VM_FAULT_OOM; result = VM_FAULT_OOM;
break; break;
case -EAGAIN:
result = VM_FAULT_RETRY;
break;
default: default:
result = VM_FAULT_SIGBUS; result = VM_FAULT_SIGBUS;
break; break;
......
...@@ -243,12 +243,10 @@ static inline int block_page_mkwrite_return(int err) ...@@ -243,12 +243,10 @@ static inline int block_page_mkwrite_return(int err)
{ {
if (err == 0) if (err == 0)
return VM_FAULT_LOCKED; return VM_FAULT_LOCKED;
if (err == -EFAULT) if (err == -EFAULT || err == -EAGAIN)
return VM_FAULT_NOPAGE; return VM_FAULT_NOPAGE;
if (err == -ENOMEM) if (err == -ENOMEM)
return VM_FAULT_OOM; return VM_FAULT_OOM;
if (err == -EAGAIN)
return VM_FAULT_RETRY;
/* -ENOSPC, -EDQUOT, -EIO ... */ /* -ENOSPC, -EDQUOT, -EIO ... */
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment