Changeset bf75e3cb in mainline for kernel

Timestamp:

2011-01-26T20:22:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4e7d3dd, 5b7a107, 875c629

Parents:

a0ce870 (diff), 4fe94c66 (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/fs.

Highlights of the merge:

• the kernel signs each call by the sender's task hash

• async framework tracks and reference counts connections from the same client task

• VFS associates the table of open files with the client task rather than with a single connection

• VFS libc client code now uses async sessions to support parallel requests

• vfs_file_get() now explicitly adds a reference on the file structure and the newly introduced vfs_file_put() drops it

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/sysipc.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -165 +165 @@
  *                       error is sent back to caller. Otherwise 
  *                       the call is accepted and the response is sent back.
- *                     - the allocated phoneid is passed to userspace 
+ *                     - the hash of the client task is passed to userspace
+ *                       (on the receiving side) as ARG4 of the call.
+ *                     - the hash of the allocated phone is passed to userspace
  *                       (on the receiving side) as ARG5 of the call.
  *
@@ -319 +321 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
+        /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
+        struct task *task;
+        /** Phone which made or last masqueraded this call. */
         phone_t *phone;
 } ipc_data_t;

kernel/generic/src/ipc/ipc.c

@@ -295 +295 @@
                 atomic_inc(&phone->active_calls);
                 call->data.phone = phone;
+                call->data.task = TASK;
         }
         
@@ -406 +407 @@
                         call->caller_phone = call->data.phone;
                 call->data.phone = newphone;
+                call->data.task = TASK;
         }
         

kernel/generic/src/ipc/sysipc.c

@@ -248 +248 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
+                        /* Set 'task hash' as arg4 of response */
+                        IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,