Skip to content

Commit 3337ab0

Browse files
author
Andreas Gruenbacher
committed
iov_iter: Introduce nofault flag to disable page faults
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 <[email protected]>
1 parent 55b8fe7 commit 3337ab0

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

include/linux/uio.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ struct iov_iter_state {
3535

3636
struct iov_iter {
3737
u8 iter_type;
38+
bool nofault;
3839
bool data_source;
3940
size_t iov_offset;
4041
size_t count;

lib/iov_iter.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction,
513513
WARN_ON(direction & ~(READ | WRITE));
514514
*i = (struct iov_iter) {
515515
.iter_type = ITER_IOVEC,
516+
.nofault = false,
516517
.data_source = direction,
517518
.iov = iov,
518519
.nr_segs = nr_segs,
@@ -1527,13 +1528,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i,
15271528
return 0;
15281529

15291530
if (likely(iter_is_iovec(i))) {
1531+
unsigned int gup_flags = 0;
15301532
unsigned long addr;
15311533

1534+
if (iov_iter_rw(i) != WRITE)
1535+
gup_flags |= FOLL_WRITE;
1536+
if (i->nofault)
1537+
gup_flags |= FOLL_NOFAULT;
1538+
15321539
addr = first_iovec_segment(i, &len, start, maxsize, maxpages);
15331540
n = DIV_ROUND_UP(len, PAGE_SIZE);
1534-
res = get_user_pages_fast(addr, n,
1535-
iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0,
1536-
pages);
1541+
res = get_user_pages_fast(addr, n, gup_flags, pages);
15371542
if (unlikely(res <= 0))
15381543
return res;
15391544
return (res == n ? len : res * PAGE_SIZE) - *start;
@@ -1649,15 +1654,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
16491654
return 0;
16501655

16511656
if (likely(iter_is_iovec(i))) {
1657+
unsigned int gup_flags = 0;
16521658
unsigned long addr;
16531659

1660+
if (iov_iter_rw(i) != WRITE)
1661+
gup_flags |= FOLL_WRITE;
1662+
if (i->nofault)
1663+
gup_flags |= FOLL_NOFAULT;
1664+
16541665
addr = first_iovec_segment(i, &len, start, maxsize, ~0U);
16551666
n = DIV_ROUND_UP(len, PAGE_SIZE);
16561667
p = get_pages_array(n);
16571668
if (!p)
16581669
return -ENOMEM;
1659-
res = get_user_pages_fast(addr, n,
1660-
iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0, p);
1670+
res = get_user_pages_fast(addr, n, gup_flags, p);
16611671
if (unlikely(res <= 0)) {
16621672
kvfree(p);
16631673
*pages = NULL;

0 commit comments

Comments
 (0)