X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fvirtio%2Fvhost-user.c;h=6a7f7e600ba7865e7fd5b16a075e4e4461e1bb29;hb=fbb2ef64563ccab03978a22660ad4b22ca3eae4a;hp=51b0c409d2ae9a8b73fd3fe59d889087d4b40e50;hpb=00a9dcad03eaab34e03b71e3af071a62e3406b0d;p=vpp.git

diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index 51b0c409d2a..6a7f7e600ba 100644
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -36,15 +36,13 @@
 #include <vnet/ip/ip.h>
 
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/devices/devices.h>
+#include <vnet/feature/feature.h>
 
 #include <vnet/devices/virtio/vhost-user.h>
 
 #define VHOST_USER_DEBUG_SOCKET 0
-#define VHOST_USER_DEBUG_VQ 0
-
-/* Set to get virtio_net_hdr in buffer pre-data
-   details will be shown in  packet trace */
-#define VHOST_USER_COPY_TX_HDR 0
+#define VHOST_DEBUG_VQ 0
 
 #if VHOST_USER_DEBUG_SOCKET == 1
 #define DBG_SOCK(args...) clib_warning(args);
@@ -52,19 +50,34 @@
 #define DBG_SOCK(args...)
 #endif
 
-#if VHOST_USER_DEBUG_VQ == 1
+#if VHOST_DEBUG_VQ == 1
 #define DBG_VQ(args...) clib_warning(args);
 #else
 #define DBG_VQ(args...)
 #endif
 
+#define foreach_virtio_trace_flags \
+  _ (SIMPLE_CHAINED, 0, "Simple descriptor chaining") \
+  _ (SINGLE_DESC,  1, "Single descriptor packet") \
+  _ (INDIRECT, 2, "Indirect descriptor") \
+  _ (MAP_ERROR, 4, "Memory mapping error")
+
+typedef enum
+{
+#define _(n,i,s) VIRTIO_TRACE_F_##n,
+  foreach_virtio_trace_flags
+#undef _
+} virtio_trace_flag_t;
+
 vlib_node_registration_t vhost_user_input_node;
 
 #define foreach_vhost_user_tx_func_error      \
   _(NONE, "no error")  \
   _(NOT_READY, "vhost user state error")  \
   _(PKT_DROP_NOBUF, "tx packet drops (no available descriptors)")  \
-  _(MMAP_FAIL, "mmap failure")
+  _(PKT_DROP_NOMRG, "tx packet drops (cannot merge descriptors)")  \
+  _(MMAP_FAIL, "mmap failure") \
+  _(INDIRECT_OVERFLOW, "indirect descriptor table overflow")
 
 typedef enum
 {
@@ -84,7 +97,9 @@ static char *vhost_user_tx_func_error_strings[] = {
   _(NO_ERROR, "no error")  \
   _(NO_BUFFER, "no available buffer")  \
   _(MMAP_FAIL, "mmap failure")  \
-  _(UNDERSIZED_FRAME, "undersized ethernet frame received (< 14 bytes)")
+  _(INDIRECT_OVERFLOW, "indirect descriptor overflows table")  \
+  _(UNDERSIZED_FRAME, "undersized ethernet frame received (< 14 bytes)") \
+  _(FULL_RX_QUEUE, "full rx queue (possible driver tx drop)")
 
 typedef enum
 {
@@ -144,22 +159,71 @@ vhost_user_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
   return 0;
 }
 
-
-static inline void *
-map_guest_mem (vhost_user_intf_t * vui, uword addr)
+static_always_inline void *
+map_guest_mem (vhost_user_intf_t * vui, uword addr, u32 * hint)
 {
-  int i;
+  int i = *hint;
+  if (PREDICT_TRUE ((vui->regions[i].guest_phys_addr <= addr) &&
+		    ((vui->regions[i].guest_phys_addr +
+		      vui->regions[i].memory_size) > addr)))
+    {
+      return (void *) (vui->region_mmap_addr[i] + addr -
+		       vui->regions[i].guest_phys_addr);
+    }
+#if __SSE4_2__
+  __m128i rl, rh, al, ah, r;
+  al = _mm_set1_epi64x (addr + 1);
+  ah = _mm_set1_epi64x (addr);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[0]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[0]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_and_si128 (rl, rh);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[2]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[2]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x22);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[4]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[4]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x44);
+
+  rl = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_lo[6]);
+  rl = _mm_cmpgt_epi64 (al, rl);
+  rh = _mm_loadu_si128 ((__m128i *) & vui->region_guest_addr_hi[6]);
+  rh = _mm_cmpgt_epi64 (rh, ah);
+  r = _mm_blend_epi16 (r, _mm_and_si128 (rl, rh), 0x88);
+
+  r = _mm_shuffle_epi8 (r, _mm_set_epi64x (0, 0x0e060c040a020800));
+  i = __builtin_ctzll (_mm_movemask_epi8 (r));
+
+  if (i < vui->nregions)
+    {
+      *hint = i;
+      return (void *) (vui->region_mmap_addr[i] + addr -
+		       vui->regions[i].guest_phys_addr);
+    }
+
+#else
   for (i = 0; i < vui->nregions; i++)
     {
       if ((vui->regions[i].guest_phys_addr <= addr) &&
 	  ((vui->regions[i].guest_phys_addr + vui->regions[i].memory_size) >
 	   addr))
 	{
+	  *hint = i;
 	  return (void *) (vui->region_mmap_addr[i] + addr -
 			   vui->regions[i].guest_phys_addr);
 	}
     }
+#endif
   DBG_VQ ("failed to map guest mem addr %llx", addr);
+  *hint = 0;
   return 0;
 }
 
@@ -224,6 +288,167 @@ unmap_all_mem_regions (vhost_user_intf_t * vui)
   vui->nregions = 0;
 }
 
+static void
+vhost_user_tx_thread_placement (vhost_user_intf_t * vui)
+{
+  //Let's try to assign one queue to each thread
+  u32 qid = 0;
+  u32 cpu_index = 0;
+  vui->use_tx_spinlock = 0;
+  while (1)
+    {
+      for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
+	{
+	  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
+	  if (!rxvq->started || !rxvq->enabled)
+	    continue;
+
+	  vui->per_cpu_tx_qid[cpu_index] = qid;
+	  cpu_index++;
+	  if (cpu_index == vlib_get_thread_main ()->n_vlib_mains)
+	    return;
+	}
+      //We need to loop, meaning the spinlock has to be used
+      vui->use_tx_spinlock = 1;
+      if (cpu_index == 0)
+	{
+	  //Could not find a single valid one
+	  for (cpu_index = 0;
+	       cpu_index < vlib_get_thread_main ()->n_vlib_mains; cpu_index++)
+	    {
+	      vui->per_cpu_tx_qid[cpu_index] = 0;
+	    }
+	  return;
+	}
+    }
+}
+
+static void
+vhost_user_rx_thread_placement ()
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  vhost_cpu_t *vhc;
+  u32 *workers = 0;
+
+  //Let's list all workers cpu indexes
+  u32 i;
+  for (i = vum->input_cpu_first_index;
+       i < vum->input_cpu_first_index + vum->input_cpu_count; i++)
+    {
+      vlib_node_set_state (vlib_mains ? vlib_mains[i] : &vlib_global_main,
+			   vhost_user_input_node.index,
+			   VLIB_NODE_STATE_DISABLED);
+      vec_add1 (workers, i);
+    }
+
+  vec_foreach (vhc, vum->cpus)
+  {
+    vec_reset_length (vhc->rx_queues);
+  }
+
+  i = 0;
+  vec_foreach (vui, vum->vhost_user_interfaces)
+  {
+    if (!vui->active)
+      continue;
+
+    u32 *vui_workers = vec_len (vui->workers) ? vui->workers : workers;
+    u32 qid;
+    for (qid = 0; qid < VHOST_VRING_MAX_N / 2; qid++)
+      {
+	vhost_user_vring_t *txvq = &vui->vrings[VHOST_VRING_IDX_TX (qid)];
+	if (!txvq->started)
+	  continue;
+
+	i %= vec_len (vui_workers);
+	u32 cpu_index = vui_workers[i];
+	i++;
+	vhc = &vum->cpus[cpu_index];
+
+	vhost_iface_and_queue_t iaq = {
+	  .qid = qid,
+	  .vhost_iface_index = vui - vum->vhost_user_interfaces,
+	};
+	vec_add1 (vhc->rx_queues, iaq);
+	vlib_node_set_state (vlib_mains ? vlib_mains[cpu_index] :
+			     &vlib_global_main, vhost_user_input_node.index,
+			     VLIB_NODE_STATE_POLLING);
+      }
+  }
+}
+
+static int
+vhost_user_thread_placement (u32 sw_if_index, u32 worker_thread_index, u8 del)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  vhost_user_intf_t *vui;
+  vnet_hw_interface_t *hw;
+
+  if (worker_thread_index < vum->input_cpu_first_index ||
+      worker_thread_index >=
+      vum->input_cpu_first_index + vum->input_cpu_count)
+    return -1;
+
+  if (!(hw = vnet_get_sup_hw_interface (vnet_get_main (), sw_if_index)))
+    return -2;
+
+  vui = vec_elt_at_index (vum->vhost_user_interfaces, hw->dev_instance);
+  u32 found = ~0, *w;
+  vec_foreach (w, vui->workers)
+  {
+    if (*w == worker_thread_index)
+      {
+	found = w - vui->workers;
+	break;
+      }
+  }
+
+  if (del)
+    {
+      if (found == ~0)
+	return -3;
+      vec_del1 (vui->workers, found);
+    }
+  else if (found == ~0)
+    {
+      vec_add1 (vui->workers, worker_thread_index);
+    }
+
+  vhost_user_rx_thread_placement ();
+  return 0;
+}
+
+/** @brief Returns whether at least one TX and one RX vring are enabled */
+int
+vhost_user_intf_ready (vhost_user_intf_t * vui)
+{
+  int i, found[2] = { };	//RX + TX
+
+  for (i = 0; i < VHOST_VRING_MAX_N; i++)
+    if (vui->vrings[i].started && vui->vrings[i].enabled)
+      found[i & 1] = 1;
+
+  return found[0] && found[1];
+}
+
+static void
+vhost_user_update_iface_state (vhost_user_intf_t * vui)
+{
+  /* if we have pointers to descriptor table, go up */
+  int is_up = vhost_user_intf_ready (vui);
+  if (is_up != vui->is_up)
+    {
+      DBG_SOCK ("interface %d %s", vui->sw_if_index,
+		is_up ? "ready" : "down");
+      vnet_hw_interface_set_flags (vnet_get_main (), vui->hw_if_index,
+				   is_up ? VNET_HW_INTERFACE_FLAG_LINK_UP :
+				   0);
+      vui->is_up = is_up;
+    }
+  vhost_user_rx_thread_placement ();
+  vhost_user_tx_thread_placement (vui);
+}
 
 static clib_error_t *
 vhost_user_callfd_read_ready (unix_file_t * uf)
@@ -234,6 +459,97 @@ vhost_user_callfd_read_ready (unix_file_t * uf)
   return 0;
 }
 
+static clib_error_t *
+vhost_user_kickfd_read_ready (unix_file_t * uf)
+{
+  __attribute__ ((unused)) int n;
+  u8 buff[8];
+  vhost_user_intf_t *vui =
+    vec_elt_at_index (vhost_user_main.vhost_user_interfaces,
+		      uf->private_data >> 8);
+  u32 qid = uf->private_data & 0xff;
+  n = read (uf->file_descriptor, ((char *) &buff), 8);
+  DBG_SOCK ("if %d KICK queue %d", uf->private_data >> 8, qid);
+
+  vlib_worker_thread_barrier_sync (vlib_get_main ());
+  vui->vrings[qid].started = 1;
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
+  return 0;
+}
+
+/**
+ * @brief Try once to lock the vring
+ * @return 0 on success, non-zero on failure.
+ */
+static inline int
+vhost_user_vring_try_lock (vhost_user_intf_t * vui, u32 qid)
+{
+  return __sync_lock_test_and_set (vui->vring_locks[qid], 1);
+}
+
+/**
+ * @brief Spin until the vring is successfully locked
+ */
+static inline void
+vhost_user_vring_lock (vhost_user_intf_t * vui, u32 qid)
+{
+  while (vhost_user_vring_try_lock (vui, qid))
+    ;
+}
+
+/**
+ * @brief Unlock the vring lock
+ */
+static inline void
+vhost_user_vring_unlock (vhost_user_intf_t * vui, u32 qid)
+{
+  *vui->vring_locks[qid] = 0;
+}
+
+static inline void
+vhost_user_vring_init (vhost_user_intf_t * vui, u32 qid)
+{
+  vhost_user_vring_t *vring = &vui->vrings[qid];
+  memset (vring, 0, sizeof (*vring));
+  vring->kickfd = -1;
+  vring->callfd = -1;
+  vring->errfd = -1;
+
+  /*
+   * We have a bug with some qemu 2.5, and this may be a fix.
+   * Feel like interpretation holy text, but this is from vhost-user.txt.
+   * "
+   * One queue pair is enabled initially. More queues are enabled
+   * dynamically, by sending message VHOST_USER_SET_VRING_ENABLE.
+   * "
+   * Don't know who's right, but this is what DPDK does.
+   */
+  if (qid == 0 || qid == 1)
+    vring->enabled = 1;
+}
+
+static inline void
+vhost_user_vring_close (vhost_user_intf_t * vui, u32 qid)
+{
+  vhost_user_vring_t *vring = &vui->vrings[qid];
+  if (vring->kickfd != -1)
+    {
+      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					   vring->kickfd_idx);
+      unix_file_del (&unix_main, uf);
+    }
+  if (vring->callfd != -1)
+    {
+      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					   vring->callfd_idx);
+      unix_file_del (&unix_main, uf);
+    }
+  if (vring->errfd != -1)
+    close (vring->errfd);
+  vhost_user_vring_init (vui, qid);
+}
+
 static inline void
 vhost_user_if_disconnect (vhost_user_intf_t * vui)
 {
@@ -248,20 +564,16 @@ vhost_user_if_disconnect (vhost_user_intf_t * vui)
       unix_file_del (&unix_main, unix_main.file_pool + vui->unix_file_index);
       vui->unix_file_index = ~0;
     }
+  else
+    close (vui->unix_fd);
 
   hash_unset (vum->vhost_user_interface_index_by_sock_fd, vui->unix_fd);
   hash_unset (vum->vhost_user_interface_index_by_listener_fd, vui->unix_fd);
-  close (vui->unix_fd);
   vui->unix_fd = -1;
   vui->is_up = 0;
-  for (q = 0; q < vui->num_vrings; q++)
-    {
-      vui->vrings[q].desc = NULL;
-      vui->vrings[q].avail = NULL;
-      vui->vrings[q].used = NULL;
-      vui->vrings[q].log_guest_addr = 0;
-      vui->vrings[q].log_used = 0;
-    }
+
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
+    vhost_user_vring_close (vui, q);
 
   unmap_all_mem_regions (vui);
   DBG_SOCK ("interface ifindex %d disconnected", vui->sw_if_index);
@@ -293,7 +605,7 @@ vhost_user_log_dirty_pages (vhost_user_intf_t * vui, u64 addr, u64 len)
 
 #define vhost_user_log_dirty_ring(vui, vq, member) \
   if (PREDICT_FALSE(vq->log_used)) { \
-    vhost_user_log_dirty_pages(vui, vq->log_guest_addr + offsetof(vring_used_t, member), \
+    vhost_user_log_dirty_pages(vui, vq->log_guest_addr + STRUCT_OFFSET_OF(vring_used_t, member), \
                              sizeof(vq->used->member)); \
   }
 
@@ -343,11 +655,26 @@ vhost_user_socket_read (unix_file_t * uf)
 
   n = recvmsg (uf->file_descriptor, &mh, 0);
 
+  /* Stop workers to avoid end of the world */
+  vlib_worker_thread_barrier_sync (vlib_get_main ());
+
   if (n != VHOST_USER_MSG_HDR_SZ)
-    goto close_socket;
+    {
+      if (n == -1)
+	{
+	  DBG_SOCK ("recvmsg returned error %d %s", errno, strerror (errno));
+	}
+      else
+	{
+	  DBG_SOCK ("n (%d) != VHOST_USER_MSG_HDR_SZ (%d)",
+		    n, VHOST_USER_MSG_HDR_SZ);
+	}
+      goto close_socket;
+    }
 
   if (mh.msg_flags & MSG_CTRUNC)
     {
+      DBG_SOCK ("MSG_CTRUNC is set");
       goto close_socket;
     }
 
@@ -370,25 +697,39 @@ vhost_user_socket_read (unix_file_t * uf)
     }
 
   {
-    int rv __attribute__ ((unused));
-    /* $$$$ pay attention to rv */
-    rv = read (uf->file_descriptor, ((char *) &msg) + n, msg.size);
+    int rv;
+    rv =
+      read (uf->file_descriptor, ((char *) &msg) + VHOST_USER_MSG_HDR_SZ,
+	    msg.size);
+    if (rv < 0)
+      {
+	DBG_SOCK ("read failed %s", strerror (errno));
+	goto close_socket;
+      }
+    else if (rv != msg.size)
+      {
+	DBG_SOCK ("message too short (read %dB should be %dB)", rv, msg.size);
+	goto close_socket;
+      }
   }
 
   switch (msg.request)
     {
     case VHOST_USER_GET_FEATURES:
-      DBG_SOCK ("if %d msg VHOST_USER_GET_FEATURES", vui->hw_if_index);
-
       msg.flags |= 4;
-      msg.u64 = (1 << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
-	(1 << FEAT_VIRTIO_F_ANY_LAYOUT) |
-	(1 << FEAT_VHOST_F_LOG_ALL) |
-	(1 << FEAT_VIRTIO_NET_F_GUEST_ANNOUNCE) |
-	(1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES);
+      msg.u64 = (1ULL << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
+	(1ULL << FEAT_VIRTIO_NET_F_CTRL_VQ) |
+	(1ULL << FEAT_VIRTIO_F_ANY_LAYOUT) |
+	(1ULL << FEAT_VIRTIO_F_INDIRECT_DESC) |
+	(1ULL << FEAT_VHOST_F_LOG_ALL) |
+	(1ULL << FEAT_VIRTIO_NET_F_GUEST_ANNOUNCE) |
+	(1ULL << FEAT_VIRTIO_NET_F_MQ) |
+	(1ULL << FEAT_VHOST_USER_F_PROTOCOL_FEATURES) |
+	(1ULL << FEAT_VIRTIO_F_VERSION_1);
       msg.u64 &= vui->feature_mask;
-
       msg.size = sizeof (msg.u64);
+      DBG_SOCK ("if %d msg VHOST_USER_GET_FEATURES - reply 0x%016llx",
+		vui->hw_if_index, msg.u64);
       break;
 
     case VHOST_USER_SET_FEATURES:
@@ -397,7 +738,9 @@ vhost_user_socket_read (unix_file_t * uf)
 
       vui->features = msg.u64;
 
-      if (vui->features & (1 << FEAT_VIRTIO_NET_F_MRG_RXBUF))
+      if (vui->features &
+	  ((1 << FEAT_VIRTIO_NET_F_MRG_RXBUF) |
+	   (1ULL << FEAT_VIRTIO_F_VERSION_1)))
 	vui->virtio_net_hdr_sz = 12;
       else
 	vui->virtio_net_hdr_sz = 10;
@@ -409,16 +752,8 @@ vhost_user_socket_read (unix_file_t * uf)
       vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
       vui->is_up = 0;
 
-      for (q = 0; q < 2; q++)
-	{
-	  vui->vrings[q].desc = 0;
-	  vui->vrings[q].avail = 0;
-	  vui->vrings[q].used = 0;
-	  vui->vrings[q].log_guest_addr = 0;
-	  vui->vrings[q].log_used = 0;
-	}
-
-      DBG_SOCK ("interface %d disconnected", vui->sw_if_index);
+      /*for (q = 0; q < VHOST_VRING_MAX_N; q++)
+         vhost_user_vring_close(&vui->vrings[q]); */
 
       break;
 
@@ -456,6 +791,9 @@ vhost_user_socket_read (unix_file_t * uf)
 
 	  vui->region_mmap_addr[i] = mmap (0, map_sz, PROT_READ | PROT_WRITE,
 					   MAP_SHARED, fds[i], 0);
+	  vui->region_guest_addr_lo[i] = vui->regions[i].guest_phys_addr;
+	  vui->region_guest_addr_hi[i] = vui->regions[i].guest_phys_addr +
+	    vui->regions[i].memory_size;
 
 	  DBG_SOCK
 	    ("map memory region %d addr 0 len 0x%lx fd %d mapped 0x%lx "
@@ -479,7 +817,7 @@ vhost_user_socket_read (unix_file_t * uf)
 
       if ((msg.state.num > 32768) ||	/* maximum ring size is 32768 */
 	  (msg.state.num == 0) ||	/* it cannot be zero */
-	  (msg.state.num % 2))	/* must be power of 2 */
+	  ((msg.state.num - 1) & msg.state.num))	/* must be power of 2 */
 	goto close_socket;
       vui->vrings[msg.state.index].qsz = msg.state.num;
       break;
@@ -488,6 +826,20 @@ vhost_user_socket_read (unix_file_t * uf)
       DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ADDR idx %d",
 		vui->hw_if_index, msg.state.index);
 
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ADDR:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
+      if (msg.size < sizeof (msg.addr))
+	{
+	  DBG_SOCK ("vhost message is too short (%d < %d)",
+		    msg.size, sizeof (msg.addr));
+	  goto close_socket;
+	}
+
       vui->vrings[msg.state.index].desc = (vring_desc_t *)
 	map_user_mem (vui, msg.addr.desc_user_addr);
       vui->vrings[msg.state.index].used = (vring_used_t *)
@@ -510,17 +862,17 @@ vhost_user_socket_read (unix_file_t * uf)
 
       /* Spec says: If VHOST_USER_F_PROTOCOL_FEATURES has not been negotiated,
          the ring is initialized in an enabled state. */
-
       if (!(vui->features & (1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES)))
 	{
 	  vui->vrings[msg.state.index].enabled = 1;
 	}
 
       vui->vrings[msg.state.index].last_used_idx =
+	vui->vrings[msg.state.index].last_avail_idx =
 	vui->vrings[msg.state.index].used->idx;
 
       /* tell driver that we don't want interrupts */
-      vui->vrings[msg.state.index].used->flags |= 1;
+      vui->vrings[msg.state.index].used->flags = VRING_USED_F_NO_NOTIFY;
       break;
 
     case VHOST_USER_SET_OWNER:
@@ -537,18 +889,22 @@ vhost_user_socket_read (unix_file_t * uf)
 
       q = (u8) (msg.u64 & 0xFF);
 
+      /* if there is old fd, delete and close it */
+      if (vui->vrings[q].callfd != -1)
+	{
+	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					       vui->vrings[q].callfd_idx);
+	  unix_file_del (&unix_main, uf);
+	}
+
       if (!(msg.u64 & 0x100))
 	{
 	  if (number_of_fds != 1)
-	    goto close_socket;
-
-	  /* if there is old fd, delete it */
-	  if (vui->vrings[q].callfd)
 	    {
-	      unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
-						   vui->vrings[q].callfd_idx);
-	      unix_file_del (&unix_main, uf);
+	      DBG_SOCK ("More than one fd received !");
+	      goto close_socket;
 	    }
+
 	  vui->vrings[q].callfd = fds[0];
 	  template.read_function = vhost_user_callfd_read_ready;
 	  template.file_descriptor = fds[0];
@@ -564,15 +920,39 @@ vhost_user_socket_read (unix_file_t * uf)
 
       q = (u8) (msg.u64 & 0xFF);
 
+      if (vui->vrings[q].kickfd != -1)
+	{
+	  unix_file_t *uf = pool_elt_at_index (unix_main.file_pool,
+					       vui->vrings[q].kickfd);
+	  unix_file_del (&unix_main, uf);
+	}
+
       if (!(msg.u64 & 0x100))
 	{
 	  if (number_of_fds != 1)
-	    goto close_socket;
+	    {
+	      DBG_SOCK ("More than one fd received !");
+	      goto close_socket;
+	    }
+
+	  if (vui->vrings[q].kickfd > -1)
+	    close (vui->vrings[q].kickfd);
 
 	  vui->vrings[q].kickfd = fds[0];
+	  template.read_function = vhost_user_kickfd_read_ready;
+	  template.file_descriptor = fds[0];
+	  template.private_data =
+	    ((vui - vhost_user_main.vhost_user_interfaces) << 8) + q;
+	  vui->vrings[q].kickfd_idx = unix_file_add (&unix_main, &template);
 	}
       else
-	vui->vrings[q].kickfd = -1;
+	{
+	  vui->vrings[q].kickfd = -1;
+	  vui->vrings[q].started = 1;
+	}
+
+      //TODO: When kickfd is specified, 'started' is set when the first kick
+      //is received.
       break;
 
     case VHOST_USER_SET_VRING_ERR:
@@ -581,17 +961,19 @@ vhost_user_socket_read (unix_file_t * uf)
 
       q = (u8) (msg.u64 & 0xFF);
 
+      if (vui->vrings[q].errfd != -1)
+	close (vui->vrings[q].errfd);
+
       if (!(msg.u64 & 0x100))
 	{
 	  if (number_of_fds != 1)
 	    goto close_socket;
 
-	  fd = fds[0];
+	  vui->vrings[q].errfd = fds[0];
 	}
       else
-	fd = -1;
+	vui->vrings[q].errfd = -1;
 
-      vui->vrings[q].errfd = fd;
       break;
 
     case VHOST_USER_SET_VRING_BASE:
@@ -605,8 +987,15 @@ vhost_user_socket_read (unix_file_t * uf)
       DBG_SOCK ("if %d msg VHOST_USER_GET_VRING_BASE idx %d num %d",
 		vui->hw_if_index, msg.state.index, msg.state.num);
 
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_GET_VRING_BASE:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
       /* Spec says: Client must [...] stop ring upon receiving VHOST_USER_GET_VRING_BASE. */
-      vui->vrings[msg.state.index].enabled = 0;
+      vhost_user_vring_close (vui, msg.state.index);
 
       msg.state.num = vui->vrings[msg.state.index].last_avail_idx;
       msg.flags |= 4;
@@ -676,7 +1065,8 @@ vhost_user_socket_read (unix_file_t * uf)
 		vui->hw_if_index);
 
       msg.flags |= 4;
-      msg.u64 = (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD);
+      msg.u64 = (1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD) |
+	(1 << VHOST_USER_PROTOCOL_F_MQ);
       msg.size = sizeof (msg.u64);
       break;
 
@@ -688,9 +1078,24 @@ vhost_user_socket_read (unix_file_t * uf)
 
       break;
 
+    case VHOST_USER_GET_QUEUE_NUM:
+      DBG_SOCK ("if %d msg VHOST_USER_GET_QUEUE_NUM", vui->hw_if_index);
+      msg.flags |= 4;
+      msg.u64 = VHOST_VRING_MAX_N;
+      msg.size = sizeof (msg.u64);
+      break;
+
     case VHOST_USER_SET_VRING_ENABLE:
-      DBG_SOCK ("if %d VHOST_USER_SET_VRING_ENABLE, enable: %d",
-		vui->hw_if_index, msg.state.num);
+      DBG_SOCK ("if %d VHOST_USER_SET_VRING_ENABLE: %s queue %d",
+		vui->hw_if_index, msg.state.num ? "enable" : "disable",
+		msg.state.index);
+      if (msg.state.index >= VHOST_VRING_MAX_N)
+	{
+	  DBG_SOCK ("invalid vring index VHOST_USER_SET_VRING_ENABLE:"
+		    " %d >= %d", msg.state.index, VHOST_VRING_MAX_N);
+	  goto close_socket;
+	}
+
       vui->vrings[msg.state.index].enabled = msg.state.num;
       break;
 
@@ -700,39 +1105,33 @@ vhost_user_socket_read (unix_file_t * uf)
       goto close_socket;
     }
 
-  /* if we have pointers to descriptor table, go up */
-  if (!vui->is_up &&
-      vui->vrings[VHOST_NET_VRING_IDX_TX].desc &&
-      vui->vrings[VHOST_NET_VRING_IDX_RX].desc)
-    {
-
-      DBG_SOCK ("interface %d connected", vui->sw_if_index);
-
-      vnet_hw_interface_set_flags (vnm, vui->hw_if_index,
-				   VNET_HW_INTERFACE_FLAG_LINK_UP);
-      vui->is_up = 1;
-
-    }
-
   /* if we need to reply */
   if (msg.flags & 4)
     {
       n =
 	send (uf->file_descriptor, &msg, VHOST_USER_MSG_HDR_SZ + msg.size, 0);
       if (n != (msg.size + VHOST_USER_MSG_HDR_SZ))
-	goto close_socket;
+	{
+	  DBG_SOCK ("could not send message response");
+	  goto close_socket;
+	}
     }
 
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
   return 0;
 
 close_socket:
   vhost_user_if_disconnect (vui);
+  vhost_user_update_iface_state (vui);
+  vlib_worker_thread_barrier_release (vlib_get_main ());
   return 0;
 }
 
 static clib_error_t *
 vhost_user_socket_error (unix_file_t * uf)
 {
+  vlib_main_t *vm = vlib_get_main ();
   vhost_user_main_t *vum = &vhost_user_main;
   vhost_user_intf_t *vui;
   uword *p;
@@ -747,7 +1146,11 @@ vhost_user_socket_error (unix_file_t * uf)
   else
     vui = vec_elt_at_index (vum->vhost_user_interfaces, p[0]);
 
+  DBG_SOCK ("socket error on if %d", vui->sw_if_index);
+  vlib_worker_thread_barrier_sync (vm);
   vhost_user_if_disconnect (vui);
+  vhost_user_rx_thread_placement ();
+  vlib_worker_thread_barrier_release (vm);
   return 0;
 }
 
@@ -779,6 +1182,7 @@ vhost_user_socksvr_accept_ready (unix_file_t * uf)
   if (client_fd < 0)
     return clib_error_return_unix (0, "accept");
 
+  DBG_SOCK ("New client socket for vhost interface %d", vui->sw_if_index);
   template.read_function = vhost_user_socket_read;
   template.error_function = vhost_user_socket_error;
   template.file_descriptor = client_fd;
@@ -797,6 +1201,8 @@ vhost_user_init (vlib_main_t * vm)
   clib_error_t *error;
   vhost_user_main_t *vum = &vhost_user_main;
   vlib_thread_main_t *tm = vlib_get_thread_main ();
+  vlib_thread_registration_t *tr;
+  uword *p;
 
   error = vlib_call_init_function (vm, ip4_init);
   if (error)
@@ -813,6 +1219,19 @@ vhost_user_init (vlib_main_t * vm)
 
   vec_validate_aligned (vum->rx_buffers, tm->n_vlib_mains - 1,
 			CLIB_CACHE_LINE_BYTES);
+  vec_validate (vum->cpus, tm->n_vlib_mains - 1);
+
+  /* find out which cpus will be used for input */
+  vum->input_cpu_first_index = 0;
+  vum->input_cpu_count = 1;
+  p = hash_get_mem (tm->thread_registrations_by_name, "workers");
+  tr = p ? (vlib_thread_registration_t *) p[0] : 0;
+
+  if (tr && tr->count > 0)
+    {
+      vum->input_cpu_first_index = tr->first_index;
+      vum->input_cpu_count = tr->count;
+    }
 
   return 0;
 }
@@ -828,84 +1247,97 @@ vhost_user_exit (vlib_main_t * vm)
 
 VLIB_MAIN_LOOP_EXIT_FUNCTION (vhost_user_exit);
 
-enum
-{
-  VHOST_USER_RX_NEXT_ETHERNET_INPUT,
-  VHOST_USER_RX_NEXT_DROP,
-  VHOST_USER_RX_N_NEXT,
-};
-
-
 typedef struct
 {
-  u16 virtqueue;
-  u16 device_index;
-#if VHOST_USER_COPY_TX_HDR == 1
-  virtio_net_hdr_t hdr;
-#endif
-} vhost_user_input_trace_t;
+  u16 qid; /** The interface queue index (Not the virtio vring idx) */
+  u16 device_index; /** The device index */
+  u32 virtio_ring_flags; /** Runtime queue flags  **/
+  u16 first_desc_len; /** Length of the first data descriptor **/
+  virtio_net_hdr_mrg_rxbuf_t hdr; /** Virtio header **/
+} vhost_trace_t;
 
 static u8 *
-format_vhost_user_input_trace (u8 * s, va_list * va)
+format_vhost_trace (u8 * s, va_list * va)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
   CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
   vhost_user_main_t *vum = &vhost_user_main;
-  vhost_user_input_trace_t *t = va_arg (*va, vhost_user_input_trace_t *);
+  vhost_trace_t *t = va_arg (*va, vhost_trace_t *);
   vhost_user_intf_t *vui = vec_elt_at_index (vum->vhost_user_interfaces,
 					     t->device_index);
 
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
 
-#if VHOST_USER_COPY_TX_HDR == 1
   uword indent = format_get_indent (s);
-#endif
 
-  s = format (s, "%U virtqueue %d",
-	      format_vnet_sw_interface_name, vnm, sw, t->virtqueue);
+  s = format (s, "%U %U queue %d\n", format_white_space, indent,
+	      format_vnet_sw_interface_name, vnm, sw, t->qid);
 
-#if VHOST_USER_COPY_TX_HDR == 1
-  s = format (s, "\n%Uvirtio_net_hdr flags 0x%02x gso_type %u hdr_len %u",
+  s = format (s, "%U virtio flags:\n", format_white_space, indent);
+#define _(n,i,st) \
+	  if (t->virtio_ring_flags & (1 << VIRTIO_TRACE_F_##n)) \
+	    s = format (s, "%U  %s %s\n", format_white_space, indent, #n, st);
+  foreach_virtio_trace_flags
+#undef _
+    s = format (s, "%U virtio_net_hdr first_desc_len %u\n",
+		format_white_space, indent, t->first_desc_len);
+
+  s = format (s, "%U   flags 0x%02x gso_type %u\n",
 	      format_white_space, indent,
-	      t->hdr.flags, t->hdr.gso_type, t->hdr.hdr_len);
-#endif
+	      t->hdr.hdr.flags, t->hdr.hdr.gso_type);
+
+  if (vui->virtio_net_hdr_sz == 12)
+    s = format (s, "%U   num_buff %u",
+		format_white_space, indent, t->hdr.num_buffers);
 
   return s;
 }
 
 void
-vhost_user_rx_trace (vlib_main_t * vm,
-		     vlib_node_runtime_t * node,
-		     vhost_user_intf_t * vui, i16 virtqueue)
+vhost_user_rx_trace (vhost_trace_t * t,
+		     vhost_user_intf_t * vui, u16 qid,
+		     vlib_buffer_t * b, vhost_user_vring_t * txvq)
 {
-  u32 *b, n_left;
   vhost_user_main_t *vum = &vhost_user_main;
-
-  u32 next_index = VHOST_USER_RX_NEXT_ETHERNET_INPUT;
-
-  n_left = vec_len (vui->d_trace_buffers);
-  b = vui->d_trace_buffers;
-
-  while (n_left >= 1)
+  u32 qsz_mask = txvq->qsz - 1;
+  u32 last_avail_idx = txvq->last_avail_idx;
+  u32 desc_current = txvq->avail->ring[last_avail_idx & qsz_mask];
+  vring_desc_t *hdr_desc = 0;
+  virtio_net_hdr_mrg_rxbuf_t *hdr;
+  u32 hint = 0;
+
+  memset (t, 0, sizeof (*t));
+  t->device_index = vui - vum->vhost_user_interfaces;
+  t->qid = qid;
+
+  hdr_desc = &txvq->desc[desc_current];
+  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
     {
-      u32 bi0;
-      vlib_buffer_t *b0;
-      vhost_user_input_trace_t *t0;
-
-      bi0 = b[0];
-      n_left -= 1;
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
+      //Header is the first here
+      hdr_desc = map_guest_mem (vui, txvq->desc[desc_current].addr, &hint);
+    }
+  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
+    }
+  if (!(txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
+      !(txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
+    }
 
-      b0 = vlib_get_buffer (vm, bi0);
-      vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 0);
-      t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
-      t0->virtqueue = virtqueue;
-      t0->device_index = vui - vum->vhost_user_interfaces;
-#if VHOST_USER_COPY_TX_HDR == 1
-      clib_memcpy (&t0->hdr, b0->pre_data, sizeof (virtio_net_hdr_t));
-#endif
+  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
 
-      b += 1;
+  if (!hdr_desc || !(hdr = map_guest_mem (vui, hdr_desc->addr, &hint)))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_MAP_ERROR;
+    }
+  else
+    {
+      u32 len = vui->virtio_net_hdr_sz;
+      memcpy (&t->hdr, hdr, len > hdr_desc->len ? hdr_desc->len : len);
     }
 }
 
@@ -925,10 +1357,11 @@ vhost_user_send_call (vlib_main_t * vm, vhost_user_vring_t * vq)
 static u32
 vhost_user_if_input (vlib_main_t * vm,
 		     vhost_user_main_t * vum,
-		     vhost_user_intf_t * vui, vlib_node_runtime_t * node)
+		     vhost_user_intf_t * vui,
+		     u16 qid, vlib_node_runtime_t * node)
 {
-  vhost_user_vring_t *txvq = &vui->vrings[VHOST_NET_VRING_IDX_TX];
-  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_NET_VRING_IDX_RX];
+  vhost_user_vring_t *txvq = &vui->vrings[VHOST_VRING_IDX_TX (qid)];
+  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_VRING_IDX_RX (qid)];
   uword n_rx_packets = 0, n_rx_bytes = 0;
   uword n_left;
   u32 n_left_to_next, *to_next;
@@ -938,37 +1371,36 @@ vhost_user_if_input (vlib_main_t * vm,
   u16 qsz_mask;
   u32 cpu_index, rx_len, drops, flush;
   f64 now = vlib_time_now (vm);
+  u32 map_guest_hint_desc = 0;
+  u32 map_guest_hint_indirect = 0;
+  u32 *map_guest_hint_p = &map_guest_hint_desc;
 
-  vec_reset_length (vui->d_trace_buffers);
-
-  /* no descriptor ptr - bail out */
-  if (PREDICT_FALSE (!txvq->desc || !txvq->avail || !txvq->enabled))
-    return 0;
-
-  /* do we have pending intterupts ? */
+  /* do we have pending interrupts ? */
   if ((txvq->n_since_last_int) && (txvq->int_deadline < now))
     vhost_user_send_call (vm, txvq);
 
   if ((rxvq->n_since_last_int) && (rxvq->int_deadline < now))
     vhost_user_send_call (vm, rxvq);
 
-  /* only bit 0 of avail.flags is used so we don't want to deal with this
-     interface if any other bit is set */
   if (PREDICT_FALSE (txvq->avail->flags & 0xFFFE))
     return 0;
 
+  n_left = (u16) (txvq->avail->idx - txvq->last_avail_idx);
+
   /* nothing to do */
-  if (txvq->avail->idx == txvq->last_avail_idx)
+  if (PREDICT_FALSE (n_left == 0))
     return 0;
 
-  if (PREDICT_TRUE (txvq->avail->idx > txvq->last_avail_idx))
-    n_left = txvq->avail->idx - txvq->last_avail_idx;
-  else				/* wrapped */
-    n_left = (u16) - 1 - txvq->last_avail_idx + txvq->avail->idx;
-
-  if (PREDICT_FALSE (!vui->admin_up))
+  if (PREDICT_FALSE (!vui->admin_up || !(txvq->enabled)))
     {
-      /* if intf is admin down, just drop all packets waiting in the ring */
+      /*
+       * Discard input packet if interface is admin down or vring is not
+       * enabled.
+       * "For example, for a networking device, in the disabled state
+       * client must not supply any new RX packets, but must process
+       * and discard any TX packets."
+       */
+
       txvq->last_avail_idx = txvq->last_used_idx = txvq->avail->idx;
       CLIB_MEMORY_BARRIER ();
       txvq->used->idx = txvq->last_used_idx;
@@ -977,8 +1409,12 @@ vhost_user_if_input (vlib_main_t * vm,
       return 0;
     }
 
-  if (PREDICT_FALSE (n_left > txvq->qsz))
-    return 0;
+  if (PREDICT_FALSE (n_left == txvq->qsz))
+    {
+      //Informational error logging when VPP is not receiving packets fast enough
+      vlib_error_count (vm, node->node_index,
+			VHOST_USER_INPUT_FUNC_ERROR_FULL_RX_QUEUE, 1);
+    }
 
   qsz_mask = txvq->qsz - 1;
   cpu_index = os_get_cpu_number ();
@@ -997,7 +1433,7 @@ vhost_user_if_input (vlib_main_t * vm,
    */
   if (PREDICT_FALSE (!vum->rx_buffers[cpu_index]))
     {
-      vec_alloc (vum->rx_buffers[cpu_index], VLIB_FRAME_SIZE);
+      vec_alloc (vum->rx_buffers[cpu_index], 2 * VLIB_FRAME_SIZE);
 
       if (PREDICT_FALSE (!vum->rx_buffers[cpu_index]))
 	flush = n_left;		//Drop all input
@@ -1005,14 +1441,12 @@ vhost_user_if_input (vlib_main_t * vm,
 
   if (PREDICT_FALSE (_vec_len (vum->rx_buffers[cpu_index]) < n_left))
     {
+      u32 curr_len = _vec_len (vum->rx_buffers[cpu_index]);
       _vec_len (vum->rx_buffers[cpu_index]) +=
 	vlib_buffer_alloc_from_free_list (vm,
 					  vum->rx_buffers[cpu_index] +
-					  _vec_len (vum->rx_buffers
-						    [cpu_index]),
-					  VLIB_FRAME_SIZE -
-					  _vec_len (vum->rx_buffers
-						    [cpu_index]),
+					  curr_len,
+					  2 * VLIB_FRAME_SIZE - curr_len,
 					  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
 
       if (PREDICT_FALSE (n_left > _vec_len (vum->rx_buffers[cpu_index])))
@@ -1053,15 +1487,41 @@ vhost_user_if_input (vlib_main_t * vm,
 	  u16 desc_chain_head, desc_current;
 	  u8 error = VHOST_USER_INPUT_FUNC_ERROR_NO_ERROR;
 
+	  if (PREDICT_TRUE (n_left > 1))
+	    {
+	      u32 next_desc =
+		txvq->avail->ring[(txvq->last_avail_idx + 1) & qsz_mask];
+	      void *buffer_addr =
+		map_guest_mem (vui, txvq->desc[next_desc].addr,
+			       &map_guest_hint_desc);
+	      if (PREDICT_TRUE (buffer_addr != 0))
+		CLIB_PREFETCH (buffer_addr, 64, STORE);
+
+	      u32 bi = vum->rx_buffers[cpu_index][rx_len - 2];
+	      vlib_prefetch_buffer_with_index (vm, bi, STORE);
+	      CLIB_PREFETCH (vlib_get_buffer (vm, bi)->data, 128, STORE);
+	    }
+
 	  desc_chain_head = desc_current =
 	    txvq->avail->ring[txvq->last_avail_idx & qsz_mask];
 	  bi_head = bi_current = vum->rx_buffers[cpu_index][--rx_len];
 	  b_head = b_current = vlib_get_buffer (vm, bi_head);
 	  vlib_buffer_chain_init (b_head);
+	  if (PREDICT_FALSE (n_trace))
+	    {
+	      vlib_trace_buffer (vm, node, next_index, b_head,
+				 /* follow_chain */ 0);
+	      vhost_trace_t *t0 =
+		vlib_add_trace (vm, node, b_head, sizeof (t0[0]));
+	      vhost_user_rx_trace (t0, vui, qid, b_head, txvq);
+	      n_trace--;
+	      vlib_set_trace_count (vm, node, n_trace);
+	    }
 
 	  uword offset;
 	  if (PREDICT_TRUE (vui->is_any_layout) ||
-	      !(txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT))
+	      (!(txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
+	       !(txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)))
 	    {
 	      /* ANYLAYOUT or single buffer */
 	      offset = vui->virtio_net_hdr_sz;
@@ -1072,24 +1532,44 @@ vhost_user_if_input (vlib_main_t * vm,
 	      offset = txvq->desc[desc_current].len;
 	    }
 
+	  vring_desc_t *desc_table = txvq->desc;
+	  u32 desc_index = desc_current;
+	  map_guest_hint_p = &map_guest_hint_desc;
+
+	  if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
+	    {
+	      desc_table = map_guest_mem (vui, txvq->desc[desc_current].addr,
+					  &map_guest_hint_desc);
+	      desc_index = 0;
+	      map_guest_hint_p = &map_guest_hint_indirect;
+	      if (PREDICT_FALSE (desc_table == 0))
+		{
+		  error = VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL;
+		  goto out;
+		}
+	    }
+
 	  while (1)
 	    {
 	      void *buffer_addr =
-		map_guest_mem (vui, txvq->desc[desc_current].addr);
+		map_guest_mem (vui, desc_table[desc_index].addr,
+			       map_guest_hint_p);
 	      if (PREDICT_FALSE (buffer_addr == 0))
 		{
 		  error = VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL;
-		  break;
+		  goto out;
 		}
 
-#if VHOST_USER_COPY_TX_HDR == 1
-	      if (PREDICT_TRUE (offset))
-		clib_memcpy (b->pre_data, buffer_addr, sizeof (virtio_net_hdr_t));	/* 12 byte hdr is not used on tx */
-#endif
+	      if (PREDICT_TRUE
+		  (desc_table[desc_index].flags & VIRTQ_DESC_F_NEXT))
+		{
+		  CLIB_PREFETCH (&desc_table[desc_table[desc_index].next],
+				 sizeof (vring_desc_t), STORE);
+		}
 
-	      if (txvq->desc[desc_current].len > offset)
+	      if (desc_table[desc_index].len > offset)
 		{
-		  u16 len = txvq->desc[desc_current].len - offset;
+		  u16 len = desc_table[desc_index].len - offset;
 		  u16 copied = vlib_buffer_chain_append_data_with_alloc (vm,
 									 VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX,
 									 b_head,
@@ -1098,7 +1578,6 @@ vhost_user_if_input (vlib_main_t * vm,
 									 +
 									 offset,
 									 len);
-
 		  if (copied != len)
 		    {
 		      error = VHOST_USER_INPUT_FUNC_ERROR_NO_BUFFER;
@@ -1108,11 +1587,12 @@ vhost_user_if_input (vlib_main_t * vm,
 	      offset = 0;
 
 	      /* if next flag is set, take next desc in the chain */
-	      if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
-		desc_current = txvq->desc[desc_current].next;
+	      if ((desc_table[desc_index].flags & VIRTQ_DESC_F_NEXT))
+		desc_index = desc_table[desc_index].next;
 	      else
-		break;
+		goto out;
 	    }
+	out:
 
 	  /* consume the descriptor and return it as used */
 	  txvq->last_avail_idx++;
@@ -1123,11 +1603,14 @@ vhost_user_if_input (vlib_main_t * vm,
 				     ring[txvq->last_used_idx & qsz_mask]);
 	  txvq->last_used_idx++;
 
+	  //It is important to free RX as fast as possible such that the TX
+	  //process does not drop packets
+	  if ((txvq->last_used_idx & 0x3f) == 0)	// Every 64 packets
+	    txvq->used->idx = txvq->last_used_idx;
+
 	  if (PREDICT_FALSE (b_head->current_length < 14 &&
 			     error == VHOST_USER_INPUT_FUNC_ERROR_NO_ERROR))
-	    {
-	      error = VHOST_USER_INPUT_FUNC_ERROR_UNDERSIZED_FRAME;
-	    }
+	    error = VHOST_USER_INPUT_FUNC_ERROR_UNDERSIZED_FRAME;
 
 	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b_head);
 
@@ -1135,13 +1618,10 @@ vhost_user_if_input (vlib_main_t * vm,
 	  vnet_buffer (b_head)->sw_if_index[VLIB_TX] = (u32) ~ 0;
 	  b_head->error = node->errors[error];
 
-	  if (PREDICT_FALSE (n_trace > n_rx_packets))
-	    vec_add1 (vui->d_trace_buffers, bi_head);
-
 	  if (PREDICT_FALSE (error))
 	    {
 	      drops++;
-	      next0 = VHOST_USER_RX_NEXT_DROP;
+	      next0 = VNET_DEVICE_INPUT_NEXT_DROP;
 	    }
 	  else
 	    {
@@ -1149,16 +1629,30 @@ vhost_user_if_input (vlib_main_t * vm,
 		b_head->current_length +
 		b_head->total_length_not_including_first_buffer;
 	      n_rx_packets++;
-	      next0 = VHOST_USER_RX_NEXT_ETHERNET_INPUT;
+	      next0 = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
 	    }
 
 	  to_next[0] = bi_head;
 	  to_next++;
 	  n_left_to_next--;
+
+	  /* redirect if feature path enabled */
+	  vnet_feature_start_device_input_x1 (vui->sw_if_index, &next0,
+					      b_head, 0);
+
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
 					   to_next, n_left_to_next,
 					   bi_head, next0);
 	  n_left--;
+	  if (PREDICT_FALSE (!n_left))
+	    {
+	      // I NEED SOME MORE !
+	      u32 remain = (u16) (txvq->avail->idx - txvq->last_avail_idx);
+	      remain = (remain > VLIB_FRAME_SIZE - n_rx_packets) ?
+		VLIB_FRAME_SIZE - n_rx_packets : remain;
+	      remain = (remain > rx_len) ? rx_len : remain;
+	      n_left = remain;
+	    }
 	}
 
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
@@ -1172,15 +1666,8 @@ vhost_user_if_input (vlib_main_t * vm,
   txvq->used->idx = txvq->last_used_idx;
   vhost_user_log_dirty_ring (vui, txvq, idx);
 
-  if (PREDICT_FALSE (vec_len (vui->d_trace_buffers) > 0))
-    {
-      vhost_user_rx_trace (vm, node, vui, VHOST_NET_VRING_IDX_TX);
-      vlib_set_trace_count (vm, node,
-			    n_trace - vec_len (vui->d_trace_buffers));
-    }
-
   /* interrupt (call) handling */
-  if ((txvq->callfd > 0) && !(txvq->avail->flags & 1))
+  if ((txvq->callfd > -1) && !(txvq->avail->flags & 1))
     {
       txvq->n_since_last_int += n_rx_packets;
 
@@ -1210,20 +1697,20 @@ vhost_user_input (vlib_main_t * vm,
 		  vlib_node_runtime_t * node, vlib_frame_t * f)
 {
   vhost_user_main_t *vum = &vhost_user_main;
-  dpdk_main_t *dm = &dpdk_main;
-  vhost_user_intf_t *vui;
   uword n_rx_packets = 0;
   u32 cpu_index = os_get_cpu_number ();
-  int i;
 
-  for (i = 0; i < vec_len (vum->vhost_user_interfaces); i++)
-    {
-      vui = vec_elt_at_index (vum->vhost_user_interfaces, i);
-      if (vui->is_up &&
-	  (i % dm->input_cpu_count) ==
-	  (cpu_index - dm->input_cpu_first_index))
-	n_rx_packets += vhost_user_if_input (vm, vum, vui, node);
-    }
+
+  vhost_iface_and_queue_t *vhiq;
+  vec_foreach (vhiq, vum->cpus[cpu_index].rx_queues)
+  {
+    vhost_user_intf_t *vui =
+      &vum->vhost_user_interfaces[vhiq->vhost_iface_index];
+    n_rx_packets += vhost_user_if_input (vm, vum, vui, vhiq->qid, node);
+  }
+
+  //TODO: One call might return more than 256 packets here.
+  //But this is supposed to be the vector size.
   return n_rx_packets;
 }
 
@@ -1232,65 +1719,91 @@ VLIB_REGISTER_NODE (vhost_user_input_node) = {
   .function = vhost_user_input,
   .type = VLIB_NODE_TYPE_INPUT,
   .name = "vhost-user-input",
+  .sibling_of = "device-input",
 
   /* Will be enabled if/when hardware is detected. */
   .state = VLIB_NODE_STATE_DISABLED,
 
   .format_buffer = format_ethernet_header_with_length,
-  .format_trace = format_vhost_user_input_trace,
+  .format_trace = format_vhost_trace,
 
   .n_errors = VHOST_USER_INPUT_FUNC_N_ERROR,
   .error_strings = vhost_user_input_func_error_strings,
-
-  .n_next_nodes = VHOST_USER_RX_N_NEXT,
-  .next_nodes = {
-    [VHOST_USER_RX_NEXT_DROP] = "error-drop",
-    [VHOST_USER_RX_NEXT_ETHERNET_INPUT] = "ethernet-input",
-  },
 };
 
 VLIB_NODE_FUNCTION_MULTIARCH (vhost_user_input_node, vhost_user_input)
 /* *INDENT-ON* */
 
+
+void
+vhost_user_tx_trace (vhost_trace_t * t,
+		     vhost_user_intf_t * vui, u16 qid,
+		     vlib_buffer_t * b, vhost_user_vring_t * rxvq)
+{
+  vhost_user_main_t *vum = &vhost_user_main;
+  u32 qsz_mask = rxvq->qsz - 1;
+  u32 last_avail_idx = rxvq->last_avail_idx;
+  u32 desc_current = rxvq->avail->ring[last_avail_idx & qsz_mask];
+  vring_desc_t *hdr_desc = 0;
+  u32 hint = 0;
+
+  memset (t, 0, sizeof (*t));
+  t->device_index = vui - vum->vhost_user_interfaces;
+  t->qid = qid;
+
+  hdr_desc = &rxvq->desc[desc_current];
+  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_INDIRECT;
+      //Header is the first here
+      hdr_desc = map_guest_mem (vui, rxvq->desc[desc_current].addr, &hint);
+    }
+  if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SIMPLE_CHAINED;
+    }
+  if (!(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT) &&
+      !(rxvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT))
+    {
+      t->virtio_ring_flags |= 1 << VIRTIO_TRACE_F_SINGLE_DESC;
+    }
+
+  t->first_desc_len = hdr_desc ? hdr_desc->len : 0;
+}
+
 static uword
 vhost_user_intfc_tx (vlib_main_t * vm,
 		     vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
   u32 *buffers = vlib_frame_args (frame);
   u32 n_left = 0;
-  u16 used_index;
   vhost_user_main_t *vum = &vhost_user_main;
   uword n_packets = 0;
   vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
   vhost_user_intf_t *vui =
     vec_elt_at_index (vum->vhost_user_interfaces, rd->dev_instance);
-  vhost_user_vring_t *rxvq = &vui->vrings[VHOST_NET_VRING_IDX_RX];
+  u32 qid = ~0;
+  vhost_user_vring_t *rxvq;
   u16 qsz_mask;
   u8 error = VHOST_USER_TX_FUNC_ERROR_NONE;
+  u32 cpu_index = os_get_cpu_number ();
+  n_left = n_packets = frame->n_vectors;
+  u32 map_guest_hint_desc = 0;
+  u32 map_guest_hint_indirect = 0;
+  u32 *map_guest_hint_p = &map_guest_hint_desc;
+  vhost_trace_t *current_trace = 0;
 
-  if (PREDICT_FALSE (!vui->is_up))
-    goto done2;
-
-  if (PREDICT_FALSE
-      (!rxvq->desc || !rxvq->avail || vui->sock_errno != 0 || !rxvq->enabled))
+  if (PREDICT_FALSE (!vui->is_up || !vui->admin_up))
     {
       error = VHOST_USER_TX_FUNC_ERROR_NOT_READY;
-      goto done2;
-    }
-
-  if (PREDICT_FALSE (vui->lockp != 0))
-    {
-      while (__sync_lock_test_and_set (vui->lockp, 1))
-	;
+      goto done3;
     }
 
-  /* only bit 0 of avail.flags is used so we don't want to deal with this
-     interface if any other bit is set */
-  if (PREDICT_FALSE (rxvq->avail->flags & 0xFFFE))
-    {
-      error = VHOST_USER_TX_FUNC_ERROR_NOT_READY;
-      goto done2;
-    }
+  qid =
+    VHOST_VRING_IDX_RX (*vec_elt_at_index (vui->per_cpu_tx_qid, cpu_index));
+  rxvq = &vui->vrings[qid];
+  if (PREDICT_FALSE (vui->use_tx_spinlock))
+    vhost_user_vring_lock (vui, qid);
 
   if (PREDICT_FALSE ((rxvq->avail->idx == rxvq->last_avail_idx)))
     {
@@ -1298,23 +1811,25 @@ vhost_user_intfc_tx (vlib_main_t * vm,
       goto done2;
     }
 
-  n_left = n_packets = frame->n_vectors;
-  used_index = rxvq->used->idx;
   qsz_mask = rxvq->qsz - 1;	/* qsz is always power of 2 */
 
   while (n_left > 0)
     {
       vlib_buffer_t *b0, *current_b0;
-      u16 desc_chain_head, desc_current, desc_len;
+      u16 desc_head, desc_index, desc_len;
+      vring_desc_t *desc_table;
       void *buffer_addr;
-      uword offset;
-
-      if (n_left >= 2)
-	vlib_prefetch_buffer_with_index (vm, buffers[1], LOAD);
+      u32 buffer_len;
 
       b0 = vlib_get_buffer (vm, buffers[0]);
       buffers++;
-      n_left--;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	{
+	  current_trace = vlib_add_trace (vm, node, b0,
+					  sizeof (*current_trace));
+	  vhost_user_tx_trace (current_trace, vui, qid / 2, b0, rxvq);
+	}
 
       if (PREDICT_FALSE (rxvq->last_avail_idx == rxvq->avail->idx))
 	{
@@ -1322,41 +1837,58 @@ vhost_user_intfc_tx (vlib_main_t * vm,
 	  goto done;
 	}
 
-      desc_current = desc_chain_head =
+      desc_table = rxvq->desc;
+      map_guest_hint_p = &map_guest_hint_desc;
+      desc_head = desc_index =
 	rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
-      offset = vui->virtio_net_hdr_sz;
-      desc_len = offset;
+      if (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT)
+	{
+	  if (PREDICT_FALSE
+	      (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
+	    {
+	      error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
+	      goto done;
+	    }
+	  if (PREDICT_FALSE
+	      (!(desc_table =
+		 map_guest_mem (vui, rxvq->desc[desc_index].addr,
+				&map_guest_hint_desc))))
+	    {
+	      error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
+	      goto done;
+	    }
+	  desc_index = 0;
+	  map_guest_hint_p = &map_guest_hint_indirect;
+	}
+
+      desc_len = vui->virtio_net_hdr_sz;
+
       if (PREDICT_FALSE
 	  (!(buffer_addr =
-	     map_guest_mem (vui, rxvq->desc[desc_current].addr))))
+	     map_guest_mem (vui, desc_table[desc_index].addr,
+			    map_guest_hint_p))))
 	{
 	  error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
 	  goto done;
 	}
-      CLIB_PREFETCH (buffer_addr, clib_min (rxvq->desc[desc_current].len,
-					    4 * CLIB_CACHE_LINE_BYTES),
-		     STORE);
+      buffer_len = desc_table[desc_index].len;
+
+      CLIB_PREFETCH (buffer_addr, CLIB_CACHE_LINE_BYTES, STORE);
 
       virtio_net_hdr_mrg_rxbuf_t *hdr =
 	(virtio_net_hdr_mrg_rxbuf_t *) buffer_addr;
       hdr->hdr.flags = 0;
       hdr->hdr.gso_type = 0;
-
-      vhost_user_log_dirty_pages (vui, rxvq->desc[desc_current].addr,
-				  vui->virtio_net_hdr_sz);
-
       if (vui->virtio_net_hdr_sz == 12)
 	hdr->num_buffers = 1;
 
+      vhost_user_log_dirty_pages (vui, desc_table[desc_index].addr,
+				  vui->virtio_net_hdr_sz);
+
       u16 bytes_left = b0->current_length;
-      buffer_addr += offset;
+      buffer_addr += vui->virtio_net_hdr_sz;
+      buffer_len -= vui->virtio_net_hdr_sz;
       current_b0 = b0;
-
-      //FIXME: This was in the code but I don't think it is valid
-      /*if (PREDICT_FALSE(!vui->is_any_layout && (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT))) {
-         rxvq->desc[desc_current].len = vui->virtio_net_hdr_sz;
-         } */
-
       while (1)
 	{
 	  if (!bytes_left)
@@ -1373,103 +1905,137 @@ vhost_user_intfc_tx (vlib_main_t * vm,
 		}
 	    }
 
-	  if (rxvq->desc[desc_current].len <= offset)
+	  if (buffer_len == 0)
 	    {			//Get new output
-	      if (rxvq->desc[desc_current].flags & VIRTQ_DESC_F_NEXT)
+	      if (desc_table[desc_index].flags & VIRTQ_DESC_F_NEXT)
 		{
-		  offset = 0;
-		  desc_current = rxvq->desc[desc_current].next;
+		  //Next one is chained
+		  desc_index = desc_table[desc_index].next;
 		  if (PREDICT_FALSE
 		      (!(buffer_addr =
-			 map_guest_mem (vui, rxvq->desc[desc_current].addr))))
+			 map_guest_mem (vui, desc_table[desc_index].addr,
+					map_guest_hint_p))))
 		    {
-		      used_index -= hdr->num_buffers - 1;
+		      rxvq->last_used_idx -= hdr->num_buffers - 1;
 		      rxvq->last_avail_idx -= hdr->num_buffers - 1;
 		      error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
 		      goto done;
 		    }
+		  buffer_len = desc_table[desc_index].len;
 		}
-	      else if (vui->virtio_net_hdr_sz == 12)
-		{		//MRG is available
-
+	      else if (vui->virtio_net_hdr_sz == 12)	//MRG is available
+		{
 		  //Move from available to used buffer
-		  rxvq->used->ring[used_index & qsz_mask].id =
-		    desc_chain_head;
-		  rxvq->used->ring[used_index & qsz_mask].len = desc_len;
+		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id =
+		    desc_head;
+		  rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len =
+		    desc_len;
 		  vhost_user_log_dirty_ring (vui, rxvq,
-					     ring[used_index & qsz_mask]);
+					     ring[rxvq->last_used_idx &
+						  qsz_mask]);
 		  rxvq->last_avail_idx++;
-		  used_index++;
+		  rxvq->last_used_idx++;
 		  hdr->num_buffers++;
 
 		  if (PREDICT_FALSE
 		      (rxvq->last_avail_idx == rxvq->avail->idx))
 		    {
 		      //Dequeue queued descriptors for this packet
-		      used_index -= hdr->num_buffers - 1;
+		      rxvq->last_used_idx -= hdr->num_buffers - 1;
 		      rxvq->last_avail_idx -= hdr->num_buffers - 1;
 		      error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
 		      goto done;
 		    }
 
-		  //Look at next one
-		  desc_chain_head =
+		  desc_table = rxvq->desc;
+		  map_guest_hint_p = &map_guest_hint_desc;
+		  desc_head = desc_index =
 		    rxvq->avail->ring[rxvq->last_avail_idx & qsz_mask];
-		  desc_current = desc_chain_head;
-		  desc_len = 0;
-		  offset = 0;
+		  if (PREDICT_FALSE
+		      (rxvq->desc[desc_head].flags & VIRTQ_DESC_F_INDIRECT))
+		    {
+		      //It is seriously unlikely that a driver will put indirect descriptor
+		      //after non-indirect descriptor.
+		      if (PREDICT_FALSE
+			  (rxvq->desc[desc_head].len < sizeof (vring_desc_t)))
+			{
+			  error = VHOST_USER_TX_FUNC_ERROR_INDIRECT_OVERFLOW;
+			  goto done;
+			}
+		      if (PREDICT_FALSE
+			  (!(desc_table =
+			     map_guest_mem (vui,
+					    rxvq->desc[desc_index].addr,
+					    &map_guest_hint_desc))))
+			{
+			  error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
+			  goto done;
+			}
+		      desc_index = 0;
+		      map_guest_hint_p = &map_guest_hint_indirect;
+		    }
+
 		  if (PREDICT_FALSE
 		      (!(buffer_addr =
-			 map_guest_mem (vui, rxvq->desc[desc_current].addr))))
+			 map_guest_mem (vui, desc_table[desc_index].addr,
+					map_guest_hint_p))))
 		    {
-		      //Dequeue queued descriptors for this packet
-		      used_index -= hdr->num_buffers - 1;
-		      rxvq->last_avail_idx -= hdr->num_buffers - 1;
 		      error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
 		      goto done;
 		    }
+		  buffer_len = desc_table[desc_index].len;
+		  CLIB_PREFETCH (buffer_addr, CLIB_CACHE_LINE_BYTES, STORE);
 		}
 	      else
 		{
-		  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOBUF;
+		  error = VHOST_USER_TX_FUNC_ERROR_PKT_DROP_NOMRG;
 		  goto done;
 		}
 	    }
 
-	  u16 bytes_to_copy =
-	    bytes_left >
-	    (rxvq->desc[desc_current].len -
-	     offset) ? (rxvq->desc[desc_current].len - offset) : bytes_left;
+	  u16 bytes_to_copy = bytes_left;
+	  bytes_to_copy =
+	    (bytes_to_copy > buffer_len) ? buffer_len : bytes_to_copy;
 	  clib_memcpy (buffer_addr,
 		       vlib_buffer_get_current (current_b0) +
 		       current_b0->current_length - bytes_left,
 		       bytes_to_copy);
 
 	  vhost_user_log_dirty_pages (vui,
-				      rxvq->desc[desc_current].addr + offset,
+				      desc_table[desc_index].addr +
+				      desc_table[desc_index].len -
+				      bytes_left - bytes_to_copy,
 				      bytes_to_copy);
+
+	  CLIB_PREFETCH (rxvq, sizeof (*rxvq), STORE);
 	  bytes_left -= bytes_to_copy;
-	  offset += bytes_to_copy;
+	  buffer_len -= bytes_to_copy;
 	  buffer_addr += bytes_to_copy;
 	  desc_len += bytes_to_copy;
 	}
 
       //Move from available to used ring
-      rxvq->used->ring[used_index & qsz_mask].id = desc_chain_head;
-      rxvq->used->ring[used_index & qsz_mask].len = desc_len;
-      vhost_user_log_dirty_ring (vui, rxvq, ring[used_index & qsz_mask]);
+      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id = desc_head;
+      rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len = desc_len;
+      vhost_user_log_dirty_ring (vui, rxvq,
+				 ring[rxvq->last_used_idx & qsz_mask]);
 
       rxvq->last_avail_idx++;
-      used_index++;
+      rxvq->last_used_idx++;
+
+      if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	current_trace->hdr = *hdr;
+
+      n_left--;			//At the end for error counting when 'goto done' is invoked
     }
 
 done:
   CLIB_MEMORY_BARRIER ();
-  rxvq->used->idx = used_index;
+  rxvq->used->idx = rxvq->last_used_idx;
   vhost_user_log_dirty_ring (vui, rxvq, idx);
 
   /* interrupt (call) handling */
-  if ((rxvq->callfd > 0) && !(rxvq->avail->flags & 1))
+  if ((rxvq->callfd > -1) && !(rxvq->avail->flags & 1))
     {
       rxvq->n_since_last_int += n_packets - n_left;
 
@@ -1478,10 +2044,9 @@ done:
     }
 
 done2:
+  vhost_user_vring_unlock (vui, qid);
 
-  if (PREDICT_FALSE (vui->lockp != 0))
-    *vui->lockp = 0;
-
+done3:
   if (PREDICT_FALSE (n_left && error != VHOST_USER_TX_FUNC_ERROR_NONE))
     {
       vlib_error_count (vm, node->node_index, error, n_left);
@@ -1524,6 +2089,7 @@ VNET_DEVICE_CLASS (vhost_user_dev_class,static) = {
   .name_renumber = vhost_user_name_renumber,
   .admin_up_down_function = vhost_user_interface_admin_up_down,
   .no_flatten_output_chains = 1,
+  .format_tx_trace = format_vhost_trace,
 };
 
 VLIB_DEVICE_TX_FUNCTION_MULTIARCH (vhost_user_dev_class,
@@ -1601,7 +2167,10 @@ vhost_user_process (vlib_main_t * vm,
 	      getsockopt (vui->unix_fd, SOL_SOCKET, SO_ERROR, &error, &len);
 
 	    if (retval)
-	      vhost_user_if_disconnect (vui);
+	      {
+		DBG_SOCK ("getsockopt returned %d", retval);
+		vhost_user_if_disconnect (vui);
+	      }
 	  }
       }
     }
@@ -1638,6 +2207,7 @@ vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, u32 sw_if_index)
   vui->active = 0;
   // disconnect interface sockets
   vhost_user_if_disconnect (vui);
+  vhost_user_update_iface_state (vui);
   // add to inactive interface list
   vec_add1 (vum->vhost_user_inactive_interfaces_index, p[0]);
 
@@ -1723,6 +2293,7 @@ vhost_user_vui_new ()
   // vui was not retrieved from inactive ifaces - create new
   if (!vui)
     vec_add2 (vum->vhost_user_interfaces, vui, 1);
+
   return vui;
 }
 
@@ -1774,12 +2345,10 @@ vhost_user_vui_init (vnet_main_t * vnm,
 {
   vnet_sw_interface_t *sw;
   sw = vnet_get_hw_sw_interface (vnm, vui->hw_if_index);
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
   int q;
 
   vui->unix_fd = sockfd;
   vui->sw_if_index = sw->sw_if_index;
-  vui->num_vrings = 2;
   vui->sock_is_server = is_server;
   strncpy (vui->sock_filename, sock_filename,
 	   ARRAY_LEN (vui->sock_filename) - 1);
@@ -1790,22 +2359,24 @@ vhost_user_vui_init (vnet_main_t * vnm,
   vui->unix_file_index = ~0;
   vui->log_base_addr = 0;
 
-  for (q = 0; q < 2; q++)
-    {
-      vui->vrings[q].enabled = 0;
-    }
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
+    vhost_user_vring_init (vui, q);
 
   vnet_hw_interface_set_flags (vnm, vui->hw_if_index, 0);
 
   if (sw_if_index)
     *sw_if_index = vui->sw_if_index;
 
-  if (tm->n_vlib_mains > 1)
+  for (q = 0; q < VHOST_VRING_MAX_N; q++)
     {
-      vui->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
-					   CLIB_CACHE_LINE_BYTES);
-      memset ((void *) vui->lockp, 0, CLIB_CACHE_LINE_BYTES);
+      vui->vring_locks[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
+						    CLIB_CACHE_LINE_BYTES);
+      memset ((void *) vui->vring_locks[q], 0, CLIB_CACHE_LINE_BYTES);
     }
+
+  vec_validate (vui->per_cpu_tx_qid,
+		vlib_get_thread_main ()->n_vlib_mains - 1);
+  vhost_user_tx_thread_placement (vui);
 }
 
 // register vui and start polling on it
@@ -1813,7 +2384,6 @@ static void
 vhost_user_vui_register (vlib_main_t * vm, vhost_user_intf_t * vui)
 {
   vhost_user_main_t *vum = &vhost_user_main;
-  dpdk_main_t *dm = &dpdk_main;
   int cpu_index;
   vlib_thread_main_t *tm = vlib_get_thread_main ();
 
@@ -1823,8 +2393,8 @@ vhost_user_vui_register (vlib_main_t * vm, vhost_user_intf_t * vui)
 	    vui - vum->vhost_user_interfaces);
 
   /* start polling */
-  cpu_index = dm->input_cpu_first_index +
-    (vui - vum->vhost_user_interfaces) % dm->input_cpu_count;
+  cpu_index = vum->input_cpu_first_index +
+    (vui - vum->vhost_user_interfaces) % vum->input_cpu_count;
 
   if (tm->n_vlib_mains == 1)
     vlib_node_set_state (vm, vhost_user_input_node.index,
@@ -1937,7 +2507,7 @@ vhost_user_connect_command_fn (vlib_main_t * vm,
   u8 *sock_filename = NULL;
   u32 sw_if_index;
   u8 is_server = 0;
-  u64 feature_mask = (u64) ~ 0;
+  u64 feature_mask = (u64) ~ (0ULL);
   u8 renumber = 0;
   u32 custom_dev_instance = ~0;
   u8 hwaddr[6];
@@ -2079,6 +2649,10 @@ show_vhost_user_command_fn (vlib_main_t * vm,
   vhost_user_intf_t *vui;
   u32 hw_if_index, *hw_if_indices = 0;
   vnet_hw_interface_t *hi;
+  vhost_cpu_t *vhc;
+  vhost_iface_and_queue_t *vhiq;
+  u32 ci;
+
   int i, j, q;
   int show_descr = 0;
   struct feat_struct
@@ -2095,13 +2669,23 @@ show_vhost_user_command_fn (vlib_main_t * vm,
     {.str = NULL}
   };
 
+#define foreach_protocol_feature \
+  _(VHOST_USER_PROTOCOL_F_MQ) \
+  _(VHOST_USER_PROTOCOL_F_LOG_SHMFD)
+
+  static struct feat_struct proto_feat_array[] = {
+#define _(s) { .str = #s, .bit = s},
+    foreach_protocol_feature
+#undef _
+    {.str = NULL}
+  };
+
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat
 	  (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index))
 	{
 	  vec_add1 (hw_if_indices, hw_if_index);
-	  vlib_cli_output (vm, "add %d", hw_if_index);
 	}
       else if (unformat (input, "descriptors") || unformat (input, "desc"))
 	show_descr = 1;
@@ -2121,7 +2705,7 @@ show_vhost_user_command_fn (vlib_main_t * vm,
       }
     }
   vlib_cli_output (vm, "Virtio vhost-user interfaces");
-  vlib_cli_output (vm, "Global:\n  coalesce frames %d time %e\n\n",
+  vlib_cli_output (vm, "Global:\n  coalesce frames %d time %e",
 		   vum->coalesce_frames, vum->coalesce_time);
 
   for (i = 0; i < vec_len (hw_if_indices); i++)
@@ -2131,26 +2715,61 @@ show_vhost_user_command_fn (vlib_main_t * vm,
       vlib_cli_output (vm, "Interface: %s (ifindex %d)",
 		       hi->name, hw_if_indices[i]);
 
-      vlib_cli_output (vm, "virtio_net_hdr_sz %d\n features (0x%llx): \n",
-		       vui->virtio_net_hdr_sz, vui->features);
+      vlib_cli_output (vm, "virtio_net_hdr_sz %d\n"
+		       " features mask (0x%llx): \n"
+		       " features (0x%llx): \n",
+		       vui->virtio_net_hdr_sz, vui->feature_mask,
+		       vui->features);
 
       feat_entry = (struct feat_struct *) &feat_array;
       while (feat_entry->str)
 	{
-	  if (vui->features & (1 << feat_entry->bit))
+	  if (vui->features & (1ULL << feat_entry->bit))
 	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
 			     feat_entry->bit);
 	  feat_entry++;
 	}
 
-      vlib_cli_output (vm, "\n");
+      vlib_cli_output (vm, "  protocol features (0x%llx)",
+		       vui->protocol_features);
+      feat_entry = (struct feat_struct *) &proto_feat_array;
+      while (feat_entry->str)
+	{
+	  if (vui->protocol_features & (1ULL << feat_entry->bit))
+	    vlib_cli_output (vm, "   %s (%d)", feat_entry->str,
+			     feat_entry->bit);
+	  feat_entry++;
+	}
 
+      vlib_cli_output (vm, "\n");
 
       vlib_cli_output (vm, " socket filename %s type %s errno \"%s\"\n\n",
 		       vui->sock_filename,
 		       vui->sock_is_server ? "server" : "client",
 		       strerror (vui->sock_errno));
 
+      vlib_cli_output (vm, " rx placement: ");
+      vec_foreach (vhc, vum->cpus)
+      {
+	vec_foreach (vhiq, vhc->rx_queues)
+	{
+	  if (vhiq->vhost_iface_index == vui - vum->vhost_user_interfaces)
+	    vlib_cli_output (vm, "   thread %d on vring %d\n",
+			     vhc - vum->cpus, VHOST_VRING_IDX_TX (vhiq->qid));
+	}
+      }
+
+      vlib_cli_output (vm, " tx placement: %s\n",
+		       vui->use_tx_spinlock ? "spin-lock" : "lock-free");
+
+      vec_foreach_index (ci, vui->per_cpu_tx_qid)
+      {
+	vlib_cli_output (vm, "   thread %d on vring %d\n", ci,
+			 VHOST_VRING_IDX_RX (vui->per_cpu_tx_qid[ci]));
+      }
+
+      vlib_cli_output (vm, "\n");
+
       vlib_cli_output (vm, " Memory regions (total %d)\n", vui->nregions);
 
       if (vui->nregions)
@@ -2171,9 +2790,14 @@ show_vhost_user_command_fn (vlib_main_t * vm,
 			   vui->regions[j].mmap_offset,
 			   pointer_to_uword (vui->region_mmap_addr[j]));
 	}
-      for (q = 0; q < vui->num_vrings; q++)
+      for (q = 0; q < VHOST_VRING_MAX_N; q++)
 	{
-	  vlib_cli_output (vm, "\n Virtqueue %d\n", q);
+	  if (!vui->vrings[q].started)
+	    continue;
+
+	  vlib_cli_output (vm, "\n Virtqueue %d (%s%s)\n", q,
+			   (q & 1) ? "RX" : "TX",
+			   vui->vrings[q].enabled ? "" : " disabled");
 
 	  vlib_cli_output (vm,
 			   "  qsz %d last_avail_idx %d last_used_idx %d\n",
@@ -2201,6 +2825,7 @@ show_vhost_user_command_fn (vlib_main_t * vm,
 			       "  ===== ================== ===== ====== ===== ==================\n");
 	      for (j = 0; j < vui->vrings[q].qsz; j++)
 		{
+		  u32 mem_hint = 0;
 		  vlib_cli_output (vm,
 				   "  %-5d 0x%016lx %-5d 0x%04x %-5d 0x%016lx\n",
 				   j, vui->vrings[q].desc[j].addr,
@@ -2209,8 +2834,8 @@ show_vhost_user_command_fn (vlib_main_t * vm,
 				   vui->vrings[q].desc[j].next,
 				   pointer_to_uword (map_guest_mem
 						     (vui,
-						      vui->vrings[q].
-						      desc[j].addr)));
+						      vui->vrings[q].desc[j].
+						      addr, &mem_hint)));
 		}
 	    }
 	}
@@ -2221,6 +2846,30 @@ done:
   return error;
 }
 
+/*
+ * CLI functions
+ */
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vhost_user_connect_command, static) = {
+    .path = "create vhost-user",
+    .short_help = "create vhost-user socket <socket-filename> [server] [feature-mask <hex>] [renumber <dev_instance>]",
+    .function = vhost_user_connect_command_fn,
+};
+
+VLIB_CLI_COMMAND (vhost_user_delete_command, static) = {
+    .path = "delete vhost-user",
+    .short_help = "delete vhost-user sw_if_index <nn>",
+    .function = vhost_user_delete_command_fn,
+};
+
+VLIB_CLI_COMMAND (show_vhost_user_command, static) = {
+    .path = "show vhost-user",
+    .short_help = "show vhost-user interface",
+    .function = show_vhost_user_command_fn,
+};
+/* *INDENT-ON* */
+
 static clib_error_t *
 vhost_user_config (vlib_main_t * vm, unformat_input_t * input)
 {
@@ -2260,6 +2909,48 @@ vhost_user_unmap_all (void)
     }
 }
 
+static clib_error_t *
+vhost_thread_command_fn (vlib_main_t * vm,
+			 unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 worker_thread_index;
+  u32 sw_if_index;
+  u8 del = 0;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat
+      (line_input, "%U %d", unformat_vnet_sw_interface, vnet_get_main (),
+       &sw_if_index, &worker_thread_index))
+    {
+      unformat_free (line_input);
+      return clib_error_return (0, "unknown input `%U'",
+				format_unformat_error, input);
+    }
+
+  if (unformat (line_input, "del"))
+    del = 1;
+
+  if ((rv =
+       vhost_user_thread_placement (sw_if_index, worker_thread_index, del)))
+    return clib_error_return (0, "vhost_user_thread_placement returned %d",
+			      rv);
+  return 0;
+}
+
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (vhost_user_thread_command, static) = {
+    .path = "vhost thread",
+    .short_help = "vhost thread <iface> <worker-index> [del]",
+    .function = vhost_thread_command_fn,
+};
+/* *INDENT-ON* */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *