Merge pull request #1265 from AndreasAakesson/dev

Make CPU features optional

Author: fwsGonzo

CMakeLists.txt

@@ -23,10 +23,21 @@ execute_process(COMMAND git describe --dirty
 	        OUTPUT_VARIABLE OS_VERSION)
 string(STRIP ${OS_VERSION} OS_VERSION)
 
+option(cpu_feat_vanilla "Restrict use of CPU features to vanilla" ON)
+if(cpu_feat_vanilla)
+  include("cmake/vanilla.cmake")
+  set(DEFAULT_SETTINGS_CMAKE "vanilla.cmake") # for service cmake
+  set(DEFAULT_VM "vm.vanilla.json") # vmrunner
+else()
+  include("cmake/cpu_feat.cmake")
+  set(DEFAULT_SETTINGS_CMAKE "cpu_feat.cmake") # for service cmake
+  set(DEFAULT_VM "vm.cpu_feat.json") # vmrunner
+endif(cpu_feat_vanilla)
+
 # create random hex string as stack protector canary
 string(RANDOM LENGTH 8 ALPHABET 0123456789ABCDEF STACK_PROTECTOR_VALUE)
 
-set(CAPABS "-mavx -maes -mfma -fstack-protector-strong -D_STACK_GUARD_VALUE_=0x${STACK_PROTECTOR_VALUE} ")
+set(CAPABS "${CAPABS} -fstack-protector-strong -D_STACK_GUARD_VALUE_=0x${STACK_PROTECTOR_VALUE}")
 
 # Various global defines
 # * NO_DEBUG disables output from the debug macro
@@ -160,10 +171,20 @@ endif(rapidjson)
 #
 # Installation
 #
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/service.cmake DESTINATION includeos)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/library.cmake DESTINATION includeos)
-install(DIRECTORY vmrunner DESTINATION includeos/)
+
+# Install cmake files
+install(FILES etc/service.cmake DESTINATION includeos)
+install(FILES etc/library.cmake DESTINATION includeos)
+install(FILES cmake/${DEFAULT_SETTINGS_CMAKE} DESTINATION includeos RENAME settings.cmake) # cpu_feat_vanilla opt
+
+# Install vmrunner
+install(DIRECTORY vmrunner DESTINATION includeos)
+install(FILES vmrunner/${DEFAULT_VM} DESTINATION includeos/vmrunner/ RENAME vm.default.json) # cpu_feat_vanilla opt
+
+# Install toolchain
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/i686-elf-toolchain.cmake DESTINATION includeos)
+
+# Install seed
 install(DIRECTORY seed/ DESTINATION includeos/seed)
 
 # Install boot util

api/net/tcp/connection.hpp

@@ -65,12 +65,13 @@ class Connection : public std::enable_shared_from_this<Connection> {
   using WriteBuffer = Write_queue::WriteBuffer;
 
 public:
-  /** Called with the connection itself when it's been established. */
+  /** Called with the connection itself when it's been established. May be a nullptr if the connection failed. */
   using ConnectCallback         = delegate<void(Connection_ptr self)>;
   /**
    * @brief      Event when a connection has been established.
    *             This event lets you know when to start using the connection,
    *             and should always be assigned.
+   *             NOTE: The Connection_ptr will be a nullptr when an outgoing connection failed.
    *
    * @param[in]  callback  The callback
    *
@@ -137,18 +138,6 @@ class Connection : public std::enable_shared_from_this<Connection> {
    */
   inline Connection&            on_write(WriteCallback callback);
 
-  /** Called with the error encountered. */
-  using ErrorCallback           = delegate<void(const TCPException& err)>;
-  /**
-   * @brief      Event when a connection has experienced an error of any kind.
-   *             Pretty useless in it's current form, and only useful for printing.
-   *
-   * @param[in]  callback  The callback
-   *
-   * @return     This connection
-   */
-  inline Connection&            on_error(ErrorCallback callback);
-
   /** Called with the packet that got dropped and the reason why. */
   using PacketDroppedCallback   = delegate<void(const Packet&, Drop_reason)>;
   /**
@@ -231,7 +220,10 @@ class Connection : public std::enable_shared_from_this<Connection> {
      */
     Stream(Connection_ptr conn)
       : tcp{std::move(conn)}
-    {}
+    {
+      // stream for a nullptr makes no sense
+      Expects(tcp != nullptr);
+    }
 
     /**
      * @brief      Event when the stream is connected/established/ready to use.
@@ -788,6 +780,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /**
    * @brief      Open the connection.
    *             Active determines whether the connection is active or passive.
+   *             May throw if no remote host, or state isnt valid for opening.
    *
    * @param[in]  active  Whether its an active (outgoing) or passive (listening)
    */
@@ -843,7 +836,6 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /** Callbacks */
   ConnectCallback         on_connect_;
   DisconnectCallback      on_disconnect_;
-  ErrorCallback           on_error_;
   PacketDroppedCallback   on_packet_dropped_;
   RtxTimeoutCallback      on_rtx_timeout_;
   CloseCallback           on_close_;
@@ -998,15 +990,15 @@ class Connection : public std::enable_shared_from_this<Connection> {
   /*
     Invoke/signal the diffrent TCP events.
   */
-  void signal_connect()
-  { if(on_connect_) on_connect_(shared_from_this()); }
+  void signal_connect(const bool success = true)
+  {
+    if(on_connect_)
+      (success) ? on_connect_(shared_from_this()) : on_connect_(nullptr);
+  }
 
   void signal_disconnect(Disconnect::Reason&& reason)
   { on_disconnect_(shared_from_this(), Disconnect{reason}); }
 
-  void signal_error(TCPException error)
-  { if(on_error_) on_error_(std::forward<TCPException>(error)); }
-
   void signal_packet_dropped(const Packet& packet, Drop_reason reason)
   { if(on_packet_dropped_) on_packet_dropped_(packet, reason); }
 
@@ -1264,7 +1256,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
     Retransmission timeout limit reached
   */
   bool rto_limit_reached() const
-  { return rtx_attempt_ >= 15 or syn_rtx_ >= 5; };
+  { return rtx_attempt_ >= 14 or syn_rtx_ >= 4; };
 
   /*
     Remove all packets acknowledge by ACK in retransmission queue

api/net/tcp/connection.inc

@@ -24,11 +24,6 @@ inline Connection& Connection::on_write(WriteCallback cb) {
   return *this;
 }
 
-inline Connection& Connection::on_error(ErrorCallback callback) {
-  on_error_ = callback;
-  return *this;
-}
-
 inline Connection& Connection::on_packet_dropped(PacketDroppedCallback callback) {
   on_packet_dropped_ = callback;
   return *this;

cmake/cpu_feat.cmake

@@ -0,0 +1,2 @@
+set(CAPABS "-mavx -maes -mfma")
+message(STATUS "Using extended CPU features: AVX, AES, FMA. CAPABS = ${CAPABS}")

cmake/vanilla.cmake

@@ -0,0 +1,2 @@
+set(CAPABS "-msse3")
+message(STATUS "Using vanilla CPU features: SSE3. CAPABS = ${CAPABS}")

etc/library.cmake

@@ -17,10 +17,13 @@ endif(CMAKE_COMPILER_IS_GNUCC)
 set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
 enable_language(ASM_NASM)
 
+# defines $CAPABS depending on installation
+include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
+
 # Various global defines
 # * OS_TERMINATE_ON_CONTRACT_VIOLATION provides classic assert-like output from Expects / Ensures
 # * _GNU_SOURCE enables POSIX-extensions in newlib, such as strnlen. ("everything newlib has", ref. cdefs.h)
-set(CAPABS "-msse3 -fstack-protector-strong -DOS_TERMINATE_ON_CONTRACT_VIOLATION -D_GNU_SOURCE")
+set(CAPABS "${CAPABS} -fstack-protector-strong -DOS_TERMINATE_ON_CONTRACT_VIOLATION -D_GNU_SOURCE")
 set(WARNS  "-Wall -Wextra") #-pedantic
 
 # configure options

etc/service.cmake

@@ -25,12 +25,13 @@ endif(CMAKE_COMPILER_IS_GNUCC)
 set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
 enable_language(ASM_NASM)
 
-set(CAPABS "-mavx -maes -mfma -fstack-protector-strong")
+# defines $CAPABS depending on installation
+include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
 
 # Various global defines
 # * OS_TERMINATE_ON_CONTRACT_VIOLATION provides classic assert-like output from Expects / Ensures
 # * _GNU_SOURCE enables POSIX-extensions in newlib, such as strnlen. ("everything newlib has", ref. cdefs.h)
-set(CAPABS "${CAPABS} -DOS_TERMINATE_ON_CONTRACT_VIOLATION -D_GNU_SOURCE -DSERVICE=\"\\\"${BINARY}\\\"\" -DSERVICE_NAME=\"\\\"${SERVICE_NAME}\\\"\"")
+set(CAPABS "${CAPABS} -fstack-protector-strong -DOS_TERMINATE_ON_CONTRACT_VIOLATION -D_GNU_SOURCE -DSERVICE=\"\\\"${BINARY}\\\"\" -DSERVICE_NAME=\"\\\"${SERVICE_NAME}\\\"\"")
 set(WARNS  "-Wall -Wextra") #-pedantic
 
 # configure options

src/arch/x86/start.asm

@@ -50,9 +50,9 @@ rock_bottom:
   ;; enable SSE before we enter C/C++ land
   call enable_sse
   ;; ... and XSAVE to get xsetbv/xgetbv working
-  call enable_xsave
+  ;call enable_xsave
   ;; ... and finally, enable AVX
-  call enable_avx
+  ;call enable_avx
 
   ;;  Place multiboot parameters on stack
   push ebx

src/net/tcp/connection.cpp

@@ -82,7 +82,6 @@ void Connection::reset_callbacks()
   on_disconnect_ = {this, &Connection::default_on_disconnect};
   on_connect_.reset();
   writeq.on_write(nullptr);
-  on_error_.reset();
   on_packet_dropped_.reset();
   on_rtx_timeout_.reset();
   on_close_.reset();
@@ -246,16 +245,10 @@ void Connection::writeq_reset() {
   rtx_timer.stop();
 }
 
-void Connection::open(bool active) {
-  try {
-    debug("<TCP::Connection::open> Trying to open Connection...\n");
-    state_->open(*this, active);
-  }
-  // No remote host, or state isnt valid for opening.
-  catch (const TCPException& e) {
-    debug("<TCP::Connection::open> Cannot open Connection. \n");
-    signal_error(e);
-  }
+void Connection::open(bool active)
+{
+  debug("<TCP::Connection::open> Trying to open Connection...\n");
+  state_->open(*this, active);
 }
 
 void Connection::close() {
@@ -269,8 +262,9 @@ void Connection::close() {
     if(is_state(Closed::instance()))
       signal_close();
   }
-  catch(const TCPException& err) {
-    signal_error(err);
+  catch(const TCPException&) {
+    // just ignore for now, it's kinda stupid its even throwing (i think)
+    // early return is_closing will probably prevent this from happening
   }
 }
 
@@ -685,7 +679,7 @@ void Connection::retransmit() {
       writeq.size(), buf.length() - buf.acknowledged);
     fill_packet(*packet, buf.data() + writeq.acked(), buf.length() - writeq.acked());
   }
-
+  rtx_attempt_++;
   packet->set_seq(cb.SND.UNA);
 
   /*
@@ -766,16 +760,11 @@ void Connection::rtx_timeout() {
   }
 
   // retransmit SND.UNA
-  retransmit();
+  retransmit(); // increases rtx_attempt
+
+  // "back off" timer
+  rttm.RTO *= 2.0;
 
-  if(cb.SND.UNA != cb.ISS) {
-    // "back off" timer
-    rttm.RTO *= 2.0;
-  }
-  // we never queue SYN packets since they don't carry data..
-  else {
-    rttm.RTO = std::chrono::seconds(3);
-  }
   // timer need to be restarted
   rtx_start();
 
@@ -789,7 +778,7 @@ void Connection::rtx_timeout() {
 
       ssthresh = max (FlightSize / 2, 2*SMSS)
   */
-  if(rtx_attempt_++ == 0)
+  if(rtx_attempt_ == 1)
   {
     // RFC 4015
     /*
@@ -888,14 +877,13 @@ void Connection::clean_up() {
 
   on_connect_.reset();
   on_disconnect_.reset();
-  on_error_.reset();
   on_packet_dropped_.reset();
   on_rtx_timeout_.reset();
   on_close_.reset();
   read_request.clean_up();
   _on_cleanup_.reset();
 
-  debug("<Connection::clean_up> Succesfully cleaned up %s\n", to_string().c_str());
+  debug2("<Connection::clean_up> Succesfully cleaned up %s\n", to_string().c_str());
 }
 
 std::string Connection::TCB::to_string() const {

src/net/tcp/connection_states.cpp

@@ -890,7 +890,7 @@ State::Result Connection::SynSent::handle(Connection& tcp, Packet_ptr in) {
   // 2. check RST
   if(UNLIKELY(in->isset(RST))) {
     if(in->isset(ACK)) {
-      tcp.signal_error(TCPException{"Connection reset."});
+      tcp.signal_connect(false);
       tcp.drop(*in, Drop_reason::RST);
       return CLOSED;
     } else {
@@ -960,6 +960,13 @@ State::Result Connection::SynSent::handle(Connection& tcp, Packet_ptr in) {
       tcb.SND.WL2 = in->ack();
       // end of correction
 
+      // [RFC 6298] p.4 (5.7)
+      if(UNLIKELY(tcp.syn_rtx_ > 0))
+      {
+        tcp.syn_rtx_ = 0;
+        tcp.rttm.RTO = RTTM::seconds(3.0);
+      }
+
       tcp.set_state(Connection::Established::instance());
       const seq_t snd_nxt = tcb.SND.NXT;
       tcp.signal_connect(); // NOTE: User callback
@@ -1061,6 +1068,13 @@ State::Result Connection::SynReceived::handle(Connection& tcp, Packet_ptr in) {
 
       tcp.handle_ack(*in);
 
+      // [RFC 6298] p.4 (5.7)
+      if(UNLIKELY(tcp.syn_rtx_ > 0))
+      {
+        tcp.syn_rtx_ = 0;
+        tcp.rttm.RTO = RTTM::seconds(3.0);
+      }
+
       tcp.signal_connect(); // NOTE: User callback
 
       // 7. proccess the segment text