3 files changed, 15 insertions, 11 deletions

diff --git a/.clang-format b/.clang-format
index 201a4f531b90..f49620f506f1 100644
--- a/.clang-format
+++ b/.clang-format
@@ -290,7 +290,6 @@ ForEachMacros:
   - 'idr_for_each_entry_ul'
   - 'inet_bind_bucket_for_each'
   - 'inet_lhash2_for_each_icsk_rcu'
-  - 'iov_for_each'
   - 'key_for_each'
   - 'key_for_each_safe'
   - 'klp_for_each_func'
diff --git a/include/linux/uio.h b/include/linux/uio.h
index ecf584f6b82d..87477e1640f9 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -110,14 +110,6 @@ static inline struct iovec iov_iter_iovec(const struct iov_iter *iter)
         };
 }
 
-#define iov_for_each(iov, iter, start)                          \
-        if (iov_iter_type(start) == ITER_IOVEC ||               \
-            iov_iter_type(start) == ITER_KVEC)                  \
-        for (iter = (start);                                    \
-             (iter).count &&                                    \
-             ((iov = iov_iter_iovec(&(iter))), 1);              \
-             iov_iter_advance(&(iter), (iov).iov_len))
-
 size_t iov_iter_copy_from_user_atomic(struct page *page,
                 struct iov_iter *i, unsigned long offset, size_t bytes);
 void iov_iter_advance(struct iov_iter *i, size_t bytes);
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index be4bd627caf0..ea36dc355da1 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -861,8 +861,21 @@ EXPORT_SYMBOL(_copy_from_iter_full_nocache);
 
 static inline bool page_copy_sane(struct page *page, size_t offset, size_t n)
 {
-        struct page *head = compound_head(page);
-        size_t v = n + offset + page_address(page) - page_address(head);
+        struct page *head;
+        size_t v = n + offset;
+
+        /*
+         * The general case needs to access the page order in order
+         * to compute the page size.
+         * However, we mostly deal with order-0 pages and thus can
+         * avoid a possible cache line miss for requests that fit all
+         * page orders.
+         */
+        if (n <= v && v <= PAGE_SIZE)
+                return true;
+
+        head = compound_head(page);
+        v += (page - head) << PAGE_SHIFT;
 
         if (likely(n <= v && v <= (PAGE_SIZE << compound_order(head))))
                 return true;