Changeset 482f968 in mainline for kernel/generic/src

Timestamp:

2018-10-31T16:48:51Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

91a8f83, bab75df6

Parents:

37781819

Message:

Make FRAME_HIGHMEM fall back to low memory on failure.

Which is what existing users of it are doing, and there is no reason
not to as far as I can see.

Also make sure calls to frame_alloc all have either FRAME_LOWMEM or
FRAME_HIGHMEM explicitly set, as appropriate.

Location:

kernel/generic/src

Files:

• ddi/ddi.c (modified) (1 diff)
• mm/frame.c (modified) (4 diffs)
• mm/km.c (modified) (2 diffs)
• mm/slab.c (modified) (1 diff)
• time/clock.c (modified) (1 diff)

kernel/generic/src/ddi/ddi.c

@@ -385 +385 @@
                 return EINVAL;
 
+        // FIXME: probably need to ensure that the memory is suitable for DMA
         *phys = frame_alloc(frames, FRAME_ATOMIC, constraint);
         if (*phys == 0)

kernel/generic/src/mm/frame.c

@@ -815 +815 @@
 }
 
+static size_t try_find_zone(size_t count, bool lowmem,
+    pfn_t frame_constraint, size_t hint)
+{
+        if (!lowmem) {
+                size_t znum = find_free_zone(count,
+                    ZONE_HIGHMEM | ZONE_AVAILABLE, frame_constraint, hint);
+                if (znum != (size_t) -1)
+                        return znum;
+        }
+
+        return find_free_zone(count, ZONE_LOWMEM | ZONE_AVAILABLE,
+            frame_constraint, hint);
+}
+
 /** Allocate frames of physical memory.
  *
@@ -843 +857 @@
         irq_spinlock_lock(&zones.lock, true);
 
+        // TODO: Print diagnostic if neither is explicitly specified.
+        bool lowmem = (flags & FRAME_LOWMEM) || !(flags & FRAME_HIGHMEM);
+
         /*
          * First, find suitable frame zone.
          */
-        size_t znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
-            frame_constraint, hint);
+        size_t znum = try_find_zone(count, lowmem, frame_constraint, hint);
 
         /*
@@ -859 +875 @@
 
                 if (freed > 0)
-                        znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
+                        znum = try_find_zone(count, lowmem,
                             frame_constraint, hint);
 
@@ -868 +884 @@
 
                         if (freed > 0)
-                                znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
+                                znum = try_find_zone(count, lowmem,
                                     frame_constraint, hint);
                 }

kernel/generic/src/mm/km.c

@@ -121 +121 @@
                 return base;
         else
-                return (uintptr_t) NULL;
+                panic("Kernel ran out of virtual address space.");
 }
 
@@ -256 +256 @@
         uintptr_t frame;
 
-        frame = frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
-        if (frame) {
+        frame = frame_alloc(1, FRAME_HIGHMEM | flags, 0);
+        if (frame >= config.identity_size) {
                 page = km_map(frame, PAGE_SIZE, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                if (!page) {
-                        frame_free(frame, 1);
-                        goto lowmem;
-                }
         } else {
-        lowmem:
-                frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
-                if (!frame)
-                        return (uintptr_t) NULL;
-
                 page = PA2KA(frame);
         }

kernel/generic/src/mm/slab.c

@@ -188 +188 @@
 
         uintptr_t data_phys =
-            frame_alloc_generic(cache->frames, flags, 0, &zone);
+            frame_alloc_generic(cache->frames, FRAME_LOWMEM | flags, 0, &zone);
         if (!data_phys)
                 return NULL;

kernel/generic/src/time/clock.c

@@ -81 +81 @@
 void clock_counter_init(void)
 {
-        uintptr_t faddr = frame_alloc(1, FRAME_ATOMIC, 0);
+        uintptr_t faddr = frame_alloc(1, FRAME_LOWMEM | FRAME_ATOMIC, 0);
         if (faddr == 0)
                 panic("Cannot allocate page for clock.");