Changeset 720db0c in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2010-06-26T23:00:54Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

68667ce

Parents:

cae5404

Message:

fix erroneous resizing of physical zones (ticket #240)

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (3 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -47 +47 @@
 #include <print.h>
 
-#define PHYSMEM_LIMIT  0x7C000000
+#define PHYSMEM_LIMIT  0x7C000000ull
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -88 +88 @@
 #endif
                 
-                pfn_t pfn;
-                size_t count;
-                
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                        /* To be safe, make available zone possibly smaller */
-                        pfn = ADDR2PFN(ALIGN_UP(base, FRAME_SIZE));
-                        count = SIZE2FRAMES(ALIGN_DOWN(size, FRAME_SIZE));
+                        /* To be safe, make the available zone possibly smaller */
+                        uint64_t new_base = ALIGN_UP(base, FRAME_SIZE);
+                        uint64_t new_size = ALIGN_DOWN(size - (new_base - base),
+                            FRAME_SIZE);
+                        
+                        pfn_t pfn = ADDR2PFN(new_base);
+                        size_t count = SIZE2FRAMES(new_size);
                         
                         pfn_t conf;
@@ -105 +106 @@
                         
                         // XXX this has to be removed
-                        if (last_frame < ALIGN_UP(base + size, FRAME_SIZE))
-                                last_frame = ALIGN_UP(base + size, FRAME_SIZE);
+                        if (last_frame < ALIGN_UP(new_base + new_size, FRAME_SIZE))
+                                last_frame = ALIGN_UP(new_base + new_size, FRAME_SIZE);
                 }
                 
                 if (e820table[i].type == MEMMAP_MEMORY_RESERVED) {
-                        /* To be safe, make reserved zone possibly larger */
-                        pfn = ADDR2PFN(ALIGN_DOWN(base, FRAME_SIZE));
-                        count = SIZE2FRAMES(ALIGN_UP(size, FRAME_SIZE));
+                        /* To be safe, make the reserved zone possibly larger */
+                        uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE);
+                        uint64_t new_size = ALIGN_UP(size + (base - new_base),
+                            FRAME_SIZE);
                         
-                        zone_create(pfn, count, 0, ZONE_RESERVED);
+                        zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
+                            ZONE_RESERVED);
                 }
                 
                 if (e820table[i].type == MEMMAP_MEMORY_ACPI) {
-                        /* To be safe, make firmware zone possibly larger */
-                        pfn = ADDR2PFN(ALIGN_DOWN(base, (uintptr_t) FRAME_SIZE));
-                        count = SIZE2FRAMES(ALIGN_UP(size, (uintptr_t) FRAME_SIZE));
+                        /* To be safe, make the firmware zone possibly larger */
+                        uint64_t new_base = ALIGN_DOWN(base, FRAME_SIZE);
+                        uint64_t new_size = ALIGN_UP(size + (base - new_base),
+                            FRAME_SIZE);
                         
-                        zone_create(pfn, count, 0, ZONE_FIRMWARE);
+                        zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
+                            ZONE_FIRMWARE);
                 }
         }