Changeset cd3b380 in mainline

Timestamp:

2013-09-11T11:56:39Z (11 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

Files:

• arch/ia64/src/mm/vhpt.c (modified) (1 diff)
• arch/sparc64/src/mm/sun4u/as.c (modified) (1 diff)
• arch/sparc64/src/mm/sun4v/as.c (modified) (2 diffs)
• generic/src/cpu/cpu.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)
• generic/src/mm/slab.c (modified) (1 diff)
• generic/src/proc/thread.c (modified) (2 diffs)
• test/mm/falloc1.c (modified) (2 diffs)
• test/mm/falloc2.c (modified) (3 diffs)

kernel/arch/ia64/src/mm/vhpt.c

@@ -42 +42 @@
 uintptr_t vhpt_set_up(void)
 {
-        vhpt_base = (vhpt_entry_t *)
-            PA2KA(frame_alloc(SIZE2FRAMES(VHPT_SIZE), FRAME_ATOMIC, 0));
-        if (!vhpt_base)
+        uintptr_t vhpt_frame =
+            frame_alloc(SIZE2FRAMES(VHPT_SIZE), FRAME_ATOMIC, 0);
+        if (!vhpt_frame)
                 panic("Kernel configured with VHPT but no memory for table.");
         
+        vhpt_base = (vhpt_entry_t *) PA2KA(vhpt_frame);
         vhpt_invalidate_all();
         return (uintptr_t) vhpt_base;

kernel/arch/sparc64/src/mm/sun4u/as.c

@@ -63 +63 @@
 {
 #ifdef CONFIG_TSB
+        uintptr_t tsb_phys =
+            frame_alloc(SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t)), flags, 0);
+        if (!tsb_phys)
+                return -1;
+        
+        tsb_entry_t *tsb = (tsb_entry_t *) PA2KA(tsb_phys);
+        
+        as->arch.itsb = tsb;
+        as->arch.dtsb = tsb + ITSB_ENTRY_COUNT;
+        
+        memsetb(as->arch.itsb, (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t), 0);
+#endif
+        
+        return 0;
+}
+
+int as_destructor_arch(as_t *as)
+{
+#ifdef CONFIG_TSB
         size_t frames = SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
             sizeof(tsb_entry_t));
-        
-        uintptr_t tsb = PA2KA(frame_alloc(frames, flags, 0));
-        if (!tsb)
-                return -1;
-        
-        as->arch.itsb = (tsb_entry_t *) tsb;
-        as->arch.dtsb = (tsb_entry_t *) (tsb +
-            ITSB_ENTRY_COUNT * sizeof(tsb_entry_t));
-        
-        memsetb(as->arch.itsb,
-            (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
-#endif
-        
-        return 0;
-}
-
-int as_destructor_arch(as_t *as)
-{
-#ifdef CONFIG_TSB
-        /*
-         * The count must be calculated with respect to the emualted 16K page
-         * size.
-         */
-        size_t cnt = ((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t)) >> FRAME_WIDTH;
-        frame_free(KA2PA((uintptr_t) as->arch.itsb));
-        
-        return cnt;
+        frame_free(KA2PA((uintptr_t) as->arch.itsb), frames);
+        
+        return frames;
 #else
         return 0;

kernel/arch/sparc64/src/mm/sun4v/as.c

@@ -66 +66 @@
 {
 #ifdef CONFIG_TSB
-        size_t frames =
-            SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t));
-        
-        uintptr_t tsb = frame_alloc(frames, flags, 0);
+        uintptr_t tsb =
+            frame_alloc(SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t)),
+            flags, 0);
         if (!tsb)
                 return -1;
@@ -91 +90 @@
 {
 #ifdef CONFIG_TSB
-        size_t cnt = (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH;
-        frame_free((uintptr_t) as->arch.tsb_description.tsb_base);
+        size_t frames = SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t));
+        frame_free(as->arch.tsb_description.tsb_base, frames);
         
-        return cnt;
+        return frames;
 #else
         return 0;

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

kernel/test/mm/falloc1.c

@@ -62 +62 @@
                         unsigned int allocated = 0;
                         for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
-                                frames[allocated] =
-                                    PA2KA(frame_alloc(count, FRAME_ATOMIC, 0));
-                                
-                                if (frames[allocated])
+                                frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
+                                if (frames[allocated]) {
                                         allocated++;
-                                else {
+                                } else {
                                         TPRINTF("done. ");
                                         break;
@@ -84 +82 @@
                         
                         for (unsigned int i = 0; i < allocated; i++)
-                                frame_free(KA2PA(frames[i]), count);
+                                frame_free(frames[i], count);
                         
                         TPRINTF("done.\n");

kernel/test/mm/falloc2.c

@@ -74 +74 @@
                         unsigned int allocated = 0;
                         for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
-                                frames[allocated] =
-                                    PA2KA(frame_alloc(count, FRAME_ATOMIC, 0));
+                                frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
                                 if (frames[allocated]) {
-                                        memsetb((void *) frames[allocated], bytes, val);
+                                        memsetb((void *) PA2KA(frames[allocated]), bytes, val);
                                         allocated++;
                                 } else
@@ -91 +90 @@
                         for (unsigned int i = 0; i < allocated; i++) {
                                 for (size_t k = 0; k < bytes; k++) {
-                                        if (((uint8_t *) frames[i])[k] != val) {
+                                        if (((uint8_t *) PA2KA(frames[i]))[k] != val) {
                                                 TPRINTF("Thread #%" PRIu64 " (cpu%u): "
                                                     "Unexpected data (%c) in block %zu offset %zu\n",
-                                                    THREAD->tid, CPU->id, ((char *) frames[i])[k],
+                                                    THREAD->tid, CPU->id, ((char *) PA2KA(frames[i]))[k],
                                                     frames[i], k);
                                                 atomic_inc(&thread_fail);
@@ -100 +99 @@
                                         }
                                 }
-                                frame_free(KA2PA(frames[i]), count);
+                                frame_free(frames[i], count);
                         }