Merge pull request #1371 from fwsGonzo/dev

Gonzo's fixes

Author: fwsGonzo

src/drivers/virtionet.hpp

@@ -133,7 +133,7 @@ class VirtioNet : Virtio, public net::Link_layer<net::Ethernet> {
   { return 1500; }
 
   uint16_t packet_len() const noexcept {
-    return Link::Protocol::header_size() + MTU();
+    return sizeof(net::ethernet::Header) + MTU();
   }
 
   net::Packet_ptr create_packet(int) override;

src/drivers/vmxnet3.cpp

@@ -106,7 +106,7 @@ inline void mmio_write32(uintptr_t location, uint32_t value)
 
 vmxnet3::vmxnet3(hw::PCI_Device& d) :
     Link(Link_protocol{{this, &vmxnet3::transmit}, mac()},
-         2048, 2048 /* half-page buffer size */),
+         1024, 2048 /* half-page buffer size */),
     pcidev(d)
 {
   INFO("vmxnet3", "Driver initializing (rev=%#x)", d.rev_id());
@@ -330,8 +330,7 @@ void vmxnet3::refill(rxring_state& rxq)
   bool added_buffers = false;
   int  old_value = rxq.producers;
 
-  while (rxq.prod_count < VMXNET3_RX_FILL
-      && bufstore().available() != 0)
+  while (rxq.prod_count < VMXNET3_RX_FILL)
   {
     size_t i = rxq.producers % vmxnet3::NUM_RX_DESC;
     const uint32_t generation =

src/drivers/vmxnet3.hpp

@@ -30,8 +30,8 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>
   using Link_protocol = Link::Protocol;
   static const int ETH_FRAME_LEN = 1514;
   static const int NUM_RX_QUEUES = 1;
-  static const int NUM_TX_DESC   = 128;
-  static const int NUM_RX_DESC   = 128;
+  static const int NUM_TX_DESC   = 256;
+  static const int NUM_RX_DESC   = 256;
 
   static std::unique_ptr<Nic> new_instance(hw::PCI_Device& d)
   { return std::make_unique<vmxnet3>(d); }
@@ -52,8 +52,8 @@ class vmxnet3 : public net::Link_layer<net::Ethernet>
   }
 
   uint16_t packet_len() const noexcept
-  {        // ethernet + vlan + fcs
-    return ETH_FRAME_LEN + 4 + 4;
+  {
+    return sizeof(net::ethernet::Header) + MTU();
   }
 
   net::downstream create_physical_downstream()

src/net/tcp/connection_states.cpp

@@ -123,8 +123,11 @@ bool Connection::State::check_seq(Connection& tcp, const Packet& in)
   if( in.seq() == tcb.RCV.NXT ) {
     goto acceptable;
   }
+  /// TODO: FIXME: reordering issues solved by this
+  else goto unacceptable;
+
   // #2
-  else if( tcb.RCV.NXT <= in.seq() and in.seq() < tcb.RCV.NXT + tcb.RCV.WND ) {
+  if( tcb.RCV.NXT <= in.seq() and in.seq() < tcb.RCV.NXT + tcb.RCV.WND ) {
     goto acceptable;
   }
   // #3 (INVALID)