Changeset 436a0a5 in mainline for kernel/generic/src/ipc

Timestamp:

2018-11-09T22:04:01Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

95d45482

Parents:

88e43bc (diff), abf6c01 (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.

Message:

(merge) Reduce the number of blocking allocations in the kernel

Location:

kernel/generic/src/ipc

Files:

• event.c (modified) (1 diff)
• ipc.c (modified) (4 diffs)
• ipcrsc.c (modified) (2 diffs)
• irq.c (modified) (2 diffs)
• sysipc.c (modified) (4 diffs)

kernel/generic/src/ipc/event.c

@@ -147 +147 @@
         if (event->answerbox != NULL) {
                 if (!event->masked) {
-                        call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                        call_t *call = ipc_call_alloc();
 
                         if (call) {

kernel/generic/src/ipc/ipc.c

@@ -108 +108 @@
  * TASK->answerbox.
  *
- * @param flags Parameters for slab_alloc (e.g FRAME_ATOMIC).
- *
- * @return If flags permit it, return NULL, or initialized kernel
- *         call structure with one reference.
- *
- */
-call_t *ipc_call_alloc(unsigned int flags)
-{
-        call_t *call = slab_alloc(call_cache, flags);
+ * @return Initialized kernel call structure with one reference, or NULL.
+ *
+ */
+call_t *ipc_call_alloc(void)
+{
+        // TODO: Allocate call and kobject in single allocation
+
+        call_t *call = slab_alloc(call_cache, FRAME_ATOMIC);
         if (!call)
                 return NULL;
 
-        kobject_t *kobj;
-        if (flags & FRAME_ATOMIC)
-                kobj = (kobject_t *) malloc(sizeof(kobject_t));
-        else
-                kobj = (kobject_t *) nfmalloc(sizeof(kobject_t));
-
+        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t));
         if (!kobj) {
                 slab_free(call_cache, call);
@@ -219 +213 @@
 errno_t ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
+        answerbox_t *mybox = slab_alloc(answerbox_cache, FRAME_ATOMIC);
+        if (!mybox)
+                return ENOMEM;
+
         ipc_answerbox_init(mybox, TASK);
 
@@ -483 +480 @@
                 kobject_put(phone->kobject);
 
-                call_t *call = ipc_call_alloc(0);
+                call_t *call = phone->hangup_call;
+                phone->hangup_call = NULL;
+                assert(call);
+
                 IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                 call->request_method = IPC_M_PHONE_HUNGUP;
@@ -685 +685 @@
                          * to exist as soon as we release it.
                          */
-                        call_t *call = ipc_call_alloc(0);
+                        call_t *call = phone->hangup_call;
+                        phone->hangup_call = NULL;
+                        assert(call);
+
                         IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                         call->request_method = IPC_M_PHONE_HUNGUP;

kernel/generic/src/ipc/ipcrsc.c

@@ -46 +46 @@
 {
         phone_t *phone = (phone_t *) arg;
+        if (phone->hangup_call)
+                kobject_put(phone->hangup_call->kobject);
         slab_free(phone_cache, phone);
 }
@@ -79 +81 @@
                         return ENOMEM;
                 }
+                call_t *hcall = ipc_call_alloc();
+                if (!hcall) {
+                        cap_free(TASK, handle);
+                        slab_free(phone_cache, phone);
+                        free(kobj);
+                        return ENOMEM;
+                }
 
                 ipc_phone_init(phone, task);
                 phone->state = IPC_PHONE_CONNECTING;
+                phone->hangup_call = hcall;
 
                 kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone,

kernel/generic/src/ipc/irq.c

@@ -529 +529 @@
 
         if (irq->notif_cfg.answerbox) {
-                call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                call_t *call = ipc_call_alloc();
                 if (!call)
                         return;
@@ -565 +565 @@
 
         if (irq->notif_cfg.answerbox) {
-                call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                call_t *call = ipc_call_alloc();
                 if (!call) {
                         irq_spinlock_unlock(&irq->lock, true);

kernel/generic/src/ipc/sysipc.c

@@ -267 +267 @@
  * @return EOK on success.
  * @return ENOENT if there is no such phone handle.
+ * @return ENOMEM if not enough memory to make the call
  *
  */
@@ -276 +277 @@
                 return ENOENT;
 
-        call_t *call = ipc_call_alloc(0);
+        call_t *call = ipc_call_alloc();
+        if (!call) {
+                kobject_put(kobj);
+                return ENOMEM;
+        }
+
         call->priv = priv;
         memcpy(call->data.args, data->args, sizeof(data->args));
@@ -373 +379 @@
         }
 
-        call_t *call = ipc_call_alloc(0);
+        call_t *call = ipc_call_alloc();
+        if (!call) {
+                kobject_put(kobj);
+                return ENOMEM;
+        }
+
         IPC_SET_IMETHOD(call->data, imethod);
         IPC_SET_ARG1(call->data, arg1);
@@ -420 +431 @@
         }
 
-        call_t *call = ipc_call_alloc(0);
+        call_t *call = ipc_call_alloc();
+        if (!call) {
+                kobject_put(kobj);
+                return ENOMEM;
+        }
+
         errno_t rc = copy_from_uspace(&call->data.args, &data->args,
             sizeof(call->data.args));