Changeset d51a0d6 in mainline

Timestamp:

2017-11-21T22:23:00Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

35f2bb1

Parents:

c4c6025

Message:

Associate a kobject_t with a call_t

Let all the reference counting be done on call_t::kobject.

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (2 diffs)
• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/ipc.c (modified) (6 diffs)
• src/ipc/sysipc.c (modified) (6 diffs)

kernel/generic/include/cap/cap.h

@@ -53 +53 @@
 
 typedef enum {
+        KOBJECT_TYPE_CALL,
+        KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_PHONE,
-        KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_MAX
 } kobject_type_t;
 
 struct task;
+
+struct call;
+struct irq;
 struct phone;
-struct irq;
 
 struct kobject;
@@ -79 +82 @@
         union {
                 void *raw;
+                struct call *call;
+                struct irq *irq;
                 struct phone *phone;
-                struct irq *irq;
         };
 } kobject_t;

kernel/generic/include/ipc/ipc.h

@@ -109 +109 @@
 
 typedef struct {
+        kobject_t *kobject;
+
         /**
          * Task link.
@@ -115 +117 @@
          */
         link_t ta_link;
-
-        atomic_t refcnt;
 
         /** Answerbox link. */

kernel/generic/src/ipc/ipc.c

@@ -87 +87 @@
 }
 
-void ipc_call_hold(call_t *call)
-{
-        atomic_inc(&call->refcnt);
-}
-
-void ipc_call_release(call_t *call)
-{
-        if (atomic_predec(&call->refcnt) == 0) {
-                if (call->buffer)
-                        free(call->buffer);
-                if (call->caller_phone)
-                        kobject_put(call->caller_phone->kobject);
-                slab_free(call_slab, call);
-        }
-}
+static void call_destroy(void *arg)
+{
+        call_t *call = (call_t *) arg;
+
+        if (call->buffer)
+                free(call->buffer);
+        if (call->caller_phone)
+                kobject_put(call->caller_phone->kobject);
+        slab_free(call_slab, call);
+}
+
+static kobject_ops_t call_kobject_ops = {
+        .destroy = call_destroy
+};
 
 /** Allocate and initialize a call structure.
@@ -117 +116 @@
 {
         call_t *call = slab_alloc(call_slab, flags);
-        if (call) {
-                _ipc_call_init(call);
-                ipc_call_hold(call);
-        }
+        if (!call)
+                return NULL;
+        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t), flags);
+        if (!kobj) {
+                slab_free(call_slab, call);
+                return NULL;
+        }
+
+        _ipc_call_init(call);
+        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops);
+        call->kobject = kobj;
         
         return call;
-}
-
-/** Deallocate a call structure.
- *
- * @param call Call structure to be freed.
- *
- */
-void ipc_call_free(call_t *call)
-{
-        ipc_call_release(call);
 }
 
@@ -290 +286 @@
                 /* This is a forgotten call and call->sender is not valid. */
                 spinlock_unlock(&call->forget_lock);
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 return;
         } else {
@@ -705 +701 @@
          * must hold a reference to it.
          */
-        ipc_call_hold(call);
+        kobject_add_ref(call->kobject);
 
         spinlock_unlock(&call->forget_lock);
@@ -714 +710 @@
         SYSIPC_OP(request_forget, call);
 
-        ipc_call_release(call);
+        kobject_put(call->kobject);
 }
 
@@ -822 +818 @@
         SYSIPC_OP(answer_process, call);
 
-        ipc_call_free(call);
+        kobject_put(call->kobject);
         goto restart;
 }

kernel/generic/src/ipc/sysipc.c

@@ -286 +286 @@
 #endif
 
-                ipc_call_hold(call);
+                kobject_add_ref(call->kobject);
                 rc = ipc_call_sync(kobj->phone, call);
                 spinlock_lock(&call->forget_lock);
                 bool forgotten = call->forget;
                 spinlock_unlock(&call->forget_lock);
-                ipc_call_release(call);
+                kobject_put(call->kobject);
 
 #ifdef CONFIG_UDEBUG
@@ -306 +306 @@
                                  * deallocation.
                                  */
-                                ipc_call_free(call);
+                                kobject_put(call->kobject);
                         } else {
                                 /*
@@ -323 +323 @@
         
         memcpy(data->args, call->data.args, sizeof(data->args));
-        ipc_call_free(call);
+        kobject_put(call->kobject);
         kobject_put(kobj);
         
@@ -420 +420 @@
             sizeof(call->data.args));
         if (rc != 0) {
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 kobject_put(kobj);
                 return (sysarg_t) rc;
@@ -753 +753 @@
                 STRUCT_TO_USPACE(calldata, &call->data);
                 
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 
                 return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
@@ -762 +762 @@
                 
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {
-                        ipc_call_free(call);
+                        kobject_put(call->kobject);
                         goto restart;
                 }
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 
                 return ((sysarg_t) call) | IPC_CALLID_ANSWERED;