Changeset f5837524 in mainline for kernel/generic/src/ipc/ops/conctmeto.c

Timestamp:

2018-10-29T17:15:02Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

eec201d

Parents:

184f2f8a

git-author:

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

git-committer:

Jakub Jermar <jakub@…> (2018-10-29 17:15:02)

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/ops/conctmeto.c (modified) (5 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -46 +46 @@
          * That will be done once the phone is connected.
          */
-        cap_phone_handle_t phone_handle;
-        kobject_t *phone_obj;
-        errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
+        cap_phone_handle_t phandle;
+        kobject_t *pobj;
+        errno_t rc = phone_alloc(TASK, false, &phandle, &pobj);
         if (rc != EOK) {
-                call->priv = -1;
+                call->priv = 0;
                 return rc;
         }
 
-        /* Hand over phone_obj's reference to ARG5 */
-        IPC_SET_ARG5(call->data, (sysarg_t) phone_obj->phone);
+        /* Move pobj's reference to call->priv */
+        call->priv = (sysarg_t) pobj;
+        pobj = NULL;
 
         /* Remember the handle */
-        call->priv = CAP_HANDLE_RAW(phone_handle);
+        IPC_SET_ARG5(call->data, (sysarg_t) phandle);
 
         return EOK;
@@ -65 +66 @@
 static errno_t request_forget(call_t *call)
 {
-        cap_phone_handle_t phone_handle = (cap_handle_t) call->priv;
+        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call->data);
 
-        if (CAP_HANDLE_RAW(phone_handle) < 0)
+        if (CAP_HANDLE_RAW(phandle) < 0)
                 return EOK;
 
-        /* Hand over reference from ARG5 to phone->kobject */
-        phone_t *phone = (phone_t *) IPC_GET_ARG5(call->data);
-        /* Drop phone->kobject's reference */
-        kobject_put(phone->kobject);
-        cap_free(TASK, phone_handle);
+        /* Move reference from call->priv to pobj */
+        kobject_t *pobj = (kobject_t *) call->priv;
+        call->priv = 0;
+        /* Drop pobj's reference */
+        kobject_put(pobj);
+        cap_free(TASK, phandle);
 
         return EOK;
@@ -81 +83 @@
 static errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        /* Hand over reference from ARG5 to phone */
-        phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
+        /* Get an extra reference for phone */
+        kobject_t *pobj = (kobject_t *) answer->priv;
+        kobject_add_ref(pobj);
 
-        /*
-         * Get an extra reference and pass it in the answer data.
-         */
-        kobject_add_ref(phone->kobject);
-        IPC_SET_ARG5(answer->data, (sysarg_t) phone);
+        /* Set the recipient-assigned label */
+        pobj->phone->label = IPC_GET_ARG5(answer->data);
+
+        /* Restore phone handle in answer's ARG5 */
+        IPC_SET_ARG5(answer->data, IPC_GET_ARG5(*olddata));
 
         /* If the user accepted the call, connect */
         if (IPC_GET_RETVAL(answer->data) == EOK) {
-                /* Hand over reference from phone to the answerbox */
-                (void) ipc_phone_connect(phone, &TASK->answerbox);
+                /* Hand over reference from pobj to the answerbox */
+                (void) ipc_phone_connect(pobj->phone, &TASK->answerbox);
         } else {
-                kobject_put(phone->kobject);
+                /* Drop the extra reference */
+                kobject_put(pobj);
         }
 
@@ -103 +107 @@
 static errno_t answer_process(call_t *answer)
 {
-        cap_phone_handle_t phone_handle = (cap_handle_t) answer->priv;
-        phone_t *phone = (phone_t *) IPC_GET_ARG5(answer->data);
+        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(answer->data);
+        /* Move the reference from answer->priv to pobj */
+        kobject_t *pobj = (kobject_t *) answer->priv;
+        answer->priv = 0;
 
         if (IPC_GET_RETVAL(answer->data)) {
-                if (CAP_HANDLE_RAW(phone_handle) >= 0) {
+                if (CAP_HANDLE_RAW(phandle) >= 0) {
                         /*
                          * Cleanup the unpublished capability and drop
                          * phone->kobject's reference.
                          */
-                        kobject_put(phone->kobject);
-                        cap_free(TASK, phone_handle);
+                        kobject_put(pobj);
+                        cap_free(TASK, phandle);
                 }
         } else {
@@ -121 +127 @@
                  * capability for each phone that wasn't hung up by the user.
                  */
-                cap_publish(TASK, phone_handle, phone->kobject);
-
-                IPC_SET_ARG5(answer->data, CAP_HANDLE_RAW(phone_handle));
+                cap_publish(TASK, phandle, pobj);
         }