memif: include interface name in logs

[vpp.git] / src / plugins / memif / memif.c

diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index f533ab9..e35a8dc 100644 (file)
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -77,7 +77,8 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
   if (mif == 0)
     return;
 
-  DBG ("disconnect %u (%v)", mif->dev_instance, err ? err->what : 0);
+  memif_log_debug (mif, "disconnect %u (%v)", mif->dev_instance,
+                  err ? err->what : 0);
 
   if (err)
     {
@@ -106,7 +107,10 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
       clib_error_t *err;
       err = clib_socket_close (mif->sock);
       if (err)
-       clib_error_report (err);
+       {
+         memif_log_err (mif, "%U", format_clib_error, err);
+         clib_error_free (err);
+       }
       clib_mem_free (mif->sock);
     }
 
@@ -119,8 +123,9 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
          int rv;
          rv = vnet_hw_interface_unassign_rx_thread (vnm, mif->hw_if_index, i);
          if (rv)
-           DBG ("Warning: unable to unassign interface %d, "
-                "queue %d: rc=%d", mif->hw_if_index, i, rv);
+           memif_log_warn (mif,
+                          "Unable to unassign interface %d, queue %d: rc=%d",
+                          mif->hw_if_index, i, rv);
          mq->ring = 0;
        }
     }
@@ -141,7 +146,7 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
       if (mr->is_external)
        continue;
       if ((rv = munmap (mr->shm, mr->region_size)))
-       clib_warning ("munmap failed, rv = %d", rv);
+       memif_log_err (mif, "munmap failed, rv = %d", rv);
       if (mr->fd > -1)
        close (mr->fd);
     }
@@ -166,7 +171,7 @@ memif_int_fd_read_ready (clib_file_t * uf)
   size = read (uf->file_descriptor, &b, sizeof (b));
   if (size < 0)
     {
-      DBG_UNIX_LOG ("Failed to read from socket");
+      memif_log_debug (mif, "Failed to read form socket");
       return 0;
     }
 
@@ -184,8 +189,9 @@ memif_connect (memif_if_t * mif)
   clib_file_t template = { 0 };
   memif_region_t *mr;
   int i;
+  clib_error_t *err = NULL;
 
-  DBG ("connect %u", mif->dev_instance);
+  memif_log_debug (mif, "connect %u", mif->dev_instance);
 
   vec_free (mif->local_disc_string);
   vec_free (mif->remote_disc_string);
@@ -197,11 +203,17 @@ memif_connect (memif_if_t * mif)
        continue;
 
       if (mr->fd < 0)
-       clib_error_return (0, "no memory region fd");
+       {
+         err = clib_error_return (0, "no memory region fd");
+         goto error;
+       }
 
       if ((mr->shm = mmap (NULL, mr->region_size, PROT_READ | PROT_WRITE,
                           MAP_SHARED, mr->fd, 0)) == MAP_FAILED)
-       return clib_error_return_unix (0, "mmap");
+       {
+         err = clib_error_return_unix (0, "mmap");
+         goto error;
+       }
     }
   /* *INDENT-ON* */
 
@@ -214,7 +226,10 @@ memif_connect (memif_if_t * mif)
 
       mq->ring = mif->regions[mq->region].shm + mq->offset;
       if (mq->ring->cookie != MEMIF_COOKIE)
-       return clib_error_return (0, "wrong cookie on tx ring %u", i);
+       {
+         err = clib_error_return (0, "wrong cookie on tx ring %u", i);
+         goto error;
+       }
     }
 
   vec_foreach_index (i, mif->rx_queues)
@@ -224,7 +239,10 @@ memif_connect (memif_if_t * mif)
 
       mq->ring = mif->regions[mq->region].shm + mq->offset;
       if (mq->ring->cookie != MEMIF_COOKIE)
-       return clib_error_return (0, "wrong cookie on tx ring %u", i);
+       {
+         err = clib_error_return (0, "wrong cookie on tx ring %u", i);
+         goto error;
+       }
 
       if (mq->int_fd > -1)
        {
@@ -239,8 +257,8 @@ memif_connect (memif_if_t * mif)
       rv = vnet_hw_interface_set_rx_mode (vnm, mif->hw_if_index, i,
                                          VNET_HW_INTERFACE_RX_MODE_DEFAULT);
       if (rv)
-       clib_warning
-         ("Warning: unable to set rx mode for interface %d queue %d: "
+       memif_log_err
+         (mif, "Warning: unable to set rx mode for interface %d queue %d: "
           "rc=%d", mif->hw_if_index, i, rv);
       else
        {
@@ -261,6 +279,10 @@ memif_connect (memif_if_t * mif)
   vnet_hw_interface_set_flags (vnm, mif->hw_if_index,
                               VNET_HW_INTERFACE_FLAG_LINK_UP);
   return 0;
+
+error:
+  memif_log_err (mif, "%U", format_clib_error, err);
+  return err;
 }
 
 static_always_inline memif_ring_t *
@@ -307,7 +329,7 @@ memif_init_regions_and_queues (memif_if_t * mif)
 
   err = clib_mem_vm_ext_alloc (&alloc);
   if (err)
-    return err;
+    goto error;
 
   r->fd = alloc.fd;
   r->shm = alloc.addr;
@@ -376,7 +398,10 @@ memif_init_regions_and_queues (memif_if_t * mif)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i);
       if ((mq->int_fd = eventfd (0, EFD_NONBLOCK)) < 0)
-       return clib_error_return_unix (0, "eventfd[tx queue %u]", i);
+       {
+         err = clib_error_return_unix (0, "eventfd[tx queue %u]", i);
+         goto error;
+       }
       mq->int_clib_file_index = ~0;
       mq->ring = memif_get_ring (mif, MEMIF_RING_S2M, i);
       mq->log2_ring_size = mif->cfg.log2_ring_size;
@@ -399,7 +424,10 @@ memif_init_regions_and_queues (memif_if_t * mif)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i);
       if ((mq->int_fd = eventfd (0, EFD_NONBLOCK)) < 0)
-       return clib_error_return_unix (0, "eventfd[rx queue %u]", i);
+       {
+         err = clib_error_return_unix (0, "eventfd[rx queue %u]", i);
+         goto error;
+       }
       mq->int_clib_file_index = ~0;
       mq->ring = memif_get_ring (mif, MEMIF_RING_M2S, i);
       mq->log2_ring_size = mif->cfg.log2_ring_size;
@@ -414,6 +442,10 @@ memif_init_regions_and_queues (memif_if_t * mif)
   /* *INDENT-ON* */
 
   return 0;
+
+error:
+  memif_log_err (mif, "%U", format_clib_error, err);
+  return err;
 }
 
 static uword
@@ -522,7 +554,6 @@ VLIB_REGISTER_NODE (memif_process_node,static) = {
 };
 /* *INDENT-ON* */
 
-
 static int
 memif_add_socket_file (u32 sock_id, u8 * socket_filename)
 {
@@ -544,8 +575,6 @@ memif_add_socket_file (u32 sock_id, u8 * socket_filename)
       return VNET_API_ERROR_ENTRY_ALREADY_EXISTS;
     }
 
-  DBG ("creating socket file (uninitialized) %s", msf->filename);
-
   pool_get (mm->socket_files, msf);
   memset (msf, 0, sizeof (memif_socket_file_t));
 
@@ -589,7 +618,12 @@ memif_delete_socket_file (u32 sock_id)
 int
 memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename)
 {
-  if (sock_id == 0 || sock_id == ~0)
+  struct stat file_stat;
+  char *dir = 0, *tmp;
+  u32 idx = 0;
+
+  /* allow adding socket id 0 */
+  if ((sock_id == 0 && is_add == 0) || sock_id == ~0)
     {
       return VNET_API_ERROR_INVALID_ARGUMENT;
     }
@@ -607,7 +641,23 @@ memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename)
   if (sock_filename[0] != '/')
     {
       clib_error_t *error;
-      error = vlib_unix_recursive_mkdir (vlib_unix_get_runtime_dir ());
+
+      /* copy runtime dir path */
+      vec_add (dir, vlib_unix_get_runtime_dir (),
+              strlen (vlib_unix_get_runtime_dir ()));
+      vec_add1 (dir, '/');
+
+      /* if sock_filename contains dirs, add them to path */
+      tmp = strrchr ((char *) sock_filename, '/');
+      if (tmp)
+       {
+         idx = tmp - (char *) sock_filename;
+         vec_add (dir, sock_filename, idx);
+       }
+
+      vec_add1 (dir, '\0');
+      /* create socket dir */
+      error = vlib_unix_recursive_mkdir (dir);
       if (error)
        {
          clib_error_free (error);
@@ -620,7 +670,24 @@ memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename)
   else
     {
       sock_filename = vec_dup (sock_filename);
+
+      /* check if directory exists */
+      tmp = strrchr ((char *) sock_filename, '/');
+      if (tmp)
+       {
+         idx = tmp - (char *) sock_filename;
+         vec_add (dir, sock_filename, idx);
+         vec_add1 (dir, '\0');
+       }
+
+      if (((dir == 0) || (stat (dir, &file_stat) == -1)
+          || (!S_ISDIR (file_stat.st_mode))) && (idx != 0))
+       {
+         vec_free (dir);
+         return VNET_API_ERROR_INVALID_ARGUMENT;
+       }
     }
+  vec_free (dir);
 
   return memif_add_socket_file (sock_id, sock_filename);
 }
@@ -679,7 +746,10 @@ memif_delete_if (vlib_main_t * vm, memif_if_t * mif)
        {
          err = clib_socket_close (msf->sock);
          if (err)
-           clib_error_report (err);
+           {
+             memif_log_err (mif, "%U", format_clib_error, err);
+             clib_error_free (err);
+           }
          clib_mem_free (msf->sock);
        }
     }
@@ -760,7 +830,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args)
            {
              error = clib_error_return (0, "File exists for %s",
                                         msf->filename);
-             clib_error_report (error);
              rv = VNET_API_ERROR_VALUE_EXIST;
              goto done;
            }
@@ -771,7 +840,7 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args)
       msf->dev_instance_by_fd = hash_create (0, sizeof (uword));
       msf->is_listener = (args->is_master != 0);
 
-      DBG ("initializing socket file %s", msf->filename);
+      memif_log_debug (0, "initializing socket file %s", msf->filename);
     }
 
   if (mm->per_thread_data == 0)
@@ -848,7 +917,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args)
 
   if (error)
     {
-      clib_error_report (error);
       ret = VNET_API_ERROR_SYSCALL_ERROR_2;
       goto error;
     }
@@ -882,7 +950,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args)
 
       if ((error = clib_socket_init (s)))
        {
-         clib_error_report (error);
          ret = VNET_API_ERROR_SYSCALL_ERROR_4;
          goto error;
        }
@@ -934,21 +1001,27 @@ error:
       mif->hw_if_index = ~0;
     }
   memif_delete_if (vm, mif);
+  if (error)
+    {
+      memif_log_err (mif, "%U", format_clib_error, error);
+      clib_error_free (error);
+    }
   return ret;
 
 done:
   return rv;
 }
 
-
 static clib_error_t *
 memif_init (vlib_main_t * vm)
 {
   memif_main_t *mm = &memif_main;
-  u8 *filename;
 
   memset (mm, 0, sizeof (memif_main_t));
 
+  mm->log_class = vlib_log_register_class ("memif_plugin", 0);
+  memif_log_debug (0, "initialized");
+
   /* initialize binary API */
   memif_plugin_api_hookup (vm);
 
@@ -957,10 +1030,7 @@ memif_init (vlib_main_t * vm)
    * for socket-id 0 to MEMIF_DEFAULT_SOCKET_FILENAME in the
    * default run-time directory.
    */
-  filename = format (0, "%s/%s%c",
-                    vlib_unix_get_runtime_dir (),
-                    MEMIF_DEFAULT_SOCKET_FILENAME, 0);
-  memif_add_socket_file (0, filename);
+  memif_socket_filename_add_del (1, 0, (u8 *) MEMIF_DEFAULT_SOCKET_FILENAME);
 
   return 0;
 }
@@ -970,7 +1040,7 @@ VLIB_INIT_FUNCTION (memif_init);
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
-    .description = "Packet Memory Interface (experimetal)",
+    .description = "Packet Memory Interface (experimental)",
 };
 /* *INDENT-ON* */