Changeset 2c2d54a in mainline for uspace/srv/vfs

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/pager

Location:

uspace/srv/vfs

Files:

• Makefile (modified) (1 diff)
• vfs.c (modified) (6 diffs)
• vfs.h (modified) (1 diff)
• vfs_ops.c (modified) (5 diffs)
• vfs_pager.c (added)

uspace/srv/vfs/Makefile

@@ -38 +38 @@
         vfs_ops.c \
         vfs_lookup.c \
-        vfs_register.c
+        vfs_register.c \
+        vfs_pager.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/vfs/vfs.c

@@ -37 +37 @@
 
 #include <vfs/vfs.h>
+#include <stdlib.h>
 #include <ipc/services.h>
+#include <abi/ipc/methods.h>
+#include <libarch/config.h>
 #include <ns.h>
 #include <async.h>
@@ -51 +54 @@
 #define NAME  "vfs"
 
+static void vfs_pager(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        async_answer_0(iid, EOK);
+
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PAGE_IN:
+                        vfs_page_in(callid, &call);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
+        }
+}
+
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -150 +175 @@
 int main(int argc, char **argv)
 {
+        int rc;
+
         printf("%s: HelenOS VFS server\n", NAME);
         
@@ -165 +192 @@
          */
         plb = as_area_create(AS_AREA_ANY, PLB_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
         if (plb == AS_MAP_FAILED) {
                 printf("%s: Cannot create address space area\n", NAME);
@@ -179 +206 @@
 
         /*
+         * Create a port for the pager.
+         */
+        port_id_t port;
+        rc = async_create_port(INTERFACE_PAGER, vfs_pager, NULL, &port);
+        if (rc != EOK)
+                return rc;
+                
+        /*
          * Set a connection handling function/fibril.
          */
@@ -192 +227 @@
          * Register at the naming service.
          */
-        int rc = service_register(SERVICE_VFS);
+        rc = service_register(SERVICE_VFS);
         if (rc != EOK) {
                 printf("%s: Cannot register VFS service\n", NAME);

uspace/srv/vfs/vfs.h

@@ -224 +224 @@
 extern void vfs_statfs(ipc_callid_t, ipc_call_t *);
 
+extern void vfs_page_in(ipc_callid_t, ipc_call_t *);
+
+typedef struct {
+        void *buffer;
+        size_t size;
+} rdwr_io_chunk_t;
+
+extern int vfs_rdwr_internal(int, bool, rdwr_io_chunk_t *);
+
 #endif
 

uspace/srv/vfs/vfs_ops.c

@@ -734 +734 @@
 }
 
-static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
+typedef int (* rdwr_ipc_cb_t)(async_exch_t *, vfs_file_t *, ipc_call_t *,
+    bool, void *);
+
+static int rdwr_ipc_client(async_exch_t *exch, vfs_file_t *file,
+    ipc_call_t *answer, bool read, void *data)
+{
+        size_t *bytes = (size_t *) data;
+        int rc;
+
+        /*
+         * Make a VFS_READ/VFS_WRITE request at the destination FS server
+         * and forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE request to the
+         * destination FS server. The call will be routed as if sent by
+         * ourselves. Note that call arguments are immutable in this case so we
+         * don't have to bother.
+         */
+
+        if (read) {
+                rc = async_data_read_forward_4_1(exch, VFS_OUT_READ,
+                    file->node->service_id, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), answer);
+        } else {
+                rc = async_data_write_forward_4_1(exch, VFS_OUT_WRITE,
+                    file->node->service_id, file->node->index,
+                    LOWER32(file->pos), UPPER32(file->pos), answer);
+        }
+
+        *bytes = IPC_GET_ARG1(*answer);
+        return rc;
+}
+
+static int rdwr_ipc_internal(async_exch_t *exch, vfs_file_t *file,
+    ipc_call_t *answer, bool read, void *data)
+{
+        rdwr_io_chunk_t *chunk = (rdwr_io_chunk_t *) data;
+
+        if (exch == NULL)
+                return ENOENT;
+        
+        aid_t msg = async_send_fast(exch, read ? VFS_OUT_READ : VFS_OUT_WRITE,
+            file->node->service_id, file->node->index, LOWER32(file->pos),
+            UPPER32(file->pos), answer);
+        if (msg == 0)
+                return EINVAL;
+
+        int retval = async_data_read_start(exch, chunk->buffer, chunk->size);
+        if (retval != EOK) {
+                async_forget(msg);
+                return retval;
+        }
+        
+        sysarg_t rc;
+        async_wait_for(msg, &rc);
+        
+        chunk->size = IPC_GET_ARG1(*answer); 
+
+        return (int) rc;
+}
+
+static int vfs_rdwr(int fd, bool read, rdwr_ipc_cb_t ipc_cb, void *ipc_cb_data)
 {
         /*
@@ -746 +805 @@
          */
         
-        int fd = IPC_GET_ARG1(*request);
-        
         /* Lookup the file structure corresponding to the file descriptor. */
         vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                async_answer_0(rid, ENOENT);
-                return;
-        }
+        if (!file)
+                return ENOENT;
         
         /*
@@ -786 +841 @@
         async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
         
-        /*
-         * Make a VFS_READ/VFS_WRITE request at the destination FS server
-         * and forward the IPC_M_DATA_READ/IPC_M_DATA_WRITE request to the
-         * destination FS server. The call will be routed as if sent by
-         * ourselves. Note that call arguments are immutable in this case so we
-         * don't have to bother.
-         */
-        sysarg_t rc;
+        if (!read && file->append)
+                file->pos = file->node->size;
+        
+        /*
+         * Handle communication with the endpoint FS.
+         */
         ipc_call_t answer;
-        if (read) {
-                rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ,
-                    file->node->service_id, file->node->index,
-                    LOWER32(file->pos), UPPER32(file->pos), &answer);
-        } else {
-                if (file->append)
-                        file->pos = file->node->size;
-                
-                rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
-                    file->node->service_id, file->node->index,
-                    LOWER32(file->pos), UPPER32(file->pos), &answer);
-        }
+        int rc = ipc_cb(fs_exch, file, &answer, read, ipc_cb_data);
         
         vfs_exchange_release(fs_exch);
@@ -833 +875 @@
         vfs_file_put(file);     
 
-        /*
-         * FS server's reply is the final result of the whole operation we
-         * return to the client.
-         */
+        return rc;
+}
+        
+static void vfs_rdwr_client(ipc_callid_t rid, ipc_call_t *request, bool read)
+{
+        size_t bytes = 0;       
+        int rc = vfs_rdwr(IPC_GET_ARG1(*request), read, rdwr_ipc_client,
+            &bytes);
         async_answer_1(rid, rc, bytes);
 }
 
+int vfs_rdwr_internal(int fd, bool read, rdwr_io_chunk_t *chunk)
+{
+        return vfs_rdwr(fd, read, rdwr_ipc_internal, chunk);
+}
+
 void vfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr(rid, request, true);
+        vfs_rdwr_client(rid, request, true);
 }
 
 void vfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-        vfs_rdwr(rid, request, false);
+        vfs_rdwr_client(rid, request, false);
 }
 
@@ -893 +944 @@
                 
                 file->pos += off;
-                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
+                newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
                 
                 fibril_mutex_unlock(&file->lock);