moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: iov_iter: Introduce nofault flag to disable page faults

Browse Source 
commit 3337ab08d08b1a375f88471d9c8b1cac968cb054 upstream

Introduce a new nofault flag to indicate to iov_iter_get_pages not to
fault in user pages.

This is implemented by passing the FOLL_NOFAULT flag to get_user_pages,
which causes get_user_pages to fail when it would otherwise fault in a
page. We'll use the ->nofault flag to prevent iomap_dio_rw from faulting
in pages when page faults are not allowed.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f86f8d2784)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6a03ed603ee208ea1b1d515ab500ab6349ffd7cb
This commit is contained in:
Andreas Gruenbacher
2022-04-15 06:28:52 +08:00
committed by Carlos Llamas
parent ccf74d1eca
commit 127a8ed2d3
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/uio.h
View File

@@ -35,6 +35,7 @@ struct iov_iter_state {
struct iov_iter { struct iov_iter {
u8 iter_type; u8 iter_type;
bool nofault;
bool data_source; bool data_source;
size_t iov_offset; size_t iov_offset;
size_t count; size_t count;

20
lib/iov_iter.c
View File

@@ -514,6 +514,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
WARN_ON(direction & ~(READ | WRITE)); WARN_ON(direction & ~(READ | WRITE));
*i = (struct iov_iter) { *i = (struct iov_iter) {
.iter_type = ITER_IOVEC, .iter_type = ITER_IOVEC,
.nofault = false,
.data_source = direction, .data_source = direction,
.iov = iov, .iov = iov,
.nr_segs = nr_segs, .nr_segs = nr_segs,
@@ -1529,13 +1530,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
return 0; return 0;
if (likely(iter_is_iovec(i))) { if (likely(iter_is_iovec(i))) {
unsigned int gup_flags = 0;
unsigned long addr; unsigned long addr;
if (iov_iter_rw(i) != WRITE)
gup_flags |= FOLL_WRITE;
if (i->nofault)
gup_flags |= FOLL_NOFAULT;
addr = first_iovec_segment(i, &len, start, maxsize, maxpages); addr = first_iovec_segment(i, &len, start, maxsize, maxpages);
n = DIV_ROUND_UP(len, PAGE_SIZE); n = DIV_ROUND_UP(len, PAGE_SIZE);
res = get_user_pages_fast(addr, n, res = get_user_pages_fast(addr, n, gup_flags, pages);
iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0,
pages);
if (unlikely(res <= 0)) if (unlikely(res <= 0))
return res; return res;
return (res == n ? len : res * PAGE_SIZE) - *start; return (res == n ? len : res * PAGE_SIZE) - *start;
@@ -1651,15 +1656,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
return 0; return 0;
if (likely(iter_is_iovec(i))) { if (likely(iter_is_iovec(i))) {
unsigned int gup_flags = 0;
unsigned long addr; unsigned long addr;
if (iov_iter_rw(i) != WRITE)
gup_flags |= FOLL_WRITE;
if (i->nofault)
gup_flags |= FOLL_NOFAULT;
addr = first_iovec_segment(i, &len, start, maxsize, ~0U); addr = first_iovec_segment(i, &len, start, maxsize, ~0U);
n = DIV_ROUND_UP(len, PAGE_SIZE); n = DIV_ROUND_UP(len, PAGE_SIZE);
p = get_pages_array(n); p = get_pages_array(n);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
res = get_user_pages_fast(addr, n, res = get_user_pages_fast(addr, n, gup_flags, p);
iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0, p);
if (unlikely(res <= 0)) { if (unlikely(res <= 0)) {
kvfree(p); kvfree(p);
*pages = NULL; *pages = NULL;