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

Author: alfreb

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/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   0x9fff00
+%define STACK_LOCATION   0x9ffff0
 
 [BITS 32]
 __arch_start:

src/arch/x86_64/ist.cpp

@@ -11,15 +11,15 @@ extern gdtr64 __gdt64_base_pointer;
 
 #define INTR_SIZE  4096
 #define NMI_SIZE  20480
-#define DFI_SIZE  20480
+#define DFI_SIZE   4096
 
 namespace x86
 {
   struct alignas(SMP_ALIGN) LM_IST
   {
     char* intr; // 4kb
     char* nmi;  // 20kb
-    char* dfi;  // 20kb
+    char* dfi;  // 4kb
 
     AMD64_TSS tss;
   };

src/kernel/syscalls.cpp

@@ -151,6 +151,9 @@ void OS::on_panic(on_panic_func func)
   panic_handler = std::move(func);
 }
 
+extern "C" __attribute__((noreturn)) void panic_epilogue(const char*);
+
+
 /**
  * panic:
  * Display reason for kernel panic
@@ -193,21 +196,37 @@ asm("panic_begin:");
   fflush(stderr);
   SMP::global_unlock();
 
-  // call custom on panic handler (if present)
-  if (panic_handler) panic_handler(why);
+  panic_epilogue(why);
+}
 
-#if defined(ARCH_x86)
+extern "C"
+void double_fault(const char* why)
+{
   SMP::global_lock();
-  // Signal End-Of-Transmission
-  kprint("\x04");
+  fprintf(stderr, "\n%s\nCPU: %d, Reason: %s\n",
+          panic_signature, SMP::cpu_id(), why);
   SMP::global_unlock();
 
-  // .. if we return from the panic handler, go to permanent sleep
-  while (1) asm("cli; hlt");
+  panic_epilogue(why);
+}
+
+void panic_epilogue(const char* why)
+{
+  // call custom on panic handler (if present)
+  if (panic_handler) panic_handler(why);
+
+  #if defined(ARCH_x86)
+    SMP::global_lock();
+    // Signal End-Of-Transmission
+    kprint("\x04");
+    SMP::global_unlock();
+
+    // .. if we return from the panic handler, go to permanent sleep
+    while (1) asm("cli; hlt");
+  #else
+    #warning "panic() handler not implemented for selected arch"
+  #endif
   __builtin_unreachable();
-#else
-  #warning "panic() handler not implemented for selected arch"
-#endif
 }
 
 // Shutdown the machine when one of the exit functions are called

src/net/configure.cpp

@@ -81,9 +81,11 @@ void configure(const rapidjson::Value& net)
 
     std::string method = val["config"].GetString();
 
+    double timeout = (val.HasMember("timeout")) ? val["timeout"].GetDouble() : 10.0;
+
     if(method == "dhcp")
     {
-      stack.negotiate_dhcp(5.0);
+      stack.negotiate_dhcp(timeout);
     }
     else if(method == "static")
     {
@@ -92,14 +94,14 @@ void configure(const rapidjson::Value& net)
     else if(method == "dhcp-with-fallback")
     {
       auto addresses = parse_iface(val);
-      auto static_cfg = [addresses, &stack] (bool timeout)
+      auto static_cfg = [addresses, &stack] (bool timedout)
       {
-        if(timeout) {
+        if(timedout) {
           MYINFO("DHCP timeout (%s) - falling back to static configuration", stack.ifname().c_str());
           config_stack(stack, addresses);
         }
       };
-      stack.negotiate_dhcp(5.0, static_cfg);
+      stack.negotiate_dhcp(timeout, static_cfg);
     }
   }
 

src/net/inet4.cpp

@@ -164,7 +164,7 @@ void Inet4::error_report(Error& err, Packet_ptr orig_pckt) {
 }
 
 void Inet4::negotiate_dhcp(double timeout, dhcp_timeout_func handler) {
-  INFO("Inet4", "Negotiating DHCP...");
+  INFO("Inet4", "Negotiating DHCP (%.1fs timeout)...", timeout);
   if (!dhcp_)
       dhcp_ = std::make_shared<DHClient>(*this);
   // @timeout for DHCP-server negotation

src/platform/x86_pc/idt.cpp

@@ -259,6 +259,8 @@ static void cpu_dump_regs(uintptr_t* regs)
   fprintf(stderr, "\n");
 }
 
+extern "C" void double_fault(const char*);
+
 extern "C"
 __attribute__((noreturn, optnone))
 void __cpu_exception(uintptr_t* regs, int error, uint32_t code)
@@ -270,8 +272,17 @@ void __cpu_exception(uintptr_t* regs, int error, uint32_t code)
           exception_names[error], error, (void*) regs[RIP_REG], code);
   cpu_dump_regs(regs);
   SMP::global_unlock();
-  // call panic, which will decide what to do next
+  // error message:
   char buffer[64];
   snprintf(buffer, sizeof(buffer), "%s (%d)", exception_names[error], error);
-  panic(buffer);
+  // normal CPU exception
+  if (error != 0x8) {
+    // call panic, which will decide what to do next
+    panic(buffer);
+  }
+  else {
+    // handle double faults differently
+    double_fault(buffer);
+  }
+  __builtin_unreachable();
 }

test/net/integration/configure/config.json

@@ -21,11 +21,13 @@
     },
     {
       "iface": 3,
-      "config": "dhcp"
+      "config": "dhcp",
+      "timeout": 5.0
     },
     {
       "iface": 5,
       "config": "dhcp-with-fallback",
+      "timeout": 10,
       "address": "10.0.0.44",
       "netmask": "255.255.255.0",
       "gateway": "10.0.0.1"