X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_format.c;h=036ca53174c989c9a63158ca86eaa6fbc26e4d8e;hb=fd4fd0d1853ae7384e7a64c4cad17a3469720b95;hp=8278102c6440e87cb8d005003348045a2d5816cd;hpb=08eb2bb205f998a75dacd1f3b999ec1a10160b35;p=vpp.git

diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index 8278102c644..036ca53174c 100644
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -42,6 +42,7 @@
 #include <vnet/l2/l2_input.h>
 #include <vnet/l2/l2_output.h>
 #include <vnet/l2/l2_vtr.h>
+#include <vnet/interface/rx_queue_funcs.h>
 
 u8 *
 format_vtr (u8 * s, va_list * args)
@@ -97,17 +98,17 @@ format_vnet_sw_interface_flags (u8 * s, va_list * args)
 }
 
 u8 *
-format_vnet_hw_interface_rx_mode (u8 * s, va_list * args)
+format_vnet_hw_if_rx_mode (u8 * s, va_list * args)
 {
-  vnet_hw_interface_rx_mode mode = va_arg (*args, vnet_hw_interface_rx_mode);
+  vnet_hw_if_rx_mode mode = va_arg (*args, vnet_hw_if_rx_mode);
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+  if (mode == VNET_HW_IF_RX_MODE_POLLING)
     return format (s, "polling");
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_INTERRUPT)
+  if (mode == VNET_HW_IF_RX_MODE_INTERRUPT)
     return format (s, "interrupt");
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_ADAPTIVE)
+  if (mode == VNET_HW_IF_RX_MODE_ADAPTIVE)
     return format (s, "adaptive");
 
   return format (s, "unknown");
@@ -130,6 +131,26 @@ format_vnet_hw_interface_link_speed (u8 * s, va_list * args)
   return format (s, "%u Kbps", link_speed);
 }
 
+u8 *
+format_vnet_hw_interface_rss_queues (u8 * s, va_list * args)
+{
+  clib_bitmap_t *bitmap = va_arg (*args, clib_bitmap_t *);
+  int i;
+
+  if (bitmap == NULL)
+    return s;
+
+  if (bitmap)
+    {
+    /* *INDENT-OFF* */
+    clib_bitmap_foreach (i, bitmap)  {
+      s = format (s, "%u ", i);
+    }
+    /* *INDENT-ON* */
+    }
+
+  return s;
+}
 
 u8 *
 format_vnet_hw_interface (u8 * s, va_list * args)
@@ -161,8 +182,8 @@ format_vnet_hw_interface (u8 * s, va_list * args)
     {
       int hw_idx;
       s = format (s, "Slave-Idx:");
-      clib_bitmap_foreach (hw_idx, hi->bond_info, s =
-			   format (s, " %d", hw_idx));
+      clib_bitmap_foreach (hw_idx, hi->bond_info)
+	s = format (s, " %d", hw_idx);
     }
   else if (dev_class->format_device_name)
     s = format (s, "%U", dev_class->format_device_name, hi->dev_instance);
@@ -172,6 +193,27 @@ format_vnet_hw_interface (u8 * s, va_list * args)
   s = format (s, "\n%ULink speed: %U", format_white_space, indent + 2,
 	      format_vnet_hw_interface_link_speed, hi->link_speed);
 
+  if (vec_len (hi->rx_queue_indices))
+    {
+      s = format (s, "\n%URX Queues:", format_white_space, indent + 2);
+      s = format (s, "\n%U%-6s%-15s%-10s", format_white_space, indent + 4,
+		  "queue", "thread", "mode");
+      for (int i = 0; i < vec_len (hi->rx_queue_indices); i++)
+	{
+	  vnet_hw_if_rx_queue_t *rxq;
+	  rxq = vnet_hw_if_get_rx_queue (vnm, hi->rx_queue_indices[i]);
+	  s = format (s, "\n%U%-6u%-15U%-10U", format_white_space, indent + 4,
+		      rxq->queue_id, format_vlib_thread_name_and_index,
+		      rxq->thread_index, format_vnet_hw_if_rx_mode, rxq->mode);
+	}
+    }
+
+  if (hi->rss_queues)
+    {
+      s = format (s, "\n%URSS queues: %U", format_white_space, indent + 2,
+		  format_vnet_hw_interface_rss_queues, hi->rss_queues);
+    }
+
   if (verbose)
     {
       if (hw_class->format_device)
@@ -529,7 +571,7 @@ format_vnet_buffer_opaque (u8 * s, va_list * args)
 
   s = format (s,
 	      "l2.feature_bitmap_input: %U, L2.feature_bitmap_output: %U",
-	      format_l2_input_features, o->l2.feature_bitmap, 0,
+	      format_l2_input_feature_bitmap, o->l2.feature_bitmap, 0,
 	      format_l2_output_features, o->l2.feature_bitmap, 0);
   vec_add1 (s, '\n');
 
@@ -680,7 +722,7 @@ unformat_vnet_buffer_flags (unformat_input_t * input, va_list * args)
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       /* Red herring, there is no such buffer flag */
-      if (unformat (input, "avail8"))
+      if (unformat (input, "avail10"))
 	return 0;
 #define _(bit,enum,str,verbose)                                 \
       else if (unformat (input, str))                           \
@@ -698,6 +740,32 @@ unformat_vnet_buffer_flags (unformat_input_t * input, va_list * args)
   return rv;
 }
 
+uword
+unformat_vnet_buffer_offload_flags (unformat_input_t *input, va_list *args)
+{
+  u32 *flagp = va_arg (*args, u32 *);
+  int rv = 0;
+  u32 oflags = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (0)
+	;
+#define _(bit, enum, str, verbose)                                            \
+  else if (unformat (input, str))                                             \
+  {                                                                           \
+    oflags |= (1 << bit);                                                     \
+    rv = 1;                                                                   \
+  }
+      foreach_vnet_buffer_offload_flag
+#undef _
+	else break;
+    }
+  if (rv)
+    *flagp = oflags;
+  return rv;
+}
+
 uword
 unformat_vnet_hw_interface (unformat_input_t * input, va_list * args)
 {