Changeset 6769005 in mainline for abi

Timestamp:

2018-10-31T06:03:38Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

53ee7a0

Parents:

94ab1fee

git-author:

Jakub Jermar <jakub@…> (2018-10-28 12:42:35)

git-committer:

Jakub Jermar <jakub@…> (2018-10-31 06:03:38)

Message:

Use user-defined labels instead of phone hashes

This commit changes the way how the async framework maps incomming calls
to connections. Instead of abusing the kernel addresses of attached
phones as identifiers, the IPC_M_CONNECT_TO_ME and IPC_M_CONNECT_ME_TO
messages allow the server to specify an arbitrary label which is
remembered in the connected phone and consequently imprinted on each
call which is routed through this phone.

The async framework uses the address of the connection structure as the
label. This removes the need for a connection hash table because each
incoming call already remembers the connection in its label.

To disambiguate this new label and the other user-defined label used for
answers, the call structure now has the request_label member for the
former and answer_label member for the latter.

This commit also moves the kernel definition of ipc_data_t to abi/ and
removes the uspace redefinition thereof. Finally, when forwarding the
IPC_M_CONNECT_TO_ME call, the phone capability and the kernel object
allocated in request_process are now correctly disposed of.

Location:

abi/include/abi/ipc

Files:

• ipc.h (modified) (2 diffs)
• methods.h (modified) (4 diffs)

abi/include/abi/ipc/ipc.h

@@ -35 +35 @@
 #ifndef ABI_IPC_IPC_H_
 #define ABI_IPC_IPC_H_
+
+#include <abi/proc/task.h>
+#include <abi/cap.h>
 
 /** Length of data being transferred with IPC call
@@ -108 +111 @@
 #define IPC_FIRST_USER_METHOD  1024
 
+typedef struct {
+        sysarg_t args[IPC_CALL_LEN];
+        /**
+         * Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME,
+         * or the task which answered the call.
+         */
+        task_id_t task_id;
+        /** Flags */
+        unsigned flags;
+        /** User-defined label associated with requests */
+        sysarg_t request_label;
+        /** User-defined label associated with answers */
+        sysarg_t answer_label;
+        /** Capability handle */
+        cap_call_handle_t cap_handle;
+} ipc_data_t;
+
 #endif
 

abi/include/abi/ipc/methods.h

@@ -71 +71 @@
          *            arg3 .. <custom>
          *            arg4 .. <unused>
+         *            arg5 .. sender-assigned label
          *  - kernel: arg5 .. new recipient's connection phone capability
          *
@@ -78 +79 @@
          *            arg3 .. <unused>
          *            arg4 .. <unused>
-         *  - kernel: arg5 .. new recipient's connection phone hash
+         *            arg5 .. <unused>
          *
          */
@@ -95 +96 @@
          *            arg3 .. <custom>
          *            arg4 .. flags (e.g. IPC_FLAG_BLOCKING)
-         *  - kernel: arg5 .. new sender's connection phone hash
+         *            arg5 .. unused
          *
          * Recipient:
@@ -102 +103 @@
          *            arg3 .. <unused>
          *            arg4 .. <unused>
+         *            arg5 .. recipient-assigned label
          *  - kernel: arg5 .. new sender's connection phone capability
          *