Changeset 908bb96 in mainline

Timestamp:

2012-11-22T21:42:36Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e32720ff

Parents:

1dbc43f

Message:

Postpone printing the message about killing a task due to a failed late
reservation request until it is clear the task is going to be kiiled.

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• src/interrupt/interrupt.c (modified) (1 diff)
• src/mm/as.c (modified) (3 diffs)
• src/mm/backend_anon.c (modified) (1 diff)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/mm/as.h

@@ -68 +68 @@
 #define AS_AREA_ATTR_PARTIAL  1  /**< Not fully initialized area. */
 
+/** The page fault was resolved by as_page_fault(). */
+#define AS_PF_OK     0 
+
+/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
+#define AS_PF_DEFER  1
+
 /** The page fault was not resolved by as_page_fault(). */
-#define AS_PF_FAULT  0
-
-/** The page fault was resolved by as_page_fault(). */
-#define AS_PF_OK  1
-
-/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
-#define AS_PF_DEFER  2
+#define AS_PF_FAULT  2
+
+/** The page fault was not resolved by as_page_fault(). Non-verbose version. */
+#define AS_PF_SILENT 3
 
 /** Address space structure.

kernel/generic/include/proc/task.h

@@ -134 +134 @@
         uint64_t ucycles;
         uint64_t kcycles;
-
-        /** If true, do not attempt to print a verbose kill message. */ 
-        bool silent_kill;
 } task_t;
 

kernel/generic/src/interrupt/interrupt.c

@@ -166 +166 @@
 }
 
-static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
-{
-        if (!TASK->silent_kill) {
-                printf("Task %s (%" PRIu64 ") killed due to an exception at "
-                    "program counter %p.\n", TASK->name, TASK->taskid,
-                    (void *) istate_get_pc(istate));
-        
-                istate_decode(istate);
-                stack_trace_istate(istate);
-        
-                printf("Kill message: ");
-                vprintf(fmt, args);
-                printf("\n");
-        }
+static NO_TRACE
+void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
+{
+        printf("Task %s (%" PRIu64 ") killed due to an exception at "
+            "program counter %p.\n", TASK->name, TASK->taskid,
+            (void *) istate_get_pc(istate));
+        
+        istate_decode(istate);
+        stack_trace_istate(istate);
+        
+        printf("Kill message: ");
+        vprintf(fmt, args);
+        printf("\n");
         
         task_kill_self(true);

kernel/generic/src/mm/as.c

@@ -1363 +1363 @@
 int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
 {
+        int rc = AS_PF_FAULT;
+
         if (!THREAD)
                 goto page_fault;
@@ -1423 +1425 @@
          * Resort to the backend page fault handler.
          */
-        if (area->backend->page_fault(area, page, access) != AS_PF_OK) {
+        rc = area->backend->page_fault(area, page, access);
+        if (rc != AS_PF_OK) {
                 page_table_unlock(AS, false);
                 mutex_unlock(&area->lock);
@@ -1444 +1447 @@
                 istate_set_retaddr(istate,
                     (uintptr_t) &memcpy_to_uspace_failover_address);
+        } else if (rc == AS_PF_SILENT) {
+                printf("Killing task %" PRIu64 " due to a "
+                    "failed late reservation request.\n", TASK->taskid);
+                task_kill_self(true);
         } else {
                 fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);

kernel/generic/src/mm/backend_anon.c

@@ -255 +255 @@
                          * Reserve the memory for this page now.
                          */
-                        if (!reserve_try_alloc(1)) {
-                                printf("Killing task %" PRIu64 " due to a "
-                                    "failed late reservation request.\n",
-                                    TASK->taskid);
-                                TASK->silent_kill = true;
-                                return AS_PF_FAULT;
-                        }
+                        if (!reserve_try_alloc(1))
+                                return AS_PF_SILENT;
                 }
 

kernel/generic/src/proc/task.c

@@ -197 +197 @@
         task->kcycles = 0;
 
-        task->silent_kill = false;
-        
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;