diff options
-rw-r--r-- | include/linux/uio.h | 1 | ||||
-rw-r--r-- | mm/iov_iter.c | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index c567655b9595..bd8569a14c4a 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h | |||
@@ -83,6 +83,7 @@ size_t copy_page_from_iter(struct page *page, size_t offset, size_t bytes, | |||
83 | struct iov_iter *i); | 83 | struct iov_iter *i); |
84 | size_t copy_to_iter(void *addr, size_t bytes, struct iov_iter *i); | 84 | size_t copy_to_iter(void *addr, size_t bytes, struct iov_iter *i); |
85 | size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i); | 85 | size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i); |
86 | size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i); | ||
86 | size_t iov_iter_zero(size_t bytes, struct iov_iter *); | 87 | size_t iov_iter_zero(size_t bytes, struct iov_iter *); |
87 | unsigned long iov_iter_alignment(const struct iov_iter *i); | 88 | unsigned long iov_iter_alignment(const struct iov_iter *i); |
88 | void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov, | 89 | void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov, |
diff --git a/mm/iov_iter.c b/mm/iov_iter.c index 88c052e63a1d..a1599ca4ab0e 100644 --- a/mm/iov_iter.c +++ b/mm/iov_iter.c | |||
@@ -399,6 +399,27 @@ size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i) | |||
399 | } | 399 | } |
400 | EXPORT_SYMBOL(copy_from_iter); | 400 | EXPORT_SYMBOL(copy_from_iter); |
401 | 401 | ||
402 | size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i) | ||
403 | { | ||
404 | char *to = addr; | ||
405 | if (unlikely(bytes > i->count)) | ||
406 | bytes = i->count; | ||
407 | |||
408 | if (unlikely(!bytes)) | ||
409 | return 0; | ||
410 | |||
411 | iterate_and_advance(i, bytes, v, | ||
412 | __copy_from_user_nocache((to += v.iov_len) - v.iov_len, | ||
413 | v.iov_base, v.iov_len), | ||
414 | memcpy_from_page((to += v.bv_len) - v.bv_len, v.bv_page, | ||
415 | v.bv_offset, v.bv_len), | ||
416 | memcpy((to += v.iov_len) - v.iov_len, v.iov_base, v.iov_len) | ||
417 | ) | ||
418 | |||
419 | return bytes; | ||
420 | } | ||
421 | EXPORT_SYMBOL(copy_from_iter_nocache); | ||
422 | |||
402 | size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes, | 423 | size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes, |
403 | struct iov_iter *i) | 424 | struct iov_iter *i) |
404 | { | 425 | { |