Changeset 482f968 in mainline for kernel/generic/src/mm/km.c

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.

File:

• kernel/generic/src/mm/km.c (modified) (2 diffs)

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);
         }