X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fcli.c;h=dd13adb929b26640279663958a3ead6102fc7319;hb=10c5ff1;hp=3f0e28179e26b02e45e8cdd1acd3c31bac349be6;hpb=30349b075cf939549980f2a32e030b32f6d07e9a;p=vpp.git

diff --git a/src/plugins/memif/cli.c b/src/plugins/memif/cli.c
index 3f0e28179e2..dd13adb929b 100644
--- a/src/plugins/memif/cli.c
+++ b/src/plugins/memif/cli.c
@@ -183,6 +183,8 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
   if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
 
+  args.is_zero_copy = 1;
+
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (line_input, "id %u", &args.id))
@@ -203,6 +205,8 @@ memif_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	args.is_master = 1;
       else if (unformat (line_input, "slave"))
 	args.is_master = 0;
+      else if (unformat (line_input, "no-zero-copy"))
+	args.is_zero_copy = 0;
       else if (unformat (line_input, "mode ip"))
 	args.mode = MEMIF_INTERFACE_MODE_IP;
       else if (unformat (line_input, "hw-addr %U",
@@ -262,22 +266,6 @@ VLIB_CLI_COMMAND (memif_create_command, static) = {
 };
 /* *INDENT-ON* */
 
-static clib_error_t *
-create_memif_command_fn (vlib_main_t * vm, unformat_input_t * input,
-			 vlib_cli_command_t * cmd)
-{
-  vlib_cli_output (vm, "command deprecated. Please use "
-		   "'create interface memif' instead.\n");
-  return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (create_memif_command, static) = {
-  .path = "create memif",
-  .function = create_memif_command_fn,
-};
-/* *INDENT-ON* */
-
 static clib_error_t *
 memif_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
 			 vlib_cli_command_t * cmd)
@@ -354,14 +342,13 @@ format_memif_if_mode (u8 * s, va_list * args)
 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);
   u32 indent = format_get_indent (s);
 
   s = format (s, "%U%s ring %u:\n",
 	      format_white_space, indent,
-	      (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) ?
+	      (mq->type == MEMIF_RING_S2M) ?
 	      "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,
@@ -393,17 +380,17 @@ format_memif_descriptor (u8 * s, va_list * args)
       s = format (s, "%Udescriptor table:\n", format_white_space, indent);
       s =
 	format (s,
-		"%Uid    flags buf len desc len      address       offset    user address\n",
+		"%Uid    flags   len         address       offset    user address\n",
 		format_white_space, indent);
       s =
 	format (s,
-		"%U===== ===== ======= ======== ================== ====== ==================\n",
+		"%U===== ===== ======== ================== ====== ==================\n",
 		format_white_space, indent);
       for (slot = 0; slot < ring_size; slot++)
 	{
-	  s = format (s, "%U%-5d %-5d %-7d %-7d  0x%016lx %-6d 0x%016lx\n",
+	  s = format (s, "%U%-5d %-5d %-7d  0x%016lx %-6d 0x%016lx\n",
 		      format_white_space, indent, slot,
-		      ring->desc[slot].flags, ring->desc[slot].buffer_length,
+		      ring->desc[slot].flags,
 		      ring->desc[slot].length,
 		      mif->regions[ring->desc[slot].region].shm,
 		      ring->desc[slot].offset, memif_get_buffer (mif, ring,
@@ -422,6 +409,7 @@ 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 ();
+  memif_region_t *mr;
   memif_queue_t *mq;
   uword i;
   int show_descr = 0;
@@ -499,10 +487,10 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input,
       vlib_cli_output (vm, "  listener-fd %d conn-fd %d",
 		       msf->sock ? msf->sock->fd : 0,
 		       mif->sock ? mif->sock->fd : 0);
-      vlib_cli_output (vm,
-		       "  num-s2m-rings %u num-m2s-rings %u buffer-size %u",
+      vlib_cli_output (vm, "  num-s2m-rings %u num-m2s-rings %u "
+		       "buffer-size %u num-regions %u",
 		       mif->run.num_s2m_rings, mif->run.num_m2s_rings,
-		       mif->run.buffer_size);
+		       mif->run.buffer_size, vec_len (mif->regions));
 
       if (mif->local_disc_string)
 	vlib_cli_output (vm, "  local-disc-reason \"%s\"",
@@ -511,20 +499,28 @@ memif_show_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	vlib_cli_output (vm, "  remote-disc-reason \"%s\"",
 			 mif->remote_disc_string);
 
+      /* *INDENT-OFF* */
+      vec_foreach_index (i, mif->regions)
+	{
+	  mr = vec_elt_at_index (mif->regions, i);
+	  vlib_cli_output (vm, "  region %u size %u fd %d", i,
+			   mr->region_size, mr->fd);
+	}
       vec_foreach_index (i, mif->tx_queues)
-      {
-	mq = vec_elt_at_index (mif->tx_queues, i);
-	vlib_cli_output (vm, "  %U", format_memif_queue, mif, mq, i);
-	if (show_descr)
-	  vlib_cli_output (vm, "  %U", format_memif_descriptor, mif, mq);
-      }
+	{
+	  mq = vec_elt_at_index (mif->tx_queues, i);
+	  vlib_cli_output (vm, "  %U", format_memif_queue, mq, i);
+	  if (show_descr)
+	    vlib_cli_output (vm, "  %U", format_memif_descriptor, mif, mq);
+	}
       vec_foreach_index (i, mif->rx_queues)
-      {
-	mq = vec_elt_at_index (mif->rx_queues, i);
-	vlib_cli_output (vm, "  %U", format_memif_queue, mif, mq, i);
-	if (show_descr)
-	  vlib_cli_output (vm, "  %U", format_memif_descriptor, mif, mq);
-      }
+	{
+	  mq = vec_elt_at_index (mif->rx_queues, i);
+	  vlib_cli_output (vm, "  %U", format_memif_queue, mq, i);
+	  if (show_descr)
+	    vlib_cli_output (vm, "  %U", format_memif_descriptor, mif, mq);
+	}
+      /* *INDENT-ON* */
     }
 done:
   vec_free (hw_if_indices);