Changeset 3422fb6 in mainline

Timestamp:

2017-09-03T19:23:25Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a5d0143

Parents:

9306cd7

Message:

Do not register IRQs inside of answerboxes

Location:

kernel/generic

Files:

• include/ddi/irq.h (modified) (1 diff)
• include/ipc/ipc.h (modified) (1 diff)
• src/ddi/irq.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (1 diff)
• src/ipc/irq.c (modified) (2 diffs)

kernel/generic/include/ddi/irq.h

@@ -90 +90 @@
         /** Counter. */
         size_t counter;
-        
-        /**
-         * Link between IRQs that are notifying the same answerbox. The list is
-         * protected by the answerbox irq_lock.
-         */
-        link_t link;
 } ipc_notif_cfg_t;
 

kernel/generic/include/ipc/ipc.h

@@ -92 +92 @@
         /** Notifications from IRQ handlers. */
         list_t irq_notifs;
-        /** IRQs with notifications to this answerbox. */
-        list_t irq_list;
 } answerbox_t;
 

kernel/generic/src/ddi/irq.c

@@ -110 +110 @@
         link_initialize(&irq->link);
         irq_spinlock_initialize(&irq->lock, "irq.lock");
-        link_initialize(&irq->notif_cfg.link);
         irq->inr = -1;
         

kernel/generic/src/ipc/ipc.c

@@ -147 +147 @@
         list_initialize(&box->answers);
         list_initialize(&box->irq_notifs);
-        list_initialize(&box->irq_list);
         box->task = task;
 }

kernel/generic/src/ipc/irq.c

@@ -347 +347 @@
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
         irq_spinlock_lock(&irq->lock, false);
-        irq_spinlock_lock(&box->irq_lock, false);
         
         cap->type = CAP_TYPE_IRQ;
         hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
-        list_append(&irq->notif_cfg.link, &box->irq_list);
-        
-        irq_spinlock_unlock(&box->irq_lock, false);
+        
         irq_spinlock_unlock(&irq->lock, false);
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
@@ -383 +380 @@
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
         irq_spinlock_lock(&irq->lock, false);
-        irq_spinlock_lock(&box->irq_lock, false);
         
         assert(irq->notif_cfg.answerbox == box);
-        
-        /* Remove the IRQ from the answerbox's list. */
-        list_remove(&irq->notif_cfg.link);
         
         /* Remove the IRQ from the uspace IRQ hash table. */
         hash_table_remove_item(&irq_uspace_hash_table, &irq->link);
         
-        irq_spinlock_unlock(&box->irq_lock, false);
         /* irq->lock unlocked by the hash table remove_callback */
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);