Have #ip's protocol ctl()s throw errors

[akaros.git] / kern / include / kthread.h

diff --git a/kern/include/kthread.h b/kern/include/kthread.h
index c5d90a4..0b9f4bf 100644 (file)
--- a/kern/include/kthread.h
+++ b/kern/include/kthread.h
@@ -6,8 +6,7 @@
  * reason, usually during blocking IO operations.  Check out
  * Documentation/kthreads.txt for more info than you care about. */
 
-#ifndef ROS_KERN_KTHREAD_H
-#define ROS_KERN_KTHREAD_H
+#pragma once
 
 #include <ros/common.h>
 #include <trap.h>
@@ -15,6 +14,10 @@
 #include <atomic.h>
 #include <setjmp.h>
 
+struct errbuf {
+       struct jmpbuf jmpbuf;
+};
+
 struct proc;
 struct kthread;
 struct semaphore;
@@ -23,6 +26,11 @@ TAILQ_HEAD(semaphore_tailq, semaphore);
 
 #define GENBUF_SZ 128  /* plan9 uses this as a scratch space, per syscall */
 
+#define KTH_IS_KTASK                   (1 << 0)
+#define KTH_SAVE_ADDR_SPACE            (1 << 1)
+#define KTH_KTASK_FLAGS                        (KTH_IS_KTASK)
+#define KTH_DEFAULT_FLAGS              (KTH_SAVE_ADDR_SPACE)
+
 /* This captures the essence of a kernel context that we want to suspend.  When
  * a kthread is running, we make sure its stacktop is the default kernel stack,
  * meaning it will receive the interrupts from userspace. */
@@ -31,13 +39,14 @@ struct kthread {
        uintptr_t                                       stacktop;
        struct proc                                     *proc;
        struct syscall                          *sysc;
-       void                                            *errbuf;        /* TODO: avoiding include loops */
+       struct errbuf                           *errbuf;
        TAILQ_ENTRY(kthread)            link;
        /* ID, other shit, etc */
-       bool                                            is_ktask;       /* default is FALSE */
+       int                                                     flags;
        char                                            *name;
        char                                            generic_buf[GENBUF_SZ];
        struct systrace_record          *trace;
+       struct systrace_record          *strace;
 };
 
 /* Semaphore for kthreads to sleep on.  0 or less means you need to sleep */
@@ -101,6 +110,12 @@ void kthread_runnable(struct kthread *kthread);
 void kthread_yield(void);
 void kthread_usleep(uint64_t usec);
 void ktask(char *name, void (*fn)(void*), void *arg);
+
+static inline bool is_ktask(struct kthread *kthread)
+{
+       return kthread->flags & KTH_IS_KTASK;
+}
+
 /* Debugging */
 void check_poison(char *msg);
 
@@ -139,6 +154,9 @@ void __reg_abortable_cv(struct cv_lookup_elm *cle, struct cond_var *cv);
 void dereg_abortable_cv(struct cv_lookup_elm *cle);
 bool should_abort(struct cv_lookup_elm *cle);
 
+uintptr_t switch_to_ktask(void);
+void switch_back_from_ktask(uintptr_t old_ret);
+
 /* qlocks are plan9's binary sempahore, which are wrappers around our sems.
  * Not sure if they'll need irqsave or normal sems. */
 typedef struct semaphore qlock_t;
@@ -147,5 +165,3 @@ typedef struct semaphore qlock_t;
 #define qunlock(x) sem_up(x)
 #define canqlock(x) sem_trydown(x)
 #define QLOCK_INITIALIZER(name) SEMAPHORE_INITIALIZER(name, 1)
-
-#endif /* ROS_KERN_KTHREAD_H */