Changeset cd3b380 in mainline for kernel/generic/src

Timestamp:

2013-09-11T11:56:39Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

Location:

kernel/generic/src

Files:

• cpu/cpu.c (modified) (1 diff)
• mm/frame.c (modified) (1 diff)
• mm/slab.c (modified) (1 diff)
• proc/thread.c (modified) (2 diffs)

kernel/generic/src/cpu/cpu.c

@@ -73 +73 @@
                 size_t i;
                 for (i = 0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (uint8_t *) PA2KA(frame_alloc(STACK_FRAMES,
-                            FRAME_LOWMEM | FRAME_ATOMIC, STACK_SIZE - 1));
+                        uintptr_t stack_phys = frame_alloc(STACK_FRAMES,
+                            FRAME_LOWMEM | FRAME_ATOMIC, STACK_SIZE - 1);
+                        if (!stack_phys)
+                                panic("Cannot allocate CPU stack.");
+                        
+                        cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
                         cpus[i].id = i;
                         
                         irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
                         
-                        unsigned int j;
-                        for (j = 0; j < RQ_COUNT; j++) {
+                        for (unsigned int j = 0; j < RQ_COUNT; j++) {
                                 irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock");
                                 list_initialize(&cpus[i].rq[j].rq);

kernel/generic/src/mm/frame.c

@@ -374 +374 @@
                 return;
         
+        frame->refcount = 1;
         bitmap_set_range(&zone->bitmap, index, 1);
         

kernel/generic/src/mm/slab.c

@@ -182 +182 @@
         size_t zone = 0;
         
-        void *data = (void *)
-            PA2KA(frame_alloc_generic(cache->frames, flags, 0, &zone));
-        if (!data)
+        uintptr_t data_phys =
+            frame_alloc_generic(cache->frames, flags, 0, &zone);
+        if (!data_phys)
                 return NULL;
+        
+        void *data = (void *) PA2KA(data_phys);
         
         slab_t *slab;

kernel/generic/src/proc/thread.c

@@ -192 +192 @@
         kmflags &= ~FRAME_HIGHMEM;
         
-        thread->kstack = (uint8_t *)
-            PA2KA(frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1));
-        if (!thread->kstack) {
+        uintptr_t stack_phys =
+            frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1);
+        if (!stack_phys) {
 #ifdef CONFIG_FPU
                 if (thread->saved_fpu_context)
@@ -201 +201 @@
                 return -1;
         }
+        
+        thread->kstack = (uint8_t *) PA2KA(stack_phys);
         
 #ifdef CONFIG_UDEBUG