Changes in kernel/generic/src/mm/backend_phys.c [01029fc:83b6ba9f] in mainline

File:

• kernel/generic/src/mm/backend_phys.c (modified) (7 diffs)

kernel/generic/src/mm/backend_phys.c

@@ -55 +55 @@
 static bool phys_is_shareable(as_area_t *);
 
+static int phys_page_fault(as_area_t *, uintptr_t, pf_access_t);
 
-static int phys_page_fault(as_area_t *, uintptr_t, pf_access_t);
+static bool phys_create_shared_data(as_area_t *);
+static void phys_destroy_shared_data(void *);
+
+typedef struct {
+        uintptr_t base;
+        size_t frames;  
+} phys_shared_data_t;
 
 mem_backend_t phys_backend = {
@@ -69 +76 @@
         .page_fault = phys_page_fault,
         .frame_free = NULL,
+        
+        .create_shared_data = phys_create_shared_data,
+        .destroy_shared_data = phys_destroy_shared_data
 };
+
 
 bool phys_create(as_area_t *area)
@@ -92 +103 @@
 void phys_destroy(as_area_t *area)
 {
-        /* Nothing to do. */
+        /*
+         * Nothing to do.
+         * The anonymous frames, if any, are released in
+         * phys_destroy_shared_data().
+         */
 }
 
@@ -111 +126 @@
  *
  * @param area Pointer to the address space area.
- * @param addr Faulting virtual address.
+ * @param upage Faulting virtual page.
  * @param access Access mode that caused the fault (i.e. read/write/exec).
  *
@@ -117 +132 @@
  * serviced).
  */
-int phys_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
+int phys_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access)
 {
         uintptr_t base = area->backend_data.base;
@@ -123 +138 @@
         ASSERT(page_table_locked(AS));
         ASSERT(mutex_locked(&area->lock));
+        ASSERT(IS_ALIGNED(upage, PAGE_SIZE));
 
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
 
-        ASSERT(addr - area->base < area->backend_data.frames * FRAME_SIZE);
-        page_mapping_insert(AS, addr, base + (addr - area->base),
+        ASSERT(upage - area->base < area->backend_data.frames * FRAME_SIZE);
+        page_mapping_insert(AS, upage, base + (upage - area->base),
             as_area_get_flags(area));
         
-        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
+        if (!used_space_insert(area, upage, 1))
                 panic("Cannot insert used space.");
 
@@ -137 +153 @@
 }
 
+bool phys_create_shared_data(as_area_t *area)
+{
+        /*
+         * For anonymous phys areas, create the shared data.
+         */
+        if (area->backend_data.anonymous) {
+                phys_shared_data_t *data;
+
+                data = (phys_shared_data_t *) malloc(sizeof(*data), 0);
+
+                data->base = area->backend_data.base;
+                data->frames = area->backend_data.frames;
+                area->sh_info->backend_shared_data = data;
+        }
+
+        return true;
+}
+
+void phys_destroy_shared_data(void *opaque_data)
+{
+        phys_shared_data_t *data = (phys_shared_data_t *) opaque_data;
+
+        if (data) {
+                frame_free(data->base, data->frames);
+                free(data);
+        }
+}
+
 /** @}
  */