Merge pull request #1475 from hioa-cs/dev

Merge Dev

Author: alfreb

api/kernel/os.hpp

@@ -59,7 +59,7 @@ class OS {
    *  other mechanisms. The first argument is always
    *  the binary name.
   **/
-  static const std::string& cmdline_args() noexcept;
+  static const char* cmdline_args() noexcept;
 
   /** Clock cycles since boot. */
   static uint64_t cycles_since_boot() {
@@ -257,18 +257,15 @@ class OS {
   static bool boot_sequence_passed_;
   static MHz cpu_mhz_;
 
-  // XXX: Only used by solo5
   static RTC::timestamp_t booted_at_;
   static uintptr_t liveupdate_loc_;
   static std::string version_str_;
   static std::string arch_str_;
   static Plugin_vec plugins_;
-  static uintptr_t low_memory_size_;
-  static uintptr_t high_memory_size_;
   static uintptr_t memory_end_;
   static uintptr_t heap_max_;
   static const uintptr_t elf_binary_size_;
-  static std::string cmdline;
+  static const char* cmdline;
 
   // Prohibit copy and move operations
   OS(OS&)  = delete;

api/kernel/service.hpp

@@ -6,9 +6,9 @@
 // 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.
@@ -30,12 +30,12 @@ class Service {
   /**
    *  @return: The (descriptive) name of the service
    */
-  static std::string name();
+  static const char* name();
 
   /**
    *  @return: The name of the service binary
    */
-  static std::string binary_name();
+  static const char* binary_name();
 
 
   /**

api/util/elf_binary.hpp

@@ -43,18 +43,22 @@ class Elf_binary {
 public:
 
   using Span = gsl::span<char>;
+  using Elf_header = typename Arch::Ehdr;
   using Section_header = typename Arch::Shdr;
   using Section_headers = gsl::span<Section_header>;
+  using Program_header = typename Arch::Phdr;
+  using Program_headers = gsl::span<Program_header>;
+  using Addr = typename Arch::Addr;
 
   Elf_binary(Span data)
     : data_{data}
   {
     validate();
   }
 
-  const typename Arch::Ehdr& elf_header() const;
-  const typename Arch::Phdr& program_header() const;
-  const typename Arch::Shdr& section_header() const;
+  const Elf_header& elf_header() const;
+  const Program_headers program_headers() const;
+  const Section_header& section_header() const;
 
   /** Make sure this is a valid ELF binary. Throws if not. **/
   void validate();
@@ -67,7 +71,10 @@ class Elf_binary {
   void print_summary();
 
   /** Program entry point **/
-  typename Arch::Addr entry();
+  Addr entry();
+
+  /** Program headers marked loadable */
+  std::vector<const Program_header*> loadable_segments();
 
   /** Get the span of seciton headers **/
   const Section_headers section_headers() const;
@@ -82,6 +89,7 @@ class Elf_binary {
 
 private:
   Span data_;
+  Program_header& program_header() const;
 
 };
 

api/util/elf_binary.inc

@@ -1,3 +1,4 @@
+// -*-C++-*-
 // This file is a part of the IncludeOS unikernel - www.includeos.org
 //
 // Copyright 2015-2017 Oslo and Akershus University College of Applied Sciences
@@ -20,26 +21,32 @@
 template <typename Arch>
 const typename Arch::Ehdr& Elf_binary<Arch>::elf_header() const{
   Expects(data_.size() >=  (long) sizeof(typename Arch::Ehdr));
-  return *reinterpret_cast<typename Arch::Ehdr*>(data_.data());
+  return *reinterpret_cast<Elf_header*>(data_.data());
 }
 
 template <typename Arch>
-const typename Arch::Phdr& Elf_binary<Arch>::program_header() const{
+typename Arch::Phdr& Elf_binary<Arch>::program_header() const{
   auto hdr = elf_header();
   Expects(data_.size() >= (long)(hdr.e_phoff + sizeof(typename Arch::Phdr)));
-  return *reinterpret_cast<typename Arch::Phdr*>(data_.data() + hdr.e_phoff);
+  return *reinterpret_cast<Program_header*>(data_.data() + hdr.e_phoff);
+}
+
+
+template <typename Arch>
+const typename Elf_binary<Arch>::Program_headers Elf_binary<Arch>::program_headers() const {
+  return {reinterpret_cast<Program_header*>(&program_header()), elf_header().e_phnum};
 }
 
 
 template <typename Arch>
 void Elf_binary<Arch>::print_summary() {
 
-  auto hdr = elf_header();  
+  auto hdr = elf_header();
 
   for(int i {0}; i < EI_NIDENT; ++i) {
     std::cout << hdr.e_ident[i];
   }
-  
+
   std::cout << "\nType: "
             << ((hdr.e_type == ET_EXEC) ? " ELF Executable\n" : "Non-executable\n");
   std::cout << "Machine: ";
@@ -52,34 +59,34 @@ void Elf_binary<Arch>::print_summary() {
     break;
   default:
     std::cout << "Other (" << hdr.e_machine << ")\n";
-    break;      
+    break;
   }
-  
+
   std::cout << "Version: "                   << hdr.e_version      << '\n';
   std::cout << "Entry point: 0x"             << std::hex << hdr.e_entry << '\n';
   std::cout << "Number of program headers: " << std::dec << hdr.e_phnum        << '\n';
   std::cout << "Program header offset: "     << hdr.e_phoff        << '\n';
   std::cout << "Number of section headers: " << hdr.e_shnum        << '\n';
   std::cout << "Section header offset: "     << hdr.e_shoff        << '\n';
-  std::cout << "Size of ELF-header: "        << hdr.e_ehsize << " bytes\n";  
+  std::cout << "Size of ELF-header: "        << hdr.e_ehsize << " bytes\n";
 }
 
 
 template <typename Arch>
 bool Elf_binary<Arch>::is_executable(){
-  return elf_header().e_type == ET_EXEC;    
+  return elf_header().e_type == ET_EXEC;
 }
 
 template <typename Arch>
 bool Elf_binary<Arch>::is_bootable(){
 
   bool has_multiboot = false;
-  
+
   try {
     section_header(".multiboot");
     has_multiboot = true;
   }catch(...) {}
-  
+
   return is_executable() and has_multiboot;
 }
 
@@ -90,24 +97,36 @@ bool Elf_binary<Arch>::is_ELF(){
     data_[EI_MAG0] == ELFMAG0 and
     data_[EI_MAG1] == ELFMAG1 and
     data_[EI_MAG2] == ELFMAG2 and
-    data_[EI_MAG3] == ELFMAG3;    
-    
+    data_[EI_MAG3] == ELFMAG3;
+
 }
 
 
 template <typename Arch>
 void Elf_binary<Arch>::validate(){
-  
+
   if (not is_ELF() or not is_bootable() or not is_executable())
-    throw Elf_exception("Not a bootable ELF binary.");
-  
+    throw Elf_exception("Not a bootable and executable ELF binary.");
+
 }
 
 template <typename Arch>
 typename Arch::Addr Elf_binary<Arch>::entry() {
   return elf_header().e_entry;
 }
 
+
+template <typename Arch>
+std::vector<const typename Arch::Phdr*> Elf_binary<Arch>::loadable_segments() {
+  std::vector<const Program_header*> hdrs;
+  for (auto& phdr : program_headers()) {
+    if (phdr.p_type == PT_LOAD)
+      hdrs.push_back(&phdr);
+  }
+  return hdrs;
+};
+
+
 template <typename Arch>
 const typename Elf_binary<Arch>::Section_headers Elf_binary<Arch>::section_headers() const {
     return {reinterpret_cast<Section_header*>(data_.data() + elf_header().e_shoff),

cmake/cross_compiled_libraries.txt

@@ -32,37 +32,39 @@ if (WITH_SOLO5)
 ExternalProject_Add(solo5_repo
 	PREFIX precompiled
 	BUILD_IN_SOURCE 1
-	GIT_REPOSITORY https://github.com/ricarkol/solo5.git
-	GIT_TAG includeos64
-	CONFIGURE_COMMAND ./configure.sh
+	GIT_REPOSITORY https://github.com/solo5/solo5.git
+	GIT_TAG f8a277f83807333685742228ffef0d87270207cf
+	CONFIGURE_COMMAND CC=gcc ./configure.sh
 	UPDATE_COMMAND ""
-	BUILD_COMMAND make build
+	BUILD_COMMAND make
 	INSTALL_COMMAND ""
 )
 
 set(SOLO5_REPO_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/solo5_repo)
-set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/build/include/)
-set(SOLO5_LIB_DIR ${SOLO5_REPO_DIR}/build/${ARCH})
+set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/kernel)
 
 # solo5 in ukvm mode (let's call it "solo5")
 add_library(solo5 STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/solo5.o)
+set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_REPO_DIR}/kernel/ukvm/solo5.o)
 
 # ukvm-bin
 add_library(ukvm-bin STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/ukvm-bin)
+set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_REPO_DIR}/ukvm/ukvm-bin)
 
 add_dependencies(solo5 solo5_repo)
 add_dependencies(ukvm-bin solo5_repo)
 
 # Some OS components depend on solo5 (for solo5.h for example)
 add_dependencies(PrecompiledLibraries solo5)
+add_dependencies(PrecompiledLibraries ukvm-bin)
 
 # Only x86_64 supported at the moment
 if ("${ARCH}" STREQUAL "x86_64")
-  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
+  install(FILES ${SOLO5_REPO_DIR}/kernel/ukvm/solo5.o ${SOLO5_REPO_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
 endif()
 
+install(FILES ${SOLO5_INCLUDE_DIR}/solo5.h DESTINATION includeos/${ARCH}/include)
+
 endif (WITH_SOLO5)
 
 set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibraries/${ARCH})
@@ -99,8 +101,6 @@ install(DIRECTORY ${LIBCXX_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/li
 
 install(DIRECTORY ${NEWLIB_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/newlib)
 
-install(DIRECTORY ${SOLO5_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/solo5)
-
 install(FILES ${CRTEND} ${CRTBEGIN} DESTINATION includeos/${ARCH}/lib)
 
 install(FILES ${NEWLIB_LIB_DIR}/libc.a ${NEWLIB_LIB_DIR}/libg.a ${NEWLIB_LIB_DIR}/libm.a ${LIBGCC_LIB_DIR}/libgcc.a ${LIBCXX_LIB_DIR}/libc++.a ${LIBCXX_LIB_DIR}/libc++abi.a DESTINATION includeos/${ARCH}/lib)

cmake/post.service.cmake

@@ -377,25 +377,22 @@ endif()
 
 # all the OS and C/C++ libraries + crt end
 target_link_libraries(service
-  libplatform
-  libarch
   libos
   libbotan
   libosdeps
-  cxxabi
-  libc
-  libcxx
-  libm
-  libg
-  libgcc
 
   libplatform
   libarch
   libos
-  libbotan
-  libosdeps
+
+  libplatform
+  libarch
+  libos
+  libplatform
+
   cxxabi
   libc
+  libos
   libcxx
   libm
   libg

lib/uplink/starbase/config.json

@@ -1,7 +1,15 @@
 {
-    "net" : [["10.20.17.111", "255.255.255.0", "10.20.17.1", "10.20.17.1"]],
+    "net" : [
+      {
+        "iface": 0,
+        "config":  "static",
+        "address": "10.0.0.42",
+        "netmask": "255.255.255.0",
+        "gateway": "10.0.0.1"
+      }
+    ],
     "uplink" : {
-      "url" : "10.20.17.12:9090",
+      "url" : "10.0.0.1:9090",
       "token" : "kappa123",
       "reboot" : true
     }

src/CMakeLists.txt

@@ -22,10 +22,10 @@ include_directories(${BOTAN_DIR})
 
 # TODO: i wanted to use a glob, but then found out that not everything is included
 set(OS_OBJECTS
-  kernel/kernel_start.cpp kernel/multiboot.cpp
+  kernel/multiboot.cpp
   kernel/syscalls.cpp kernel/os.cpp kernel/cpuid.cpp
   kernel/events.cpp kernel/memmap.cpp kernel/pci_manager.cpp
-  kernel/heap.cpp kernel/service_stub.cpp kernel/main_call.cpp
+  kernel/heap.cpp kernel/service_stub.cpp
   kernel/elf.cpp kernel/terminal.cpp kernel/terminal_disk.cpp
   kernel/vga.cpp kernel/context.cpp kernel/context_asm.asm
   kernel/fiber.cpp kernel/tls.cpp

src/arch/i686/linker.ld

@@ -23,13 +23,15 @@ SECTIONS
   PROVIDE ( _ELF_START_ = . + 0x100000);
   PROVIDE ( _LOAD_START_ = _ELF_START_); /* For convenience w. multiboot */
 
-  .multiboot (_ELF_START_ + SIZEOF_HEADERS): {
+  . = _ELF_START_;
+
+  .multiboot (_ELF_START_ ): {
       PROVIDE(_MULTIBOOT_START_ = .);
       *(.multiboot)
    }
 
   PROVIDE( _TEXT_START_ = . );
-  .text (_TEXT_START_ ) :
+  .text ALIGN(0x10) :
   {
     *(.text)
     *(.text.*)

src/arch/x86_64/arch_start.asm

@@ -24,7 +24,7 @@ extern __multiboot_addr
 %define P4_TAB             0x1000
 %define P3_TAB             0x2000 ;; - 0x5fff
 %define P2_TAB           0x100000
-%define STACK_LOCATION   0xA00000
+%define STACK_LOCATION   0x9ffff0
 
 [BITS 32]
 __arch_start: