Merge pull request #1357 from fwsGonzo/dev

Various multiboot fixes

Author: fwsGonzo

CMakeLists.txt

@@ -45,6 +45,8 @@ else()
   set(DEFAULT_VM "vm.cpu_feat.json") # vmrunner
 endif(cpu_feat_vanilla)
 
+option(single_threaded "Compile without SMP support" ON)
+
 # create random hex string as stack protector canary
 string(RANDOM LENGTH 8 ALPHABET 0123456789ABCDEF STACK_PROTECTOR_VALUE)
 

api/kernel/irq_manager.hpp

@@ -123,7 +123,7 @@ class alignas(SMP_ALIGN) IRQ_manager {
   { return count_handled; }
 
   /** Initialize for a local APIC */
-  static void init(int cpuid);
+  static void init();
   IRQ_manager() = default;
 
 private:

api/kernel/os.hpp

@@ -213,21 +213,7 @@ class OS {
   static void start(uint32_t boot_magic, uint32_t boot_addr);
 
   /** Get "kernel modules", provided by multiboot */
-  static Span_mods modules() {
-    auto* bootinfo_ = bootinfo();
-    if (bootinfo_ and bootinfo_->flags & MULTIBOOT_INFO_MODS) {
-
-      Expects(bootinfo_->mods_count < std::numeric_limits<int>::max());
-
-      return Span_mods{
-        reinterpret_cast<multiboot_module_t*>(bootinfo_->mods_addr),
-          static_cast<int>(bootinfo_->mods_count) };
-
-    }
-
-    return nullptr;
-  }
-
+  static Span_mods modules();
 
 
 private:
@@ -281,4 +267,18 @@ class OS {
   friend void __platform_init();
 }; //< OS
 
+inline OS::Span_mods OS::modules()
+{
+  auto* bootinfo_ = bootinfo();
+  if (bootinfo_ and bootinfo_->flags & MULTIBOOT_INFO_MODS and bootinfo_->mods_count) {
+
+    Expects(bootinfo_->mods_count < std::numeric_limits<int>::max());
+
+    return Span_mods{
+      reinterpret_cast<multiboot_module_t*>(bootinfo_->mods_addr),
+        static_cast<int>(bootinfo_->mods_count) };
+  }
+  return nullptr;
+}
+
 #endif //< KERNEL_OS_HPP

cmake/cross_compiled_libraries.txt

@@ -18,8 +18,8 @@ else(BUNDLE_LOC)
 	include(ExternalProject)
 	ExternalProject_Add(PrecompiledLibraries
 			    PREFIX precompiled
-			    URL https://github.com/hioa-cs/IncludeOS/releases/download/v0.10.1-bundle/IncludeOS_dependencies_multiarch_v0-10-1.tar.gz
-			    URL_HASH SHA1=d6c718108b900d098a1576abd815a53ce2307ba1
+			    URL https://github.com/hioa-cs/IncludeOS/releases/download/v0.11.0-bundle/IncludeOS_dependencies_v0-11-0-rc-1.tar.gz
+			    URL_HASH SHA1=f719886bcab5c55957361c024bab54c601d862f5
 			    CONFIGURE_COMMAND ""
 			    BUILD_COMMAND ""
 			    UPDATE_COMMAND ""

cmake/post.service.cmake

@@ -44,7 +44,9 @@ option(stripped "Strip symbols to further reduce size" OFF)
 
 add_definitions(-DARCH_${ARCH})
 add_definitions(-DARCH="${ARCH}")
+if (single_threaded)
 add_definitions(-DINCLUDEOS_SINGLE_THREADED)
+endif()
 
 # Compiler optimization
 set(OPTIMIZE "-O2")

cmake/pre.service.cmake

@@ -22,5 +22,7 @@ set(TRIPLE ${ARCH}) #-pc-linux-elf
 set(DCMAKE_CXX_COMPILER_TARGET ${TRIPLE})
 set(DCMAKE_C_COMPILER_TARGET ${TRIPLE})
 
+option(single_threaded "Compile without SMP support" ON)
+
 # include toolchain for arch
 include($ENV{INCLUDEOS_PREFIX}/includeos/${ARCH}-elf-toolchain.cmake)

src/CMakeLists.txt

@@ -13,7 +13,9 @@ enable_language(ASM_NASM)
 
 add_definitions(-DARCH_${ARCH})
 add_definitions(-DARCH="${ARCH}")
+if (single_threaded)
 add_definitions(-DINCLUDEOS_SINGLE_THREADED)
+endif()
 
 include_directories(${INCLUDEOS_ROOT}/api/posix)
 include_directories(${LIBCXX_INCLUDE_DIR})

src/arch/x86_64/CMakeLists.txt

@@ -3,6 +3,7 @@ set(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
 ### x86_64 arch specific ###
 set(ARCH_OBJECTS
   apic_asm.asm
+  apic_longmode.asm
   arch_start.asm
   interrupts.asm
   fiber_asm.asm

src/arch/x86_64/apic_longmode.asm

@@ -0,0 +1,73 @@
+; This file is a part of the IncludeOS unikernel - www.includeos.org
+;
+; Copyright 2015 Oslo and Akershus University College of Applied Sciences
+; and Alfred Bratterud
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+global __apic_trampoline:function
+extern __gdt64_base_pointer
+extern revenant_main
+
+%define P4_TAB    0x1000
+
+[BITS 32]
+__apic_trampoline:
+    pop edi  ;; cpuid
+
+    ;; use same pagetable as CPU 0
+    mov eax, P4_TAB
+    mov cr3, eax
+
+    ;; enable PAE
+    mov eax, cr4
+    or  eax, 1 << 5
+    mov cr4, eax
+
+    ;; enable long mode
+    mov ecx, 0xC0000080          ; EFER MSR
+    rdmsr
+    or  eax, 1 << 8              ; Long Mode bit
+    wrmsr
+
+    ;; enable paging
+    mov eax, cr0                 ; Set the A-register to control register 0.
+    or  eax, 1 << 31
+    mov cr0, eax                 ; Set control register 0 to the A-register.
+
+    ;; load 64-bit GDT
+    lgdt [__gdt64_base_pointer]
+    jmp  0x8:long_mode ;; 0x8 = code seg
+
+[BITS 64]
+long_mode:
+    ;; segment regs
+    mov cx, 0x10 ;; 0x10 = data seg
+    mov ds, cx
+    mov es, cx
+    mov fs, cx
+    mov gs, cx
+    mov ss, cx
+
+    ;; align stack
+    and  rsp, -16
+    ;; retrieve CPU id
+    mov rax, 1
+    cpuid
+    shr rbx, 24
+    ;; geronimo!
+    mov rdi, rbx
+    call revenant_main
+    ; stop execution
+    cli
+    hlt

src/arch/x86_64/arch_start.asm

@@ -15,6 +15,7 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 global __arch_start:function
+global __gdt64_base_pointer
 extern kernel_start
 extern __multiboot_magic
 extern __multiboot_addr
@@ -78,19 +79,16 @@ __arch_start:
     ;; enable long mode
     mov ecx, 0xC0000080          ; EFER MSR
     rdmsr
-    or eax, 1 << 8               ; Long Mode bit
+    or  eax, 1 << 8              ; Long Mode bit
     wrmsr
 
     ;; enable paging
     mov eax, cr0                 ; Set the A-register to control register 0.
-    or eax, 1 << 31
+    or  eax, 1 << 31
     mov cr0, eax                 ; Set control register 0 to the A-register.
 
-    mov eax, DWORD[__multiboot_magic]        ; Preserve multiboot regs
-    mov ebx, DWORD[__multiboot_addr]
-
     ;; load 64-bit GDT
-    lgdt [GDT64.Pointer]
+    lgdt [__gdt64_base_pointer]
     jmp  GDT64.Code:long_mode
 
 
@@ -112,7 +110,7 @@ GDT64:
     db 00000000b                 ; Granularity.
     db 0                         ; Base (high).
     dw 0x0 ;; alignment padding
-  .Pointer:                    ; The GDT-pointer.
+__gdt64_base_pointer:
     dw $ - GDT64 - 1             ; Limit.
     dq GDT64                     ; Base.
 
@@ -130,12 +128,12 @@ long_mode:
 
     ;; set up new stack for 64-bit
     push rsp
-    mov rsp, STACK_LOCATION
-    mov rbp, rsp
+    mov  rsp, STACK_LOCATION
+    mov  rbp, rsp
 
     ;; geronimo!
-    mov rdi, rax
-    mov rsi, rbx
+    mov  edi, DWORD[__multiboot_magic]
+    mov  esi, DWORD[__multiboot_addr]
     call kernel_start
     pop  rsp
     ret