Changeset 6769005 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

53ee7a0

Parents:

94ab1fe

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.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (5 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -202 +202 @@
                         kobject_put(phone->kobject);
                         phone->state = IPC_PHONE_SLAMMED;
+                        phone->label = 0;
                         irq_spinlock_unlock(&phone->callee->lock, true);
                 }
@@ -386 +387 @@
 
         /* Set the user-defined label */
-        call->data.label = label;
+        call->data.answer_label = label;
 
         errno_t res = request_preprocess(call, kobj->phone);
@@ -430 +431 @@
 
         /* Set the user-defined label */
-        call->data.label = label;
+        call->data.answer_label = label;
 
         errno_t res = request_preprocess(call, kobj->phone);
@@ -504 +505 @@
         if (!method_is_immutable(IPC_GET_IMETHOD(call->data))) {
                 if (method_is_system(IPC_GET_IMETHOD(call->data))) {
-                        if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME)
-                                phone_dealloc((cap_phone_handle_t)
-                                    IPC_GET_ARG5(call->data));
+                        if (IPC_GET_IMETHOD(call->data) ==
+                            IPC_M_CONNECT_TO_ME) {
+                                kobject_put((kobject_t *) call->priv);
+                                call->priv = 0;
+                                cap_free(TASK,
+                                    (cap_handle_t) IPC_GET_ARG5(call->data));
+                        }
 
                         IPC_SET_ARG1(call->data, imethod);
@@ -771 +776 @@
         call->data.flags = call->flags;
         if (call->flags & IPC_CALL_NOTIF) {
-                /* Set in_phone_hash to the interrupt counter */
-                call->data.phone = (void *) call->priv;
+                /* Set the request_label to the interrupt counter */
+                call->data.request_label = (sysarg_t) call->priv;
 
                 call->data.cap_handle = CAP_NIL;