Merge pull request #1398 from fwsGonzo/ukvm

uKVM-64 port

Author: fwsGonzo

.gitignore

@@ -47,3 +47,5 @@ build_x86_64/
 CMakeFiles*
 CMakeCache*
 cmake_install.cmake
+
+dummy.disk

CMakeLists.txt

@@ -213,6 +213,7 @@ install(PROGRAMS
   ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/grubify.sh
   ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/qemu-ifup
   ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/qemu_cmd.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/ukvm-ifup.sh
   ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/run.sh
   DESTINATION includeos/scripts)
 

README.md

@@ -97,7 +97,7 @@ More information is [available on the wiki](https://github.com/hioa-cs/IncludeOS
 
 ### Writing your first service
 
-1. Copy the [./seed/service](./seed/service) directory to a convenient location like `~/your_service`. Then, just start implementing the `Service::start` function in the `Service` class, located in [your_service/service.cpp](./seed/service/service.cpp) (Very simple example provided). This function will be called once the OS is up and running.
+1. Copy the [./seed/service](./seed/service) directory to a convenient location like `~/your_service`. Then, just start implementing the `Service::start` function in the `Service` class, located in [your_service/service.cpp](./seed/service/service.cpp) (very simple example provided). This function will be called once the OS is up and running.
 2. Update the [CMakeLists.txt](./seed/service/CMakeLists.txt) to specify the name of your project, enable any needed drivers or plugins, etc.
 
 **Example:**

api/hw/mac_addr.hpp

@@ -64,6 +64,29 @@ union Addr {
     : part{a,b,c,d,e,f}
   {}
 
+  static uint8_t dehex(char c)
+  {
+    if (c >= '0' && c <= '9')
+        return (c - '0');
+    else if (c >= 'a' && c <= 'f')
+        return 10 + (c - 'a');
+    else if (c >= 'A' && c <= 'F')
+        return 10 + (c - 'A');
+    else
+        return 0;
+  }
+
+  Addr(const char *smac) noexcept
+  {
+    uint8_t macaddr[PARTS_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+    for (size_t i = 0; i < PARTS_LEN; i++) {
+        macaddr[i] = dehex(*smac++) << 4;
+        macaddr[i] |= dehex(*smac++);
+        smac++;
+    }
+    memcpy(part, macaddr, PARTS_LEN);
+  }
+
   /**
    * Assignment operator
    *

api/hw/nic.hpp

@@ -100,6 +100,10 @@ namespace hw {
     virtual void flush() = 0;
 
     virtual ~Nic() {}
+
+    /** Trigger a read from buffers, pusing any packets up the stack */
+    virtual void poll() = 0;
+
   protected:
     /**
      *  Constructor

api/hw/pci_device.hpp

@@ -44,6 +44,9 @@ namespace PCI {
 
   static const uint32_t  WTF                   {~0x0U};
 
+  static const uint32_t  SOLO5_NET_DUMMY_ADDR  {0xFFFE};
+  static const uint32_t  SOLO5_BLK_DUMMY_ADDR  {0xFFFF};
+
   /**
    *  @brief PCI device message format
    *
@@ -103,6 +106,7 @@ namespace PCI {
     VENDOR_VIRTIO  = 0x1AF4,
     VENDOR_REALTEK = 0x10EC,
     VENDOR_VMWARE  = 0x15AD,
+    VENDOR_SOLO5   = 0x5050,
   };
 
   static inline const char* classcode_str(uint8_t code);

api/kernel/os.hpp

@@ -69,13 +69,10 @@ class OS {
   static int64_t micros_since_boot() noexcept;
 
   /** Timestamp for when OS was booted */
-  static RTC::timestamp_t boot_timestamp()
-  { return RTC::boot_timestamp(); }
+  static RTC::timestamp_t boot_timestamp();
 
   /** Uptime in whole seconds. */
-  static RTC::timestamp_t uptime() {
-    return RTC::time_since_boot();
-  }
+  static RTC::timestamp_t uptime();
 
   static MHz cpu_freq() noexcept
   { return cpu_mhz_; }
@@ -145,6 +142,8 @@ class OS {
   **/
   static void add_stdout_default_serial();
 
+  static void add_stdout_solo5();
+
   /** Memory page helpers */
   static constexpr uint32_t page_size() noexcept {
     return 4096;
@@ -217,6 +216,8 @@ class OS {
   /** Start the OS.  @todo Should be `init()` - and not accessible from ABI */
   static void start(uint32_t boot_magic, uint32_t boot_addr);
 
+  static void start(char *cmdline, uintptr_t mem_size);
+
   /** Get "kernel modules", provided by multiboot */
   static Span_mods modules();
 
@@ -250,6 +251,9 @@ class OS {
   static bool power_;
   static bool boot_sequence_passed_;
   static MHz cpu_mhz_;
+
+  // XXX: Only used by solo5
+  static RTC::timestamp_t booted_at_;
   static std::string version_str_;
   static std::string arch_str_;
   static Plugin_vec plugins_;

api/kernel/solo5_manager.hpp

@@ -0,0 +1,36 @@
+// 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.
+
+#ifndef KERNEL_SOLO5_MANAGER_HPP
+#define KERNEL_SOLO5_MANAGER_HPP
+
+#include <memory>
+#include <delegate>
+#include <hw/devices.hpp>
+
+class Solo5_manager {
+public:
+  using Nic_ptr = std::unique_ptr<hw::Nic>;
+  using Blk_ptr = std::unique_ptr<hw::Block_device>;
+
+  static void register_net(delegate<Nic_ptr()>);
+  static void register_blk(delegate<Blk_ptr()>);
+
+  static void init();
+}; //< class Solo5_manager
+
+#endif //< KERNEL_SOLO5_MANAGER_HPP

api/util/crc32.hpp

@@ -89,12 +89,37 @@ static uint32_t crc_32_tab[] =
 
 #ifdef __SSE4_2__
 #include <immintrin.h>
+inline bool ____is__aligned(const uint8_t* buffer, const int align) noexcept {
+  return (((uintptr_t) buffer) & (align-1)) == 0;
+}
 
-inline uint32_t crc32_hw(const uint8_t* buffer, size_t len)
+inline uint32_t crc32_hw(const uint8_t* buffer, size_t len) noexcept
 {
   uint32_t hash = 0xFFFFFFFF;
-  for (size_t i = 0; i < len; i++) {
-    hash = _mm_crc32_u8(hash, buffer[i]);
+  // 8-bits until 4-byte aligned
+  while (____is__aligned(buffer, 4) == false && len > 0) {
+    hash = _mm_crc32_u8(hash, *buffer++); len--;
+  }
+  // 16 bytes at a time
+  while (len >= 16) {
+    hash = _mm_crc32_u32(hash, *(uint32_t*) (buffer +  0));
+    hash = _mm_crc32_u32(hash, *(uint32_t*) (buffer +  4));
+    hash = _mm_crc32_u32(hash, *(uint32_t*) (buffer +  8));
+    hash = _mm_crc32_u32(hash, *(uint32_t*) (buffer + 12));
+    buffer += 16; len -= 16;
+  }
+  // 4 bytes at a time
+  while (len >= 4) {
+    hash = _mm_crc32_u32(hash, *(uint32_t*) buffer);
+    buffer += 4; len -= 4;
+  }
+  // remaining bytes
+  if (len & 2) {
+    hash = _mm_crc32_u16(hash, *(uint16_t*) buffer);
+    buffer += 2;
+  }
+  if (len & 1) {
+    hash = _mm_crc32_u8(hash, *buffer);
   }
   return hash ^ 0xFFFFFFFF;
 }

cmake/cross_compiled_libraries.txt

@@ -28,6 +28,35 @@ else(BUNDLE_LOC)
 
 endif (BUNDLE_LOC)
 
+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
+	UPDATE_COMMAND ""
+	BUILD_COMMAND make build
+	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})
+
+# 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)
+
+# ukvm-bin
+add_library(ukvm-bin STATIC IMPORTED)
+set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_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)
+
 set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibraries/${ARCH})
 
 set(LIBCXX_INCLUDE_DIR ${PRECOMPILED_DIR}/libcxx/include/)
@@ -54,10 +83,6 @@ add_library(libm STATIC IMPORTED)
 set_target_properties(libm PROPERTIES IMPORTED_LOCATION ${NEWLIB_LIB_DIR}/libm.a)
 add_dependencies(libm PrecompiledLibraries)
 
-add_library(libgcc STATIC IMPORTED)
-set_target_properties(libgcc PROPERTIES IMPORTED_LOCATION ${LIBGCC_LIB_DIR}/libgcc.a)
-add_dependencies(libgcc PrecompiledLibraries)
-
 set(CRTEND ${PRECOMPILED_DIR}/crt/crtend.o)
 set(CRTBEGIN ${PRECOMPILED_DIR}/crt/crtbegin.o)
 
@@ -66,6 +91,13 @@ 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)
 
+# 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)
+endif()
+
 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)