Changeset a7a1063 in mainline for src/mm/frame.c

Timestamp:

2005-06-07T00:41:39Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d896525

Parents:

b0bf501

Message:

SMP recovery patch #2 (SMP is no longer broken !!!).
Fix missing KA2PA() operation in ap.S which was causing page faults during AP early initialization.
Fix bug in map_page_to_frame(): 'root' was interpretted as kernel address while read_dba() returns physical address.
Make references to page directory and page tables use kernel addresses instead of physical addresses.

Massive frame allocation code cleanup.
Basically revert to what we had had before implementation of userspace.

Usual cosmetics.

File:

• src/mm/frame.c (modified) (10 diffs)

src/mm/frame.c

@@ -49 +49 @@
 count_t frame_bitmap_octets;
 
-/*
- * This is for kernel address space frames (allocated with FRAME_KA).
- * Their addresses may not interfere with user address space.
- */
-__u8 *frame_kernel_bitmap;
-count_t kernel_frames;
-count_t kernel_frames_free;
-
 static spinlock_t framelock;
 
@@ -78 +70 @@
                 memsetb((__address) frame_bitmap, frame_bitmap_octets, 0);
                 frames_free = frames;
-
-                /*
-                 * Will be properly set up by architecture dependent frame init.
-                 */
-                frame_kernel_bitmap = NULL;
-                kernel_frames_free = 0;
-                kernel_frames = 0;      
         }
 
         /*
-         * No frame allocations/reservations  prior this point.
+         * No frame allocations/reservations prior this point.
          */
 
@@ -109 +94 @@
         int i;
         pri_t pri;
-        __u8 **frame_bitmap_ptr = &frame_bitmap;
-        count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
-        
-        if (flags & FRAME_KA) {
-                frame_bitmap_ptr = &frame_kernel_bitmap;
-                frames_ptr = &kernel_frames;
-                frames_free_ptr = &kernel_frames_free;
-        }
         
 loop:
         pri = cpu_priority_high();
         spinlock_lock(&framelock);
-        if (*frames_free_ptr) {
-                for (i=0; i < *frames_ptr; i++) {
+        if (frames_free) {
+                for (i=0; i < frames; i++) {
                         int m, n;
                 
@@ -128 +105 @@
                         n = i % 8;
 
-                        if (((*frame_bitmap_ptr)[m] & (1<<n)) == 0) {
-                                (*frame_bitmap_ptr)[m] |= (1<<n);
-                                *frames_free_ptr--;
-                                if (flags & FRAME_KA) {
-                                        /*
-                                         * frames_free_ptr points to kernel_frames_free
-                                         * It is still necessary to decrement frames_free.
-                                         */
-                                        frames_free--;
-                                }
+                        if ((frame_bitmap[m] & (1<<n)) == 0) {
+                                frame_bitmap[m] |= (1<<n);
+                                frames_free--;
                                 spinlock_unlock(&framelock);
                                 cpu_priority_restore(pri);
@@ -165 +135 @@
         pri_t pri;
         __u32 frame;
-        count_t *frames_free_ptr = &frames_free, *frames_ptr = &frames;
-        __u8 **frame_bitmap_ptr = &frame_bitmap;
-
-        if (IS_KA(addr)) {
-                frames_free_ptr = &kernel_frames_free;
-                frame_bitmap_ptr = &frame_kernel_bitmap;
-        }
 
         pri = cpu_priority_high();
@@ -178 +141 @@
         frame = IS_KA(addr) ? KA2PA(addr) : addr;
         frame /= FRAME_SIZE;
-        if (frame < *frames_ptr) {
+        if (frame < frames) {
                 int m, n;
         
@@ -184 +147 @@
                 n = frame % 8;
         
-                if ((*frame_bitmap_ptr)[m] & (1<<n)) {
-                        (*frame_bitmap_ptr)[m] &= ~(1<<n);
-                        *frames_free_ptr++;
-                        if (IS_KA(addr)) {
-                                /*
-                                 * frames_free_ptr points to kernel_frames_free
-                                 * It is still necessary to increment frames_free.
-                                 */
-                                 frames_free++;
-                        }       
+                if (frame_bitmap[m] & (1<<n)) {
+                        frame_bitmap[m] &= ~(1<<n);
+                        frames_free++;
                 }
                 else panic("frame already free\n");
@@ -211 +167 @@
         pri_t pri;
         __u32 frame;
-        count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
-        __u8 **frame_bitmap_ptr = &frame_bitmap;
         
         pri = cpu_priority_high();
@@ -218 +172 @@
         frame = IS_KA(addr) ? KA2PA(addr) : addr;
         frame /= FRAME_SIZE;
-        if (frame < *frames_ptr) {
+        if (frame < frames) {
                 int m, n;
 
@@ -224 +178 @@
                 n = frame % 8;
         
-                if (((*frame_bitmap_ptr)[m] & (1<<n)) == 0) {   
-                        (*frame_bitmap_ptr)[m] |= (1<<n);
-                        *frames_free_ptr--;     
-                        if (IS_KA(addr)) {
-                                /*
-                                 * frames_free_ptr points to kernel_frames_free
-                                 * It is still necessary to decrement frames_free.
-                                 */
-                                frames_free--;
-                        }
+                if ((frame_bitmap[m] & (1<<n)) == 0) {  
+                        frame_bitmap[m] |= (1<<n);
+                        frames_free--;  
                 }
         }