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

[vpp.git] / src / vnet / interface_api.c

diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 4fe655c..ab9d04a 100644 (file)
--- 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>
@@ -367,8 +368,8 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
 
   char *strcasestr (char *, char *);   /* lnx hdr file botch */
   /* *INDENT-OFF* */
-  pool_foreach (swif, im->sw_interfaces,
-  ({
+  pool_foreach (swif, im->sw_interfaces)
+   {
     if (!vnet_swif_is_api_visible (swif))
         continue;
     vec_reset_length(name);
@@ -379,7 +380,7 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp)
        continue;
 
     send_sw_interface_details (am, rp, swif, name, mp->context);
-  }));
+  }
   /* *INDENT-ON* */
 
   vec_free (name);
@@ -789,12 +790,12 @@ link_state_process (vlib_main_t * vm,
            continue;
 
           /* *INDENT-OFF* */
-          pool_foreach(reg, vam->interface_events_registrations,
-          ({
+          pool_foreach (reg, vam->interface_events_registrations)
+           {
             vl_reg = vl_api_client_index_to_registration (reg->client_index);
             if (vl_reg)
              send_sw_interface_event (vam, reg, vl_reg, i, event_by_sw_if_index[i]);
-          }));
+          }
           /* *INDENT-ON* */
        }
       vec_reset_length (event_by_sw_if_index);
@@ -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);
        }
     }