misc: remove GNU Indent directives

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

diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index c9d2f00..7e3dd44 100644 (file)
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -26,7 +26,6 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 #include <sys/mman.h>
-#include <sys/prctl.h>
 #include <sys/eventfd.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -100,6 +99,8 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
   memif_region_t *mr;
   memif_queue_t *mq;
   int i;
+  vlib_main_t *vm = vlib_get_main ();
+  int with_barrier = 0;
 
   if (mif == 0)
     return;
@@ -141,7 +142,12 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
       clib_mem_free (mif->sock);
     }
 
-  /* *INDENT-OFF* */
+  if (vlib_worker_thread_barrier_held () == 0)
+    {
+      with_barrier = 1;
+      vlib_worker_thread_barrier_sync (vm);
+    }
+
   vec_foreach_index (i, mif->rx_queues)
     {
       mq = vec_elt_at_index (mif->rx_queues, i);
@@ -156,7 +162,6 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
     }
   vnet_hw_if_unregister_all_rx_queues (vnm, mif->hw_if_index);
 
-  /* *INDENT-OFF* */
   vec_foreach_index (i, mif->tx_queues)
   {
     mq = vec_elt_at_index (mif->tx_queues, i);
@@ -193,11 +198,13 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
       if (mr->fd > -1)
        close (mr->fd);
     }
-  /* *INDENT-ON* */
   vec_free (mif->regions);
   vec_free (mif->remote_name);
   vec_free (mif->remote_if_name);
   clib_fifo_free (mif->msg_queue);
+
+  if (with_barrier)
+    vlib_worker_thread_barrier_release (vm);
 }
 
 static clib_error_t *
@@ -255,7 +262,6 @@ memif_connect (memif_if_t * mif)
   vec_free (mif->local_disc_string);
   vec_free (mif->remote_disc_string);
 
-  /* *INDENT-OFF* */
   vec_foreach (mr, mif->regions)
     {
       if (mr->shm)
@@ -274,7 +280,6 @@ memif_connect (memif_if_t * mif)
          goto error;
        }
     }
-  /* *INDENT-ON* */
 
   template.read_function = memif_int_fd_read_ready;
   template.write_function = memif_int_fd_write_ready;
@@ -286,7 +291,6 @@ memif_connect (memif_if_t * mif)
   if (with_barrier)
     vlib_worker_thread_barrier_sync (vm);
 
-  /* *INDENT-OFF* */
   vec_foreach_index (i, mif->tx_queues)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i);
@@ -301,6 +305,37 @@ memif_connect (memif_if_t * mif)
       mq->queue_index =
        vnet_hw_if_register_tx_queue (vnm, mif->hw_if_index, i);
       clib_spinlock_init (&mq->lockp);
+
+      if (mif->flags & MEMIF_IF_FLAG_USE_DMA)
+       {
+         memif_dma_info_t *dma_info;
+         mq->dma_head = 0;
+         mq->dma_tail = 0;
+         mq->dma_info_head = 0;
+         mq->dma_info_tail = 0;
+         mq->dma_info_size = MEMIF_DMA_INFO_SIZE;
+         vec_validate_aligned (mq->dma_info, MEMIF_DMA_INFO_SIZE,
+                               CLIB_CACHE_LINE_BYTES);
+
+         vec_foreach (dma_info, mq->dma_info)
+           {
+             vec_validate_aligned (dma_info->data.desc_data,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.desc_len,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.desc_status,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.copy_ops, 0,
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_reset_length (dma_info->data.copy_ops);
+             vec_validate_aligned (dma_info->data.buffers, 0,
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_reset_length (dma_info->data.buffers);
+           }
+       }
     }
 
   if (vec_len (mif->tx_queues) > 0)
@@ -331,6 +366,37 @@ memif_connect (memif_if_t * mif)
       qi = vnet_hw_if_register_rx_queue (vnm, mif->hw_if_index, i,
                                         VNET_HW_IF_RXQ_THREAD_ANY);
       mq->queue_index = qi;
+
+      if (mif->flags & MEMIF_IF_FLAG_USE_DMA)
+       {
+         memif_dma_info_t *dma_info;
+         mq->dma_head = 0;
+         mq->dma_tail = 0;
+         mq->dma_info_head = 0;
+         mq->dma_info_tail = 0;
+         mq->dma_info_size = MEMIF_DMA_INFO_SIZE;
+         vec_validate_aligned (mq->dma_info, MEMIF_DMA_INFO_SIZE,
+                               CLIB_CACHE_LINE_BYTES);
+         vec_foreach (dma_info, mq->dma_info)
+           {
+             vec_validate_aligned (dma_info->data.desc_data,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.desc_len,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.desc_status,
+                                   pow2_mask (max_log2_ring_sz),
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_validate_aligned (dma_info->data.copy_ops, 0,
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_reset_length (dma_info->data.copy_ops);
+             vec_validate_aligned (dma_info->data.buffers, 0,
+                                   CLIB_CACHE_LINE_BYTES);
+             vec_reset_length (dma_info->data.buffers);
+           }
+       }
+
       if (mq->int_fd > -1)
        {
          template.file_descriptor = mq->int_fd;
@@ -362,7 +428,6 @@ memif_connect (memif_if_t * mif)
            vnet_hw_if_rx_queue_set_int_pending (vnm, qi);
        }
     }
-  /* *INDENT-ON* */
 
   if (1 << max_log2_ring_sz > vec_len (mm->per_thread_data[0].desc_data))
     {
@@ -462,7 +527,6 @@ memif_init_regions_and_queues (memif_if_t * mif)
   if (mif->flags & MEMIF_IF_FLAG_ZERO_COPY)
     {
       vlib_buffer_pool_t *bp;
-      /* *INDENT-OFF* */
       vec_foreach (bp, vm->buffer_main->buffer_pools)
        {
          vlib_physmem_map_t *pm;
@@ -473,7 +537,6 @@ memif_init_regions_and_queues (memif_if_t * mif)
          r->shm = pm->base;
          r->is_external = 1;
        }
-      /* *INDENT-ON* */
     }
 
   for (i = 0; i < mif->run.num_s2m_rings; i++)
@@ -518,7 +581,6 @@ memif_init_regions_and_queues (memif_if_t * mif)
   vec_validate_aligned (mif->tx_queues, mif->run.num_s2m_rings - 1,
                        CLIB_CACHE_LINE_BYTES);
 
-  /* *INDENT-OFF* */
   vec_foreach_index (i, mif->tx_queues)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i);
@@ -539,13 +601,11 @@ memif_init_regions_and_queues (memif_if_t * mif)
        vec_validate_aligned (mq->buffers, 1 << mq->log2_ring_size,
                              CLIB_CACHE_LINE_BYTES);
     }
-  /* *INDENT-ON* */
 
   ASSERT (mif->rx_queues == 0);
   vec_validate_aligned (mif->rx_queues, mif->run.num_m2s_rings - 1,
                        CLIB_CACHE_LINE_BYTES);
 
-  /* *INDENT-OFF* */
   vec_foreach_index (i, mif->rx_queues)
     {
       memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i);
@@ -565,7 +625,6 @@ memif_init_regions_and_queues (memif_if_t * mif)
        vec_validate_aligned (mq->buffers, 1 << mq->log2_ring_size,
                              CLIB_CACHE_LINE_BYTES);
     }
-  /* *INDENT-ON* */
 
   return 0;
 
@@ -616,7 +675,6 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
        }
 
       last_run_duration = start_time = vlib_time_now (vm);
-      /* *INDENT-OFF* */
       pool_foreach (mif, mm->interfaces)
          {
          memif_socket_file_t * msf = vec_elt_at_index (mm->socket_files, mif->socket_file_index);
@@ -669,7 +727,6 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
                }
            }
         }
-      /* *INDENT-ON* */
       last_run_duration = vlib_time_now (vm) - last_run_duration;
     }
   return 0;
@@ -862,10 +919,8 @@ memif_delete_if (vlib_main_t *vm, memif_if_t *mif)
       if (msf->is_listener)
        {
          int i;
-         /* *INDENT-OFF* */
          vec_foreach_index (i, msf->pending_clients)
            memif_socket_close (msf->pending_clients + i);
-         /* *INDENT-ON* */
          memif_socket_close (&msf->sock);
          vec_free (msf->pending_clients);
        }
@@ -894,13 +949,21 @@ memif_delete_if (vlib_main_t *vm, memif_if_t *mif)
   return 0;
 }
 
-/* *INDENT-OFF* */
 VNET_HW_INTERFACE_CLASS (memif_ip_hw_if_class, static) = {
   .name = "memif-ip",
   .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
   .tx_hash_fn_type = VNET_HASH_FN_TYPE_IP,
 };
-/* *INDENT-ON* */
+
+static void
+memif_prepare_dma_args (vlib_dma_config_t *args)
+{
+  args->max_batches = 256;
+  args->max_transfer_size = VLIB_BUFFER_DEFAULT_DATA_SIZE;
+  args->barrier_before_last = 1;
+  args->sw_fallback = 1;
+  args->callback_fn = NULL;
+}
 
 clib_error_t *
 memif_create_if (vlib_main_t *vm, memif_create_if_args_t *args)
@@ -989,6 +1052,20 @@ memif_create_if (vlib_main_t *vm, memif_create_if_args_t *args)
   if (args->secret)
     mif->secret = vec_dup (args->secret);
 
+  /* register dma config if enabled */
+  if (args->use_dma)
+    {
+      vlib_dma_config_t dma_args;
+      bzero (&dma_args, sizeof (dma_args));
+      memif_prepare_dma_args (&dma_args);
+
+      dma_args.max_transfers = 1 << args->log2_ring_size;
+      dma_args.callback_fn = memif_dma_completion_cb;
+      mif->dma_input_config = vlib_dma_config_add (vm, &dma_args);
+      dma_args.callback_fn = memif_tx_dma_completion_cb;
+      mif->dma_tx_config = vlib_dma_config_add (vm, &dma_args);
+    }
+
   if (mif->mode == MEMIF_INTERFACE_MODE_ETHERNET)
     {
 
@@ -1077,6 +1154,9 @@ memif_create_if (vlib_main_t *vm, memif_create_if_args_t *args)
        mif->flags |= MEMIF_IF_FLAG_ZERO_COPY;
     }
 
+  if (args->use_dma)
+    mif->flags |= MEMIF_IF_FLAG_USE_DMA;
+
   vnet_hw_if_set_caps (vnm, mif->hw_if_index, VNET_HW_IF_CAP_INT_MODE);
   vnet_hw_if_set_input_node (vnm, mif->hw_if_index, memif_input_node.index);
   mhash_set (&msf->dev_instance_by_id, &mif->id, mif->dev_instance, 0);
@@ -1146,12 +1226,10 @@ memif_init (vlib_main_t * vm)
 
 VLIB_INIT_FUNCTION (memif_init);
 
-/* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
     .description = "Packet Memory Interface (memif) -- Experimental",
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON