Changeset 162ad53 in mainline for kernel/generic/include

Timestamp:

2025-06-27T16:18:16Z (4 weeks ago)

Author:

GitHub <noreply@…>

Parents:

5caad1d (diff), 455241b (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-06-27 16:18:16)

git-committer:

GitHub <noreply@…> (2025-06-27 16:18:16)

Message:

Merge 455241b37bedd3719ed3b5b025fdf26f44fd565b into 5caad1d4a9774280b120ed9f9da51f4bb6f1f4bf

Location:

kernel/generic/include

Files:

• cap/cap.h (modified) (6 diffs)
• ddi/irq.h (modified) (1 diff)
• ipc/ipc.h (modified) (3 diffs)
• ipc/irq.h (modified) (1 diff)
• synch/syswaitq.h (modified) (1 diff)

kernel/generic/include/cap/cap.h

@@ -37 +37 @@
 
 #include <abi/cap.h>
+#include <adt/hash_table.h>
+#include <adt/hash.h>
+#include <adt/list.h>
+#include <atomic.h>
+#include <lib/ra.h>
+#include <lib/refcount.h>
+#include <synch/mutex.h>
 #include <typedefs.h>
-#include <adt/list.h>
-#include <adt/hash.h>
-#include <adt/hash_table.h>
-#include <lib/ra.h>
-#include <synch/mutex.h>
-#include <atomic.h>
 
 typedef enum {
@@ -59 +60 @@
 } kobject_type_t;
 
-struct task;
-
-struct call;
-struct irq;
-struct phone;
-struct waitq;
+struct kobject;
 
 typedef struct kobject_ops {
-        void (*destroy)(void *);
+        void (*destroy)(struct kobject *);
 } kobject_ops_t;
 
@@ -76 +72 @@
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
- * list and its lock is imutable.
+ * list and its lock is immutable.
  */
 typedef struct kobject {
         kobject_type_t type;
-        atomic_size_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** Mutex protecting caps_list */
@@ -86 +82 @@
         /** List of published capabilities associated with the kobject */
         list_t caps_list;
-
-        union {
-                void *raw;
-                struct call *call;
-                struct irq *irq;
-                struct phone *phone;
-                struct waitq *waitq;
-        };
 } kobject_t;
 
@@ -129 +117 @@
 extern errno_t caps_task_alloc(struct task *);
 extern void caps_task_free(struct task *);
-extern void caps_task_init(struct task *);
+extern void caps_task_clear(struct task *task);
+extern errno_t caps_task_init(struct task *);
 extern bool caps_apply_to_kobject_type(struct task *, kobject_type_t,
     bool (*)(cap_t *, void *), void *);
@@ -139 +128 @@
 extern void cap_free(struct task *, cap_handle_t);
 
-extern kobject_t *kobject_alloc(unsigned int);
-extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
+extern void kobject_initialize(kobject_t *, kobject_type_t);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);

kernel/generic/include/ddi/irq.h

@@ -132 +132 @@
 extern hash_table_t irq_uspace_hash_table;
 
-extern slab_cache_t *irq_cache;
-
 extern inr_t last_inr;
 

kernel/generic/include/ipc/ipc.h

@@ -74 +74 @@
         /** User-defined label */
         sysarg_t label;
-        kobject_t *kobject;
+        kobject_t kobject;
 } phone_t;
 
@@ -108 +108 @@
 
 typedef struct call {
-        kobject_t *kobject;
+        kobject_t kobject;
 
         /**
@@ -169 +169 @@
 
 extern slab_cache_t *phone_cache;
+extern slab_cache_t *irq_cache;
 
 extern answerbox_t *ipc_box_0;
 
 extern kobject_ops_t call_kobject_ops;
+
+static inline phone_t *phone_from_kobject(kobject_t *kobject)
+{
+        if (kobject)
+                return ((void *) kobject) - offsetof(phone_t, kobject);
+        else
+                return NULL;
+}
+
+static inline call_t *call_from_kobject(kobject_t *kobject)
+{
+        if (kobject)
+                return ((void *) kobject) - offsetof(call_t, kobject);
+        else
+                return NULL;
+}
 
 extern void ipc_init(void);

kernel/generic/include/ipc/irq.h

@@ -50 +50 @@
 extern kobject_ops_t irq_kobject_ops;
 
+typedef struct {
+        kobject_t kobject;
+        irq_t irq;
+} irq_kobject_t;
+
+static inline irq_t *irq_from_kobject(kobject_t *kobject)
+{
+        if (kobject) {
+                return &((irq_kobject_t *) kobject)->irq;
+        } else {
+                return NULL;
+        }
+}
+
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);
 extern void ipc_irq_top_half_handler(irq_t *);

kernel/generic/include/synch/syswaitq.h

@@ -44 +44 @@
 extern void sys_waitq_init(void);
 
-extern void sys_waitq_task_cleanup(void);
-
 extern sys_errno_t sys_waitq_create(uspace_ptr_cap_waitq_handle_t);
 extern sys_errno_t sys_waitq_sleep(cap_waitq_handle_t, uint32_t, unsigned int);