Changeset fc0de8c in mainline

Timestamp:

2019-10-14T15:30:30Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46a8c3cd

Parents:

f1cd4b0

git-author:

Jakub Jermar <jakub@…> (2019-10-14 15:27:34)

git-committer:

Jakub Jermar <jakub@…> (2019-10-14 15:30:30)

Message:

Move kobject's ops out of kobject

Kobject ops is a property of the kobject type rather than the individual
kernel objects. There is no need to remember the ops in every single
instance.

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (3 diffs)
• include/ipc/ipc.h (modified) (1 diff)
• include/ipc/ipcrsc.h (modified) (1 diff)
• include/ipc/irq.h (modified) (1 diff)
• include/synch/syswaitq.h (modified) (1 diff)
• src/cap/cap.c (modified) (5 diffs)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/ipcrsc.c (modified) (2 diffs)
• src/ipc/irq.c (modified) (2 diffs)
• src/synch/syswaitq.c (modified) (2 diffs)

kernel/generic/include/cap/cap.h

@@ -70 +70 @@
 } kobject_ops_t;
 
+extern kobject_ops_t *kobject_ops[];
+
+#define KOBJECT_OP(k)   kobject_ops[(k)->type]
+
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
@@ -82 +86 @@
         /** List of published capabilities associated with the kobject */
         list_t caps_list;
-
-        kobject_ops_t *ops;
 
         union {
@@ -139 +141 @@
 extern kobject_t *kobject_alloc(unsigned int);
 extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *,
-    kobject_ops_t *);
+extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);

kernel/generic/include/ipc/ipc.h

@@ -172 +172 @@
 extern answerbox_t *ipc_box_0;
 
+extern kobject_ops_t call_kobject_ops;
+
 extern void ipc_init(void);
 

kernel/generic/include/ipc/ipcrsc.h

@@ -40 +40 @@
 #include <cap/cap.h>
 
+extern kobject_ops_t phone_kobject_ops;
+
 extern errno_t phone_alloc(task_t *, bool, cap_phone_handle_t *, kobject_t **);
 extern void phone_dealloc(cap_phone_handle_t);

kernel/generic/include/ipc/irq.h

@@ -46 +46 @@
 #include <typedefs.h>
 #include <adt/list.h>
+#include <cap/cap.h>
+
+extern kobject_ops_t irq_kobject_ops;
 
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);

kernel/generic/include/synch/syswaitq.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <abi/cap.h>
+#include <cap/cap.h>
+
+extern kobject_ops_t waitq_kobject_ops;
 
 extern void sys_waitq_init(void);

kernel/generic/src/cap/cap.c

@@ -83 +83 @@
 #include <mm/slab.h>
 #include <adt/list.h>
+#include <synch/syswaitq.h>
+#include <ipc/ipcrsc.h>
+#include <ipc/ipc.h>
+#include <ipc/irq.h>
 
 #include <limits.h>
@@ -94 +98 @@
 static slab_cache_t *cap_cache;
 static slab_cache_t *kobject_cache;
+
+kobject_ops_t *kobject_ops[KOBJECT_TYPE_MAX] = {
+        [KOBJECT_TYPE_CALL] = &call_kobject_ops,
+        [KOBJECT_TYPE_IRQ] = &irq_kobject_ops,
+        [KOBJECT_TYPE_PHONE] = &phone_kobject_ops,
+        [KOBJECT_TYPE_WAITQ] = &waitq_kobject_ops
+};
 
 static size_t caps_hash(const ht_link_t *item)
@@ -412 +423 @@
  * @param type  Type of the kernel object.
  * @param raw   Raw pointer to the encapsulated object.
- * @param ops   Pointer to kernel object operations for the respective type.
- */
-void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw,
-    kobject_ops_t *ops)
+ */
+void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw)
 {
         atomic_store(&kobj->refcnt, 1);
@@ -424 +433 @@
         kobj->type = type;
         kobj->raw = raw;
-        kobj->ops = ops;
 }
 
@@ -474 +482 @@
 {
         if (atomic_postdec(&kobj->refcnt) == 1) {
-                kobj->ops->destroy(kobj->raw);
+                KOBJECT_OP(kobj)->destroy(kobj->raw);
                 kobject_free(kobj);
         }

kernel/generic/src/ipc/ipc.c

@@ -100 +100 @@
 }
 
-static kobject_ops_t call_kobject_ops = {
+kobject_ops_t call_kobject_ops = {
         .destroy = call_destroy
 };
@@ -127 +127 @@
 
         _ipc_call_init(call);
-        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops);
+        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call);
         call->kobject = kobj;
 

kernel/generic/src/ipc/ipcrsc.c

@@ -52 +52 @@
 }
 
-static kobject_ops_t phone_kobject_ops = {
+kobject_ops_t phone_kobject_ops = {
         .destroy = phone_destroy
 };
@@ -94 +94 @@
                 phone->hangup_call = hcall;
 
-                kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone,
-                    &phone_kobject_ops);
+                kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone);
                 phone->kobject = kobj;
 

kernel/generic/src/ipc/irq.c

@@ -306 +306 @@
 }
 
-static kobject_ops_t irq_kobject_ops = {
+kobject_ops_t irq_kobject_ops = {
         .destroy = irq_destroy
 };
@@ -385 +385 @@
         irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
 
-        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq, &irq_kobject_ops);
+        kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq);
         cap_publish(TASK, handle, kobject);
 

kernel/generic/src/synch/syswaitq.c

@@ -54 +54 @@
 }
 
-static kobject_ops_t waitq_kobject_ops = {
+kobject_ops_t waitq_kobject_ops = {
         .destroy = waitq_destroy
 };
@@ -100 +100 @@
                 return (sys_errno_t) ENOMEM;
         }
-        kobject_initialize(kobj, KOBJECT_TYPE_WAITQ, wq, &waitq_kobject_ops);
+        kobject_initialize(kobj, KOBJECT_TYPE_WAITQ, wq);
 
         cap_handle_t handle;