Changeset 9fa16b20 in mainline

Timestamp:

2006-04-17T15:45:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

73e9b49

Parents:

97a7eff

Message:

Fix amd64 and ia32 management of I/O bitmap in before_task_runs_arch()
by treating the iomap array as a bitmap. Make use of the bitmap type
and functions added in previous commit.

Location:

arch

Files:

• amd64/include/pm.h (modified) (2 diffs)
• amd64/include/proc/task.h (modified) (1 diff)
• amd64/src/proc/scheduler.c (modified) (4 diffs)
• amd64/src/proc/task.c (modified) (1 diff)
• ia32/include/pm.h (modified) (2 diffs)
• ia32/include/proc/task.h (modified) (1 diff)
• ia32/src/proc/scheduler.c (modified) (3 diffs)
• ia32/src/proc/task.c (modified) (2 diffs)

arch/amd64/include/pm.h

@@ -68 +68 @@
 
 #define TSS_BASIC_SIZE  104
+#define TSS_IOMAP_SIZE  (16*1024+1)     /* 16K for bitmap + 1 terminating byte for convenience */
 
 #ifndef __ASM__
@@ -145 +146 @@
         __u16 reserve4;
         __u16 iomap_base;
-        __u8 iomap[0x10000 + 1];        /* 64K + 1 terminating byte */
+        __u8 iomap[TSS_IOMAP_SIZE];
 } __attribute__ ((packed));
 typedef struct tss tss_t;

arch/amd64/include/proc/task.h

@@ -32 +32 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <adt/bitmap.h>
 
 typedef struct {
-        count_t iomap_size;
-        __u8 *iomap;
+        bitmap_t iomap;
 } task_arch_t;
 

arch/amd64/src/proc/scheduler.c

@@ -37 +37 @@
 #include <print.h>
 #include <arch/pm.h>
+#include <adt/bitmap.h>
 
 /** Perform amd64 specific tasks needed before the new task is run.
@@ -44 +45 @@
 void before_task_runs_arch(void)
 {
-        size_t iomap_size;
+        count_t bits;
         ptr_16_64_t cpugdtr;
         descriptor_t *gdt_p;
@@ -54 +55 @@
         /* First, copy the I/O Permission Bitmap. */
         spinlock_lock(&TASK->lock);
-        iomap_size = TASK->arch.iomap_size;
-        if (iomap_size) {
-                ASSERT(TASK->arch.iomap);
-                memcpy(CPU->arch.tss->iomap, TASK->arch.iomap, iomap_size);
-                CPU->arch.tss->iomap[iomap_size] = 0xff;        /* terminating byte */
+        if ((bits = TASK->arch.iomap.bits)) {
+                bitmap_t iomap;
+        
+                ASSERT(TASK->arch.iomap.map);
+                bitmap_initialize(&iomap, CPU->arch.tss->iomap, TSS_IOMAP_SIZE * 8);
+                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                /*
+                 * It is safe to set the trailing four bits because of the extra
+                 * convenience byte in TSS_IOMAP_SIZE.
+                 */
+                bitmap_set_range(&iomap, TASK->arch.iomap.bits, 4);
         }
         spinlock_unlock(&TASK->lock);
@@ -65 +72 @@
         gdtr_store(&cpugdtr);
         gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + iomap_size - 1);
+        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits) - 1);
         gdtr_load(&cpugdtr);
 }

arch/amd64/src/proc/task.c

@@ -36 +36 @@
 void task_create_arch(task_t *t)
 {
-        t->arch.iomap = NULL;
-        t->arch.iomap_size = 0;
+        bitmap_initialize(&t->arch.iomap, NULL, 0);
 }

arch/ia32/include/pm.h

@@ -57 +57 @@
 
 #define TSS_BASIC_SIZE  104
+#define TSS_IOMAP_SIZE  (16*1024+1)     /* 16K for bitmap + 1 terminating byte for convenience */
 
 #ifndef __ASM__
@@ -132 +133 @@
         unsigned : 16;
         __u16 iomap_base;
-        __u8 iomap[0x10000+1];  /* 64K + 1 terminating byte */
+        __u8 iomap[TSS_IOMAP_SIZE];
 } __attribute__ ((packed));
 typedef struct tss tss_t;

arch/ia32/include/proc/task.h

@@ -32 +32 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <adt/bitmap.h>
 
 typedef struct {
-        count_t iomap_size;
-        __u8 *iomap;
+        bitmap_t iomap;
 } task_arch_t;
 

arch/ia32/src/proc/scheduler.c

@@ -36 +36 @@
 #include <arch/pm.h>
 #include <arch/asm.h>
+#include <adt/bitmap.h>
 
 /** Perform ia32 specific tasks needed before the new task is run.
@@ -43 +44 @@
 void before_task_runs_arch(void)
 {
-        size_t iomap_size;
+        count_t bits;
         ptr_16_32_t cpugdtr;
         descriptor_t *gdt_p;
@@ -53 +54 @@
         /* First, copy the I/O Permission Bitmap. */
         spinlock_lock(&TASK->lock);
-        iomap_size = TASK->arch.iomap_size;
-        if (iomap_size) {
-                ASSERT(TASK->arch.iomap);
-                memcpy(CPU->arch.tss->iomap, TASK->arch.iomap, iomap_size);
-                CPU->arch.tss->iomap[iomap_size] = 0xff;        /* terminating byte */
+        if ((bits = TASK->arch.iomap.bits)) {
+                bitmap_t iomap;
+
+                ASSERT(TASK->arch.iomap.map);
+                bitmap_initialize(&iomap, CPU->arch.tss->iomap, TSS_IOMAP_SIZE * 8);
+                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                /*
+                 * It is safe to set the trailing four bits because of the extra
+                 * convenience byte in TSS_IOMAP_SIZE.
+                 */
+                bitmap_set_range(&iomap, TASK->arch.iomap.bits, 4);
         }
-        spinlock_unlock(&TASK->lock);   
+        spinlock_unlock(&TASK->lock);
 
         /* Second, adjust TSS segment limit. */
         gdtr_store(&cpugdtr);
         gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + iomap_size - 1);
+        gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits) - 1);
         gdtr_load(&cpugdtr);
 }

arch/ia32/src/proc/task.c

@@ -29 +29 @@
 #include <proc/task.h>
 #include <arch/types.h>
+#include <adt/bitmap.h>
 
 /** Perform ia32 specific task initialization.
@@ -36 +37 @@
 void task_create_arch(task_t *t)
 {
-        t->arch.iomap = NULL;
-        t->arch.iomap_size = 0;
+        bitmap_initialize(&t->arch.iomap, NULL, 0);
 }