x86, mm: pass in 'total' to __copy_from_user_*nocache()

Impact: cleanup, enable future change

Add a 'total bytes copied' parameter to __copy_from_user_*nocache(),
and update all the callsites.

The parameter is not used yet - architecture code can use it to
more intelligently decide whether the copy should be cached or
non-temporal.

Cc: Salman Qazi <sqazi@google.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 7 insertions, 5 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 23acefe51808..60fd56772cc6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1816,14 +1816,14 @@ EXPORT_SYMBOL(file_remove_suid);
 static size_t __iovec_copy_from_user_inatomic(char *vaddr,
                         const struct iovec *iov, size_t base, size_t bytes)
 {
-        size_t copied = 0, left = 0;
+        size_t copied = 0, left = 0, total = bytes;
 
         while (bytes) {
                 char __user *buf = iov->iov_base + base;
                 int copy = min(bytes, iov->iov_len - base);
 
                 base = 0;
-                left = __copy_from_user_inatomic_nocache(vaddr, buf, copy);
+                left = __copy_from_user_inatomic_nocache(vaddr, buf, copy, total);
                 copied += copy;
                 bytes -= copy;
                 vaddr += copy;
@@ -1851,8 +1851,9 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
         if (likely(i->nr_segs == 1)) {
                 int left;
                 char __user *buf = i->iov->iov_base + i->iov_offset;
+
                 left = __copy_from_user_inatomic_nocache(kaddr + offset,
-                                                        buf, bytes);
+                                                        buf, bytes, bytes);
                 copied = bytes - left;
         } else {
                 copied = __iovec_copy_from_user_inatomic(kaddr + offset,
@@ -1880,7 +1881,8 @@ size_t iov_iter_copy_from_user(struct page *page,
         if (likely(i->nr_segs == 1)) {
                 int left;
                 char __user *buf = i->iov->iov_base + i->iov_offset;
-                left = __copy_from_user_nocache(kaddr + offset, buf, bytes);
+
+                left = __copy_from_user_nocache(kaddr + offset, buf, bytes, bytes);
                 copied = bytes - left;
         } else {
                 copied = __iovec_copy_from_user_inatomic(kaddr + offset,
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 0c04615651b7..bf54f8a2cf1d 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -354,7 +354,7 @@ __xip_file_write(struct file *filp, const char __user *buf,
                         break;
 
                 copied = bytes -
-                        __copy_from_user_nocache(xip_mem + offset, buf, bytes);
+                        __copy_from_user_nocache(xip_mem + offset, buf, bytes, bytes);
 
                 if (likely(copied > 0)) {
                         status = copied;