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

Timestamp:

2017-10-28T11:40:41Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eca820c

Parents:

15d9fe6

Message:

Use recursive mutex to protect task_t::cap_info

This makes it possible to use the mutex-protected capability APIs even
inside caps_apply_to_kobject_type() callbacks. Now there is no need to
provide eg. cap_unpublish_locked() and cap_free_locked(). Likewise,
ipc_irq_unsubscribe() can be used when the task's cap_info is already
locked by the current thread inside of a callback.

File:

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

kernel/generic/src/ipc/irq.c

@@ -271 +271 @@
 }
 
+static void irq_hash_out(irq_t *irq)
+{
+        irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
+        irq_spinlock_lock(&irq->lock, false);
+        
+        if (irq->notif_cfg.hashed_in) {
+                /* Remove the IRQ from the uspace IRQ hash table. */
+                hash_table_remove_item(&irq_uspace_hash_table, &irq->link);
+                irq->notif_cfg.hashed_in = false;
+        }
+
+        irq_spinlock_unlock(&irq->lock, false);
+        irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
+}
+
 static void irq_destroy(void *arg)
 {
         irq_t *irq = (irq_t *) arg;
+
+        irq_hash_out(irq);
 
         /* Free up the IRQ code and associated structures. */
@@ -373 +390 @@
         assert(kobj->irq->notif_cfg.answerbox == box);
 
-        irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-        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;
-        }
-
-        irq_spinlock_unlock(&kobj->irq->lock, false);
-        irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
+        irq_hash_out(kobj->irq);
 
         kobject_put(kobj);