Skip to content

Commit cdd591f

Browse files
author
Andreas Gruenbacher
committed
iov_iter: Introduce fault_in_iov_iter_writeable
Introduce a new fault_in_iov_iter_writeable helper for safely faulting in an iterator for writing. Uses get_user_pages() to fault in the pages without actually writing to them, which would be destructive. We'll use fault_in_iov_iter_writeable in gfs2 once we've determined that the iterator passed to .read_iter isn't in memory. Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent a629459 commit cdd591f

File tree

4 files changed

+104
-0
lines changed

4 files changed

+104
-0
lines changed

include/linux/pagemap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,7 @@ extern void add_page_wait_queue(struct page *page, wait_queue_entry_t *waiter);
736736
* Fault in userspace address range.
737737
*/
738738
size_t fault_in_writeable(char __user *uaddr, size_t size);
739+
size_t fault_in_safe_writeable(const char __user *uaddr, size_t size);
739740
size_t fault_in_readable(const char __user *uaddr, size_t size);
740741

741742
int add_to_page_cache_locked(struct page *page, struct address_space *mapping,

include/linux/uio.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ size_t copy_page_from_iter_atomic(struct page *page, unsigned offset,
134134
void iov_iter_advance(struct iov_iter *i, size_t bytes);
135135
void iov_iter_revert(struct iov_iter *i, size_t bytes);
136136
size_t fault_in_iov_iter_readable(const struct iov_iter *i, size_t bytes);
137+
size_t fault_in_iov_iter_writeable(const struct iov_iter *i, size_t bytes);
137138
size_t iov_iter_single_seg_count(const struct iov_iter *i);
138139
size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
139140
struct iov_iter *i);

lib/iov_iter.c

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,45 @@ size_t fault_in_iov_iter_readable(const struct iov_iter *i, size_t size)
467467
}
468468
EXPORT_SYMBOL(fault_in_iov_iter_readable);
469469

470+
/*
471+
* fault_in_iov_iter_writeable - fault in iov iterator for writing
472+
* @i: iterator
473+
* @size: maximum length
474+
*
475+
* Faults in the iterator using get_user_pages(), i.e., without triggering
476+
* hardware page faults. This is primarily useful when we already know that
477+
* some or all of the pages in @i aren't in memory.
478+
*
479+
* Returns the number of bytes not faulted in, like copy_to_user() and
480+
* copy_from_user().
481+
*
482+
* Always returns 0 for non-user-space iterators.
483+
*/
484+
size_t fault_in_iov_iter_writeable(const struct iov_iter *i, size_t size)
485+
{
486+
if (iter_is_iovec(i)) {
487+
size_t count = min(size, iov_iter_count(i));
488+
const struct iovec *p;
489+
size_t skip;
490+
491+
size -= count;
492+
for (p = i->iov, skip = i->iov_offset; count; p++, skip = 0) {
493+
size_t len = min(count, p->iov_len - skip);
494+
size_t ret;
495+
496+
if (unlikely(!len))
497+
continue;
498+
ret = fault_in_safe_writeable(p->iov_base + skip, len);
499+
count -= len - ret;
500+
if (ret)
501+
break;
502+
}
503+
return count + size;
504+
}
505+
return 0;
506+
}
507+
EXPORT_SYMBOL(fault_in_iov_iter_writeable);
508+
470509
void iov_iter_init(struct iov_iter *i, unsigned int direction,
471510
const struct iovec *iov, unsigned long nr_segs,
472511
size_t count)

mm/gup.c

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,6 +1691,69 @@ size_t fault_in_writeable(char __user *uaddr, size_t size)
16911691
}
16921692
EXPORT_SYMBOL(fault_in_writeable);
16931693

1694+
/*
1695+
* fault_in_safe_writeable - fault in an address range for writing
1696+
* @uaddr: start of address range
1697+
* @size: length of address range
1698+
*
1699+
* Faults in an address range using get_user_pages, i.e., without triggering
1700+
* hardware page faults. This is primarily useful when we already know that
1701+
* some or all of the pages in the address range aren't in memory.
1702+
*
1703+
* Other than fault_in_writeable(), this function is non-destructive.
1704+
*
1705+
* Note that we don't pin or otherwise hold the pages referenced that we fault
1706+
* in. There's no guarantee that they'll stay in memory for any duration of
1707+
* time.
1708+
*
1709+
* Returns the number of bytes not faulted in, like copy_to_user() and
1710+
* copy_from_user().
1711+
*/
1712+
size_t fault_in_safe_writeable(const char __user *uaddr, size_t size)
1713+
{
1714+
unsigned long start = (unsigned long)untagged_addr(uaddr);
1715+
unsigned long end, nstart, nend;
1716+
struct mm_struct *mm = current->mm;
1717+
struct vm_area_struct *vma = NULL;
1718+
int locked = 0;
1719+
1720+
nstart = start & PAGE_MASK;
1721+
end = PAGE_ALIGN(start + size);
1722+
if (end < nstart)
1723+
end = 0;
1724+
for (; nstart != end; nstart = nend) {
1725+
unsigned long nr_pages;
1726+
long ret;
1727+
1728+
if (!locked) {
1729+
locked = 1;
1730+
mmap_read_lock(mm);
1731+
vma = find_vma(mm, nstart);
1732+
} else if (nstart >= vma->vm_end)
1733+
vma = vma->vm_next;
1734+
if (!vma || vma->vm_start >= end)
1735+
break;
1736+
nend = end ? min(end, vma->vm_end) : vma->vm_end;
1737+
if (vma->vm_flags & (VM_IO | VM_PFNMAP))
1738+
continue;
1739+
if (nstart < vma->vm_start)
1740+
nstart = vma->vm_start;
1741+
nr_pages = (nend - nstart) / PAGE_SIZE;
1742+
ret = __get_user_pages_locked(mm, nstart, nr_pages,
1743+
NULL, NULL, &locked,
1744+
FOLL_TOUCH | FOLL_WRITE);
1745+
if (ret <= 0)
1746+
break;
1747+
nend = nstart + ret * PAGE_SIZE;
1748+
}
1749+
if (locked)
1750+
mmap_read_unlock(mm);
1751+
if (nstart == end)
1752+
return 0;
1753+
return size - min_t(size_t, nstart - start, size);
1754+
}
1755+
EXPORT_SYMBOL(fault_in_safe_writeable);
1756+
16941757
/**
16951758
* fault_in_readable - fault in userspace address range for reading
16961759
* @uaddr: start of user address range

0 commit comments

Comments
 (0)