Changeset 48bcf49 in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2017-09-28T22:08:15Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6636fb19

Parents:

dd20cbb

Message:

Introduce reference-counted kobjects

Capabilities are thus reduced to task-local names for references to kobjects.

File:

• kernel/generic/src/ipc/irq.c (modified) (6 diffs)

kernel/generic/src/ipc/irq.c

@@ -271 +271 @@
 }
 
+static void irq_destroy(void *arg)
+{
+        irq_t *irq = (irq_t *) arg;
+
+        /* Free up the IRQ code and associated structures. */
+        code_free(irq->notif_cfg.code);
+        slab_free(irq_slab, irq);
+}
+
+static kobject_ops_t irq_kobject_ops = {
+        .destroy = irq_destroy
+};
+
 /** Subscribe an answerbox as a receiving end for IRQ notifications.
  *
@@ -304 +317 @@
          * Allocate and populate the IRQ kernel object.
          */
-        int handle = cap_alloc(TASK);
+        cap_handle_t handle = cap_alloc(TASK);
         if (handle < 0)
                 return handle;
@@ -311 +324 @@
         if (!irq) {
                 cap_free(TASK, handle);
+                return ENOMEM;
+        }
+
+        kobject_t *kobject = malloc(sizeof(kobject_t), FRAME_ATOMIC);
+        if (!kobject) {
+                cap_free(TASK, handle);
+                slab_free(irq_slab, irq);
                 return ENOMEM;
         }
@@ -330 +350 @@
         irq_spinlock_lock(&irq->lock, false);
         
+        irq->notif_cfg.hashed_in = true;
         hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
         
@@ -335 +356 @@
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
 
-        cap_publish(TASK, handle, CAP_TYPE_IRQ, irq);
+        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq, &irq_kobject_ops);
+        cap_publish(TASK, handle, kobject);
         
         return handle;
@@ -350 +372 @@
 int ipc_irq_unsubscribe(answerbox_t *box, int handle)
 {
-        cap_t *cap = cap_unpublish(TASK, handle, CAP_TYPE_IRQ);
-        if (!cap)
+        kobject_t *kobj = cap_unpublish(TASK, handle, KOBJECT_TYPE_IRQ);
+        if (!kobj)
                 return ENOENT;
         
-        irq_t *irq = (irq_t *) cap->kobject;
-        
+        assert(kobj->irq->notif_cfg.answerbox == box);
+
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-        irq_spinlock_lock(&irq->lock, false);
-        
-        assert(irq->notif_cfg.answerbox == box);
-        
-        /* Remove the IRQ from the uspace IRQ hash table. */
-        hash_table_remove_item(&irq_uspace_hash_table, &irq->link);
-        
-        /* irq->lock unlocked by the hash table remove_callback */
+        irq_spinlock_lock(&kobj->irq->lock, false);
+        
+        if (kobj->irq->notif_cfg.hashed_in) {
+                /* Remove the IRQ from the uspace IRQ hash table. */
+                hash_table_remove_item(&irq_uspace_hash_table,
+                    &kobj->irq->link);
+                kobj->irq->notif_cfg.hashed_in = false;
+        }
+
+        /* kobj->irq->lock unlocked by the hash table remove_callback */
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-        
-        /* Free up the IRQ code and associated structures. */
-        code_free(irq->notif_cfg.code);
-        
-        /* Free up the IRQ capability and the underlying kernel object. */
-        slab_free(irq_slab, cap->kobject);
+
+        kobject_put(kobj);
         cap_free(TASK, handle);