uml: start fixing os_read_file and os_write_file

This patch starts the removal of a very old, very broken piece of code.  This
stems from the problem of passing a userspace buffer into read() or write() on
the host.  If that buffer had not yet been faulted in, read and write will
return -EFAULT.

To avoid this problem, the solution was to fault the buffer in before the
system call by touching the pages that hold the buffer by doing a copy-user of
a byte to each page.  This is obviously bogus, but it does usually work, in tt
mode, since the kernel and process are in the same address space and userspace
addresses can be accessed directly in the kernel.

In skas mode, where the kernel and process are in separate address spaces, it
is completely bogus because the userspace address, which is invalid in the
kernel, is passed into the system call instead of the corresponding physical
address, which would be valid.  Here, it appears that this code, on every host
read() or write(), tries to fault in a random process page.  This doesn't seem
to cause any correctness problems, but there is a performance impact.  This
patch, and the ones following, result in a 10-15% performance gain on a kernel
build.

This code can't be immediately tossed out because when it is, you can't log
in.  Apparently, there is some code in the console driver which depends on
this somehow.

However, we can start removing it by switching the code which does I/O using
kernel addresses to using plain read() and write().  This patch introduces
os_read_file_k and os_write_file_k for use with kernel buffers and converts
all call locations which use obvious kernel buffers to use them.  These
include I/O using buffers which are local variables which are on the stack or
kmalloc-ed.  Later patches will handle the less obvious cases, followed by a
mass conversion back to the original interface.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 9 deletions

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 83189e188c3f..6d163c9e2885 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -504,7 +504,7 @@ static void ubd_handler(void)
         struct ubd *dev;
         int n;
 
-        n = os_read_file(thread_fd, &req, sizeof(req));
+        n = os_read_file_k(thread_fd, &req, sizeof(req));
         if(n != sizeof(req)){
                 printk(KERN_ERR "Pid %d - spurious interrupt in ubd_handler, "
                        "err = %d\n", os_getpid(), -n);
@@ -1092,8 +1092,7 @@ static void do_ubd_request(request_queue_t *q)
                 err = prepare_request(req, &io_req);
                 if(!err){
                         dev->active = 1;
-                        n = os_write_file(thread_fd, (char *) &io_req,
-                                         sizeof(io_req));
+                        n = os_write_file_k(thread_fd, &io_req, sizeof(io_req));
                         if(n != sizeof(io_req))
                                 printk("write to io thread failed, "
                                        "errno = %d\n", -n);
@@ -1336,8 +1335,8 @@ static int update_bitmap(struct io_thread_req *req)
                 return(1);
         }
 
-        n = os_write_file(req->fds[1], &req->bitmap_words,
-                          sizeof(req->bitmap_words));
+        n = os_write_file_k(req->fds[1], &req->bitmap_words,
+                            sizeof(req->bitmap_words));
         if(n != sizeof(req->bitmap_words)){
                 printk("do_io - bitmap update failed, err = %d fd = %d\n", -n,
                        req->fds[1]);
@@ -1381,7 +1380,7 @@ void do_io(struct io_thread_req *req)
                         do {
                                 buf = &buf[n];
                                 len -= n;
-                                n = os_read_file(req->fds[bit], buf, len);
+                                n = os_read_file_k(req->fds[bit], buf, len);
                                 if (n < 0) {
                                         printk("do_io - read failed, err = %d "
                                                "fd = %d\n", -n, req->fds[bit]);
@@ -1391,7 +1390,7 @@ void do_io(struct io_thread_req *req)
                         } while((n < len) && (n != 0));
                         if (n < len) memset(&buf[n], 0, len - n);
                 } else {
-                        n = os_write_file(req->fds[bit], buf, len);
+                        n = os_write_file_k(req->fds[bit], buf, len);
                         if(n != len){
                                 printk("do_io - write failed err = %d "
                                        "fd = %d\n", -n, req->fds[bit]);
@@ -1421,7 +1420,7 @@ int io_thread(void *arg)
 
         ignore_sigwinch_sig();
         while(1){
-                n = os_read_file(kernel_fd, &req, sizeof(req));
+                n = os_read_file_k(kernel_fd, &req, sizeof(req));
                 if(n != sizeof(req)){
                         if(n < 0)
                                 printk("io_thread - read failed, fd = %d, "
@@ -1434,7 +1433,7 @@ int io_thread(void *arg)
                 }
                 io_count++;
                 do_io(&req);
-                n = os_write_file(kernel_fd, &req, sizeof(req));
+                n = os_write_file_k(kernel_fd, &req, sizeof(req));
                 if(n != sizeof(req))
                         printk("io_thread - write failed, fd = %d, err = %d\n",
                                kernel_fd, -n);