Harmonize vec/pool_get_aligned object sizes and alignment requests

[vpp.git] / src / plugins / dpdk / device / format.c

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index d661fa7..3809024 100644 (file)
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -176,10 +176,22 @@ format_dpdk_device_name (u8 * s, va_list * args)
       device_name = "GigabitEthernet";
       break;
 
+    case VNET_DPDK_PORT_TYPE_ETH_2_5G:
+      device_name = "Two_FiveGigabitEthernet";
+      break;
+
+    case VNET_DPDK_PORT_TYPE_ETH_5G:
+      device_name = "FiveGigabitEthernet";
+      break;
+
     case VNET_DPDK_PORT_TYPE_ETH_10G:
       device_name = "TenGigabitEthernet";
       break;
 
+    case VNET_DPDK_PORT_TYPE_ETH_20G:
+      device_name = "TwentyGigabitEthernet";
+      break;
+
     case VNET_DPDK_PORT_TYPE_ETH_25G:
       device_name = "TwentyFiveGigabitEthernet";
       break;
@@ -192,6 +204,10 @@ format_dpdk_device_name (u8 * s, va_list * args)
       device_name = "FiftyGigabitEthernet";
       break;
 
+    case VNET_DPDK_PORT_TYPE_ETH_56G:
+      device_name = "FiftySixGigabitEthernet";
+      break;
+
     case VNET_DPDK_PORT_TYPE_ETH_100G:
       device_name = "HundredGigabitEthernet";
       break;
@@ -239,6 +255,21 @@ format_dpdk_device_name (u8 * s, va_list * args)
   return ret;
 }
 
+u8 *
+format_dpdk_device_flags (u8 * s, va_list * args)
+{
+  dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
+  u8 *t = 0;
+
+#define _(a, b, c) if (xd->flags & (1 << a)) \
+t = format (t, "%s%s", t ? " ":"", c);
+  foreach_dpdk_device_flags
+#undef _
+    s = format (s, "%v", t);
+  vec_free (t);
+  return s;
+}
+
 static u8 *
 format_dpdk_device_type (u8 * s, va_list * args)
 {
@@ -447,6 +478,8 @@ format_dpdk_device (u8 * s, va_list * args)
   s = format (s, "%U\n%Ucarrier %U",
              format_dpdk_device_type, xd->device_index,
              format_white_space, indent + 2, format_dpdk_link_status, xd);
+  s = format (s, "%Uflags: %U\n",
+             format_white_space, indent + 2, format_dpdk_device_flags, xd);
 
   rte_eth_dev_info_get (xd->device_index, &di);
 
@@ -575,16 +608,16 @@ format_dpdk_device (u8 * s, va_list * args)
 }
 
 u8 *
-format_dpdk_tx_dma_trace (u8 * s, va_list * va)
+format_dpdk_tx_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 ();
-  dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
+  dpdk_tx_trace_t *t = va_arg (*va, dpdk_tx_trace_t *);
   dpdk_main_t *dm = &dpdk_main;
   dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
   u32 indent = format_get_indent (s);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
 
   s = format (s, "%U tx queue %d",
              format_vnet_sw_interface_name, vnm, sw, t->queue_index);
@@ -605,17 +638,17 @@ format_dpdk_tx_dma_trace (u8 * s, va_list * va)
 }
 
 u8 *
-format_dpdk_rx_dma_trace (u8 * s, va_list * va)
+format_dpdk_rx_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 ();
-  dpdk_rx_dma_trace_t *t = va_arg (*va, dpdk_rx_dma_trace_t *);
+  dpdk_rx_trace_t *t = va_arg (*va, dpdk_rx_trace_t *);
   dpdk_main_t *dm = &dpdk_main;
   dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
   format_function_t *f;
   u32 indent = format_get_indent (s);
-  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+  vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
 
   s = format (s, "%U rx queue %d",
              format_vnet_sw_interface_name, vnm, sw, t->queue_index);
@@ -723,12 +756,15 @@ format_dpdk_rte_mbuf (u8 * s, va_list * va)
 
   s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
              "\n%Ubuf_len %d, data_len %d, ol_flags 0x%lx, data_off %d, phys_addr 0x%x"
-             "\n%Upacket_type 0x%x l2_len %u l3_len %u outer_l2_len %u outer_l3_len %u",
+             "\n%Upacket_type 0x%x l2_len %u l3_len %u outer_l2_len %u outer_l3_len %u"
+             "\n%Urss 0x%x fdir.hi 0x%x fdir.lo 0x%x",
              mb->port, mb->nb_segs, mb->pkt_len,
              format_white_space, indent,
              mb->buf_len, mb->data_len, mb->ol_flags, mb->data_off,
              mb->buf_physaddr, format_white_space, indent, mb->packet_type,
-             mb->l2_len, mb->l3_len, mb->outer_l2_len, mb->outer_l3_len);
+             mb->l2_len, mb->l3_len, mb->outer_l2_len, mb->outer_l3_len,
+             format_white_space, indent, mb->hash.rss, mb->hash.fdir.hi,
+             mb->hash.fdir.lo);
 
   if (mb->ol_flags)
     s = format (s, "\n%U%U", format_white_space, indent,