Merge branch 'dev' of github.com:hioa-cs/IncludeOS into dev

Author: AndreasAakesson

.travis.yml

@@ -17,5 +17,5 @@ before_script:
   - mkdir darwin && cd darwin
 
 script:
-  - cmake .. -DTRAVIS=ON
+  - cmake .. -DTRAVIS=ON -DEXTRA_TESTS=ON
   - make VERBOSE=1 && ./unittests --pass

examples/demo_service/service.cpp

@@ -82,8 +82,10 @@ http::Response handle_request(const http::Request& req)
 void Service::start(const std::string&)
 {
   // DHCP on interface 0
+  printf("*** Waiting up to 10 sec. for DHCP... ***\n");
   auto& inet = net::Inet4::ifconfig(5.0, [](bool timeout) {
     if (timeout) {
+      printf("*** Falling back to static network config ***\n");
       // static IP in case DHCP fails
       net::Inet4::stack().network_config(
         { 10,0,0,42 },     // IP

install.sh

@@ -33,7 +33,7 @@ while getopts "h?yqb:" opt; do
         ;;
     q)  quiet=1
         ;;
-    b)  BUNDLE_LOC=$OPTARG 
+    b)  BUNDLE_LOC=$OPTARG
 		if [ -f $BUNDLE_LOC ]; then
 		    export BUNDLE_LOC=$BUNDLE_LOC
 		else
@@ -105,7 +105,7 @@ if ! command -v sudo > /dev/null 2>&1; then
     exit 1
 fi
 
-# Install build requirements (compiler, etc) 
+# Install build requirements (compiler, etc)
 if [ "Darwin" = "$SYSTEM" ]; then
     if ! ./etc/install_osx.sh; then
 		printf "%s\n" ">>> Sorry <<<"\
@@ -118,7 +118,7 @@ else
 		dependency_level=all
 	else
 		dependency_level=build
-	fi	
+	fi
 	echo ">>> Dependencies required:"
 	if ! ./etc/install_build_requirements.sh -s $SYSTEM -r $RELEASE -c -d $dependency_level; then
 		missing_dependencies=1
@@ -132,7 +132,7 @@ fi
 # Check if script has write permission to PREFIX location
 start_dir=$INCLUDEOS_PREFIX
 while [ "$start_dir" != "/" ]
-do	
+do
 	if [ -d $start_dir ]; then	# If dir exists
 		if [ ! -w $start_dir ]; then	# If dir is not writable
 			printf "\n\n>>> IncludeOS can't be installed with the current options\n"
@@ -164,7 +164,7 @@ printf "    %-25s %-25s %s\n"\
 
 # Give user option to evaluate install options
 if tty -s && [ $install_yes -eq 0 ]; then
-	read -p "Is this correct [Y/n]?" answer
+	read -p "Is this correct [Y/n]? " answer
 	answer=${answer:-"Y"}	# Default value
 	case $answer in
 		[yY] | [yY][Ee][Ss] )
@@ -190,7 +190,7 @@ function clean {
 	if [ -f /tmp/cmake_output.txt ]; then
 		rm /tmp/cmake_output.txt
 	fi
-} 
+}
 trap clean EXIT
 
 printf "\n\n>>> Running install_from_bundle.sh (expect up to 3 minutes)\n"
@@ -223,7 +223,7 @@ fi
 # INSTALL FINISHED:
 ############################################################
 
-printf "\n\n>>> IncludeOS installation Done!\n" 
+printf "\n\n>>> IncludeOS installation Done!\n"
 printf "    %s\n" "To use IncludeOS set env variables for cmake to know your compiler, e.g.:"\
 	   '    export CC="clang-3.8"'\
 	   '    export CXX="clang++-3.8"'\

src/arch/x86/start.asm

@@ -20,6 +20,7 @@ extern kernel_start
 global _start
 global __xsave_enabled
 global __avx_enabled
+global __ecx_was
 
 %define  MB_MAGIC   0x1BADB002
 %define  MB_FLAGS   0x3  ;; ALIGN + MEMINFO
@@ -49,7 +50,6 @@ __xsave_enabled:
 __avx_enabled:
     dw 0x0
 
-ALIGN32
 section .text
 ;; Multiboot places boot paramters on eax and ebx.
 _start:
@@ -77,8 +77,10 @@ rock_bottom:
 
   ;; enable SSE before we enter C/C++ land
   call enable_sse
+  ;; try to enable XSAVE before checking AVX
+  call enable_xsave
   ;; enable AVX if xsave and avx supported on CPU
-  ;call enable_avx
+  call enable_avx
 
   ;;  Place multiboot parameters on stack
   push ebx
@@ -99,11 +101,24 @@ enable_sse:
   ret
 
 enable_xsave:
+  push eax
+  push ebx
+  ; check for XSAVE support
+  mov eax, 1
+  xor ecx, ecx
+  cpuid
+  ; bit 26 ecx
+  and ecx, 0x04000000
+  cmp ecx, 0x04000000
+  jne xsave_not_supported
   ; enable XSAVE
   mov eax, cr4
   or  eax, 0x40000
   mov cr4, eax
   mov WORD [__xsave_enabled], 0x1
+xsave_not_supported:
+  pop ebx
+  pop eax
   ret
 
 enable_avx:
@@ -117,8 +132,6 @@ enable_avx:
   and ecx, 0x18000000
   cmp ecx, 0x18000000
   jne avx_not_supported
-  ;; enable XSAVE
-  call enable_xsave
   ;; enable AVX support
   xor ecx, ecx
   xgetbv

src/drivers/virtionet.cpp

@@ -156,7 +156,8 @@ VirtioNet::VirtioNet(hw::PCI_Device& d)
   }
   else
   {
-    assert(0 && "Legacy IRQs not supported");
+    auto irq = Virtio::get_legacy_irq();
+    IRQ_manager::get().subscribe(irq, {this, &VirtioNet::legacy_handler});
   }
 
 #ifndef NO_DEFERRED_KICK
@@ -243,6 +244,12 @@ void VirtioNet::msix_xmit_handler()
   }
 }
 
+void VirtioNet::legacy_handler()
+{
+  msix_recv_handler();
+  msix_xmit_handler();
+}
+
 void VirtioNet::add_receive_buffer(uint8_t* pkt)
 {
   // offset pointer to virtionet header

src/drivers/virtionet.hpp

@@ -220,6 +220,9 @@ class VirtioNet : Virtio, public net::Link_layer<net::Ethernet> {
   void msix_xmit_handler();
   void msix_conf_handler();
 
+  /** Legacy IRQ handler */
+  void legacy_handler();
+
   /** Allocate and queue buffer from bufstore_ in RX queue. */
   void add_receive_buffer(uint8_t*);
 

test/fs/unit/memdisk_test.cpp

@@ -20,16 +20,16 @@
 
 CASE("memdisk properties")
 {
-  auto disk = fs::new_shared_memdisk();
-  EXPECT(disk->empty() == true);
-  EXPECT(disk->device_id() == 0);
-  EXPECT(disk->fs_ready() == false);
-  EXPECT(disk->name() == "memdisk0");
-  EXPECT(disk->dev().size() == 0ull);
-  EXPECT(disk->dev().device_type() == "Block device");
-  EXPECT(disk->dev().driver_name() == "MemDisk");
+  fs::Disk& disk = fs::memdisk();
+  EXPECT(disk.empty() == true);
+  EXPECT(disk.device_id() == 0);
+  EXPECT(disk.fs_ready() == false);
+  EXPECT(disk.name() == "memdisk0");
+  EXPECT(disk.dev().size() == 0ull);
+  EXPECT(disk.dev().device_type() == "Block device");
+  EXPECT(disk.dev().driver_name() == "MemDisk");
   bool enumerated_partitions {false};
-  
+
   fs::Disk::on_parts_func part_fn = [&enumerated_partitions, &lest_env]
   (fs::error_t err, std::vector<fs::Disk::Partition>& partitions)
   {
@@ -39,6 +39,6 @@ CASE("memdisk properties")
     }
   };
 
-  disk->partitions(part_fn);
+  disk.partitions(part_fn);
   EXPECT(enumerated_partitions == true);
 }

test/posix/integration/conf/service.cpp

@@ -29,11 +29,11 @@ extern "C" void test_sysconf();
 extern "C" void test_pathconf();
 extern "C" void test_pwd();
 
-fs::Disk_ptr& memdisk() {
-  static auto disk = fs::new_shared_memdisk();
+fs::Disk& memdisk() {
+  fs::Disk& disk = fs::memdisk();
 
-  if (not disk->fs_ready()) {
-    disk->init_fs([](fs::error_t err, auto&) {
+  if (not disk.fs_ready()) {
+    disk.init_fs([](fs::error_t err, auto&) {
         if (err) {
           printf("ERROR MOUNTING DISK\n");
           printf("%s\n", err.reason().c_str());
@@ -58,7 +58,7 @@ int main(int, char **) {
   test_sysconf();
 
   // mount a disk with contents for testing
-  auto root = memdisk()->fs().stat("/");
+  auto root = memdisk().fs().stat("/");
   fs::mount("/etc", root, "test fs");
   test_pathconf();
 

test/posix/integration/stat/ftw_tests.cpp

@@ -98,7 +98,7 @@ void ftw_tests()
   printf("Total size: %ld\n", total_size);
 }
 
-int display_info(const char *fpath, const struct stat *sb, int flag, struct FTW *ftwbuf)
+int display_info(const char *fpath, const struct stat *sb, int flag, struct FTW *)
 {
   printf("%ld\t%s (%d)\n", sb->st_size, fpath, flag);
 #ifdef EXTRAVERBOSE

test/posix/integration/stat/test_stat_ftw.cpp

@@ -24,12 +24,12 @@
 int ftw_tests();
 int stat_tests();
 
-fs::Disk_ptr& memdisk() {
-  static auto disk = fs::new_shared_memdisk();
+fs::Disk& memdisk() {
+  fs::Disk& disk = fs::memdisk();
 
-  if (not disk->fs_ready()) {
-    printf("%s\n", disk->name().c_str());
-    disk->init_fs([](fs::error_t err, auto&) {
+  if (not disk.fs_ready()) {
+    printf("%s\n", disk.name().c_str());
+    disk.init_fs([](fs::error_t err, auto&) {
         if (err) {
           printf("ERROR MOUNTING DISK\n");
           exit(127);
@@ -44,7 +44,7 @@ int main()
   INFO("POSIX stat", "Running tests for POSIX stat");
 
   // mount a disk with contents for testing
-  auto root = memdisk()->fs().stat("/");
+  auto root = memdisk().fs().stat("/");
   fs::mount("/mnt/disk", root, "test root");
 
   fs::print_tree();