Changeset 91b60499 in mainline for kernel/generic/include/ddi/irq.h

Timestamp:

2017-09-30T06:29:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (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 support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

File:

• kernel/generic/include/ddi/irq.h (modified) (6 diffs)

kernel/generic/include/ddi/irq.h

@@ -43 +43 @@
 #include <proc/task.h>
 #include <ipc/ipc.h>
+#include <mm/slab.h>
+
+typedef enum {
+        IRQ_HT_KEY_INR,
+        IRQ_HT_KEY_MODE
+} irq_ht_key_t;
+
+typedef enum {
+        IRQ_HT_MODE_CLAIM,
+        IRQ_HT_MODE_NO_CLAIM
+} irq_ht_mode_t;
 
 typedef enum {
@@ -70 +81 @@
         /** When false, notifications are not sent. */
         bool notify;
+        /** True if the structure is in irq_uspace_hash_table_table */
+        bool hashed_in;
         /** Answerbox for notifications. */
         answerbox_t *answerbox;
@@ -76 +89 @@
         /** Arguments that will be sent if the IRQ is claimed. */
         uint32_t scratch[IPC_CALL_LEN];
-        /** Top-half pseudocode. */
+        /** Top-half IRQ code. */
         irq_code_t *code;
         /** 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;
 
@@ -91 +98 @@
  *
  * If one device has multiple interrupts, there will be multiple irq_t
- * instantions with the same devno.
- *
+ * instantions.
  */
 typedef struct irq {
@@ -112 +118 @@
          */
         bool preack;
-        
-        /** Unique device number. -1 if not yet assigned. */
-        devno_t devno;
         
         /** Actual IRQ number. -1 if not yet assigned. */
@@ -139 +142 @@
 extern hash_table_t irq_uspace_hash_table;
 
+extern slab_cache_t *irq_slab;
+
 extern inr_t last_inr;