X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Fformat.c;h=2c4eaf790412156894dda9535ecffc8abb60f065;hb=8b388e35b2aeca39c277453337751d14aeba0d40;hp=ed99e5861c841c30622ddc50bff3184bdb60abbc;hpb=c811663491262fdc01e8309b1f9ecde2a110a84d;p=vpp.git

diff --git a/src/plugins/avf/format.c b/src/plugins/avf/format.c
index ed99e5861c8..2c4eaf79041 100644
--- a/src/plugins/avf/format.c
+++ b/src/plugins/avf/format.c
@@ -27,8 +27,7 @@ format_avf_device_name (u8 * s, va_list * args)
 {
   vlib_main_t *vm = vlib_get_main ();
   u32 i = va_arg (*args, u32);
-  avf_main_t *am = &avf_main;
-  avf_device_t *ad = vec_elt_at_index (am->devices, i);
+  avf_device_t *ad = avf_get_device (i);
   vlib_pci_addr_t *addr = vlib_pci_get_addr (vm, ad->pci_dev_handle);
 
   if (ad->name)
@@ -88,12 +87,19 @@ u8 *
 format_avf_device (u8 * s, va_list * args)
 {
   u32 i = va_arg (*args, u32);
-  avf_main_t *am = &avf_main;
-  avf_device_t *ad = vec_elt_at_index (am->devices, i);
+  avf_device_t *ad = avf_get_device (i);
   u32 indent = format_get_indent (s);
   u8 *a = 0;
-
-  s = format (s, "flags: %U", format_avf_device_flags, ad);
+  avf_rxq_t *rxq = vec_elt_at_index (ad->rxqs, 0);
+  avf_txq_t *txq = vec_elt_at_index (ad->txqs, 0);
+
+  s = format (s, "rx: queues %u, desc %u (min %u max %u)", ad->n_rx_queues,
+	      rxq->size, AVF_QUEUE_SZ_MIN, AVF_QUEUE_SZ_MAX);
+  s = format (s, "\n%Utx: queues %u, desc %u (min %u max %u)",
+	      format_white_space, indent, ad->n_tx_queues, txq->size,
+	      AVF_QUEUE_SZ_MIN, AVF_QUEUE_SZ_MAX);
+  s = format (s, "\n%Uflags: %U", format_white_space, indent,
+	      format_avf_device_flags, ad);
   s = format (s, "\n%Uoffload features: %U", format_white_space, indent,
 	      format_avf_vf_cap_flags, ad->feature_bitmap);
 
@@ -107,9 +113,10 @@ format_avf_device (u8 * s, va_list * args)
     s = format (s, "\n%Uerror %U", format_white_space, indent,
 		format_clib_error, ad->error);
 
-#define _(c) if (ad->eth_stats.c) \
+#define _(c) if (ad->eth_stats.c - ad->last_cleared_eth_stats.c) \
   a = format (a, "\n%U%-20U %u", format_white_space, indent + 2, \
-	      format_c_identifier, #c, ad->eth_stats.c);
+	      format_c_identifier, #c,                           \
+              ad->eth_stats.c - ad->last_cleared_eth_stats.c);
   foreach_virtchnl_eth_stats;
 #undef _
   if (a)
@@ -128,14 +135,23 @@ format_avf_input_trace (u8 * s, va_list * args)
   vnet_main_t *vnm = vnet_get_main ();
   vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, t->hw_if_index);
   u32 indent = format_get_indent (s);
-  avf_rx_vector_entry_t *rxve = &t->rxve;
-
-  s = format (s, "avf: %v (%d) next-node %U",
-	      hi->name, t->hw_if_index, format_vlib_next_node_name, vm,
-	      node->index, t->next_index);
-  s = format (s, "\n%Ustatus 0x%x error 0x%x ptype 0x%x length %u",
-	      format_white_space, indent + 2, rxve->status, rxve->error,
-	      rxve->ptype, rxve->length);
+  int i = 0;
+
+  s = format (s, "avf: %v (%d) qid %u next-node %U",
+	      hi->name, t->hw_if_index, t->qid, format_vlib_next_node_name,
+	      vm, node->index, t->next_index);
+
+  do
+    {
+      s = format (s, "\n%Udesc %u: status 0x%x error 0x%x ptype 0x%x len %u",
+		  format_white_space, indent + 2, i,
+		  t->qw1s[i] & pow2_mask (19),
+		  (t->qw1s[i] >> AVF_RXD_ERROR_SHIFT) & pow2_mask (8),
+		  (t->qw1s[i] >> AVF_RXD_PTYPE_SHIFT) & pow2_mask (8),
+		  (t->qw1s[i] >> AVF_RXD_LEN_SHIFT));
+    }
+  while ((t->qw1s[i++] & AVF_RXD_STATUS_EOP) == 0 &&
+	 i < AVF_RX_MAX_DESC_IN_CHAIN);
 
   return s;
 }