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

File:

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

kernel/generic/src/mm/as.c

@@ -544 +544 @@
     mem_backend_data_t *backend_data, uintptr_t *base, uintptr_t bound)
 {
-        if ((*base != (uintptr_t) -1) && !IS_ALIGNED(*base, PAGE_SIZE))
+        if ((*base != (uintptr_t) -1) && ((*base % PAGE_SIZE) != 0))
                 return NULL;
         
@@ -688 +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);
         
@@ -1353 +1350 @@
  * Interrupts are assumed disabled.
  *
- * @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.
+ * @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.
  *
  * @return AS_PF_FAULT on page fault.
@@ -1364 +1361 @@
  *
  */
-int as_page_fault(uintptr_t address, pf_access_t access, istate_t *istate)
-{
-        uintptr_t page = ALIGN_DOWN(address, PAGE_SIZE);
+int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
+{
         int rc = AS_PF_FAULT;
 
@@ -1456 +1452 @@
                 task_kill_self(true);
         } else {
-                fault_if_from_uspace(istate, "Page fault: %p.", (void *) address);
-                panic_memtrap(istate, access, address, NULL);
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
+                panic_memtrap(istate, access, page, NULL);
         }
         
@@ -1683 +1679 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
+        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
         ASSERT(count);
         
@@ -1967 +1963 @@
 {
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(IS_ALIGNED(page, PAGE_SIZE));
+        ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
         ASSERT(count);
         
@@ -2144 +2140 @@
 {
         uintptr_t virt = base;
-        as_area_t *area = as_area_create(AS, flags, size,
+        as_area_t *area = as_area_create(AS, flags | AS_AREA_CACHEABLE, size,
             AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, bound);
         if (area == NULL)