Changeset f3ac636 in mainline

Timestamp:

2006-04-26T11:57:43Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6fa476f7

Parents:

df0103f7

Message:

Add frame_reference_add().

Location:

generic

Files:

• include/mm/frame.h (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/mm/frame.c (modified) (5 diffs)

generic/include/mm/frame.h

@@ -91 +91 @@
 extern pfn_t frame_alloc_generic(__u8 order, int flags, int * status, int *pzone);
 extern void frame_free(pfn_t pfn);
+extern void frame_reference_add(pfn_t pfn);
 
 extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);

generic/src/mm/as.c

@@ -392 +392 @@
                         ASSERT(PTE_PRESENT(pte));
                         frame = PTE_GET_FRAME(pte);
-                        if (!(flags & AS_AREA_DEVICE)) {
-                                /* TODO: increment frame reference count */
-                        }
+                        if (!(flags & AS_AREA_DEVICE))
+                                frame_reference_add(ADDR2PFN(frame));
                         page_table_unlock(AS, false);
                 } else {

generic/src/mm/frame.c

@@ -59 +59 @@
         link_t buddy_link;      /**< link to the next free block inside one order */
         void *parent;           /**< If allocated by slab, this points there */
-}frame_t;
+} frame_t;
 
 typedef struct {
         SPINLOCK_DECLARE(lock); /**< this lock protects everything below */
-        pfn_t base;     /**< frame_no of the first frame in the frames array */
+        pfn_t base;             /**< frame_no of the first frame in the frames array */
         count_t count;          /**< Size of zone */
 
@@ -72 +72 @@
         buddy_system_t * buddy_system; /**< buddy system for the zone */
         int flags;
-}zone_t;
+} zone_t;
 
 /*
@@ -83 +83 @@
         int count;
         zone_t *info[ZONES_MAX];
-}zones;
+} zones;
 
 
@@ -945 +945 @@
 /** Free a frame.
  *
- * Find respective frame structure for supplied addr.
+ * Find respective frame structure for supplied PFN.
  * Decrement frame reference count.
  * If it drops to zero, move the frame structure to free list.
  *
- * @param frame Frame no to be freed.
+ * @param frame Frame number to be freed.
  */
 void frame_free(pfn_t pfn)
@@ -970 +970 @@
 }
 
-
+/** Add reference to frame.
+ *
+ * Find respective frame structure for supplied PFN and
+ * increment frame reference count.
+ *
+ * @param frame Frame no to be freed.
+ */
+void frame_reference_add(pfn_t pfn)
+{
+        ipl_t ipl;
+        zone_t *zone;
+        frame_t *frame;
+
+        ipl = interrupts_disable();
+        
+        /*
+         * First, find host frame zone for addr.
+         */
+        zone = find_zone_and_lock(pfn,NULL);
+        ASSERT(zone);
+        
+        frame = &zone->frames[pfn-zone->base];
+        frame->refcount++;
+        
+        spinlock_unlock(&zone->lock);
+        interrupts_restore(ipl);
+}
 
 /** Mark given range unavailable in frame zones */