Changes in kernel/generic/src/mm/as.c [57355a40:908bb96] in mainline

File:

• kernel/generic/src/mm/as.c (modified) (4 diffs)

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);
         }