Changeset aaa3c457 in mainline for kernel

Timestamp:

2018-11-12T10:36:10Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a43dfcb

Parents:

3ce781f4 (diff), 6874bd2 (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:

Jakub Jermář <jakub@…> (2018-11-12 10:36:10)

git-committer:

GitHub <noreply@…> (2018-11-12 10:36:10)

Message:

Merge pull request #56 from jermar/futexremoval

Remove kernel support for futexes in favor of waitq kobjects.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• generic/include/cap/cap.h (modified) (3 diffs)
• generic/include/proc/task.h (modified) (2 diffs)
• generic/include/synch/syswaitq.h (moved) (moved from kernel/generic/include/synch/futex.h ) (2 diffs)
• generic/include/synch/waitq.h (modified) (1 diff)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/proc/task.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (2 diffs)
• generic/src/synch/futex.c (deleted)
• generic/src/synch/syswaitq.c (added)
• generic/src/syscall/syscall.c (modified) (2 diffs)

kernel/Makefile

@@ -227 +227 @@
         generic/src/synch/smc.c \
         generic/src/synch/waitq.c \
-        generic/src/synch/futex.c \
+        generic/src/synch/syswaitq.c \
         generic/src/smp/ipi.c \
         generic/src/smp/smp.c \

kernel/generic/include/cap/cap.h

@@ -55 +55 @@
         KOBJECT_TYPE_IRQ,
         KOBJECT_TYPE_PHONE,
+        KOBJECT_TYPE_WAITQ,
         KOBJECT_TYPE_MAX
 } kobject_type_t;
@@ -63 +64 @@
 struct irq;
 struct phone;
+struct waitq;
 
 typedef struct kobject_ops {
@@ -88 +90 @@
                 struct irq *irq;
                 struct phone *phone;
+                struct waitq *waitq;
         };
 } kobject_t;

kernel/generic/include/proc/task.h

@@ -42 +42 @@
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
-#include <synch/futex.h>
 #include <adt/list.h>
 #include <adt/odict.h>
@@ -128 +127 @@
         task_arch_t arch;
 
-        /** Serializes access to futex_list.*/
-        SPINLOCK_DECLARE(futex_list_lock);
-        /** List of all futexes accesses by this task. */
-        list_t futex_list;
-
         /** Accumulated accounting. */
         uint64_t ucycles;

kernel/generic/include/synch/syswaitq.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2018 Jakub Jermar
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef KERN_FUTEX_H_
-#define KERN_FUTEX_H_
+#ifndef KERN_SYS_WAITQ_H_
+#define KERN_SYS_WAITQ_H_
 
 #include <typedefs.h>
-#include <synch/waitq.h>
-#include <adt/hash_table.h>
+#include <abi/cap.h>
 
-/** Kernel-side futex structure. */
-typedef struct {
-        /** Physical address of the status variable. */
-        uintptr_t paddr;
-        /** Wait queue for threads waiting for futex availability. */
-        waitq_t wq;
-        /** Futex hash table link. */
-        ht_link_t ht_link;
-        /** Number of tasks that reference this futex. */
-        size_t refcount;
-} futex_t;
+extern void sys_waitq_init(void);
 
-extern void futex_init(void);
-extern sys_errno_t sys_futex_sleep(uintptr_t, uintptr_t);
-extern sys_errno_t sys_futex_wakeup(uintptr_t);
+extern void sys_waitq_task_cleanup(void);
 
-extern void futex_task_cleanup(void);
-extern void futex_task_init(struct task *);
+extern sys_errno_t sys_waitq_create(cap_waitq_handle_t *);
+extern sys_errno_t sys_waitq_sleep(cap_waitq_handle_t, uint32_t, unsigned int);
+extern sys_errno_t sys_waitq_wakeup(cap_waitq_handle_t);
+extern sys_errno_t sys_waitq_destroy(cap_waitq_handle_t);
 
 #endif

kernel/generic/include/synch/waitq.h

@@ -49 +49 @@
  *
  */
-typedef struct {
+typedef struct waitq {
         /** Lock protecting wait queue structure.
          *

kernel/generic/src/main/main.c

@@ -77 +77 @@
 #include <mm/reserve.h>
 #include <synch/waitq.h>
-#include <synch/futex.h>
+#include <synch/syswaitq.h>
 #include <arch/arch.h>
 #include <arch.h>
@@ -278 +278 @@
         task_init();
         thread_init();
-        futex_init();
+        sys_waitq_init();
 
         sysinfo_set_item_data("boot_args", NULL, bargs, str_size(bargs) + 1);

kernel/generic/src/proc/task.c

@@ -43 +43 @@
 #include <mm/slab.h>
 #include <atomic.h>
-#include <synch/futex.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -251 +250 @@
         }
 
-        futex_task_init(task);
-
         irq_spinlock_lock(&tasks_lock, true);
 

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/syswaitq.h>
 #include <cpu.h>
 #include <str.h>
@@ -519 +520 @@
                          */
                         ipc_cleanup();
-                        futex_task_cleanup();
+                        sys_waitq_task_cleanup();
                         LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid);
                 }

kernel/generic/src/syscall/syscall.c

@@ -46 +46 @@
 #include <interrupt.h>
 #include <ipc/sysipc.h>
-#include <synch/futex.h>
 #include <synch/smc.h>
+#include <synch/syswaitq.h>
 #include <ddi/ddi.h>
 #include <ipc/event.h>
@@ -136 +136 @@
 
         /* Synchronization related syscalls. */
-        [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep,
-        [SYS_FUTEX_WAKEUP] = (syshandler_t) sys_futex_wakeup,
+        [SYS_WAITQ_CREATE] = (syshandler_t) sys_waitq_create,
+        [SYS_WAITQ_SLEEP] = (syshandler_t) sys_waitq_sleep,
+        [SYS_WAITQ_WAKEUP] = (syshandler_t) sys_waitq_wakeup,
+        [SYS_WAITQ_DESTROY] = (syshandler_t) sys_waitq_destroy,
         [SYS_SMC_COHERENCE] = (syshandler_t) sys_smc_coherence,