Changeset c520034 in mainline for kernel/arch/mips32/src

Timestamp:

2011-12-31T18:19:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

295f658, 77c2b02, 96cd5b4

Parents:

852052d (diff), 22f0561 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Support for kernel non-identity mappings, phase I.

• identity/non-identity kernel memory split on all architectures
• low/high physical memory split on all architectures
• frame allocator understands low/high memory
• high physical memory currently unused (Phase II)
• more compact frame_t
• zone conf frames, pte_t, kernel stacks allocated from low memory
• lockless TLB-miss handlers everywhere (newly sparc64, ia64)
• preallocate PTL1 page tables for non-identity and prevent their deallocation
• hw_map() unification
• new resource allocator used for allocating kernel virtual addresses

Breakage:

• sparc64/sun4v creates too large kernel identity; not fixed because of lack of testing hw
• ppc32's tlb_refill() seems wrong as it creates too large kernel identity, but appears unused and the architecture works normally

Not implemented yet (phase II):

• allow high memory to be used for common kernel allocations

Location:

kernel/arch/mips32/src/mm

Files:

• frame.c (modified) (5 diffs)
• km.c (added)
• page.c (modified) (1 diff)
• tlb.c (modified) (1 diff)

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

@@ -131 +131 @@
 }
 
-static void frame_add_region(pfn_t start_frame, pfn_t end_frame)
-{
-        if (end_frame > start_frame) {
-                /* Convert 1M frames to 16K frames */
-                pfn_t first = ADDR2PFN(start_frame << ZERO_PAGE_WIDTH);
-                pfn_t count = ADDR2PFN((end_frame - start_frame) << ZERO_PAGE_WIDTH);
-                
+static void frame_add_region(pfn_t start_frame, pfn_t end_frame, bool low)
+{
+        if (end_frame <= start_frame)
+                return;
+
+        uintptr_t base = start_frame << ZERO_PAGE_WIDTH;
+        size_t size = (end_frame - start_frame) << ZERO_PAGE_WIDTH;
+
+        if (!frame_adjust_zone_bounds(low, &base, &size))
+                return; 
+
+        pfn_t first = ADDR2PFN(base);
+        size_t count = SIZE2FRAMES(size);
+        pfn_t conf_frame;
+
+        if (low) {
                 /* Interrupt vector frame is blacklisted */
-                pfn_t conf_frame;
                 if (first == 0)
                         conf_frame = 1;
                 else
                         conf_frame = first;
-                
-                zone_create(first, count, conf_frame, 0);
-                
-                if (phys_regions_count < MAX_REGIONS) {
-                        phys_regions[phys_regions_count].start = first;
-                        phys_regions[phys_regions_count].count = count;
-                        phys_regions_count++;
-                }
+                zone_create(first, count, conf_frame,
+                    ZONE_AVAILABLE | ZONE_LOWMEM);
+        } else {
+                conf_frame = zone_external_conf_alloc(count);
+                zone_create(first, count, conf_frame,
+                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
+                
+                
+        if (phys_regions_count < MAX_REGIONS) {
+                phys_regions[phys_regions_count].start = first;
+                phys_regions[phys_regions_count].count = count;
+                phys_regions_count++;
         }
 }
@@ -165 +178 @@
  *
  */
-void frame_arch_init(void)
+void frame_low_arch_init(void)
 {
         ipl_t ipl = interrupts_disable();
@@ -224 +237 @@
                 
                 if (!avail) {
-                        frame_add_region(start_frame, frame);
+                        frame_add_region(start_frame, frame, true);
                         start_frame = frame + 1;
                         avail = true;
@@ -230 +243 @@
         }
         
-        frame_add_region(start_frame, frame);
+        frame_add_region(start_frame, frame, true);
         
         /* Blacklist interrupt vector frame */
@@ -246 +259 @@
 }
 
+void frame_high_arch_init(void)
+{
+}
 
 void physmem_print(void)

kernel/arch/mips32/src/mm/page.c

@@ -41 +41 @@
 {
         page_mapping_operations = &pt_mapping_operations;
-}
-
-/** Map device into kernel space
- * - on mips, all devices are already mapped into kernel space,
- *   translate the physical address to uncached area
- */
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        return physaddr + 0xa0000000;
+        as_switch(NULL, AS_KERNEL);
 }
 

kernel/arch/mips32/src/mm/tlb.c

@@ -95 +95 @@
         
         badvaddr = cp0_badvaddr_read();
-        
-        mutex_lock(&AS->lock);
         asid = AS->asid;
-        mutex_unlock(&AS->lock);
         
         pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);