Changeset da68871a in mainline for kernel/arch/amd64

Timestamp:

2012-08-08T08:46:22Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from mainline.

Location:

kernel/arch/amd64

Files:

• include/mm/page.h (modified) (2 diffs)
• src/asm.S (modified) (2 diffs)
• src/boot/multiboot.S (modified) (3 diffs)
• src/boot/multiboot2.S (modified) (2 diffs)
• src/boot/vesa_ret.inc (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)

kernel/arch/amd64/include/mm/page.h

@@ -119 +119 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i) \
+        set_pt_present((pte_t *) (ptl1), (size_t) (i))
+#define SET_PTL3_PRESENT_ARCH(ptl2, i) \
+        set_pt_present((pte_t *) (ptl2), (size_t) (i))
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Macros for querying the last-level PTE entries. */
 #define PTE_VALID_ARCH(p) \
@@ -215 +225 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *p = &pt[i];
+
+        p->present = 1;
+}
+
 extern void page_arch_init(void);
 extern void page_fault(unsigned int, istate_t *);

kernel/arch/amd64/src/asm.S

@@ -362 +362 @@
          */
         call syscall_handler
-        
+
+        /*
+         * Test if the saved return address is canonical and not-kernel.
+         * We do this by looking at the 16 most significant bits
+         * of the saved return address (two bytes at offset 6).
+         */
+        testw $0xffff, ISTATE_OFFSET_RIP+6(%rsp)
+        jnz bad_rip 
+
         cli
         
@@ -388 +396 @@
         sysretq
 
+bad_rip:
+        movq %rsp, %rdi
+        movabs $bad_rip_msg, %rsi
+        xorb %al, %al
+        callq fault_from_uspace
+        /* not reached */
+        
+bad_rip_msg:
+        .asciz "Invalid instruction pointer."
+
 /** Print Unicode character to EGA display.
  *

kernel/arch/amd64/src/boot/multiboot.S

@@ -76 +76 @@
 
 multiboot_image_start:
+        cli
         cld
         
@@ -81 +82 @@
         movl $START_STACK, %esp
         
-        /* Initialize Global Descriptor Table register */
+        /*
+         * Initialize Global Descriptor Table and
+         * Interrupt Descriptor Table registers
+         */
         lgdtl bootstrap_gdtr
+        lidtl bootstrap_idtr
         
         /* Kernel data + stack */
@@ -645 +650 @@
 .section K_DATA_START, "aw", @progbits
 
+.global bootstrap_idtr
+bootstrap_idtr:
+        .word 0
+        .long 0
+
 .global bootstrap_gdtr
 bootstrap_gdtr:

kernel/arch/amd64/src/boot/multiboot2.S

@@ -116 +116 @@
 
 multiboot2_image_start:
+        cli
         cld
         
@@ -121 +122 @@
         movl $START_STACK, %esp
         
-        /* Initialize Global Descriptor Table register */
+        /*
+         * Initialize Global Descriptor Table and
+         * Interrupt Descriptor Table registers
+         */
         lgdtl bootstrap_gdtr
+        lidtl bootstrap_idtr
         
         /* Kernel data + stack */

kernel/arch/amd64/src/boot/vesa_ret.inc

@@ -1 +1 @@
 .code32
 vesa_init_protected:
+        cli
         cld
         

kernel/arch/amd64/src/mm/page.c

@@ -57 +57 @@
         uintptr_t cur;
         unsigned int identity_flags =
-            PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
+            PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ;
                 
         page_mapping_operations = &pt_mapping_operations;