interface: fix rx-placement api/cli for new infra

Change-Id: Ic977ffe761efc2129c61aec581da5479fe4838da
Type: fix
Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>

3 files changed, 90 insertions, 72 deletions

diff --git a/src/vnet/interface/rx_queue_funcs.h b/src/vnet/interface/rx_queue_funcs.h
index 08d717bb68c..f3dd65a39f7 100644
--- a/src/vnet/interface/rx_queue_funcs.h
+++ b/src/vnet/interface/rx_queue_funcs.h
@@ -90,6 +90,37 @@ vnet_hw_if_get_rx_queue_thread_index (vnet_main_t *vnm, u32 queue_index)
   return rxq->thread_index;
 }
 
+static_always_inline int
+vnet_hw_if_rxq_cmp_cli_api (vnet_hw_if_rx_queue_t **a,
+			    vnet_hw_if_rx_queue_t **b)
+{
+  vnet_main_t *vnm;
+  vnet_hw_interface_t *hif_a;
+  vnet_hw_interface_t *hif_b;
+
+  if (*a == *b)
+    return 0;
+
+  if (a[0]->thread_index != b[0]->thread_index)
+    return 2 * (a[0]->thread_index > b[0]->thread_index) - 1;
+
+  vnm = vnet_get_main ();
+  hif_a = vnet_get_hw_interface (vnm, a[0]->hw_if_index);
+  hif_b = vnet_get_hw_interface (vnm, b[0]->hw_if_index);
+
+  if (hif_a->input_node_index != hif_b->input_node_index)
+    return 2 * (hif_a->input_node_index > hif_b->input_node_index) - 1;
+
+  if (a[0]->hw_if_index != b[0]->hw_if_index)
+    return 2 * (a[0]->hw_if_index > b[0]->hw_if_index) - 1;
+
+  if (a[0]->queue_id != b[0]->queue_id)
+    return 2 * (a[0]->queue_id > b[0]->queue_id) - 1;
+
+  ASSERT (0);
+  return ~0;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index a06f02fe0ac..ab9d04af2d8 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -21,6 +21,7 @@
 #include <vlibmemory/api.h>
 
 #include <vnet/interface.h>
+#include <vnet/interface/rx_queue_funcs.h>
 #include <vnet/api_errno.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip.h>
@@ -1069,29 +1070,24 @@ static void vl_api_sw_interface_rx_placement_dump_t_handler
 
   if (sw_if_index == ~0)
     {
-      vnet_device_input_runtime_t *rt;
-      vnet_device_and_queue_t *dq;
-      vlib_node_t *pn = vlib_get_node_by_name (am->vlib_main,
-					       (u8 *) "device-input");
-      uword si;
-      int index = 0;
-
-      /* *INDENT-OFF* */
-      foreach_vlib_main (({
-        clib_bitmap_foreach (si, pn->sibling_bitmap)
-         {
-          rt = vlib_node_get_runtime_data (this_vlib_main, si);
-          vec_foreach (dq, rt->devices_and_queues)
-            {
-              vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm,
-                                                             dq->hw_if_index);
-              send_interface_rx_placement_details (am, reg, hw->sw_if_index, index,
-                                          dq->queue_id, dq->mode, mp->context);
-            }
-        }
-        index++;
-      }));
-      /* *INDENT-ON* */
+      vnet_hw_if_rx_queue_t **all_queues = 0;
+      vnet_hw_if_rx_queue_t **qptr;
+      vnet_hw_if_rx_queue_t *q;
+      vec_foreach (q, vnm->interface_main.hw_if_rx_queues)
+	vec_add1 (all_queues, q);
+      vec_sort_with_function (all_queues, vnet_hw_if_rxq_cmp_cli_api);
+
+      vec_foreach (qptr, all_queues)
+	{
+	  u32 current_thread = qptr[0]->thread_index;
+	  u32 hw_if_index = qptr[0]->hw_if_index;
+	  vnet_hw_interface_t *hw_if =
+	    vnet_get_hw_interface (vnm, hw_if_index);
+	  send_interface_rx_placement_details (
+	    am, reg, hw_if->sw_if_index, current_thread, qptr[0]->queue_id,
+	    qptr[0]->mode, mp->context);
+	}
+      vec_free (all_queues);
     }
   else
     {
@@ -1114,13 +1110,13 @@ static void vl_api_sw_interface_rx_placement_dump_t_handler
 
       vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, si->hw_if_index);
 
-      for (i = 0; i < vec_len (hw->dq_runtime_index_by_queue); i++)
+      for (i = 0; i < vec_len (hw->rx_queue_indices); i++)
 	{
-	  send_interface_rx_placement_details (am, reg, hw->sw_if_index,
-					       hw->input_node_thread_index_by_queue
-					       [i], i,
-					       hw->rx_mode_by_queue[i],
-					       mp->context);
+	  vnet_hw_if_rx_queue_t *rxq =
+	    vnet_hw_if_get_rx_queue (vnm, hw->rx_queue_indices[i]);
+	  send_interface_rx_placement_details (
+	    am, reg, hw->sw_if_index, rxq->thread_index, rxq->queue_id,
+	    rxq->mode, mp->context);
 	}
     }
 
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 03e7436fead..c79fddbc0b4 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -36,7 +36,6 @@
  *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
 /**
  * @file
  * @brief Interface CLI.
@@ -44,7 +43,6 @@
  * Source code for several CLI interface commands.
  *
  */
-
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vppinfra/bitmap.h>
@@ -54,7 +52,6 @@
 #include <vnet/l2/l2_input.h>
 #include <vnet/classify/vnet_classify.h>
 #include <vnet/interface/rx_queue_funcs.h>
-
 static int
 compare_interface_names (void *a1, void *a2)
 {
@@ -1687,42 +1684,36 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input,
 {
   u8 *s = 0;
   vnet_main_t *vnm = vnet_get_main ();
-  vnet_device_input_runtime_t *rt;
-  vnet_device_and_queue_t *dq;
-  vlib_node_t *pn = vlib_get_node_by_name (vm, (u8 *) "device-input");
-  uword si;
-  int index = 0;
-
-  /* *INDENT-OFF* */
-  foreach_vlib_main (({
-    clib_bitmap_foreach (si, pn->sibling_bitmap)
-       {
-        rt = vlib_node_get_runtime_data (this_vlib_main, si);
-
-        if (vec_len (rt->devices_and_queues))
-          s = format (s, "  node %U:\n", format_vlib_node_name, vm, si);
-
-        vec_foreach (dq, rt->devices_and_queues)
-	  {
-	    vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm,
-							     dq->hw_if_index);
-	    s = format (s, "    %U queue %u (%U)\n",
-			format_vnet_sw_if_index_name, vnm, hi->sw_if_index,
-			dq->queue_id,
-			format_vnet_hw_if_rx_mode, dq->mode);
-	  }
-      }
-    if (vec_len (s) > 0)
-      {
-        vlib_cli_output(vm, "Thread %u (%s):\n%v", index,
-			vlib_worker_threads[index].name, s);
-        vec_reset_length (s);
-      }
-    index++;
-  }));
-  /* *INDENT-ON* */
-
+  vnet_hw_if_rx_queue_t **all_queues = 0;
+  vnet_hw_if_rx_queue_t **qptr;
+  vnet_hw_if_rx_queue_t *q;
+  vec_foreach (q, vnm->interface_main.hw_if_rx_queues)
+    vec_add1 (all_queues, q);
+  vec_sort_with_function (all_queues, vnet_hw_if_rxq_cmp_cli_api);
+  u32 prev_node = ~0;
+
+  vec_foreach (qptr, all_queues)
+    {
+      u32 current_thread = qptr[0]->thread_index;
+      u32 hw_if_index = qptr[0]->hw_if_index;
+      vnet_hw_interface_t *hw_if = vnet_get_hw_interface (vnm, hw_if_index);
+      u32 current_node = hw_if->input_node_index;
+      if (current_node != prev_node)
+	s = format (s, " node %U:\n", format_vlib_node_name, vm, current_node);
+      s = format (s, "    %U queue %u (%U)\n", format_vnet_sw_if_index_name,
+		  vnm, hw_if->sw_if_index, qptr[0]->queue_id,
+		  format_vnet_hw_if_rx_mode, qptr[0]->mode);
+      if (qptr == all_queues + vec_len (all_queues) - 1 ||
+	  current_thread != qptr[1]->thread_index)
+	{
+	  vlib_cli_output (vm, "Thread %u (%s):\n%v", current_thread,
+			   vlib_worker_threads[current_thread].name, s);
+	  vec_reset_length (s);
+	}
+      prev_node = current_node;
+    }
   vec_free (s);
+  vec_free (all_queues);
   return 0;
 }
 
@@ -1758,7 +1749,6 @@ VLIB_CLI_COMMAND (show_interface_rx_placement, static) = {
   .function = show_interface_rx_placement_fn,
 };
 /* *INDENT-ON* */
-
 clib_error_t *
 set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id,
 			       u32 thread_index, u8 is_main)
@@ -1813,8 +1803,8 @@ set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id,
 }
 
 static clib_error_t *
-set_interface_rx_placement (vlib_main_t * vm, unformat_input_t * input,
-			    vlib_cli_command_t * cmd)
+set_interface_rx_placement (vlib_main_t *vm, unformat_input_t *input,
+			    vlib_cli_command_t *cmd)
 {
   clib_error_t *error = 0;
   unformat_input_t _line_input, *line_input = &_line_input;
@@ -2066,8 +2056,9 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a)
     return VNET_API_ERROR_INVALID_VALUE;
 
   /* Disable capture with capture already disabled, not interesting */
-  if (((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) == 0)
-      && ((a->rx_enable + a->tx_enable + a->drop_enable == 0)))
+  if (((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) ==
+       0) &&
+      ((a->rx_enable + a->tx_enable + a->drop_enable == 0)))
     return VNET_API_ERROR_VALUE_EXIST;
 
   /* Change number of packets to capture while capturing */