Changeset e32720ff in mainline for kernel/generic/src

Timestamp:

2012-11-22T22:20:39Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f6c16fe

Parents:

0ab362c (diff), 908bb96 (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 from lp:~jakub/helenos/mm.

Location:

kernel/generic/src

Files:

• interrupt/interrupt.c (modified) (1 diff)
• mm/as.c (modified) (4 diffs)
• mm/backend_anon.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)

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

@@ -79 +79 @@
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 
 /**
@@ -1362 +1363 @@
 int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
 {
+        int rc = AS_PF_FAULT;
+
         if (!THREAD)
-                return AS_PF_FAULT;
+                goto page_fault;
         
         if (!AS)
-                return AS_PF_FAULT;
+                goto page_fault;
         
         mutex_lock(&AS->lock);
@@ -1422 +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);
@@ -1443 +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 {
-                return AS_PF_FAULT;
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
+                panic_memtrap(istate, access, page, NULL);
         }
         

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;