Changeset 67f11a0 in mainline for kernel/generic/src/ipc/ops/concttome.c

Timestamp:

2018-03-15T17:40:20Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

530f2de, e9e4068

Parents:

30f1a25 (diff), a36f442 (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.

git-author:

Jakub Jermar <jakub@…> (2018-03-15 17:25:56)

git-committer:

Jakub Jermar <jakub@…> (2018-03-15 17:40:20)

Message:

Merge branch 'noreclaimers'

This commit removes the left-over from the original IPC phone life-cycle
management in which phones were freed lazily during an attempt to
allocate a new phone when the allocator found a hung-up phone with zero
active calls. This mechanism is the reason why kernel objects had to
have the reclaim method. This commit changes the behavior in that phones
are deallocated with their last reference. At the same time it makes
sure that each active call has its own reference on the phone.

This change also makes sure that each connected phone has a capability
via which it can be hung up by the user or cleaned up in ipc_cleanup().
A special mode for phone_alloc() was introduced that allows calls such
as IPC_M_CONNECT_ME_TO and IPC_M_CONNECT_TO_ME to allocate an
unpublished capability and publish it only when the phone is
successfully connected. This fixes a nasty race condition when the user
destroys the capability before the phone is connected and then this
phone becomes essentially invisible for ipc_cleanup().

Last but not least, ipc_cleanup() was slightly streamlined in that it
now knows for how many calls it has to wait from the answerbox's active
call count.

File:

• kernel/generic/src/ipc/ops/concttome.c (modified) (4 diffs)

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

@@ -43 +43 @@
 {
         cap_handle_t phone_handle;
-        errno_t rc = phone_alloc(TASK, &phone_handle);
+        kobject_t *phone_obj;
+        errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
+        call->priv = (sysarg_t) phone_obj;
         IPC_SET_ARG5(call->data, (rc == EOK) ? phone_handle : -1);
         return 0;
@@ -51 +53 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        kobject_t *phone_obj = (kobject_t *) answer->priv;
 
-        if (phone_handle >= 0)
-                phone_dealloc(phone_handle);
+        if (phone_handle >= 0) {
+                kobject_put(phone_obj);
+                cap_free(TASK, phone_handle);
+        }
 
         return EOK;
@@ -61 +66 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        kobject_t *phone_obj = (kobject_t *) answer->priv;
 
         if (IPC_GET_RETVAL(answer->data) != EOK) {
@@ -66 +72 @@
                 answer_cleanup(answer, olddata);
         } else if (phone_handle >= 0) {
-                /* The connection was accepted */
-                if (phone_connect(phone_handle, &answer->sender->answerbox)) {
+                /*
+                 * The connection was accepted
+                 */
+
+                /*
+                 * We need to create another reference as the one we have now
+                 * will be consumed by ipc_phone_connect().
+                 */
+                kobject_add_ref(phone_obj);
+
+                if (ipc_phone_connect(phone_obj->phone,
+                    &answer->sender->answerbox)) {
+                        /* Pass the reference to the capability */
+                        cap_publish(TASK, phone_handle, phone_obj);
                         /* Set 'phone hash' as ARG5 of response */
-                        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
-                            KOBJECT_TYPE_PHONE);
                         IPC_SET_ARG5(answer->data,
                             (sysarg_t) phone_obj->phone);
-                        kobject_put(phone_obj);
                 } else {
                         /* The answerbox is shutting down. */