X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Faf_packet%2Fdevice.c;h=0542b165a3a182e17d79b19e998a9af3508e6a25;hb=7d0e30bc6;hp=2886fb5b6d5a9643477c266a202a5b5e8a6af4ce;hpb=aee73648cf524f2627a8680ca26a68d6a2c8e164;p=vpp.git

diff --git a/src/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c
index 2886fb5b6d5..0542b165a3a 100644
--- a/src/vnet/devices/af_packet/device.c
+++ b/src/vnet/devices/af_packet/device.c
@@ -67,7 +67,57 @@ format_af_packet_device_name (u8 * s, va_list * args)
 static u8 *
 format_af_packet_device (u8 * s, va_list * args)
 {
-  s = format (s, "Linux PACKET socket interface");
+  u32 dev_instance = va_arg (*args, u32);
+  u32 indent = format_get_indent (s);
+  int __clib_unused verbose = va_arg (*args, int);
+
+  af_packet_main_t *apm = &af_packet_main;
+  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, dev_instance);
+  clib_spinlock_lock_if_init (&apif->lockp);
+  u32 tx_block_sz = apif->tx_req->tp_block_size;
+  u32 tx_frame_sz = apif->tx_req->tp_frame_size;
+  u32 tx_frame_nr = apif->tx_req->tp_frame_nr;
+  u32 tx_block_nr = apif->tx_req->tp_block_nr;
+  u32 rx_block_size = apif->rx_req->tp_block_size;
+  u32 rx_frame_size = apif->rx_req->tp_frame_size;
+  u32 rx_frame_nr = apif->rx_req->tp_frame_nr;
+  u32 rx_block_nr = apif->rx_req->tp_block_nr;
+  int block = 0;
+  u8 *tx_block_start = apif->tx_ring + block * tx_block_sz;
+  u32 tx_frame = apif->next_tx_frame;
+  struct tpacket2_hdr *tph;
+
+  s = format (s, "Linux PACKET socket interface\n");
+  s = format (s, "%UTX block size:%d nr:%d  TX frame size:%d nr:%d\n",
+	      format_white_space, indent, tx_block_sz, tx_block_nr,
+	      tx_frame_sz, tx_frame_nr);
+  s = format (s, "%URX block size:%d nr:%d  RX frame size:%d nr:%d\n",
+	      format_white_space, indent, rx_block_size, rx_block_nr,
+	      rx_frame_size, rx_frame_nr);
+  s = format (s, "%Unext frame:%d\n", format_white_space, indent,
+	      apif->next_tx_frame);
+
+  int n_send_req = 0, n_avail = 0, n_sending = 0, n_tot = 0, n_wrong = 0;
+  do
+    {
+      tph = (struct tpacket2_hdr *) (tx_block_start + tx_frame * tx_frame_sz);
+      tx_frame = (tx_frame + 1) % tx_frame_nr;
+      if (tph->tp_status == 0)
+	n_avail++;
+      else if (tph->tp_status & TP_STATUS_SEND_REQUEST)
+	n_send_req++;
+      else if (tph->tp_status & TP_STATUS_SENDING)
+	n_sending++;
+      else
+	n_wrong++;
+      n_tot++;
+    }
+  while (tx_frame != apif->next_tx_frame);
+  s = format (s, "%Uavailable:%d request:%d sending:%d wrong:%d total:%d\n",
+	      format_white_space, indent, n_avail, n_send_req, n_sending,
+	      n_wrong, n_tot);
+
+  clib_spinlock_unlock_if_init (&apif->lockp);
   return s;
 }
 
@@ -99,7 +149,7 @@ VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
   struct tpacket2_hdr *tph;
   u32 frame_not_ready = 0;
 
-  while (n_left > 0)
+  while (n_left)
     {
       u32 len;
       u32 offset = 0;
@@ -109,9 +159,8 @@ VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
       buffers++;
 
       tph = (struct tpacket2_hdr *) (block_start + tx_frame * frame_size);
-
-      if (PREDICT_FALSE
-	  (tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
+      if (PREDICT_FALSE (tph->tp_status &
+			 (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
 	{
 	  frame_not_ready++;
 	  goto next;
@@ -132,9 +181,10 @@ VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
       tph->tp_len = tph->tp_snaplen = offset;
       tph->tp_status = TP_STATUS_SEND_REQUEST;
       n_sent++;
-    next:
+
       tx_frame = (tx_frame + 1) % frame_num;
 
+    next:
       /* check if we've exhausted the ring */
       if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
 	break;
@@ -146,8 +196,8 @@ VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
     {
       apif->next_tx_frame = tx_frame;
 
-      if (PREDICT_FALSE (sendto (apif->fd, NULL, 0,
-				 MSG_DONTWAIT, NULL, 0) == -1))
+      if (PREDICT_FALSE (sendto (apif->fd, NULL, 0, MSG_DONTWAIT, NULL, 0) ==
+			 -1))
 	{
 	  /* Uh-oh, drop & move on, but count whether it was fatal or not.
 	   * Note that we have no reliable way to properly determine the
@@ -155,8 +205,9 @@ VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
 	   */
 	  vlib_error_count (vm, node->node_index,
 			    unix_error_is_fatal (errno) ?
-			    AF_PACKET_TX_ERROR_TXRING_FATAL :
-			    AF_PACKET_TX_ERROR_TXRING_EAGAIN, n_sent);
+			      AF_PACKET_TX_ERROR_TXRING_FATAL :
+			      AF_PACKET_TX_ERROR_TXRING_EAGAIN,
+			    n_sent);
 	}
     }
 
@@ -329,7 +380,6 @@ error:
   return 0;			/* no error */
 }
 
-/* *INDENT-OFF* */
 VNET_DEVICE_CLASS (af_packet_device_class) = {
   .name = "af-packet",
   .format_device_name = format_af_packet_device_name,
@@ -343,7 +393,6 @@ VNET_DEVICE_CLASS (af_packet_device_class) = {
   .subif_add_del_function = af_packet_subif_add_del_function,
   .mac_addr_change_function = af_packet_set_mac_address_function,
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON