Changeset fea0ce6 in mainline for kernel/generic/src

Timestamp:

2010-01-23T20:20:54Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e095644

Parents:

9d3133d (diff), bc310a05 (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.

Message:

Merge task dump infrastructure.

Location:

kernel/generic/src

Files:

• interrupt/interrupt.c (modified) (2 diffs)
• mm/as.c (modified) (1 diff)
• udebug/udebug.c (modified) (2 diffs)
• udebug/udebug_ipc.c (modified) (5 diffs)
• udebug/udebug_ops.c (modified) (7 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -44 +44 @@
 #include <console/console.h>
 #include <console/cmd.h>
+#include <ipc/event.h>
+#include <synch/mutex.h>
+#include <time/delay.h>
+#include <macros.h>
 #include <panic.h>
 #include <print.h>
@@ -107 +111 @@
         fault_if_from_uspace(istate, "Unhandled exception %d.", n);
         panic("Unhandled exception %d.", n);
+}
+
+/** Terminate thread and task if exception came from userspace. */
+void fault_if_from_uspace(istate_t *istate, char *fmt, ...)
+{
+        task_t *task = TASK;
+        va_list args;
+
+        if (!istate_from_uspace(istate))
+                return;
+
+        printf("Task %s (%" PRIu64 ") killed due to an exception at "
+            "program counter %p.\n", task->name, task->taskid,
+            istate_get_pc(istate));
+
+        stack_trace_istate(istate);
+
+        printf("Kill message: ");
+        va_start(args, fmt);
+        vprintf(fmt, args);
+        va_end(args);
+        printf("\n");
+
+        if (event_is_subscribed(EVENT_FAULT)) {
+                event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (unative_t) THREAD);
+        }
+
+#ifdef CONFIG_UDEBUG
+        /* Wait until a debugger attends to us. */
+        mutex_lock(&THREAD->udebug.lock);
+        while (!THREAD->udebug.active)
+                condvar_wait(&THREAD->udebug.active_cv, &THREAD->udebug.lock);
+        mutex_unlock(&THREAD->udebug.lock);
+
+        udebug_stoppable_begin();
+        udebug_stoppable_end();
+
+        /* Make sure the debugging session is over before proceeding. */
+        mutex_lock(&THREAD->udebug.lock);
+        while (THREAD->udebug.active)
+                condvar_wait(&THREAD->udebug.active_cv, &THREAD->udebug.lock);
+        mutex_unlock(&THREAD->udebug.lock);
+#endif
+
+        task_kill(task->taskid);
+        thread_exit();
 }
 

kernel/generic/src/mm/as.c

@@ -1920 +1920 @@
 }
 
+/** Get list of adress space areas.
+ *
+ * @param as            Address space.
+ * @param obuf          Place to save pointer to returned buffer.
+ * @param osize         Place to save size of returned buffer.
+ */
+void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+{
+        ipl_t ipl;
+        size_t area_cnt, area_idx, i;
+        link_t *cur;
+
+        as_area_info_t *info;
+        size_t isize;
+
+        ipl = interrupts_disable();
+        mutex_lock(&as->lock);
+
+        /* First pass, count number of areas. */
+
+        area_cnt = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                area_cnt += node->keys;
+        }
+
+        isize = area_cnt * sizeof(as_area_info_t);
+        info = malloc(isize, 0);
+
+        /* Second pass, record data. */
+
+        area_idx = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+
+                        ASSERT(area_idx < area_cnt);
+                        mutex_lock(&area->lock);
+
+                        info[area_idx].start_addr = area->base;
+                        info[area_idx].size = FRAMES2SIZE(area->pages);
+                        info[area_idx].flags = area->flags;
+                        ++area_idx;
+
+                        mutex_unlock(&area->lock);
+                }
+        }
+
+        mutex_unlock(&as->lock);
+        interrupts_restore(ipl);
+
+        *obuf = info;
+        *osize = isize;
+}
+
+
 /** Print out information about address space.
  *

kernel/generic/src/udebug/udebug.c

@@ -69 +69 @@
         mutex_initialize(&ut->lock, MUTEX_PASSIVE);
         waitq_initialize(&ut->go_wq);
+        condvar_initialize(&ut->active_cv);
 
         ut->go_call = NULL;
@@ -446 +447 @@
                                 waitq_wakeup(&t->udebug.go_wq, WAKEUP_FIRST);
                         }
+                        mutex_unlock(&t->udebug.lock);
+                        condvar_broadcast(&t->udebug.active_cv);
+                } else {
+                        mutex_unlock(&t->udebug.lock);
                 }
-                mutex_unlock(&t->udebug.lock);
         }
 

kernel/generic/src/udebug/udebug_ipc.c

@@ -41 +41 @@
 #include <proc/task.h>
 #include <proc/thread.h>
+#include <mm/as.h>
 #include <arch.h>
 #include <errno.h>
@@ -165 +166 @@
 static void udebug_receive_thread_read(call_t *call)
 {
+        uintptr_t uspace_addr;
+        size_t buf_size;
+        void *buffer;
+        size_t copied, needed;
+        int rc;
+
+        uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
+        buf_size = IPC_GET_ARG3(call->data);    /* Dest. buffer size */
+
+        /*
+         * Read thread list. Variable n will be filled with actual number
+         * of threads times thread-id size.
+         */
+        rc = udebug_thread_read(&buffer, buf_size, &copied, &needed);
+        if (rc < 0) {
+                IPC_SET_RETVAL(call->data, rc);
+                ipc_answer(&TASK->kb.box, call);
+                return;
+        }
+
+        /*
+         * Make use of call->buffer to transfer data to caller's userspace
+         */
+
+        IPC_SET_RETVAL(call->data, 0);
+        /* ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
+           same code in process_answer() can be used 
+           (no way to distinguish method in answer) */
+        IPC_SET_ARG1(call->data, uspace_addr);
+        IPC_SET_ARG2(call->data, copied);
+        IPC_SET_ARG3(call->data, needed);
+        call->buffer = buffer;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
+/** Process an AREAS_READ call.
+ *
+ * Returns a list of address space areas in the current task, as an array
+ * of as_area_info_t structures.
+ *
+ * @param call  The call structure.
+ */
+static void udebug_receive_areas_read(call_t *call)
+{
         unative_t uspace_addr;
         unative_t to_copy;
-        unsigned total_bytes;
-        unsigned buf_size;
-        void *buffer;
-        size_t n;
-        int rc;
+        size_t data_size;
+        size_t buf_size;
+        void *data;
 
         uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
@@ -177 +221 @@
 
         /*
-         * Read thread list. Variable n will be filled with actual number
-         * of threads times thread-id size.
-         */
-        rc = udebug_thread_read(&buffer, buf_size, &n);
-        if (rc < 0) {
-                IPC_SET_RETVAL(call->data, rc);
-                ipc_answer(&TASK->kb.box, call);
-                return;
-        }
-
-        total_bytes = n;
-
-        /* Copy MAX(buf_size, total_bytes) bytes */
-
-        if (buf_size > total_bytes)
-                to_copy = total_bytes;
+         * Read area list.
+         */
+        as_get_area_info(AS, (as_area_info_t **) &data, &data_size);
+
+        /* Copy MAX(buf_size, data_size) bytes */
+
+        if (buf_size > data_size)
+                to_copy = data_size;
         else
                 to_copy = buf_size;
@@ -207 +243 @@
         IPC_SET_ARG2(call->data, to_copy);
 
-        IPC_SET_ARG3(call->data, total_bytes);
-        call->buffer = buffer;
-
-        ipc_answer(&TASK->kb.box, call);
-}
+        IPC_SET_ARG3(call->data, data_size);
+        call->buffer = data;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
 
 /** Process an ARGS_READ call.
@@ -331 +368 @@
                 udebug_receive_thread_read(call);
                 break;
+        case UDEBUG_M_AREAS_READ:
+                udebug_receive_areas_read(call);
+                break;
         case UDEBUG_M_ARGS_READ:
                 udebug_receive_args_read(call);

kernel/generic/src/udebug/udebug_ops.c

@@ -209 +209 @@
 
                 mutex_lock(&t->udebug.lock);
-                if ((t->flags & THREAD_FLAG_USPACE) != 0)
+                if ((t->flags & THREAD_FLAG_USPACE) != 0) {
                         t->udebug.active = true;
-                mutex_unlock(&t->udebug.lock);
+                        mutex_unlock(&t->udebug.lock);
+                        condvar_broadcast(&t->udebug.active_cv);
+                } else {
+                        mutex_unlock(&t->udebug.lock);
+                }
         }
 
@@ -355 +359 @@
  *
  * If the sequence is longer than @a buf_size bytes, only as much hashes
- * as can fit are copied. The number of thread hashes copied is stored
- * in @a n.
+ * as can fit are copied. The number of bytes copied is stored in @a stored.
+ * The total number of thread bytes that could have been saved had there been
+ * enough space is stored in @a needed.
  *
  * The rationale for having @a buf_size is that this function is only
@@ -364 +369 @@
  * @param buffer        The buffer for storing thread hashes.
  * @param buf_size      Buffer size in bytes.
- * @param n             The actual number of hashes copied will be stored here.
- */
-int udebug_thread_read(void **buffer, size_t buf_size, size_t *n)
+ * @param stored        The actual number of bytes copied will be stored here.
+ * @param needed        Total number of hashes that could have been saved.
+ */
+int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
+    size_t *needed)
 {
         thread_t *t;
         link_t *cur;
         unative_t tid;
-        unsigned copied_ids;
+        size_t copied_ids;
+        size_t extra_ids;
         ipl_t ipl;
         unative_t *id_buffer;
@@ -380 +388 @@
 
         /* Allocate a buffer to hold thread IDs */
-        id_buffer = malloc(buf_size, 0);
+        id_buffer = malloc(buf_size + 1, 0);
 
         mutex_lock(&TASK->udebug.lock);
@@ -396 +404 @@
         max_ids = buf_size / sizeof(unative_t);
         copied_ids = 0;
+        extra_ids = 0;
 
         /* FIXME: make sure the thread isn't past debug shutdown... */
         for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
-                /* Do not write past end of buffer */
-                if (copied_ids >= max_ids) break;
-
                 t = list_get_instance(cur, thread_t, th_link);
 
@@ -409 +415 @@
 
                 /* Not interested in kernel threads. */
-                if ((flags & THREAD_FLAG_USPACE) != 0) {
+                if ((flags & THREAD_FLAG_USPACE) == 0)
+                        continue;
+
+                if (copied_ids < max_ids) {
                         /* Using thread struct pointer as identification hash */
                         tid = (unative_t) t;
                         id_buffer[copied_ids++] = tid;
+                } else {
+                        extra_ids++;
                 }
         }
@@ -422 +433 @@
 
         *buffer = id_buffer;
-        *n = copied_ids * sizeof(unative_t);
+        *stored = copied_ids * sizeof(unative_t);
+        *needed = (copied_ids + extra_ids) * sizeof(unative_t);
 
         return 0;