Changes in kernel/generic/src/mm/as.c [94795812:59fb782] in mainline

File:

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

kernel/generic/src/mm/as.c

@@ -79 +79 @@
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 
 /**
@@ -426 +427 @@
         /*
          * So far, the area does not conflict with other areas.
-         * Check if it doesn't conflict with kernel address space.
+         * Check if it is contained in the user address space.
          */
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-                return !overlaps(addr, P2SZ(count), KERNEL_ADDRESS_SPACE_START,
-                    KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START);
+                return iswithin(USER_ADDRESS_SPACE_START,
+                    (USER_ADDRESS_SPACE_END - USER_ADDRESS_SPACE_START) + 1,
+                    addr, P2SZ(count));
         }
         
@@ -542 +544 @@
     mem_backend_data_t *backend_data, uintptr_t *base, uintptr_t bound)
 {
-        if ((*base != (uintptr_t) -1) && ((*base % PAGE_SIZE) != 0))
+        if ((*base != (uintptr_t) -1) && !IS_ALIGNED(*base, PAGE_SIZE))
                 return NULL;
         
@@ -686 +688 @@
 int as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
 {
+        if (!IS_ALIGNED(address, PAGE_SIZE))
+                return EINVAL;
+
         mutex_lock(&as->lock);
         
@@ -696 +701 @@
                 return ENOENT;
         }
-        
-        if (area->backend == &phys_backend) {
-                /*
-                 * Remapping of address space areas associated
-                 * with memory mapped devices is not supported.
+
+        if (!area->backend->is_resizable(area)) {
+                /*
+                 * The backend does not support resizing for this area.
                  */
                 mutex_unlock(&area->lock);
@@ -1057 +1061 @@
         }
         
-        if ((!src_area->backend) || (!src_area->backend->share)) {
-                /*
-                 * There is no backend or the backend does not
-                 * know how to share the area.
+        if (!src_area->backend->is_shareable(src_area)) {
+                /*
+                 * The backend does not permit sharing of this area.
                  */
                 mutex_unlock(&src_area->lock);
@@ -1350 +1353 @@
  * Interrupts are assumed disabled.
  *
- * @param page   Faulting page.
- * @param access Access mode that caused the page fault (i.e.
- *               read/write/exec).
- * @param istate Pointer to the interrupted state.
+ * @param address Faulting address.
+ * @param access  Access mode that caused the page fault (i.e.
+ *                read/write/exec).
+ * @param istate  Pointer to the interrupted state.
  *
  * @return AS_PF_FAULT on page fault.
@@ -1361 +1364 @@
  *
  */
-int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
-{
+int as_page_fault(uintptr_t address, pf_access_t access, istate_t *istate)
+{
+        uintptr_t page = ALIGN_DOWN(address, PAGE_SIZE);
+        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);
@@ -1423 +1429 @@
          * 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 +1451 @@
                 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 *) address);
+                panic_memtrap(istate, access, address, NULL);
         }
         
@@ -1671 +1683 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
+        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
         ASSERT(count);
         
@@ -1955 +1967 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
+        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
         ASSERT(count);
         
@@ -2132 +2144 @@
 {
         uintptr_t virt = base;
-        as_area_t *area = as_area_create(AS, flags | AS_AREA_CACHEABLE, size,
+        as_area_t *area = as_area_create(AS, flags, size,
             AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, bound);
         if (area == NULL)