Changeset 9c1ecf9 in mainline for arch/amd64/src/proc/scheduler.c

Timestamp:

2006-04-13T18:27:09Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f52e54da

Parents:

0ddeabc

Message:

Move updating I/O Permission bitmap to before_task_runs_arch().

File:

• arch/amd64/src/proc/scheduler.c (modified) (3 diffs)

arch/amd64/src/proc/scheduler.c

@@ -38 +38 @@
 #include <arch/pm.h>
 
-/** Perform amd64 specific tasks needed before the new task is run. */
+/** Perform amd64 specific tasks needed before the new task is run.
+ *
+ * Interrupts are disabled.
+ */
 void before_task_runs_arch(void)
-{
-}
-
-/** Perform amd64 specific tasks needed before the new thread is scheduled. */
-void before_thread_runs_arch(void)
 {
         size_t iomap_size;
@@ -50 +48 @@
         descriptor_t *gdt_p;
 
-        CPU->arch.tss->rsp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
-
-        /* Syscall support - write address of thread stack pointer to 
-         * hidden part of gs */
-        swapgs();
-        write_msr(AMD_MSR_GS, (__u64)&THREAD->kstack);
-        swapgs();
-
-        /* TLS support - set FS to thread local storage */
-        write_msr(AMD_MSR_FS, THREAD->arch.tls);
-
         /*
          * Switch the I/O Permission Bitmap, if necessary.
-         *
-         * First, copy the I/O Permission Bitmap.
-         * This needs to be changed so that the
-         * copying is avoided if the same task
-         * was already running and the iomap did
-         * not change.
          */
+         
+        /* First, copy the I/O Permission Bitmap. */
         spinlock_lock(&TASK->lock);
         iomap_size = TASK->arch.iomap_size;
@@ -84 +67 @@
         gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + iomap_size - 1);
         gdtr_load(&cpugdtr);
+}
+
+/** Perform amd64 specific tasks needed before the new thread is scheduled. */
+void before_thread_runs_arch(void)
+{
+        CPU->arch.tss->rsp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+
+        /* Syscall support - write address of thread stack pointer to 
+         * hidden part of gs */
+        swapgs();
+        write_msr(AMD_MSR_GS, (__u64)&THREAD->kstack);
+        swapgs();
+
+        /* TLS support - set FS to thread local storage */
+        write_msr(AMD_MSR_FS, THREAD->arch.tls);
 
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT