Changeset 874621f in mainline

Timestamp:

2006-06-06T07:40:51Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

0dbc4e7

Parents:

6f9a9bc

Message:

Added kernel circular buffer klog.
Added automatic killing of tasks raising inappropriate exceptions.
TODO Fix vsnprintf return value(and behaviour according to specs) and remove workaround in klog.

Files:

• Makefile (modified) (1 diff)
• arch/amd64/include/interrupt.h (modified) (1 diff)
• arch/amd64/src/interrupt.c (modified) (4 diffs)
• arch/amd64/src/mm/page.c (modified) (1 diff)
• arch/ia32/include/interrupt.h (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (6 diffs)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia64/include/interrupt.h (modified) (1 diff)
• arch/ia64/src/interrupt.c (modified) (5 diffs)
• arch/mips32/include/arg.h (modified) (1 diff)
• arch/mips32/include/exception.h (modified) (2 diffs)
• arch/mips32/src/exception.c (modified) (2 diffs)
• arch/mips32/src/mm/tlb.c (modified) (4 diffs)
• arch/ppc32/include/exception.h (modified) (1 diff)
• arch/ppc32/src/interrupt.c (modified) (1 diff)
• arch/ppc64/include/exception.h (modified) (1 diff)
• arch/sparc64/include/interrupt.h (modified) (1 diff)
• generic/include/console/klog.h (added)
• generic/include/interrupt.h (modified) (2 diffs)
• generic/include/ipc/irq.h (modified) (2 diffs)
• generic/include/ipc/sysipc.h (modified) (1 diff)
• generic/include/proc/thread.h (modified) (1 diff)
• generic/include/stackarg.h (modified) (1 diff)
• generic/include/stdarg.h (modified) (1 diff)
• generic/src/console/klog.c (added)
• generic/src/interrupt/interrupt.c (modified) (1 diff)
• generic/src/ipc/ipc.c (modified) (1 diff)
• generic/src/ipc/irq.c (modified) (5 diffs)
• generic/src/ipc/sysipc.c (modified) (2 diffs)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (1 diff)

Makefile

@@ -123 +123 @@
         generic/src/console/console.c \
         generic/src/console/kconsole.c \
+        generic/src/console/klog.c \
         generic/src/console/cmd.c \
         generic/src/cpu/cpu.c \

arch/amd64/include/interrupt.h

@@ -87 +87 @@
 };
 
+/** Return true if exception happened while in userspace */
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return !(istate->rip & 0x8000000000000000);
+}
+
 static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
 {
         istate->rip = retaddr;
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->rip;
 }
 

arch/amd64/src/interrupt.c

@@ -80 +80 @@
 void null_interrupt(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "unserviced interrupt: %d", n);
         print_info_errcode(n, istate);
         panic("unserviced interrupt\n");
@@ -105 +106 @@
                         return;
                 }
+                fault_if_from_uspace(istate, "general protection fault");
         }
 
@@ -113 +115 @@
 void ss_fault(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "stack fault");
         print_info_errcode(n, istate);
         panic("stack fault\n");
@@ -122 +125 @@
         scheduler_fpu_lazy_request();
 #else
+        fault_if_from_uspace(istate, "fpu fault");
         panic("fpu fault");
 #endif

arch/amd64/src/mm/page.c

@@ -184 +184 @@
         
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+                fault_if_from_uspace(istate, "Page fault: %#x", page);
+
                 print_info_errcode(n, istate);
                 printf("Page fault address: %llX\n", page);

arch/ia32/include/interrupt.h

@@ -84 +84 @@
 };
 
+/** Return true if exception happened while in userspace */
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return !(istate->eip & 0x80000000);
+}
+
 static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
 {
         istate->eip = retaddr;
+}
+
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->eip;
 }
 

arch/ia32/src/interrupt.c

@@ -80 +80 @@
 void null_interrupt(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "unserviced interrupt: %d", n);
+
         PRINT_INFO_ERRCODE(istate);
         panic("unserviced interrupt: %d\n", n);
@@ -105 +107 @@
                         return;
                 }
+                fault_if_from_uspace(istate, "general protection fault");
         }
 
@@ -113 +116 @@
 void ss_fault(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "stack fault");
+
         PRINT_INFO_ERRCODE(istate);
         panic("stack fault\n");
@@ -119 +124 @@
 void simd_fp_exception(int n, istate_t *istate)
 {
-
-        PRINT_INFO_ERRCODE(istate);
         __u32 mxcsr;
         asm
@@ -127 +130 @@
                 :"=m"(mxcsr)
         );
+        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zX",
+                             (__native)mxcsr);
+
+        PRINT_INFO_ERRCODE(istate);
         printf("MXCSR: %#zX\n",(__native)(mxcsr));
         panic("SIMD FP exception(19)\n");
@@ -136 +143 @@
         scheduler_fpu_lazy_request();
 #else
+        fault_if_from_uspace(istate, "fpu fault");
         panic("fpu fault");
 #endif

arch/ia32/src/mm/page.c

@@ -104 +104 @@
 
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+                fault_if_from_uspace(istate, "Page fault: %#x", page);
+
                 PRINT_INFO_ERRCODE(istate);
                 printf("page fault address: %#x\n", page);

arch/ia64/include/interrupt.h

@@ -114 +114 @@
 }
 
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->cr_iip;
+}
+#include <panic.h>
+static inline int istate_from_uspace(istate_t *istate)
+{
+        panic("TODO: istate_from_uspace not yet implemented");
+        return 0;
+}
+
 extern void *ivt;
 

arch/ia64/src/interrupt.c

@@ -47 +47 @@
 #include <ipc/irq.h>
 #include <ipc/ipc.h>
+#include <interrupt.h>
 
 
@@ -151 +152 @@
         char *desc = "";
 
-        dump_interrupted_context(istate);
-
         switch (istate->cr_isr.ge_code) {
             case GE_ILLEGALOP:
@@ -177 +176 @@
         }
 
+        fault_if_from_uspace(istate, "General Exception (%s)", desc);
+
+        dump_interrupted_context(istate);
         panic("General Exception (%s)\n", desc);
 }
@@ -187 +189 @@
         scheduler_fpu_lazy_request();   
 #else
+        fault_if_from_uspace(istate, "Interruption: %#hx (%s)", (__u16) vector, vector_to_string(vector));
         dump_interrupted_context(istate);
         panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
@@ -268 +271 @@
         /* TODO */
 }
-
-
-

arch/mips32/include/arg.h

@@ -45 +45 @@
         (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((__address)((ap) + 2*4 - 1) & (~3)) : ((__address)((ap) + 2*8 -1) & (~7)) )))[-1])
 
+#define va_copy(dst,src) ((dst)=(src))
+
 #define va_end(ap)
 

arch/mips32/include/exception.h

@@ -35 +35 @@
 
 #include <typedefs.h>
+#include <arch/cp0.h>
 
 #define EXC_Int         0
@@ -99 +100 @@
 }
 
+/** Return true if exception happened while in userspace */
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return istate->status & cp0_status_um_bit;
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->epc;
+}
+
 extern void exception(istate_t *istate);
 extern void tlb_refill_entry(void);

arch/mips32/src/exception.c

@@ -79 +79 @@
 static void unhandled_exception(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "unhandled exception %s", exctable[n]);
+        
         print_regdump(istate);
         panic("unhandled exception %s\n", exctable[n]);
@@ -120 +122 @@
         if (cp0_cause_coperr(cp0_cause_read()) == fpu_cop_id)
                 scheduler_fpu_lazy_request();
-        else
+        else {
+                fault_if_from_uspace(istate, "unhandled Coprocessor Unusable Exception");
                 panic("unhandled Coprocessor Unusable Exception\n");
+        }
 }
 #endif

arch/mips32/src/mm/tlb.c

@@ -40 +40 @@
 #include <debug.h>
 #include <align.h>
+#include <interrupt.h>
 
 static void tlb_refill_fail(istate_t *istate);
@@ -337 +338 @@
         if (s)
                 sym2 = s;
+
+        fault_if_from_uspace(istate, "TLB Refill Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Refill Exception at %X(%s<-%s)\n", cp0_badvaddr_read(), istate->epc, symbol, sym2);
 }
@@ -348 +351 @@
         if (s)
                 symbol = s;
+        fault_if_from_uspace(istate, "TLB Invalid Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Invalid Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
 }
@@ -358 +362 @@
         if (s)
                 symbol = s;
+        fault_if_from_uspace(istate, "TLB Modified Exception on %P", cp0_badvaddr_read());
         panic("%X: TLB Modified Exception at %X(%s)\n", cp0_badvaddr_read(), istate->epc, symbol);
 }

arch/ppc32/include/exception.h

@@ -81 +81 @@
         istate->pc = retaddr;
 }
+/** Return true if exception happened while in userspace */
+#include <panic.h>
+static inline int istate_from_uspace(istate_t *istate)
+{
+        panic("istate_from_uspace not yet implemented");
+        return 0;
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->pc;
+}
 
 #endif

arch/ppc32/src/interrupt.c

@@ -67 +67 @@
 }
 
-#include <print.h>
 /** Handler of externul interrupts */
 void extint_handler(int n, istate_t *istate)

arch/ppc64/include/exception.h

@@ -81 +81 @@
         istate->pc = retaddr;
 }
+/** Return true if exception happened while in userspace */
+#include <panic.h>
+static inline int istate_from_uspace(istate_t *istate)
+{
+        panic("istate_from_uspace not yet implemented");
+        return 0;
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        return istate->pc;
+}
 
 #endif

arch/sparc64/include/interrupt.h

@@ -52 +52 @@
         /* TODO */
 }
+static inline int istate_from_uspace(istate_t *istate)
+{
+        /* TODO */
+}
+static inline __native istate_get_pc(istate_t *istate)
+{
+        /* TODO */
+}
+
 
 extern void interrupt_register(int n, const char *name, iroutine f);

generic/include/interrupt.h

@@ -33 +33 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <proc/task.h>
+#include <proc/thread.h>
+#include <arch.h>
+#include <console/klog.h>
+#include <ipc/irq.h>
 
 #ifndef IVT_ITEMS
@@ -42 +47 @@
 #endif
 
+#define fault_if_from_uspace(istate, cmd, ...) \
+{ \
+        if (istate_from_uspace(istate)) { \
+                klog_printf(cmd, ##__VA_ARGS__); \
+                klog_printf("Task %lld got exception at PC:%P. Task killed.", TASK->taskid, istate_get_pc(istate)); \
+                task_kill(TASK->taskid); \
+                thread_exit(); \
+        } \
+}
+
+
 extern iroutine exc_register(int n, const char *name, iroutine f);
 extern void exc_dispatch(int n, istate_t *t);

generic/include/ipc/irq.h

@@ -30 +30 @@
 #define __IRQ_H__
 
+/** Maximum length of IPC IRQ program */
 #define IRQ_MAX_PROG_SIZE 10
+
+/** Reserved 'virtual' messages for kernel notifications */
+#define IPC_IRQ_RESERVED_VIRTUAL 10
+
+#define IPC_IRQ_KLOG  (-1)
 
 typedef enum {
@@ -60 +66 @@
 #ifdef KERNEL
 
+#include <ipc/ipc.h>
+
 extern void ipc_irq_make_table(int irqcount);
 extern int ipc_irq_register(answerbox_t *box, int irq, irq_code_t *ucode);
 extern void ipc_irq_send_notif(int irq);
+extern void ipc_irq_send_msg(int irq, __native a2, __native a3);
 extern void ipc_irq_unregister(answerbox_t *box, int irq);
 extern void irq_ipc_bind_arch(__native irq);

generic/include/ipc/sysipc.h

@@ -48 +48 @@
                               __native method, __native arg1);
 __native sys_ipc_hangup(int phoneid);
-__native sys_ipc_register_irq(__native irq, irq_code_t *ucode);
-__native sys_ipc_unregister_irq(__native irq);
+__native sys_ipc_register_irq(int irq, irq_code_t *ucode);
+__native sys_ipc_unregister_irq(int irq);
 
 #endif

generic/include/proc/thread.h

@@ -151 +151 @@
 extern thread_t *thread_create(void (* func)(void *), void *arg, task_t *task, int flags, char *name);
 extern void thread_ready(thread_t *t);
-extern void thread_exit(void);
+extern void thread_exit(void) __attribute__((noreturn));
 
 #ifndef thread_create_arch

generic/include/stackarg.h

@@ -50 +50 @@
         (*((type *)((ap).last + ((ap).pos  += sizeof(type) ) - sizeof(type))))
 
+#define va_copy(dst,src)       dst=src
 #define va_end(ap)
 

generic/include/stdarg.h

@@ -41 +41 @@
 #define va_arg(ap, type)                __builtin_va_arg(ap, type)
 #define va_end(ap)                      __builtin_va_end(ap)
+#define va_copy(dst,src)                __builtin_va_copy(dst,src)
 
 #endif

generic/src/interrupt/interrupt.c

@@ -91 +91 @@
 static void exc_undef(int n, istate_t *istate)
 {
+        fault_if_from_uspace(istate, "Unhandled exception %d.", n);
         panic("Unhandled exception %d.", n);
 }

generic/src/ipc/ipc.c

@@ -336 +336 @@
                 list_append(&request->link, &box->dispatched_calls);
         } else {
-                /* This can happen regularly after ipc_cleanup, remove
-                 * the warning in the future when the IPC is
-                 * more debugged */
-                printf("WARNING: Spurious IPC wakeup.\n");
+                /* This can happen regularly after ipc_cleanup */
                 spinlock_unlock(&box->lock);
                 goto restart;

generic/src/ipc/irq.c

@@ -157 +157 @@
 {
         ipl_t ipl;
+        int mq = irq + IPC_IRQ_RESERVED_VIRTUAL;
 
         ipl = interrupts_disable();
-        spinlock_lock(&irq_conns[irq].lock);
-        if (irq_conns[irq].box == box) {
-                irq_conns[irq].box = NULL;
-                code_free(irq_conns[irq].code);
-                irq_conns[irq].code = NULL;
-        }
-
-        spinlock_unlock(&irq_conns[irq].lock);
+        spinlock_lock(&irq_conns[mq].lock);
+        if (irq_conns[mq].box == box) {
+                irq_conns[mq].box = NULL;
+                code_free(irq_conns[mq].code);
+                irq_conns[mq].code = NULL;
+        }
+
+        spinlock_unlock(&irq_conns[mq].lock);
         interrupts_restore(ipl);
 }
@@ -175 +176 @@
         ipl_t ipl;
         irq_code_t *code;
+        int mq = irq + IPC_IRQ_RESERVED_VIRTUAL;
 
         ASSERT(irq_conns);
@@ -186 +188 @@
 
         ipl = interrupts_disable();
-        spinlock_lock(&irq_conns[irq].lock);
-
-        if (irq_conns[irq].box) {
-                spinlock_unlock(&irq_conns[irq].lock);
+        spinlock_lock(&irq_conns[mq].lock);
+
+        if (irq_conns[mq].box) {
+                spinlock_unlock(&irq_conns[mq].lock);
                 interrupts_restore(ipl);
                 code_free(code);
                 return EEXISTS;
         }
-        irq_conns[irq].box = box;
-        irq_conns[irq].code = code;
-        atomic_set(&irq_conns[irq].counter, 0);
-        spinlock_unlock(&irq_conns[irq].lock);
+        irq_conns[mq].box = box;
+        irq_conns[mq].code = code;
+        atomic_set(&irq_conns[mq].counter, 0);
+        spinlock_unlock(&irq_conns[mq].lock);
         interrupts_restore(ipl);
 
@@ -203 +205 @@
 }
 
-/** Notify process that an irq had happend
- *
- * We expect interrupts to be disabled
- */
-void ipc_irq_send_notif(int irq)
+/** Add call to proper answerbox queue
+ *
+ * Assume irq_conns[mq].lock is locked */
+static void send_call(int mq, call_t *call)
+{
+        spinlock_lock(&irq_conns[mq].box->irq_lock);
+        list_append(&call->link, &irq_conns[mq].box->irq_notifs);
+        spinlock_unlock(&irq_conns[mq].box->irq_lock);
+                
+        waitq_wakeup(&irq_conns[mq].box->wq, 0);
+}
+
+/** Send notification message
+ *
+ */
+void ipc_irq_send_msg(int irq, __native a2, __native a3)
 {
         call_t *call;
-
-        ASSERT(irq_conns);
-        spinlock_lock(&irq_conns[irq].lock);
-
-        if (irq_conns[irq].box) {
+        int mq = irq + IPC_IRQ_RESERVED_VIRTUAL;
+
+        spinlock_lock(&irq_conns[mq].lock);
+
+        if (irq_conns[mq].box) {
                 call = ipc_call_alloc(FRAME_ATOMIC);
                 if (!call) {
-                        spinlock_unlock(&irq_conns[irq].lock);
+                        spinlock_unlock(&irq_conns[mq].lock);
                         return;
                 }
@@ -223 +236 @@
                 IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);
                 IPC_SET_ARG1(call->data, irq);
-                IPC_SET_ARG3(call->data, atomic_preinc(&irq_conns[irq].counter));
+                IPC_SET_ARG2(call->data, a2);
+                IPC_SET_ARG3(call->data, a3);
+                
+                send_call(mq, call);
+        }
+        spinlock_unlock(&irq_conns[mq].lock);
+}
+
+/** Notify process that an irq had happend
+ *
+ * We expect interrupts to be disabled
+ */
+void ipc_irq_send_notif(int irq)
+{
+        call_t *call;
+        int mq = irq + IPC_IRQ_RESERVED_VIRTUAL;
+
+        ASSERT(irq_conns);
+        spinlock_lock(&irq_conns[mq].lock);
+
+        if (irq_conns[mq].box) {
+                call = ipc_call_alloc(FRAME_ATOMIC);
+                if (!call) {
+                        spinlock_unlock(&irq_conns[mq].lock);
+                        return;
+                }
+                call->flags |= IPC_CALL_NOTIF;
+                IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);
+                IPC_SET_ARG1(call->data, irq);
+                IPC_SET_ARG3(call->data, atomic_preinc(&irq_conns[mq].counter));
 
                 /* Execute code to handle irq */
-                code_execute(call, irq_conns[irq].code);
-
-                spinlock_lock(&irq_conns[irq].box->irq_lock);
-                list_append(&call->link, &irq_conns[irq].box->irq_notifs);
-                spinlock_unlock(&irq_conns[irq].box->irq_lock);
-
-                waitq_wakeup(&irq_conns[irq].box->wq, 0);
-        }
+                code_execute(call, irq_conns[mq].code);
                 
-        spinlock_unlock(&irq_conns[irq].lock);
-}
-
-
-/** Initialize table of interrupt handlers */
+                send_call(mq, call);
+        }
+                
+        spinlock_unlock(&irq_conns[mq].lock);
+}
+
+
+/** Initialize table of interrupt handlers
+ *
+ * @param irqcount Count of required hardware IRQs to be supported
+ */
 void ipc_irq_make_table(int irqcount)
 {
         int i;
+
+        irqcount +=  IPC_IRQ_RESERVED_VIRTUAL;
 
         irq_conns_size = irqcount;

generic/src/ipc/sysipc.c

@@ -554 +554 @@
 
 /** Connect irq handler to task */
-__native sys_ipc_register_irq(__native irq, irq_code_t *ucode)
+__native sys_ipc_register_irq(int irq, irq_code_t *ucode)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
                 return EPERM;
 
-        if (irq >= IRQ_COUNT)
+        if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
                 return (__native) ELIMIT;
-
+        
         irq_ipc_bind_arch(irq);
 
@@ -568 +568 @@
 
 /* Disconnect irq handler from task */
-__native sys_ipc_unregister_irq(__native irq)
+__native sys_ipc_unregister_irq(int irq)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
                 return EPERM;
 
-        if (irq >= IRQ_COUNT)
+        if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
                 return (__native) ELIMIT;
 

generic/src/main/main.c

@@ -75 +75 @@
 #include <macros.h>
 #include <adt/btree.h>
+#include <console/klog.h>
 
 #ifdef CONFIG_SMP
@@ -219 +220 @@
         thread_init();
         futex_init();
+        klog_init();
         
         for (i = 0; i < init.cnt; i++)

generic/src/proc/thread.c

@@ -389 +389 @@
         spinlock_unlock(&THREAD->lock);
         scheduler();
+
+        /* Not reached */
+        while (1)
+                ;
 }