memif: complete refactor of socket handling code

Change-Id: I4d41def83a23f13701f1ddcea722d481e4c85cbc
Signed-off-by: Damjan Marion <damarion@cisco.com>

1 files changed, 111 insertions, 52 deletions

diff --git a/src/plugins/memif/cli.c b/src/plugins/memif/cli.c
index 88c09e98f8b..2d126aac346 100644
--- a/src/plugins/memif/cli.c
+++ b/src/plugins/memif/cli.c
@@ -24,20 +24,7 @@
 #include <vnet/ethernet/ethernet.h>
 
 #include <memif/memif.h>
-
-static uword
-unformat_memif_queues (unformat_input_t * input, va_list * args)
-{
-  u32 *rx_queues = va_arg (*args, u32 *);
-  u32 *tx_queues = va_arg (*args, u32 *);
-
-  if (unformat (input, "rx-queues %u", rx_queues))
-    ;
-  if (unformat (input, "tx-queues %u", tx_queues))
-    ;
-
-  return 1;
-}
+#include <memif/private.h>
 
 static clib_error_t *
 memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
@@ -57,18 +44,23 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (line_input, "key 0x%" PRIx64, &args.key))
+      if (unformat (line_input, "id %u", &args.id))
 	;
       else if (unformat (line_input, "socket %s", &args.socket_filename))
 	;
+      else if (unformat (line_input, "secret %s", &args.secret))
+	;
       else if (unformat (line_input, "ring-size %u", &ring_size))
 	;
+      else if (unformat (line_input, "rx-queues %u", &rx_queues))
+	;
+      else if (unformat (line_input, "tx-queues %u", &tx_queues))
+	;
       else if (unformat (line_input, "buffer-size %u", &args.buffer_size))
 	;
       else if (unformat (line_input, "master"))
 	args.is_master = 1;
-      else if (unformat (line_input, "slave %U",
-			 unformat_memif_queues, &rx_queues, &tx_queues))
+      else if (unformat (line_input, "slave"))
 	args.is_master = 0;
       else if (unformat (line_input, "hw-addr %U",
 			 unformat_ethernet_address, args.hw_addr))
@@ -94,6 +86,9 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   r = memif_create_if (vm, &args);
 
+  vec_free (args.socket_filename);
+  vec_free (args.secret);
+
   if (r <= VNET_API_ERROR_SYSCALL_ERROR_1
       && r >= VNET_API_ERROR_SYSCALL_ERROR_10)
     return clib_error_return (0, "%s (errno %d)", strerror (errno), errno);
@@ -102,7 +97,7 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
     return clib_error_return (0, "Invalid interface name");
 
   if (r == VNET_API_ERROR_SUBIF_ALREADY_EXISTS)
-    return clib_error_return (0, "Interface already exists");
+    return clib_error_return (0, "Interface with same id already exists");
 
   return 0;
 }
@@ -110,9 +105,9 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (memif_create_command, static) = {
   .path = "create memif",
-  .short_help = "create memif [key <key>] [socket <path>] "
+  .short_help = "create memif [id <id>] [socket <path>] "
                 "[ring-size <size>] [buffer-size <size>] [hw-addr <mac-address>] "
-		"<master|slave [rx-queues <number>] [tx-queues <number>]>",
+		"<master|slave> [rx-queues <number>] [tx-queues <number>]",
   .function = memif_create_command_fn,
 };
 /* *INDENT-ON* */
@@ -122,8 +117,11 @@ memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
 			 vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
-  u64 key = 0;
-  u8 key_defined = 0;
+  u32 sw_if_index = ~0;
+  vnet_hw_interface_t *hw;
+  memif_main_t *mm = &memif_main;
+  memif_if_t *mif;
+  vnet_main_t *vnm = vnet_get_main ();
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -131,18 +129,27 @@ memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (line_input, "key 0x%" PRIx64, &key))
-	key_defined = 1;
+      if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+	;
+      else if (unformat (line_input, "%U", unformat_vnet_sw_interface,
+			 vnm, &sw_if_index))
+	;
       else
 	return clib_error_return (0, "unknown input `%U'",
 				  format_unformat_error, input);
     }
   unformat_free (line_input);
 
-  if (!key_defined)
-    return clib_error_return (0, "missing key");
+  if (sw_if_index == ~0)
+    return clib_error_return (0,
+			      "please specify interface name or sw_if_index");
+
+  hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  if (hw == NULL || memif_device_class.index != hw->dev_class_index)
+    return clib_error_return (0, "not a memif interface");
 
-  memif_delete_if (vm, key);
+  mif = pool_elt_at_index (mm->interfaces, hw->dev_instance);
+  memif_delete_if (vm, mif);
 
   return 0;
 }
@@ -150,11 +157,59 @@ memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (memif_delete_command, static) = {
   .path = "delete memif",
-  .short_help = "delete memif key <key-value>",
+  .short_help = "delete memif {<interface> | sw_if_index <sw_idx>}",
   .function = memif_delete_command_fn,
 };
 /* *INDENT-ON* */
 
+static u8 *
+format_memif_if_flags (u8 * s, va_list * args)
+{
+  u32 flags = va_arg (*args, u32);
+#define _(a,b,c) if ( flags & (1 << a)) s = format (s, " %s", c);
+  foreach_memif_if_flag
+#undef _
+    return s;
+}
+
+static u8 *
+format_memif_if_mode (u8 * s, va_list * args)
+{
+  memif_if_t *mif = va_arg (*args, memif_if_t *);
+  if (mif->mode == MEMIF_INTERFACE_MODE_ETHERNET)
+    return format (s, "ethernet");
+  if (mif->mode == MEMIF_INTERFACE_MODE_IP)
+    return format (s, "ip");
+  if (mif->mode == MEMIF_INTERFACE_MODE_PUNT_INJECT)
+    return format (s, "punt-inject");
+  return format (s, "unknown mode (%u)", mif->mode);;
+}
+
+static u8 *
+format_memif_queue (u8 * s, va_list * args)
+{
+  memif_if_t *mif = va_arg (*args, memif_if_t *);
+  memif_queue_t *mq = va_arg (*args, memif_queue_t *);
+  uword i = va_arg (*args, uword);
+  uword indent = format_get_indent (s);
+
+  s = format (s, "%U%s ring %u:\n",
+	      format_white_space, indent,
+	      (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) ?
+	      "slave-to-master" : "master-to-slave", i);
+  s = format (s, "%Uregion %u offset %u ring-size %u int-fd %d\n",
+	      format_white_space, indent + 4,
+	      mq->region, mq->offset, (1 << mq->log2_ring_size), mq->int_fd);
+
+  if (mq->ring)
+    s = format (s, "%Uhead %u tail %u flags 0x%04x interrupts %u\n",
+		format_white_space, indent + 4,
+		mq->ring->head, mq->ring->tail, mq->ring->flags,
+		mq->int_count);
+
+  return s;
+}
+
 static clib_error_t *
 memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input,
 		       vlib_cli_command_t * cmd)
@@ -162,39 +217,43 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input,
   memif_main_t *mm = &memif_main;
   memif_if_t *mif;
   vnet_main_t *vnm = vnet_get_main ();
-  int i;
+  memif_queue_t *mq;
+  uword i;
 
   /* *INDENT-OFF* */
   pool_foreach (mif, mm->interfaces,
     ({
+       memif_socket_file_t * msf = vec_elt_at_index (mm->socket_files,
+						     mif->socket_file_index);
        vlib_cli_output (vm, "interface %U", format_vnet_sw_if_index_name,
 			vnm, mif->sw_if_index);
-       vlib_cli_output (vm, "  key 0x%" PRIx64 " file %s", mif->key,
-			mif->socket_filename);
-       vlib_cli_output (vm, "  listener %d conn-fd %d int-fd %d", mif->listener_index,
-			mif->connection.fd, mif->interrupt_line.fd);
-       vlib_cli_output (vm, "  ring-size %u num-s2m-rings %u num-m2s-rings %u buffer_size %u",
-			(1 << mif->log2_ring_size),
-			mif->num_s2m_rings,
-			mif->num_m2s_rings,
-			mif->buffer_size);
-       for (i=0; i < mif->num_s2m_rings; i++)
+       if (mif->remote_name)
+         vlib_cli_output (vm, "  remote-name \"%s\"", mif->remote_name);
+       if (mif->remote_if_name)
+         vlib_cli_output (vm, "  remote-interface \"%s\"", mif->remote_if_name);
+       vlib_cli_output (vm, "  id %d mode %U file %s", mif->id,
+			format_memif_if_mode, mif, msf->filename);
+       vlib_cli_output (vm, "  flags%U", format_memif_if_flags, mif->flags);
+       vlib_cli_output (vm, "  listener-fd %d conn-fd %d", msf->fd, mif->conn_fd);
+       vlib_cli_output (vm, "  num-s2m-rings %u num-m2s-rings %u buffer-size %u",
+			mif->run.num_s2m_rings,
+			mif->run.num_m2s_rings,
+			mif->run.buffer_size);
+
+       if (mif->local_disc_string)
+         vlib_cli_output (vm, "  local-disc-reason \"%s\"", mif->local_disc_string);
+       if (mif->remote_disc_string)
+         vlib_cli_output (vm, "  remote-disc-reason \"%s\"", mif->remote_disc_string);
+
+       vec_foreach_index (i, mif->tx_queues)
          {
-	   memif_ring_t * ring = memif_get_ring (mif, MEMIF_RING_S2M, i);
-	   if (ring)
-	     {
-	       vlib_cli_output (vm, "  slave-to-master ring %u:", i);
-	       vlib_cli_output (vm, "    head %u tail %u", ring->head, ring->tail);
-	     }
+	   mq = vec_elt_at_index (mif->tx_queues, i);
+	   vlib_cli_output (vm, "  %U", format_memif_queue, mif, mq, i);
 	 }
-       for (i=0; i < mif->num_m2s_rings; i++)
+       vec_foreach_index (i, mif->rx_queues)
          {
-	   memif_ring_t * ring = memif_get_ring (mif, MEMIF_RING_M2S, i);
-	   if (ring)
-	     {
-	       vlib_cli_output (vm, "  master-to-slave ring %u:", i);
-	       vlib_cli_output (vm, "    head %u tail %u", ring->head, ring->tail);
-	     }
+	   mq = vec_elt_at_index (mif->rx_queues, i);
+	   vlib_cli_output (vm, "  %U", format_memif_queue, mif, mq, i);
 	 }
     }));
   /* *INDENT-ON* */